[packages/dspam.git] / dspam-webui.patch

--- dspam-3.6.5/webui/cgi-bin/Makefile.am	2006-05-07 16:07:10.368456730 +0300
+++ dspam-3.6.5/webui/cgi-bin/Makefile.am	2006-05-07 16:23:40.160557961 +0300
@@ -1,17 +1,21 @@
 # $Id$
 #
 
-bin_SCRIPTS = configure_pl
-CLEANFILES = configure.pl
-
-EXTRA_DIST =            \
+bindir = $(pkgdatadir)/cgi
+bin_SCRIPTS = \
 	dspam.cgi       \
 	graph.cgi       \
+	admin.cgi       \
+	admingraph.cgi
+CLEANFILES = configure.pl
+
+webappdir = /etc/webapps/$(PACKAGE_NAME)
+webapp_DATA = configure.pl \
 	default.prefs   \
+	admins
+
+EXTRA_DIST =            \
 	rgb.txt         \
-	admin.cgi       \
-	admingraph.cgi  \
-	admins          \
 	configure.pl.in
 
 SUBDIRS = templates
@@ -22,5 +26,5 @@
 	-e 's,@bindir\@,$(bindir),g'
 
-configure_pl: configure.pl.in Makefile
+configure.pl: configure.pl.in Makefile
 	${sed_substitute_variables} < $(srcdir)/configure.pl.in > configure.pl
 
--- dspam-3.6.5/webui/cgi-bin/templates/Makefile.am	2006-02-13 18:16:57.000000000 +0200
+++ dspam-3.6.5.config/webui/cgi-bin/templates/Makefile.am	2006-05-07 15:24:39.881592142 +0300
@@ -1,6 +1,7 @@
 # $Id$
 
-EXTRA_DIST =            \
+templatesdir = $(pkgdatadir)/cgi/templates
+templates_DATA =            \
         nav_alerts.html \
         nav_error.html \
         nav_performance.html \
--- dspam-3.6.5/webui/htdocs/Makefile.am	2005-07-02 06:59:52.000000000 +0300
+++ dspam-3.6.5.config/webui/htdocs/Makefile.am	2006-05-07 15:25:19.162469057 +0300
@@ -2,7 +2,8 @@
 # webui/htdocs/Makefile.am
 #
 
-EXTRA_DIST =		\
+htdocsdir = $(pkgdatadir)/htdocs
+htdocs_DATA =            \
 	base.css	\
 	dspam-logo-small.gif
 
--- dspam-3.9.0/webui/cgi-bin/graph.cgi~	2010-01-11 22:21:58.000000000 +0100
+++ dspam-3.9.0/webui/cgi-bin/graph.cgi	2010-04-27 00:17:05.000000000 +0200
@@ -25,7 +25,7 @@
 use vars qw { %CONFIG %FORM %LANG @spam_day @nonspam_day @period @data };
 
 # Read configuration parameters common to all CGI scripts
-require "configure.pl";
+require "/etc/webapps/dspam/configure.pl";
 
 #
 # Read language file
@@ -40,7 +40,7 @@
 
 %FORM = &ReadParse();
 
