/[smecontribs]/rpms/smeserver-phplist/contribs10/smeserver-phplist-0.2.1-sme10.patch
ViewVC logotype

Diff of /rpms/smeserver-phplist/contribs10/smeserver-phplist-0.2.1-sme10.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.4 by jpp, Wed Aug 3 04:07:49 2022 UTC Revision 1.7 by jpp, Thu Aug 4 04:03:03 2022 UTC
# Line 62  diff -Nur --no-dereference smeserver-php Line 62  diff -Nur --no-dereference smeserver-php
62  +service  +service
63  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  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
64  --- 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.old/root/etc/e-smith/db/configuration/migrate/phplist-database      2020-03-18 13:12:54.000000000 -0400
65  +++ 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
66  @@ -24,4 +24,29 @@  @@ -24,4 +24,29 @@
67           }           }
68           $rec->set_prop('DbPassword', $pw);           $rec->set_prop('DbPassword', $pw);
# Line 95  diff -Nur --no-dereference smeserver-php Line 95  diff -Nur --no-dereference smeserver-php
95   }   }
96  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  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
97  --- 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.old/root/etc/e-smith/events/actions/phplist-initialise      1969-12-31 19:00:00.000000000 -0500
98  +++ 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
99  @@ -0,0 +1,6 @@  @@ -0,0 +1,6 @@
100  +#!/bin/bash  +#!/bin/bash
101  +password=$(config getprop phplist AdminPass)  +password=$(config getprop phplist AdminPass)
# Line 105  diff -Nur --no-dereference smeserver-php Line 105  diff -Nur --no-dereference smeserver-php
105  +phplist -pupgrade  +phplist -pupgrade
106  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  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
107  --- 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.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist  2020-03-18 13:12:54.000000000 -0400
108  +++ 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
109  @@ -6,11 +6,12 @@  @@ -6,11 +6,12 @@
110   my $alias  =  $phplist{'AliasOnPrimary'} || 'enabled';   my $alias  =  $phplist{'AliasOnPrimary'} || 'enabled';
111   my $ver    = $sysconfig{'ReleaseVersion'} || '8.1';   my $ver    = $sysconfig{'ReleaseVersion'} || '8.1';
# Line 121  diff -Nur --no-dereference smeserver-php Line 121  diff -Nur --no-dereference smeserver-php
121                                 "    require valid-user\n" : '';                                 "    require valid-user\n" : '';
122    
123   if ($status eq 'enabled') {   if ($status eq 'enabled') {
124  @@ -22,42 +23,33 @@  @@ -22,44 +23,45 @@
125       Options None +FollowSymLinks       Options None +FollowSymLinks
126       AllowOverride None       AllowOverride None
127       DirectoryIndex index.php       DirectoryIndex index.php
# Line 148  diff -Nur --no-dereference smeserver-php Line 148  diff -Nur --no-dereference smeserver-php
148  -    Order deny,allow  -    Order deny,allow
149  -    deny from all  -    deny from all
150  -    allow from $allow  -    allow from $allow
 +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1  
151  +    Require $allow  +    Require $allow
152   </Directory>   </Directory>
153    
# Line 170  diff -Nur --no-dereference smeserver-php Line 169  diff -Nur --no-dereference smeserver-php
169  -    deny from all  -    deny from all
170  -    allow from $allow  -    allow from $allow
171  -    $auth  -    $auth
172  +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1  +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
173  +    <RequireAll>  +    <RequireAll>
174  +     Require $allow  +     Require $allow
175  +     $auth  +     $auth
176  +    </RequireAll>  +    </RequireAll>
177   </Directory>   </Directory>
178    
179    +<Directory /usr/share/phplist/www/admin/js>
180    +    <RequireAny>
181    +      Require $allow
182    +    </RequireAny>
183    +</Directory>
184    +
185    +<Directory /usr/share/phplist/www/admin/ui>
186    +    <RequireAny>
187    +      Require $allow
188    +    </RequireAny>
189    +</Directory>
190    
191     EOF
192     }
193  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  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
194  --- 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.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phplist     1969-12-31 19:00:00.000000000 -0500
195  +++ 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
196  @@ -0,0 +1,66 @@  @@ -0,0 +1,66 @@
197  +{  +{
198  +  +
# Line 267  diff -Nur --no-dereference smeserver-php Line 279  diff -Nur --no-dereference smeserver-php
279  +WantedBy=sme-server.target  +WantedBy=sme-server.target
280  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  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
281  --- smeserver-phplist-0.2.1.old/root/usr/local/bin/phplist      1969-12-31 19:00:00.000000000 -0500  --- smeserver-phplist-0.2.1.old/root/usr/local/bin/phplist      1969-12-31 19:00:00.000000000 -0500
282  +++ 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
283  @@ -0,0 +1,2 @@  @@ -0,0 +1,2 @@
284  +#!/bin/bash  +#!/bin/bash
285  +/usr/bin/php80 /usr/share/phplist/www/admin/index.php -c /etc/phplist/config.php $*  +/usr/bin/php80 /usr/share/phplist/www/admin/index.php -c /etc/phplist/config.php $*
286  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  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
287  --- 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.old/root/usr/sbin/e-smith/systemd/phplist   1969-12-31 19:00:00.000000000 -0500
288  +++ 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
289  @@ -0,0 +1,10 @@  @@ -0,0 +1,10 @@
290  +#!/bin/sh  +#!/bin/sh
291  +  +
# Line 299  diff -Nur --no-dereference smeserver-php Line 311  diff -Nur --no-dereference smeserver-php
311  -  /usr/local/bin/setuidgid www ./phplist -pprocessqueue  -  /usr/local/bin/setuidgid www ./phplist -pprocessqueue
312  -  sleep 120  -  sleep 120
313  -done  -done
314    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
315    --- smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist  2022-08-03 23:57:58.473000000 -0400
316    +++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist      2022-08-04 00:01:59.458000000 -0400
317    @@ -2,7 +2,7 @@
318    
319     my $status = $phplist{'status'} || 'disabled';
320     my $access = $phplist{'access'} || 'private';
321    -my $auth   = $phplist{'Authentication'} || 'http';
322    +my $auth   = $phplist{'Authentication'} || 'internal';
323     my $alias  =  $phplist{'AliasOnPrimary'} || 'enabled';
324     my $ver    = $sysconfig{'ReleaseVersion'} || '8.1';
325    
326    diff -Nur --no-dereference smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/phplist/config.php/35Login smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/phplist/config.php/35Login
327    --- smeserver-phplist-0.2.1.old/root/etc/e-smith/templates/etc/phplist/config.php/35Login       2020-03-18 13:12:54.000000000 -0400
328    +++ smeserver-phplist-0.2.1/root/etc/e-smith/templates/etc/phplist/config.php/35Login   2022-08-04 00:01:27.839000000 -0400
329    @@ -1,5 +1,5 @@
330     $require_login = 1;
331    -$admin_auth_module = '{(($phplist{'Authentication'} || 'http') eq 'internal') ? 'phplist_auth.inc':'external_auth.inc'}';
332    +$admin_auth_module = '{(($phplist{'Authentication'} || 'internal') eq 'internal') ? 'phplist_auth.inc':'external_auth.inc'}';
333     define("REGISTER",0);
334     define("MANUALLY_PROCESS_QUEUE",0);
335     define('MAILQUEUE_THROTTLE',0.5);

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed