--- rpms/smeserver-phplist/contribs10/smeserver-phplist-0.2.1-sme10.patch 2022/08/03 04:07:49 1.4
+++ rpms/smeserver-phplist/contribs10/smeserver-phplist-0.2.1-sme10.patch 2022/08/03 05:54:06 1.6
@@ -62,7 +62,7 @@ diff -Nur --no-dereference smeserver-php
+service
diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/db/configuration/migrate/phplist-database smeserver-phplist-0.2.1/root/etc/e-smith/db/configuration/migrate/phplist-database
--- smeserver-phplist-0.2.1.old/root/etc/e-smith/db/configuration/migrate/phplist-database 2020-03-18 13:12:54.000000000 -0400
-+++ smeserver-phplist-0.2.1/root/etc/e-smith/db/configuration/migrate/phplist-database 2022-08-03 00:07:05.132000000 -0400
++++ smeserver-phplist-0.2.1/root/etc/e-smith/db/configuration/migrate/phplist-database 2022-08-03 01:53:26.239000000 -0400
@@ -24,4 +24,29 @@
}
$rec->set_prop('DbPassword', $pw);
@@ -95,7 +95,7 @@ diff -Nur --no-dereference smeserver-php
}
diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/events/actions/phplist-initialise smeserver-phplist-0.2.1/root/etc/e-smith/events/actions/phplist-initialise
--- smeserver-phplist-0.2.1.old/root/etc/e-smith/events/actions/phplist-initialise 1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-phplist-0.2.1/root/etc/e-smith/events/actions/phplist-initialise 2022-08-03 00:07:04.884000000 -0400
++++ smeserver-phplist-0.2.1/root/etc/e-smith/events/actions/phplist-initialise 2022-08-03 01:53:25.976000000 -0400
@@ -0,0 +1,6 @@
+#!/bin/bash
+password=$(config getprop phplist AdminPass)
@@ -105,7 +105,7 @@ diff -Nur --no-dereference smeserver-php
+phplist -pupgrade
diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist
--- smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist 2020-03-18 13:12:54.000000000 -0400
-+++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist 2022-08-03 00:07:05.662000000 -0400
++++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist 2022-08-03 01:53:26.722000000 -0400
@@ -6,11 +6,12 @@
my $alias = $phplist{'AliasOnPrimary'} || 'enabled';
my $ver = $sysconfig{'ReleaseVersion'} || '8.1';
@@ -121,7 +121,7 @@ diff -Nur --no-dereference smeserver-php
" require valid-user\n" : '';
if ($status eq 'enabled') {
-@@ -22,42 +23,33 @@
+@@ -22,44 +23,45 @@
Options None +FollowSymLinks
AllowOverride None
DirectoryIndex index.php
@@ -148,7 +148,6 @@ diff -Nur --no-dereference smeserver-php
- Order deny,allow
- deny from all
- allow from $allow
-+ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+ Require $allow
@@ -170,17 +169,30 @@ diff -Nur --no-dereference smeserver-php
- deny from all
- allow from $allow
- $auth
-+ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
++ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
+
+ Require $allow
+ $auth
+
++
++
++ Require $allow
++
++
++
++
++
++ Require $allow
++
++
+ EOF
+ }
diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist
--- smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist 1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist 2022-08-03 00:07:05.910000000 -0400
++++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist 2022-08-03 01:53:26.983000000 -0400
@@ -0,0 +1,66 @@
+{
+
@@ -267,13 +279,13 @@ diff -Nur --no-dereference smeserver-php
+WantedBy=sme-server.target
diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/usr/local/bin/phplist smeserver-phplist-0.2.1/root/usr/local/bin/phplist
--- smeserver-phplist-0.2.1.old/root/usr/local/bin/phplist 1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-phplist-0.2.1/root/usr/local/bin/phplist 2022-08-03 00:07:04.607000000 -0400
++++ smeserver-phplist-0.2.1/root/usr/local/bin/phplist 2022-08-03 01:53:25.716000000 -0400
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/bin/php80 /usr/share/phplist/www/admin/index.php -c /etc/phplist/config.php $*
diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/usr/sbin/e-smith/systemd/phplist smeserver-phplist-0.2.1/root/usr/sbin/e-smith/systemd/phplist
--- smeserver-phplist-0.2.1.old/root/usr/sbin/e-smith/systemd/phplist 1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-phplist-0.2.1/root/usr/sbin/e-smith/systemd/phplist 2022-08-03 00:07:05.427000000 -0400
++++ smeserver-phplist-0.2.1/root/usr/sbin/e-smith/systemd/phplist 2022-08-03 01:53:26.456000000 -0400
@@ -0,0 +1,10 @@
+#!/bin/sh
+