-GD::Graph::colour::read_rgb("rgb.txt"); 
+GD::Graph::colour::read_rgb("/usr/X11R6/lib/X11/rgb.txt"); 
 
 do {
   my($spam, $nonspam, $period) = split(/\_/, $FORM{'data'});
--- dspam-3.9.0/webui/cgi-bin/admingraph.cgi~	2010-01-11 22:21:58.000000000 +0100
+++ dspam-3.9.0/webui/cgi-bin/admingraph.cgi	2010-04-27 00:20:27.000000000 +0200
@@ -24,7 +24,7 @@
 use vars qw { %CONFIG %FORM %LANG @spam @nonspam @period @data @inoc @sm @fp @wh @corpus @virus @black @block };
 
 # Read configuration parameters common to all CGI scripts
-require "configure.pl";
+require "/etc/webapps/dspam/configure.pl";
 
 #
 # Read language file
@@ -39,7 +39,7 @@
 
 %FORM = &ReadParse();
 
-GD::Graph::colour::read_rgb("rgb.txt"); 
+GD::Graph::colour::read_rgb("/usr/X11R6/lib/X11/rgb.txt"); 
 
 do {
   my($spam, $nonspam, $sm, $fp, $inoc, $wh, $corpus, $virus, $black, $block, $period) = split(/\_/, $FORM{'data'});
--- dspam-3.8.0/webui/cgi-bin/dspam.cgi.orig	2006-06-01 21:14:14.000000000 +0200
+++ dspam-3.8.0/webui/cgi-bin/dspam.cgi	2009-12-08 00:41:41.991051714 +0100
@@ -25,7 +25,7 @@
 require "ctime.pl";
 
 # Read configuration parameters common to all CGI scripts
-require "configure.pl";
+require "/etc/webapps/dspam/configure.pl";
 
 if($CONFIG{"DATE_FORMAT"}) {
   use POSIX qw(strftime);
@@ -67,7 +67,7 @@
 
 $CONFIG{'ADMIN'} = 0;
 if ($ENV{'REMOTE_USER'} ne "") {
-  open(FILE, "<./admins");
+  open(FILE, "</etc/webapps/dspam/admins");
   while(<FILE>) {
     chomp;
     if ($_ eq $ENV{'REMOTE_USER'}) {
@@ -2065,10 +2065,10 @@
 
   if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
 
-    if (! -e "./default.prefs") {
+    if (! -e "/etc/webapps/dspam/default.prefs") {
       &error("$LANG{'error_load_default_prefs'}");
     }
-    open(FILE, "<./default.prefs");
+    open(FILE, "</etc/webapps/dspam/default.prefs");
     while(<FILE>) {
       chomp;
       my($directive, $value) = split(/\=/);
--- dspam-3.6.5/webui/cgi-bin/admin.cgi	2006-05-07 16:34:00.934427888 +0300
+++ dspam-3.6.5/webui/cgi-bin/admin.cgi	2006-05-07 16:37:17.648823791 +0300
@@ -24,7 +24,7 @@
 require "ctime.pl";
 
 # Read configuration parameters common to all CGI scripts
-require "configure.pl";
+require "/etc/webapps/dspam/configure.pl";
 
 #
 # The current CGI script
@@ -37,7 +37,7 @@
 #
 do {
   my($admin) = 0;
-  open(FILE, "<./admins");
+  open(FILE, "</etc/webapps/dspam/admins");
   while(<FILE>) {
     chomp;
     if ($_ eq $ENV{'REMOTE_USER'}) {
@@ -125,14 +125,14 @@
   $USER = $FORM{'username'};
 
   if ($FORM{'username'} eq "") {
-    $FILE = "./default.prefs";
+    $FILE = "/etc/webapps/dspam/default.prefs";
     if ($CONFIG{'PREFERENCES_EXTENSION'} != 1 && ! -l "$CONFIG{'DSPAM_HOME'}/default.prefs") {
       $DATA{'ERROR'} = "<em>WARNING:</em> " .
         "These default preferences will not be loaded by DSPAM, but only by ".
         " the CGI interface when a user initially sets up their preferences. ".
         "To have DSPAM override its configuration with these default ".
         "preferences, symlink $CONFIG{'DSPAM_HOME'}/default.prefs to the ".
-        "default.prefs file in the CGI directory.<BR><BR>";
+        "default.prefs file in the /etc/webapps/dspam directory.<BR><BR>";
     }
   } else {
     $FILE = GetPath($FORM{'username'}) . ".prefs";
@@ -213,7 +213,7 @@
   }
 
   if (! -e $FILE) {
-    %PREFS = GetPrefs($USER, "./default.prefs");
+    %PREFS = GetPrefs($USER, "/etc/webapps/dspam/default.prefs");
   } else {
     %PREFS = GetPrefs($USER, $FILE);
   }
@@ -704,7 +704,7 @@
     close(PIPE);
   } else {
     if (! -e $FILE) {
-      $FILE = "./default.prefs";
+      $FILE = "/etc/webapps/dspam/default.prefs";
     }
                                                                                 
     if (! -e $FILE) {
--- dspam-3.9.0/webui/cgi-bin/configure.pl.in~	2010-01-11 22:21:58.000000000 +0100
+++ dspam-3.9.0/webui/cgi-bin/configure.pl.in	2010-04-27 00:33:18.000000000 +0200
@@ -34,7 +34,7 @@
 $CONFIG{'DSPAM_PROCESSES'} = "ps auxw | grep dspam | grep -v 'grep\|cgi\|sock' | wc -l"; # use ps -deaf for Solaris
 $CONFIG{'MAIL_QUEUE'}	= "mailq | grep '^[0-9,A-F]\{10,12\}[\t ][\t ]*[1-9]' | wc -l";
 
-$CONFIG{'WEB_ROOT'}	= ""; # URL location of included htdocs/ files
+$CONFIG{'WEB_ROOT'}	= "/dspam/htdocs"; # URL location of included htdocs/ files
 
 # Default DSPAM display
 #$CONFIG{'DATE_FORMAT'}	= "%d.%m.%Y %H:%M"; # Date format in strftime style
@@ -54,14 +54,14 @@
 $ENV{'PATH'}		= "$ENV{'PATH'}:$CONFIG{'DSPAM_BIN'}";
 
 # Autodetect filesystem layout and preference options
-$CONFIG{'AUTODETECT'}	= 1;
+#$CONFIG{'AUTODETECT'}	= 1;
 
 # Or, if you're running dspam.cgi as untrusted, it won't be able to auto-detect
 # so you will need to specify some features manually:
-#$CONFIG{'AUTODETECT'}	= 0;
-#$CONFIG{'LARGE_SCALE'}	= 0;
-#$CONFIG{'DOMAIN_SCALE'}= 0;
-#$CONFIG{'PREFERENCES_EXTENSION'} = 0;
+$CONFIG{'AUTODETECT'}	= 1;
+$CONFIG{'LARGE_SCALE'}	= 1;
+$CONFIG{'DOMAIN_SCALE'}= 0;
+$CONFIG{'PREFERENCES_EXTENSION'} = 1;
 
 # Get DSPAM version
 $CONFIG{'DSPAM_VERSION'} = "Unknown Version";
Commit	Line	Data
4c81e5f1 ER	1	--- dspam-3.6.5/webui/cgi-bin/Makefile.am 2006-05-07 16:07:10.368456730 +0300
	2	+++ dspam-3.6.5/webui/cgi-bin/Makefile.am 2006-05-07 16:23:40.160557961 +0300
	3	@@ -1,17 +1,21 @@
	4	# $Id$
	5	#
	6
	7	-bin_SCRIPTS = configure_pl
	8	-CLEANFILES = configure.pl
	9	-
	10	-EXTRA_DIST = \
	11	+bindir = $(pkgdatadir)/cgi
	12	+bin_SCRIPTS = \
	13	dspam.cgi \
	14	graph.cgi \
	15	+ admin.cgi \
	16	+ admingraph.cgi
	17	+CLEANFILES = configure.pl
	18	+
	19	+webappdir = /etc/webapps/$(PACKAGE_NAME)
	20	+webapp_DATA = configure.pl \
	21	default.prefs \
	22	+ admins
	23	+
	24	+EXTRA_DIST = \
	25	rgb.txt \
	26	- admin.cgi \
	27	- admingraph.cgi \
	28	- admins \
	29	configure.pl.in
	30
	31	SUBDIRS = templates
	32	@@ -22,5 +26,5 @@
	33	-e 's,@bindir\@,$(bindir),g'
	34
	35	-configure_pl: configure.pl.in Makefile
	36	+configure.pl: configure.pl.in Makefile
	37	${sed_substitute_variables} < $(srcdir)/configure.pl.in > configure.pl
	38
	39	--- dspam-3.6.5/webui/cgi-bin/templates/Makefile.am 2006-02-13 18:16:57.000000000 +0200
	40	+++ dspam-3.6.5.config/webui/cgi-bin/templates/Makefile.am 2006-05-07 15:24:39.881592142 +0300
	41	@@ -1,6 +1,7 @@
	42	# $Id$
	43
	44	-EXTRA_DIST = \
	45	+templatesdir = $(pkgdatadir)/cgi/templates
	46	+templates_DATA = \
	47	nav_alerts.html \
	48	nav_error.html \
	49	nav_performance.html \
	50	--- dspam-3.6.5/webui/htdocs/Makefile.am 2005-07-02 06:59:52.000000000 +0300
	51	+++ dspam-3.6.5.config/webui/htdocs/Makefile.am 2006-05-07 15:25:19.162469057 +0300
	52	@@ -2,7 +2,8 @@
	53	# webui/htdocs/Makefile.am
	54	#
	55
	56	-EXTRA_DIST = \
	57	+htdocsdir = $(pkgdatadir)/htdocs
	58	+htdocs_DATA = \
	59	base.css \
	60	dspam-logo-small.gif
	61
9785002f	62	--- dspam-3.9.0/webui/cgi-bin/graph.cgi~ 2010-01-11 22:21:58.000000000 +0100
	63	+++ dspam-3.9.0/webui/cgi-bin/graph.cgi 2010-04-27 00:17:05.000000000 +0200
	64	@@ -25,7 +25,7 @@
	65	use vars qw { %CONFIG %FORM %LANG @spam_day @nonspam_day @period @data };
4c81e5f1 ER	66
	67	# Read configuration parameters common to all CGI scripts
	68	-require "configure.pl";
	69	+require "/etc/webapps/dspam/configure.pl";
	70
9785002f	71	#
	72	# Read language file
	73	@@ -40,7 +40,7 @@
	74
4c81e5f1 ER	75	%FORM = &ReadParse();
	76
	77	-GD::Graph::colour::read_rgb("rgb.txt");
	78	+GD::Graph::colour::read_rgb("/usr/X11R6/lib/X11/rgb.txt");
	79
	80	do {
	81	my($spam, $nonspam, $period) = split(/\_/, $FORM{'data'});
9785002f	82	--- dspam-3.9.0/webui/cgi-bin/admingraph.cgi~ 2010-01-11 22:21:58.000000000 +0100
	83	+++ dspam-3.9.0/webui/cgi-bin/admingraph.cgi 2010-04-27 00:20:27.000000000 +0200
	84	@@ -24,7 +24,7 @@
	85	use vars qw { %CONFIG %FORM %LANG @spam @nonspam @period @data @inoc @sm @fp @wh @corpus @virus @black @block };
4c81e5f1 ER	86
	87	# Read configuration parameters common to all CGI scripts
	88	-require "configure.pl";
	89	+require "/etc/webapps/dspam/configure.pl";
	90
9785002f	91	#
	92	# Read language file
	93	@@ -39,7 +39,7 @@
	94
4c81e5f1 ER	95	%FORM = &ReadParse();
	96
	97	-GD::Graph::colour::read_rgb("rgb.txt");
	98	+GD::Graph::colour::read_rgb("/usr/X11R6/lib/X11/rgb.txt");
	99
	100	do {
9785002f	101	my($spam, $nonspam, $sm, $fp, $inoc, $wh, $corpus, $virus, $black, $block, $period) = split(/\_/, $FORM{'data'});
c5227916	102	--- dspam-3.8.0/webui/cgi-bin/dspam.cgi.orig 2006-06-01 21:14:14.000000000 +0200
c5227916	103	+++ dspam-3.8.0/webui/cgi-bin/dspam.cgi 2009-12-08 00:41:41.991051714 +0100
4c81e5f1 ER	104	@@ -25,7 +25,7 @@
	105	require "ctime.pl";
	106
	107	# Read configuration parameters common to all CGI scripts
	108	-require "configure.pl";
	109	+require "/etc/webapps/dspam/configure.pl";
	110
	111	if($CONFIG{"DATE_FORMAT"}) {
	112	use POSIX qw(strftime);
	113	@@ -67,7 +67,7 @@
	114
	115	$CONFIG{'ADMIN'} = 0;
	116	if ($ENV{'REMOTE_USER'} ne "") {
	117	- open(FILE, "<./admins");
	118	+ open(FILE, "</etc/webapps/dspam/admins");
	119	while(<FILE>) {
	120	chomp;
	121	if ($_ eq $ENV{'REMOTE_USER'}) {
9785002f	122	@@ -2065,10 +2065,10 @@
4c81e5f1 ER	123
	124	if (keys(%PREFS) eq "0" \|\| $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
	125
	126	- if (! -e "./default.prefs") {
	127	+ if (! -e "/etc/webapps/dspam/default.prefs") {
9785002f	128	&error("$LANG{'error_load_default_prefs'}");
4c81e5f1 ER	129	}
	130	- open(FILE, "<./default.prefs");
	131	+ open(FILE, "</etc/webapps/dspam/default.prefs");
	132	while(<FILE>) {
	133	chomp;
	134	my($directive, $value) = split(/\=/);
	135	--- dspam-3.6.5/webui/cgi-bin/admin.cgi 2006-05-07 16:34:00.934427888 +0300
	136	+++ dspam-3.6.5/webui/cgi-bin/admin.cgi 2006-05-07 16:37:17.648823791 +0300
	137	@@ -24,7 +24,7 @@
	138	require "ctime.pl";
	139
	140	# Read configuration parameters common to all CGI scripts
	141	-require "configure.pl";
	142	+require "/etc/webapps/dspam/configure.pl";
	143
	144	#
	145	# The current CGI script
	146	@@ -37,7 +37,7 @@
	147	#
	148	do {
	149	my($admin) = 0;
	150	- open(FILE, "<./admins");
	151	+ open(FILE, "</etc/webapps/dspam/admins");
	152	while(<FILE>) {
	153	chomp;
	154	if ($_ eq $ENV{'REMOTE_USER'}) {
	155	@@ -125,14 +125,14 @@
	156	$USER = $FORM{'username'};
	157
	158	if ($FORM{'username'} eq "") {
	159	- $FILE = "./default.prefs";
	160	+ $FILE = "/etc/webapps/dspam/default.prefs";
	161	if ($CONFIG{'PREFERENCES_EXTENSION'} != 1 && ! -l "$CONFIG{'DSPAM_HOME'}/default.prefs") {
	162	$DATA{'ERROR'} = "<em>WARNING:</em> " .
	163	"These default preferences will not be loaded by DSPAM, but only by ".
	164	" the CGI interface when a user initially sets up their preferences. ".
	165	"To have DSPAM override its configuration with these default ".
	166	"preferences, symlink $CONFIG{'DSPAM_HOME'}/default.prefs to the ".
	167	- "default.prefs file in the CGI directory.<BR><BR>";
	168	+ "default.prefs file in the /etc/webapps/dspam directory.<BR><BR>";
	169	}
	170	} else {
	171	$FILE = GetPath($FORM{'username'}) . ".prefs";
	172	@@ -213,7 +213,7 @@
	173	}
	174
	175	if (! -e $FILE) {
	176	- %PREFS = GetPrefs($USER, "./default.prefs");
	177	+ %PREFS = GetPrefs($USER, "/etc/webapps/dspam/default.prefs");
	178	} else {
	179	%PREFS = GetPrefs($USER, $FILE);
	180	}
	181	@@ -704,7 +704,7 @@
	182	close(PIPE);
	183	} else {
	184	if (! -e $FILE) {
	185	- $FILE = "./default.prefs";
	186	+ $FILE = "/etc/webapps/dspam/default.prefs";
	187	}
	188
	189	if (! -e $FILE) {
9785002f	190	--- dspam-3.9.0/webui/cgi-bin/configure.pl.in~ 2010-01-11 22:21:58.000000000 +0100
	191	+++ dspam-3.9.0/webui/cgi-bin/configure.pl.in 2010-04-27 00:33:18.000000000 +0200
	192	@@ -34,7 +34,7 @@
	193	$CONFIG{'DSPAM_PROCESSES'} = "ps auxw \| grep dspam \| grep -v 'grep\\|cgi\\|sock' \| wc -l"; # use ps -deaf for Solaris
	194	$CONFIG{'MAIL_QUEUE'} = "mailq \| grep '^[0-9,A-F]\{10,12\}[\t ][\t ]*[1-9]' \| wc -l";
2a169ea9	195
9785002f	196	-$CONFIG{'WEB_ROOT'} = ""; # URL location of included htdocs/ files
9785002f	197	+$CONFIG{'WEB_ROOT'} = "/dspam/htdocs"; # URL location of included htdocs/ files
2a169ea9 ER	198
2a169ea9 ER	199	# Default DSPAM display
9785002f	200	#$CONFIG{'DATE_FORMAT'} = "%d.%m.%Y %H:%M"; # Date format in strftime style
	201	@@ -54,14 +54,14 @@
	202	$ENV{'PATH'} = "$ENV{'PATH'}:$CONFIG{'DSPAM_BIN'}";
2a169ea9 ER	203
2a169ea9 ER	204	# Autodetect filesystem layout and preference options
9785002f	205	-$CONFIG{'AUTODETECT'} = 1;
9785002f	206	+#$CONFIG{'AUTODETECT'} = 1;
2a169ea9 ER	207
	208	# Or, if you're running dspam.cgi as untrusted, it won't be able to auto-detect
	209	# so you will need to specify some features manually:
9785002f	210	-#$CONFIG{'AUTODETECT'} = 0;
	211	-#$CONFIG{'LARGE_SCALE'} = 0;
	212	-#$CONFIG{'DOMAIN_SCALE'}= 0;
2a169ea9	213	-#$CONFIG{'PREFERENCES_EXTENSION'} = 0;
9785002f	214	+$CONFIG{'AUTODETECT'} = 1;
	215	+$CONFIG{'LARGE_SCALE'} = 1;
	216	+$CONFIG{'DOMAIN_SCALE'}= 0;
2a169ea9 ER	217	+$CONFIG{'PREFERENCES_EXTENSION'} = 1;
2a169ea9 ER	218
9785002f	219	# Get DSPAM version
9785002f	220	$CONFIG{'DSPAM_VERSION'} = "Unknown Version";