[pkg-dspam-commits] r21 - in trunk/debian: . patches
Aurelien Labrosse
aurelien-guest at costa.debian.org
Thu Oct 27 12:10:27 UTC 2005
Author: aurelien-guest
Date: Thu Oct 27 12:10:26 2005
New Revision: 21
Modified:
trunk/debian/changelog
trunk/debian/dspam-apache.conf
trunk/debian/dspam-apache2.conf
trunk/debian/dspam-webfrontend.dirs
trunk/debian/dspam-webfrontend.install
trunk/debian/dspam-webfrontend.postinst
trunk/debian/dspam-webfrontend.postrm
trunk/debian/patches/dspam-webfrontend-config-debian.dpatch
trunk/debian/rules
Log:
* [aurelien] change installation directories of dspam-webfrontend package
from /*/dspam-webfrontend to /*/dspam
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Thu Oct 27 12:10:26 2005
@@ -1,6 +1,6 @@
dspam (3.6.0-2) unstable; urgency=low
- * [aurelien] added manpages
+ * [aurelien] added manpages
* [aurelien] fix webfrontend files to fit Debian installation (patch added)
* [aurelien] fix apache 1.3 configuration for webfrontend
* [kbk] modify webfrontend.dirs to .../dspam-webfrontend/...
@@ -10,8 +10,10 @@
* [aurelien] commited spam-webfrontend-config-debian.dpatch and reactivate
it in 00list
* [mooch] erased duplicated configure entries.
-
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org> Tue, 25 Oct 2005 21:56:06 -0700
+ * [aurelien] change directories name for dspam-webfrontend. become simply
+ 'dspam' rather than 'dspam-webfrontend'
+
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org> Wed, 26 Oct 2005 19:42:45 +0000
dspam (3.6.0-1) unstable; urgency=low
Modified: trunk/debian/dspam-apache.conf
==============================================================================
--- trunk/debian/dspam-apache.conf (original)
+++ trunk/debian/dspam-apache.conf Thu Oct 27 12:10:26 2005
@@ -7,10 +7,11 @@
Group dspam
# SSLRequireSSL
servername localhost
- Alias /dspam /var/www/dspam-webfrontend/
- <Directory /var/www/dspam-webfrontend>
+ Alias /dspam /var/www/dspam/
+ <Directory /var/www/dspam>
Options +ExecCGI -Indexes
Addhandler cgi-script .cgi
+ DirectoryIndex dspam.cgi
# Note: you have to add www-data to the 'shadow'
# group to make this work. You whould
Modified: trunk/debian/dspam-apache2.conf
==============================================================================
--- trunk/debian/dspam-apache2.conf (original)
+++ trunk/debian/dspam-apache2.conf Thu Oct 27 12:10:26 2005
@@ -7,10 +7,11 @@
Addhandler cgi-script .cgi
Options +ExecCGI -Indexes
- Alias /dspam /var/www/dspam-webfrontend/
- <Directory /var/www/dspam-webfrontend/>
+ Alias /dspam /var/www/dspam/
+ <Directory /var/www/dspam/>
Addhandler cgi-script .cgi
- Options +ExecCGI -Indexes
+ Options +ExecCGI -Indexes
+ DirectoryIndex dspam.cgi
# Note: you have to add www-data to the 'shadow'
# group to make this work. You whould
Modified: trunk/debian/dspam-webfrontend.dirs
==============================================================================
--- trunk/debian/dspam-webfrontend.dirs (original)
+++ trunk/debian/dspam-webfrontend.dirs Thu Oct 27 12:10:26 2005
@@ -1,5 +1,6 @@
-etc/dspam-webfrontend/
-usr/share/doc/dspam-webfrontend
-usr/share/dspam-webfrontend/templates/
-var/spool/dspam
-var/www/dspam-webfrontend
+etc/dspam/
+usr/share/doc/dspam/
+usr/share/dspam/templates/
+var/spool/dspam/
+var/www/dspam/
+usr/share/lintian/overrides/
Modified: trunk/debian/dspam-webfrontend.install
==============================================================================
--- trunk/debian/dspam-webfrontend.install (original)
+++ trunk/debian/dspam-webfrontend.install Thu Oct 27 12:10:26 2005
@@ -1,13 +1,13 @@
-webui/cgi-bin/admin.cgi var/www/dspam-webfrontend/
-webui/cgi-bin/admingraph.cgi var/www/dspam-webfrontend/
-webui/cgi-bin/graph.cgi var/www/dspam-webfrontend/
-webui/cgi-bin/dspam.cgi var/www/dspam-webfrontend/
-webui/cgi-bin/templates/*.html usr/share/dspam-webfrontend/templates/
-webui/htdocs/base.css var/www/dspam-webfrontend/
-webui/htdocs/dspam-logo-small.gif var/www/dspam-webfrontend/
-webui/cgi-bin/admins etc/dspam-webfrontend/
-webui/cgi-bin/rgb.txt etc/dspam-webfrontend/
-webui/cgi-bin/default.prefs etc/dspam-webfrontend/
-build--tmp/webui/cgi-bin/configure.pl etc/dspam-webfrontend/
+webui/cgi-bin/admin.cgi var/www/dspam/
+webui/cgi-bin/admingraph.cgi var/www/dspam/
+webui/cgi-bin/graph.cgi var/www/dspam/
+webui/cgi-bin/dspam.cgi var/www/dspam/
+webui/cgi-bin/templates/*.html usr/share/dspam/templates/
+webui/htdocs/base.css var/www/dspam/
+webui/htdocs/dspam-logo-small.gif var/www/dspam/
+webui/cgi-bin/admins etc/dspam/
+webui/cgi-bin/rgb.txt etc/dspam/
+webui/cgi-bin/default.prefs etc/dspam/
+build--tmp/webui/cgi-bin/configure.pl etc/dspam/
debian/dspam-apache.conf usr/share/doc/dspam-webfrontend/
debian/dspam-apache2.conf usr/share/doc/dspam-webfrontend/
Modified: trunk/debian/dspam-webfrontend.postinst
==============================================================================
--- trunk/debian/dspam-webfrontend.postinst (original)
+++ trunk/debian/dspam-webfrontend.postinst Thu Oct 27 12:10:26 2005
@@ -5,11 +5,11 @@
case "$1" in
configure)
for i in \
- /var/www/dspam-webfrontend \
- /var/www/dspam-webfrontend/admin.cgi \
- /var/www/dspam-webfrontend/admingraph.cgi \
- /var/www/dspam-webfrontend/dspam.cgi \
- /var/www/dspam-webfrontend/graph.cgi
+ /var/www/dspam \
+ /var/www/dspam/admin.cgi \
+ /var/www/dspam/admingraph.cgi \
+ /var/www/dspam/dspam.cgi \
+ /var/www/dspam/graph.cgi
do
if ! dpkg-statoverride --list $i >/dev/null
then
@@ -20,24 +20,21 @@
if [ -f /usr/sbin/apache2ctl ]; then
if [ ! -L /etc/apache2/mods-enabled/suexec.load ]; then
if [ ! -L /etc/apache2/mods-enabled/auth_pam.load ]; then
- ln -s /etc/apache2/mods-available/suexec.load /etc/apache2/mods-enabled/suexec.load
- ln -s /etc/apache2/mods-available/auth_pam.load /etc/apache2/mods-enabled/auth_pam.load
+ ln -sf /etc/apache2/mods-available/suexec.load /etc/apache2/mods-enabled/suexec.load
+ ln -sf /etc/apache2/mods-available/auth_pam.load /etc/apache2/mods-enabled/auth_pam.load
+ ln -sf /usr/share/doc/dspam-webfrontend/dspam-apache2.conf /etc/apache2/conf.d/
invoke-rc.d apache2 reload
fi
fi
fi
if [ -f /usr/sbin/apache ]; then
- #/etc/init.d/apache2 restart
- echo
+ ln -sf /usr/share/doc/dspam-webfrontend/dspam-apache.conf /etc/apache/conf.d/
+ invoke-rc.d apache reload
fi
;;
- reconfigure)
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
+ reconfigure|abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
Modified: trunk/debian/dspam-webfrontend.postrm
==============================================================================
--- trunk/debian/dspam-webfrontend.postrm (original)
+++ trunk/debian/dspam-webfrontend.postrm Thu Oct 27 12:10:26 2005
@@ -4,11 +4,11 @@
remove_dspam_perms() {
for i in \
- /var/www/dspam-webfrontend \
- /var/www/dspam-webfrontend/admin.cgi \
- /var/www/dspam-webfrontend/admingraph.cgi \
- /var/www/dspam-webfrontend/dspam.cgi \
- /var/www/dspam-webfrontend/graph.cgi
+ /var/www/dspam \
+ /var/www/dspam/admin.cgi \
+ /var/www/dspam/admingraph.cgi \
+ /var/www/dspam/dspam.cgi \
+ /var/www/dspam/graph.cgi
do
dpkg-statoverride --quiet --remove $i || true
done
@@ -19,8 +19,13 @@
remove_dspam_perms
if [ -f /usr/sbin/apache2ctl ]; then
- invoke-rc.d apache2 reload
- fi
+ rm -f /etc/apache2/conf.d/dspam-apache2.conf
+ invoke-rc.d apache2 reload
+ fi
+ if [ -f /usr/sbin/apache ]; then
+ rm -f /etc/apache/conf.d/dspam-apache.conf
+ invoke-rc.d apache reload
+ fi
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
Modified: trunk/debian/patches/dspam-webfrontend-config-debian.dpatch
==============================================================================
--- trunk/debian/patches/dspam-webfrontend-config-debian.dpatch (original)
+++ trunk/debian/patches/dspam-webfrontend-config-debian.dpatch Thu Oct 27 12:10:26 2005
@@ -6,15 +6,15 @@
## DP: to make the scripts usable on a Debian system out-of-the-box
@DPATCH@
-diff -urNad dspam-3.6.0/webui/cgi-bin/admin.cgi /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/admin.cgi
---- dspam-3.6.0/webui/cgi-bin/admin.cgi 2005-10-25 12:40:36.606184224 +0000
-+++ /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/admin.cgi 2005-10-25 12:42:32.333590984 +0000
+diff -urNad dspam-3.6.0/webui/cgi-bin/admin.cgi /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/admin.cgi
+--- dspam-3.6.0/webui/cgi-bin/admin.cgi 2005-10-26 20:43:29.120437888 +0000
++++ /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/admin.cgi 2005-10-26 20:45:11.815825816 +0000
@@ -24,7 +24,7 @@
require "ctime.pl";
# Read configuration parameters common to all CGI scripts
-require "configure.pl";
-+require "/etc/dspam-webfrontend/configure.pl";
++require "/etc/dspam/configure.pl";
#
# The current CGI script
@@ -23,7 +23,7 @@
do {
my($admin) = 0;
- open(FILE, "<./admins");
-+ open(FILE, "</etc/dspam-webfrontend/admins");
++ open(FILE, "</etc/dspam/admins");
while(<FILE>) {
chomp;
if ($_ eq $ENV{'REMOTE_USER'}) {
@@ -54,32 +54,32 @@
}
if (! -e $FILE) {
-diff -urNad dspam-3.6.0/webui/cgi-bin/admingraph.cgi /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/admingraph.cgi
---- dspam-3.6.0/webui/cgi-bin/admingraph.cgi 2005-10-25 12:40:36.607184072 +0000
-+++ /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/admingraph.cgi 2005-10-25 12:41:05.744754488 +0000
+diff -urNad dspam-3.6.0/webui/cgi-bin/admingraph.cgi /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/admingraph.cgi
+--- dspam-3.6.0/webui/cgi-bin/admingraph.cgi 2005-10-26 20:43:29.121437736 +0000
++++ /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/admingraph.cgi 2005-10-26 20:45:21.734317976 +0000
@@ -24,11 +24,11 @@
use vars qw { %CONFIG %FORM @spam @nonspam @period @data @inoc @sm @fp @wh };
# Read configuration parameters common to all CGI scripts
-require "configure.pl";
-+require "/etc/dspam-webfrontend/configure.pl";
++require "/etc/dspam/configure.pl";
%FORM = &ReadParse();
-GD::Graph::colour::read_rgb("rgb.txt");
-+GD::Graph::colour::read_rgb("/etc/dspam-webfrontend/rgb.txt");
++GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt");
do {
my($spam, $nonspam, $sm, $fp, $inoc, $wh, $period) = split(/\_/, $FORM{'data'});
-diff -urNad dspam-3.6.0/webui/cgi-bin/configure.pl.in /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/configure.pl.in
---- dspam-3.6.0/webui/cgi-bin/configure.pl.in 2005-10-25 12:40:36.607184072 +0000
-+++ /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/configure.pl.in 2005-10-25 12:41:05.745754336 +0000
+diff -urNad dspam-3.6.0/webui/cgi-bin/configure.pl.in /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/configure.pl.in
+--- dspam-3.6.0/webui/cgi-bin/configure.pl.in 2005-10-26 20:43:29.121437736 +0000
++++ /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/configure.pl.in 2005-10-26 20:44:18.486933040 +0000
@@ -29,11 +29,11 @@
$CONFIG{'DSPAM_STATS'} = $CONFIG{'DSPAM_BIN'} . "/dspam_stats";
$CONFIG{'DSPAM_ARGS'} = "--deliver=innocent --class=innocent " .
"--source=error --user %CURRENT_USER% -d %u";
-$CONFIG{'TEMPLATES'} = "./templates"; # Location of HTML templates
-+$CONFIG{'TEMPLATES'} = "/usr/share/dspam-webfrontend/templates"; # Location of HTML templates
++$CONFIG{'TEMPLATES'} = "/usr/share/dspam/templates"; # Location of HTML templates
$CONFIG{'ALL_PROCS'} = "ps auxw"; # use ps -deaf for Solaris
$CONFIG{'MAIL_QUEUE'} = "mailq | grep '^[0-9,A-F]' | wc -l";
@@ -88,15 +88,15 @@
# Default DSPAM display
$CONFIG{'HISTORY_SIZE'} = 799; # Number of items in history
-diff -urNad dspam-3.6.0/webui/cgi-bin/dspam.cgi /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/dspam.cgi
---- dspam-3.6.0/webui/cgi-bin/dspam.cgi 2005-10-25 12:40:36.609183768 +0000
-+++ /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/dspam.cgi 2005-10-25 12:42:39.713469072 +0000
+diff -urNad dspam-3.6.0/webui/cgi-bin/dspam.cgi /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/dspam.cgi
+--- dspam-3.6.0/webui/cgi-bin/dspam.cgi 2005-10-26 20:43:29.122437584 +0000
++++ /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/dspam.cgi 2005-10-26 20:45:32.217724256 +0000
@@ -25,7 +25,7 @@
require "ctime.pl";
# Read configuration parameters common to all CGI scripts
-require "configure.pl";
-+require "/etc/dspam-webfrontend/configure.pl";
++require "/etc/dspam/configure.pl";
#
# The current CGI script
@@ -105,7 +105,7 @@
$CONFIG{'ADMIN'} = 0;
if ($ENV{'REMOTE_USER'} ne "") {
- open(FILE, "<./admins");
-+ open(FILE, "</etc/dspam-webfrontend/admins");
++ open(FILE, "</etc/dspam/admins");
while(<FILE>) {
chomp;
if ($_ eq $ENV{'REMOTE_USER'}) {
@@ -118,20 +118,20 @@
}
if (! -e $FILE) {
-diff -urNad dspam-3.6.0/webui/cgi-bin/graph.cgi /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/graph.cgi
---- dspam-3.6.0/webui/cgi-bin/graph.cgi 2005-10-25 12:40:36.609183768 +0000
-+++ /tmp/dpep.wdtwr2/dspam-3.6.0/webui/cgi-bin/graph.cgi 2005-10-25 12:41:05.746754184 +0000
+diff -urNad dspam-3.6.0/webui/cgi-bin/graph.cgi /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/graph.cgi
+--- dspam-3.6.0/webui/cgi-bin/graph.cgi 2005-10-26 20:43:29.123437432 +0000
++++ /tmp/dpep.dDNFrl/dspam-3.6.0/webui/cgi-bin/graph.cgi 2005-10-26 20:45:43.494010000 +0000
@@ -25,11 +25,11 @@
use vars qw { %CONFIG %FORM @spam_day @nonspam_day @period @data };
# Read configuration parameters common to all CGI scripts
-require "configure.pl";
-+require "/etc/dspam-webfrontend/configure.pl";
++require "/etc/dspam/configure.pl";
%FORM = &ReadParse();
-GD::Graph::colour::read_rgb("rgb.txt");
-+GD::Graph::colour::read_rgb("/etc/dspam-webfrontend/rgb.txt");
++GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt");
do {
my($spam, $nonspam, $period) = split(/\_/, $FORM{'data'});
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Thu Oct 27 12:10:26 2005
@@ -112,11 +112,11 @@
dh_install
# To make lintian happy
- find $(CURDIR)/debian/dspam-webfrontend/usr/share/dspam-webfrontend -type f -exec chmod 644 {} \;
- find $(CURDIR)/debian/dspam-webfrontend/usr/share/dspam-webfrontend -type d -exec chmod 755 {} \;
- find $(CURDIR)/debian/dspam-webfrontend/etc/dspam-webfrontend -type f -exec chmod 644 {} \;
- chmod 755 $(CURDIR)/debian/dspam-webfrontend/etc/dspam-webfrontend/configure.pl
- chmod 644 $(CURDIR)/debian/dspam-webfrontend/var/www/dspam-webfrontend/base.css
+ find $(CURDIR)/debian/dspam-webfrontend/usr/share/dspam -type f -exec chmod 644 {} \;
+ find $(CURDIR)/debian/dspam-webfrontend/usr/share/dspam -type d -exec chmod 755 {} \;
+ find $(CURDIR)/debian/dspam-webfrontend/etc/dspam -type f -exec chmod 644 {} \;
+ chmod 755 $(CURDIR)/debian/dspam-webfrontend/etc/dspam/configure.pl
+ chmod 644 $(CURDIR)/debian/dspam-webfrontend/var/www/dspam/base.css
binary-indep: build install
dh_testdir -i
More information about the Pkg-dspam-commits
mailing list