[packages/awstats.git] / awstats-PLD.patch

diff -ur awstats-7.9.orig/tools/awstats_buildstaticpages.pl awstats-7.9/tools/awstats_buildstaticpages.pl
--- awstats-7.9.orig/tools/awstats_buildstaticpages.pl	2021-08-19 04:00:58.000000000 +0200
+++ awstats-7.9/tools/awstats_buildstaticpages.pl	2024-01-07 20:10:32.230113241 +0100
@@ -129,7 +129,7 @@
 	my @PossibleConfigDir=();
 
 	if ($configdir) { @PossibleConfigDir=("$configdir"); }
-	else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
+	else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/webapps/awstats","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
 
 	# Open config file
 	$FileConfig=$FileSuffix='';
@@ -299,8 +299,8 @@
 # Check if AWSTATS prog is found
 my $AwstatsFound=0;
 if (-s "$Awstats") { $AwstatsFound=1; }
-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
-	$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
+elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
+	$Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
 	$AwstatsFound=1;
 }
 elsif (-s "/usr/lib/cgi-bin/awstats.pl") {
diff -ur awstats-7.9.orig/tools/awstats_configure.pl awstats-7.9/tools/awstats_configure.pl
--- awstats-7.9.orig/tools/awstats_configure.pl	2019-06-27 11:30:40.000000000 +0200
+++ awstats-7.9/tools/awstats_configure.pl	2024-01-07 20:10:32.231113254 +0100
@@ -28,11 +28,11 @@
 $AWSTATS_DIRDATA_PATH
 /;
 $AWSTATS_PATH='';
-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
-$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf';		# Used only when configure ran on linux
+$AWSTATS_ICON_PATH='/usr/share/awstats/wwwroot/icon';
+$AWSTATS_CSS_PATH='/usr/share/awstats/wwwroot/css';
+$AWSTATS_CLASSES_PATH='/usr/share/awstats/wwwroot/classes';
+$AWSTATS_CGI_PATH='/usr/share/awstats/wwwroot/cgi-bin';
+$AWSTATS_MODEL_CONFIG='/etc/webapps/awstats/awstats.model.conf';		# Used only when configure ran on linux
 $AWSTATS_DIRDATA_PATH='/var/lib/awstats';						# Used only when configure ran on linux
 
 
@@ -610,7 +610,7 @@
 		my $bidon='';
 		print "Directory path to store config file(s) (Enter for default):\n> ";
 		$bidon=<STDIN>; chomp $bidon;
-		if (! $bidon) { $bidon = "/etc/awstats"; }
+		if (! $bidon) { $bidon = "/etc/webapps/awstats"; }
 		my $configdir=$bidon;
 		if (! -d $configdir) {
 			# Create the directory for config files
diff -ur awstats-7.9.orig/tools/awstats_updateall.pl awstats-7.9/tools/awstats_updateall.pl
--- awstats-7.9.orig/tools/awstats_updateall.pl	2014-09-23 09:16:09.000000000 +0200
+++ awstats-7.9/tools/awstats_updateall.pl	2024-01-07 20:10:32.231113254 +0100
@@ -12,7 +12,7 @@
 my $VERSION="1.0 (build $REVISION)";
 
 # Default value of DIRCONFIG
-my $DIRCONFIG = "/etc/awstats";
+my $DIRCONFIG = "/etc/webapps/awstats";
 
 my $Debug=0;
 
@@ -129,8 +129,8 @@
 	# Check if AWSTATS prog is found
 	my $AwstatsFound=0;
 	if (-s "$Awstats") { $AwstatsFound=1; }
-	elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
-		$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
+	elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
+		$Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
 		$AwstatsFound=1;
 	}
 	if (! $AwstatsFound) {
diff -ur awstats-7.9.orig/wwwroot/cgi-bin/awstats.pl awstats-7.9/wwwroot/cgi-bin/awstats.pl
--- awstats-7.9.orig/wwwroot/cgi-bin/awstats.pl	2024-01-07 20:09:51.559596037 +0100
+++ awstats-7.9/wwwroot/cgi-bin/awstats.pl	2024-01-07 20:10:32.235113304 +0100
@@ -1716,6 +1716,7 @@
 	my $configdir         = shift;
 	my @PossibleConfigDir = (
 			"$DIR",
+			"/etc/webapps/awstats",
 			"/etc/awstats",
 			"/usr/local/etc/awstats",
 			"/etc/opt/awstats"
Commit	Line	Data
93619836 MK	1	diff -ur awstats-7.9.orig/tools/awstats_buildstaticpages.pl awstats-7.9/tools/awstats_buildstaticpages.pl
	2	--- awstats-7.9.orig/tools/awstats_buildstaticpages.pl 2021-08-19 04:00:58.000000000 +0200
	3	+++ awstats-7.9/tools/awstats_buildstaticpages.pl 2024-01-07 20:10:32.230113241 +0100
	4	@@ -129,7 +129,7 @@
765dcd59 MC	5	my @PossibleConfigDir=();
	6
	7	if ($configdir) { @PossibleConfigDir=("$configdir"); }
	8	- else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
	9	+ else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/webapps/awstats","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
	10
	11	# Open config file
	12	$FileConfig=$FileSuffix='';
93619836	13	@@ -299,8 +299,8 @@
765dcd59 MC	14	# Check if AWSTATS prog is found
	15	my $AwstatsFound=0;
	16	if (-s "$Awstats") { $AwstatsFound=1; }
	17	-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
	18	- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
	19	+elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
	20	+ $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
	21	$AwstatsFound=1;
	22	}
93619836 MK	23	elsif (-s "/usr/lib/cgi-bin/awstats.pl") {
	24	diff -ur awstats-7.9.orig/tools/awstats_configure.pl awstats-7.9/tools/awstats_configure.pl
	25	--- awstats-7.9.orig/tools/awstats_configure.pl 2019-06-27 11:30:40.000000000 +0200
	26	+++ awstats-7.9/tools/awstats_configure.pl 2024-01-07 20:10:32.231113254 +0100
	27	@@ -28,11 +28,11 @@
765dcd59 MC	28	$AWSTATS_DIRDATA_PATH
	29	/;
	30	$AWSTATS_PATH='';
	31	-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
	32	-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
	33	-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
	34	-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
	35	-$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux
	36	+$AWSTATS_ICON_PATH='/usr/share/awstats/wwwroot/icon';
	37	+$AWSTATS_CSS_PATH='/usr/share/awstats/wwwroot/css';
	38	+$AWSTATS_CLASSES_PATH='/usr/share/awstats/wwwroot/classes';
	39	+$AWSTATS_CGI_PATH='/usr/share/awstats/wwwroot/cgi-bin';
	40	+$AWSTATS_MODEL_CONFIG='/etc/webapps/awstats/awstats.model.conf'; # Used only when configure ran on linux
	41	$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux
	42
	43
93619836	44	@@ -610,7 +610,7 @@
f076a1e5	45	my $bidon='';
	46	print "Directory path to store config file(s) (Enter for default):\n> ";
	47	$bidon=<STDIN>; chomp $bidon;
765dcd59 MC	48	- if (! $bidon) { $bidon = "/etc/awstats"; }
765dcd59 MC	49	+ if (! $bidon) { $bidon = "/etc/webapps/awstats"; }
f076a1e5	50	my $configdir=$bidon;
765dcd59 MC	51	if (! -d $configdir) {
765dcd59 MC	52	# Create the directory for config files
93619836 MK	53	diff -ur awstats-7.9.orig/tools/awstats_updateall.pl awstats-7.9/tools/awstats_updateall.pl
	54	--- awstats-7.9.orig/tools/awstats_updateall.pl 2014-09-23 09:16:09.000000000 +0200
	55	+++ awstats-7.9/tools/awstats_updateall.pl 2024-01-07 20:10:32.231113254 +0100
	56	@@ -12,7 +12,7 @@
765dcd59 MC	57	my $VERSION="1.0 (build $REVISION)";
	58
	59	# Default value of DIRCONFIG
	60	-my $DIRCONFIG = "/etc/awstats";
	61	+my $DIRCONFIG = "/etc/webapps/awstats";
	62
	63	my $Debug=0;
	64
93619836	65	@@ -129,8 +129,8 @@
765dcd59 MC	66	# Check if AWSTATS prog is found
	67	my $AwstatsFound=0;
	68	if (-s "$Awstats") { $AwstatsFound=1; }
	69	- elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
	70	- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
	71	+ elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
	72	+ $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
	73	$AwstatsFound=1;
	74	}
	75	if (! $AwstatsFound) {
93619836 MK	76	diff -ur awstats-7.9.orig/wwwroot/cgi-bin/awstats.pl awstats-7.9/wwwroot/cgi-bin/awstats.pl
	77	--- awstats-7.9.orig/wwwroot/cgi-bin/awstats.pl 2024-01-07 20:09:51.559596037 +0100
	78	+++ awstats-7.9/wwwroot/cgi-bin/awstats.pl 2024-01-07 20:10:32.235113304 +0100
	79	@@ -1716,6 +1716,7 @@
aba656d7 ER	80	my $configdir = shift;
	81	my @PossibleConfigDir = (
	82	"$DIR",
	83	+ "/etc/webapps/awstats",
	84	"/etc/awstats",
93619836	85	"/usr/local/etc/awstats",
9a3a03c9	86	"/etc/opt/awstats"