--- rpms/smeserver-awstats/contribs10/smeserver-awstats-1.4-bz11045.patch 2021/02/22 20:14:08 1.1 +++ rpms/smeserver-awstats/contribs10/smeserver-awstats-1.4-bz11045.patch 2021/02/22 20:43:18 1.3 @@ -1,6 +1,6 @@ diff -Nur smeserver-awstats-1.4.old/createlinks smeserver-awstats-1.4/createlinks --- smeserver-awstats-1.4.old/createlinks 2007-04-06 00:59:44.000000000 -0400 -+++ 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 @@ -3,15 +3,29 @@ use esmith::Build::CreateLinks qw(:all); use File::Basename; @@ -13,28 +13,28 @@ diff -Nur smeserver-awstats-1.4.old/crea -event_link("awstats-run", "ip-change", "60"); -event_link("conf-awstats", "ip-change", "61"); -+my $service; ++my $event; -event_link("conf-awstats", "awstats-update", "10"); +panel_link("awstats", 'manager'); + -+$service="console-save"; ++$event="console-save"; +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event ); + -+$service="remoteaccess-update"; ++$event="remoteaccess-update"; +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event ); + -+$service="ip-change"; ++$event="ip-change"; +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event ); -+event_link("awstats-run", $service , "04"); ++event_link("awstats-run", $event , "04"); + -+$service="awstats-update"; ++$event="awstats-update"; +event_link("navigation-conf", $event, "50"); +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event ); event_link("awstats-run", "awstats-update", "20"); + -+my $service= "smeserver-awstat-update"; ++$event= "smeserver-awstats-update"; +event_link("navigation-conf", $event, "50"); +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event ); +templates2events("/etc/crontab", $event ); @@ -49,6 +49,79 @@ diff -Nur smeserver-awstats-1.4.old/root +++ smeserver-awstats-1.4/root/etc/e-smith/db/configuration/defaults/AWStats/type 2021-02-22 14:38:40.451000000 -0500 @@ -0,0 +1 @@ +status +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 +--- smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/awstats-upgrade 2018-07-18 10:30:22.000000000 -0400 ++++ smeserver-awstats-1.4/root/etc/e-smith/events/actions/awstats-upgrade 2021-02-22 15:41:43.860000000 -0500 +@@ -1,10 +1,19 @@ + #!/bin/bash + +-cp -a /var/www/awstats/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon +-cp -a /var/www/awstats/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats +-cp -a /var/www/awstats/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats +-cp -a /var/www/awstats/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats +-cp -a /var/www/awstats/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++if [[ -d /var/www/awstats/ ]]; then ++ cp -a /var/www/awstats/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon ++ cp -a /var/www/awstats/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++ cp -a /var/www/awstats/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++ cp -a /var/www/awstats/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++ cp -a /var/www/awstats/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++else ++ rootdir='/usr/share/awstats/' ++ cp -a $rootdir/wwwroot/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon ++ cp -a $rootdir/wwwroot/cgi-bin/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++ cp -a $rootdir/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++ cp -a $rootdir/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++ cp -a $rootdir/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats ++fi + chmod -R 770 /etc/e-smith/web/panels/manager/cgi-bin/.awstats + + #cd /etc/e-smith/web/panels/manager/html/awstats/ +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 +--- smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/conf-awstats 2018-07-18 10:30:23.000000000 -0400 ++++ smeserver-awstats-1.4/root/etc/e-smith/events/actions/conf-awstats 1969-12-31 19:00:00.000000000 -0500 +@@ -1,41 +0,0 @@ +-#!/usr/bin/perl -w +- +-#---------------------------------------------------------------------- +-# copyright (C) 2001 neddix +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-#---------------------------------------------------------------------- +- +-package esmith; +- +-use strict; +-use esmith::config; +-use esmith::util; +- +-esmith::templates::processTemplate( +- { +- TEMPLATE_PATH => '/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf', +- OUTPUT_FILENAME => "/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", +- } +-); +- +-esmith::templates::processTemplate( +- { +- TEMPLATE_PATH => '/etc/crontab', +- OUTPUT_FILENAME => "/etc/crontab", +- } +-); +- +-exit (0); 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 --- smeserver-awstats-1.4.old/root/etc/yum/post-actions/awstats.action 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-awstats-1.4/root/etc/yum/post-actions/awstats.action 2021-02-22 15:02:23.606000000 -0500