/[smecontribs]/rpms/smeserver-awstats/contribs10/smeserver-awstats-1.4-bz11045.patch
ViewVC logotype

Diff of /rpms/smeserver-awstats/contribs10/smeserver-awstats-1.4-bz11045.patch

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

Revision 1.1 by jpp, Mon Feb 22 20:14:08 2021 UTC Revision 1.4 by jpp, Mon Feb 22 21:11:34 2021 UTC
# Line 1  Line 1 
1  diff -Nur smeserver-awstats-1.4.old/createlinks smeserver-awstats-1.4/createlinks  diff -Nur smeserver-awstats-1.4.old/createlinks smeserver-awstats-1.4/createlinks
2  --- smeserver-awstats-1.4.old/createlinks       2007-04-06 00:59:44.000000000 -0400  --- smeserver-awstats-1.4.old/createlinks       2007-04-06 00:59:44.000000000 -0400
3  +++ smeserver-awstats-1.4/createlinks   2021-02-22 15:04:20.879000000 -0500  +++ smeserver-awstats-1.4/createlinks   2021-02-22 15:26:36.940000000 -0500
4  @@ -3,15 +3,29 @@  @@ -3,15 +3,29 @@
5   use esmith::Build::CreateLinks qw(:all);   use esmith::Build::CreateLinks qw(:all);
6   use File::Basename;   use File::Basename;
# Line 13  diff -Nur smeserver-awstats-1.4.old/crea Line 13  diff -Nur smeserver-awstats-1.4.old/crea
13    
14  -event_link("awstats-run", "ip-change", "60");  -event_link("awstats-run", "ip-change", "60");
15  -event_link("conf-awstats", "ip-change", "61");  -event_link("conf-awstats", "ip-change", "61");
16  +my $service;  +my $event;
17    
18  -event_link("conf-awstats", "awstats-update", "10");  -event_link("conf-awstats", "awstats-update", "10");
19  +panel_link("awstats", 'manager');  +panel_link("awstats", 'manager');
20  +  +
21  +$service="console-save";  +$event="console-save";
22  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
23  +  +
24  +$service="remoteaccess-update";  +$event="remoteaccess-update";
25  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
26  +  +
27  +$service="ip-change";  +$event="ip-change";
28  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
29  +event_link("awstats-run", $service , "04");  +event_link("awstats-run", $event , "04");
30  +  +
31  +$service="awstats-update";  +$event="awstats-update";
32  +event_link("navigation-conf", $event, "50");  +event_link("navigation-conf", $event, "50");
33  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
34   event_link("awstats-run", "awstats-update", "20");   event_link("awstats-run", "awstats-update", "20");
35    
36  +  +
37  +my $service= "smeserver-awstat-update";  +$event= "smeserver-awstats-update";
38  +event_link("navigation-conf", $event, "50");  +event_link("navigation-conf", $event, "50");
39  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );  +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
40  +templates2events("/etc/crontab", $event );  +templates2events("/etc/crontab", $event );
# Line 49  diff -Nur smeserver-awstats-1.4.old/root Line 49  diff -Nur smeserver-awstats-1.4.old/root
49  +++ smeserver-awstats-1.4/root/etc/e-smith/db/configuration/defaults/AWStats/type       2021-02-22 14:38:40.451000000 -0500  +++ smeserver-awstats-1.4/root/etc/e-smith/db/configuration/defaults/AWStats/type       2021-02-22 14:38:40.451000000 -0500
50  @@ -0,0 +1 @@  @@ -0,0 +1 @@
51  +status  +status
52    diff -Nur smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/awstats-upgrade smeserver-awstats-1.4/root/etc/e-smith/events/actions/awstats-upgrade
53    --- smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/awstats-upgrade   2018-07-18 10:30:22.000000000 -0400
54    +++ smeserver-awstats-1.4/root/etc/e-smith/events/actions/awstats-upgrade       2021-02-22 15:41:43.860000000 -0500
55    @@ -1,10 +1,19 @@
56     #!/bin/bash
57    
58    -cp -a /var/www/awstats/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon
59    -cp -a /var/www/awstats/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats
60    -cp -a /var/www/awstats/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats
61    -cp -a /var/www/awstats/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats
62    -cp -a /var/www/awstats/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats
63    +if [[ -d /var/www/awstats/ ]]; then
64    +  cp -a /var/www/awstats/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon
65    +  cp -a /var/www/awstats/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats
66    +  cp -a /var/www/awstats/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats
67    +  cp -a /var/www/awstats/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats
68    +  cp -a /var/www/awstats/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats
69    +else
70    +  rootdir='/usr/share/awstats/'
71    +  cp -a $rootdir/wwwroot/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon
72    +  cp -a $rootdir/wwwroot/cgi-bin/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats
73    +  cp -a $rootdir/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats
74    +  cp -a $rootdir/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats
75    +  cp -a $rootdir/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats
76    +fi
77     chmod -R 770 /etc/e-smith/web/panels/manager/cgi-bin/.awstats
78    
79     #cd /etc/e-smith/web/panels/manager/html/awstats/
80    diff -Nur smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/conf-awstats smeserver-awstats-1.4/root/etc/e-smith/events/actions/conf-awstats
81    --- smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/conf-awstats      2018-07-18 10:30:23.000000000 -0400
82    +++ smeserver-awstats-1.4/root/etc/e-smith/events/actions/conf-awstats  1969-12-31 19:00:00.000000000 -0500
83    @@ -1,41 +0,0 @@
84    -#!/usr/bin/perl -w
85    -
86    -#----------------------------------------------------------------------
87    -# copyright (C) 2001 neddix
88    -#
89    -# This program is free software; you can redistribute it and/or modify
90    -# it under the terms of the GNU General Public License as published by
91    -# the Free Software Foundation; either version 2 of the License, or
92    -# (at your option) any later version.
93    -#
94    -# This program is distributed in the hope that it will be useful,
95    -# but WITHOUT ANY WARRANTY; without even the implied warranty of
96    -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
97    -# GNU General Public License for more details.
98    -#
99    -# You should have received a copy of the GNU General Public License
100    -# along with this program; if not, write to the Free Software
101    -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
102    -#----------------------------------------------------------------------
103    -
104    -package esmith;
105    -
106    -use strict;
107    -use esmith::config;
108    -use esmith::util;
109    -
110    -esmith::templates::processTemplate(
111    -        {
112    -            TEMPLATE_PATH => '/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf',
113    -            OUTPUT_FILENAME => "/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf",
114    -        }
115    -);
116    -
117    -esmith::templates::processTemplate(
118    -        {
119    -            TEMPLATE_PATH => '/etc/crontab',
120    -            OUTPUT_FILENAME => "/etc/crontab",
121    -        }
122    -);
123    -
124    -exit (0);
125    diff -Nur smeserver-awstats-1.4.old/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf/10conf smeserver-awstats-1.4/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf/10conf
126    --- smeserver-awstats-1.4.old/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf/10conf    2018-07-20 09:44:29.000000000 -0400
127    +++ smeserver-awstats-1.4/root/etc/e-smith/templates/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf/10conf        2021-02-22 16:07:41.062000000 -0500
128    @@ -165,6 +165,7 @@
129    
130         my $networkDB = esmith::ConfigDB->open('networks') or die("can't open Networks DB");
131         my $skipHosts = $configDB->get_prop( "AWStats", "SkipHosts" ) || '';
132    +    my $allIPs = "";
133    
134         $OUT = "SkipHosts=\"";
135    
136    @@ -205,6 +206,9 @@
137    
138             }
139         }
140    +    
141    +    # Escape full stops e.g. \.co\.uk ; for REGEX only
142    +    $allIPs =~ s/\./\\./g;
143    
144         # external IP
145         #
146    @@ -216,6 +220,8 @@
147             # If Skip ExternalIP is set to mask
148             if ( defined $ipskipExtIP && $ipskipExtIP eq "mask" ) {
149                 my $return = mip( $externalip, $externalnetmask );
150    +           #Escape full stops e.g. \.co\.uk ; for REGEX only
151    +           $return =~ s/\./\\./g;
152                 $allIPs .= "REGEX[^$return] ";
153    
154             }
155    @@ -226,12 +232,6 @@
156             }
157    
158         }
159    -    # Always add
160    -    #$allIPs = "127.0.0.1 $allIPs";
161    -
162    -    # Escape full stops e.g. \.co\.uk
163    -    $allIPs =~ s/\./\\./g;
164    -
165         $OUT .= "127.0.0.1 $skipHosts $allIPs";
166    
167         $OUT .= '"' . "\n";
168    @@ -259,11 +259,11 @@
169         # needed for IE6 beta
170          if ( defined $ipskipExtIP && $ipskipExtIP eq "mask" ) {
171              $externalip = mip( $externalip, $externalnetmask );
172    -         $externalip =~ s/\./\\./g;
173    +         #$externalip =~ s/\./\\./g;
174              $OUT .= " " . $externalip;
175          }
176          elsif ( defined $ipskipExtIP && $ipskipExtIP eq "yes" ) {
177    -         $externalip =~ s/\./\\./g;
178    +         #$externalip =~ s/\./\\./g;
179              $OUT .= " " . $externalip;
180          }
181    
182  diff -Nur smeserver-awstats-1.4.old/root/etc/yum/post-actions/awstats.action smeserver-awstats-1.4/root/etc/yum/post-actions/awstats.action  diff -Nur smeserver-awstats-1.4.old/root/etc/yum/post-actions/awstats.action smeserver-awstats-1.4/root/etc/yum/post-actions/awstats.action
183  --- smeserver-awstats-1.4.old/root/etc/yum/post-actions/awstats.action  1969-12-31 19:00:00.000000000 -0500  --- smeserver-awstats-1.4.old/root/etc/yum/post-actions/awstats.action  1969-12-31 19:00:00.000000000 -0500
184  +++ smeserver-awstats-1.4/root/etc/yum/post-actions/awstats.action      2021-02-22 15:02:23.606000000 -0500  +++ smeserver-awstats-1.4/root/etc/yum/post-actions/awstats.action      2021-02-22 15:02:23.606000000 -0500
185  @@ -0,0 +1,2 @@  @@ -0,0 +1,2 @@
186  +awstats:install:/etc/e-smith/events/actions/awstats-upgrade  +awstats:install:/etc/e-smith/events/actions/awstats-upgrade
187  +awstats:update:/etc/e-smith/events/actions/awstats-upgrade  +awstats:update:/etc/e-smith/events/actions/awstats-upgrade
188    diff -Nur smeserver-awstats-1.4.old/root/sbin/e-smith/awstats-pp smeserver-awstats-1.4/root/sbin/e-smith/awstats-pp
189    --- smeserver-awstats-1.4.old/root/sbin/e-smith/awstats-pp      2007-04-06 00:59:44.000000000 -0400
190    +++ smeserver-awstats-1.4/root/sbin/e-smith/awstats-pp  2021-02-22 16:10:24.112000000 -0500
191    @@ -47,7 +47,7 @@
192    
193     my $status=db_get_prop(\%conf, "AWStats", "status");
194     exit (0) if not defined $status || $status ne "enabled";
195    -$debug=(db_get_prop(\%conf, "AWStats", "Debug") eq "yes");
196    +$debug=((db_get_prop(\%conf, "AWStats", "Debug") ||"no") eq "yes");
197    
198     # primitive command line options parsing
199     foreach (@ARGV) {

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