/[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.3 by jpp, Mon Feb 22 20:43:18 2021 UTC Revision 1.4 by jpp, Mon Feb 22 21:11:34 2021 UTC
# Line 122  diff -Nur smeserver-awstats-1.4.old/root Line 122  diff -Nur smeserver-awstats-1.4.old/root
122  -);  -);
123  -  -
124  -exit (0);  -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