[Pkg-dspam-commits] [pkg-dspam-commits] r166 - in trunk/debian: . patches

Kurt B. Kaiser kbk-guest at alioth.debian.org
Wed Jul 30 20:12:08 UTC 2008


Author: kbk-guest
Date: Wed Jul 30 20:12:08 2008
New Revision: 166

Log:
  * Webfrontend: Reconfigure the filesystem layout with the goal of removing
    all files from /var/www/dspam to comply with policy.  Use ucf to control
    the conffiles for the webfrontend, and make the files that the user might
    want to modify conffiles.  Goal is to conform to Webapps Policy.


    - Move the html templates to /etc/dspam/templates/
    - Move the apache conf fragment to /etc/dspam and link from apache's
      sites-available.
    - Modify dspam-apache2.conf to install a working example website
      running on localhost.  Use /etc/dspam/passwd, which doesn't need access
      to /etc/shadow.
    - Clean up customize.cgi and add it to README.Debian (Closes: #430589). 
    - Delete the old, obsolete apache.conf file from the package, and
      purge it when dspam-webfrontend is purged if it is present in
      /etc/dspam/.
    - Fix a regression in #455052, #469668: remove the /usr/share/dspam dir
      in dspam-webfrontend.preinst for versions prior to 3.6.8-9.

    - Use dh_lintian to install the webfrontend conffile override.


M    debian/control
M    debian/patches/dspam-webfrontend-config-debian.dpatch
A    debian/dspam-webfrontend.links
D    debian/customize-cgi.txt
M    debian/dspam-webfrontend.postinst
M    debian/dspam-webfrontend.dirs
M    debian/dspam-webfrontend.install
M    debian/changelog
M    debian/dspam-apache2.conf
M    debian/rules
M    debian/dspam-webfrontend.postrm
A    debian/dspam-webfrontend.preinst
M    debian/dspam-webfrontend.lintian-overrides
M    debian/README.Debian


Added:
   trunk/debian/dspam-webfrontend.links
   trunk/debian/dspam-webfrontend.preinst
Removed:
   trunk/debian/customize-cgi.txt
Modified:
   trunk/debian/README.Debian
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/dspam-apache2.conf
   trunk/debian/dspam-webfrontend.dirs
   trunk/debian/dspam-webfrontend.install
   trunk/debian/dspam-webfrontend.lintian-overrides
   trunk/debian/dspam-webfrontend.postinst
   trunk/debian/dspam-webfrontend.postrm
   trunk/debian/patches/dspam-webfrontend-config-debian.dpatch
   trunk/debian/rules

Modified: trunk/debian/README.Debian
==============================================================================
--- trunk/debian/README.Debian	(original)
+++ trunk/debian/README.Debian	Wed Jul 30 20:12:08 2008
@@ -12,6 +12,35 @@
 
     dspam_corpus [--addspam] <user> </path/to/mbox>
 
+
+Customising the dspam-webfrontend cgi interface 
+-----------------------------------------------
+
+Initially, the cgi interface uses the upstream html templates located in
+/usr/share/dspam/templates.  These are installed in /etc/dspam/templates/ as
+conffiles controlled by ucf(1).
+
+In addition, the following files are handled in the same way:
+
+   admins
+   base.css
+   webfrontend.conf    (derived from upstream's configure.pl)
+   dspam-apache2.conf  (symlinked from the /etc/apache2/conf.d directory)
+   dspam-logo-small.gif
+   rgb.txt
+
+These configuration files may be modified by the user as required.  Updates
+to the source files will be handled by debconf as required.
+
+Add your admin user to /etc/dspam/admins, and use htpasswd add your users to
+/etc/dspam/passwd.  If the users are also in /etc/passwd, then the passwords
+should differ.
+
+Refer to /etc/dspam/dspam-apache2.conf for an example on setting up the
+web interface.  SSL should be used to protect the user's credentials, and
+the VirtualHost block should be configured for your site.
+
+
 Building dspam with a different set of options
 ----------------------------------------------
 
@@ -43,4 +72,4 @@
    verbose_debug - enable extensive debug (EXTREMELY DISCOURAGED for production systems)
    debug - enable debug (currently enabled by default)
 
- -- Debian DSPAM Maintainers Maintainer: <pkg-dspam-misc at lists.alioth.debian.org>, Thu, 13 Oct 2005 11:53:46 +0000
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>, Tue, 29 Jul 2008 22:29:41 -0400

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Wed Jul 30 20:12:08 2008
@@ -6,18 +6,34 @@
   * Set debhelper combatibility level to 7.
   * Eliminate libdspam7-drv-db4 package, db4 support not included since 3.6.6.
   * Remove the htdocs dir (Alioth website!) brought in from svn repo.
-  * Use dh_lintian to install the webfrontend conffile override.
   * Revise build to not use build--tmp subdir: it's easier to clean the tree
     if the Makefiles are created.
   * Move linking in config.guess and config.sub to configure target.
   * Use maintainer-clean in clean target and remove any Makefile.in left over.
-  * Add apache2-suexec as webfrontend dependency (Closes: #488924).
-  * Enable the suexec module during webfrontend postinstall (Ref #366478).
-  * Remove the old apache.conf, but leave its removal in webfrontend postrm.
   * Break a long line in debian/copyright to quiet lintian.
   * Acknowledge NMU.  Thanks Peter Eisentraut. (Closes: #473027, #480602)
+  * Webfrontend: Reconfigure the filesystem layout with the goal of removing
+    all files from /var/www/dspam to comply with policy.  Use ucf to control
+    the conffiles for the webfrontend, and make the files that the user might
+    want to modify conffiles.  Goal is to conform to Webapps Policy.
+    - RC Bug: Add apache2-suexec as webfrontend dependency (Closes: #488924).
+    - Enable the suexec module in postinst (Ref #366478).
+    - Move the html templates to /etc/dspam/templates/
+    - Move the apache conf fragment to /etc/dspam and link from apache's
+      sites-available.
+    - Modify dspam-apache2.conf to install a working example website
+      running on localhost.  Use /etc/dspam/passwd, which doesn't need access
+      to /etc/shadow.
+    - Clean up customize.cgi and add it to README.Debian (Closes: #430589). 
+    - Delete the old, obsolete apache.conf file from the package, and
+      purge it when dspam-webfrontend is purged if it is present in
+      /etc/dspam/.
+    - Fix a regression in #455052, #469668: remove the /usr/share/dspam dir
+      in dspam-webfrontend.preinst for versions prior to 3.6.8-9.
+    - Remove libapache2-mod-auth-shadow: no longer available in unstable.
+    - Use dh_lintian to install the webfrontend conffile override.
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Fri, 25 Jul 2008 11:48:14 -0400
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Wed, 30 Jul 2008 11:24:26 -0400
 
 dspam (3.6.8-8.1) unstable; urgency=low
 

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Wed Jul 30 20:12:08 2008
@@ -24,8 +24,8 @@
 Package: dspam-webfrontend
 Priority: extra
 Architecture: all
-Depends: dspam, apache2-suexec, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgd-graph3d-perl
-Suggests: libapache2-mod-perl2, libapache2-mod-auth-kerb | libapache2-mod-auth-mysql | libapache2-mod-auth-openid | libapache2-mod-auth-pam | libapache2-mod-auth-pgsql | libapache2-mod-auth-plain | libapache2-mod-auth-radius | libapache2-mod-auth-shadow | libapache2-mod-auth-sys-group
+Depends: dspam, apache2-suexec, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgd-graph3d-perl, ucf
+Suggests: libapache2-mod-perl2, libapache2-mod-auth-kerb | libapache2-mod-auth-mysql | libapache2-mod-auth-openid | libapache2-mod-auth-pam | libapache2-mod-auth-pgsql | libapache2-mod-auth-plain | libapache2-mod-auth-radius | libapache2-mod-auth-sys-group
 Description: web frontend for dspam
  DSPAM is a dedicated statistical filter using minimal resources. It includes
  many new algorithms to fight against spam including:

Modified: trunk/debian/dspam-apache2.conf
==============================================================================
--- trunk/debian/dspam-apache2.conf	(original)
+++ trunk/debian/dspam-apache2.conf	Wed Jul 30 20:12:08 2008
@@ -1,26 +1,35 @@
+# Dspam example website configuration
 #
-# This is a sample config that 
-# should be encapsulated into
-# a VirtualHost section.
+# Use htpasswd to create /etc/dspam/passwd and add a system username.
+# The password should not be the same as the user's system password.
+#
+# # chown root.www-data /etc/dspam/passwd && chmod 640 /etc/dspam/passwd
+#
+# Then visit http://127.0.0.123/dspam and log in.
+#
+# Add the admin username to /etc/dspam/admins, which will enable the
+# 'Administrative Suite' tab and functionality for that person.
 
+<VirtualHost 127.0.0.123>
+    Servername 127.0.0.123
     SuexecUserGroup dspam dspam
-    Addhandler cgi-script .cgi
-    Options +ExecCGI -Indexes
-
     Alias /dspam /var/www/dspam/
+    Alias /etc/dspam /etc/dspam
+    LogLevel debug
     <Directory /var/www/dspam/>
-    	Addhandler cgi-script .cgi
-        Options +ExecCGI -Indexes
-        DirectoryIndex dspam.cgi
-	
-# Note: you have to add www-data to the 'shadow'
-#       group to make this work. You whould
-#       better change for another authentication bakend
-AuthPAM_Enabled on
-AuthBasicAuthoritative Off
-
+	Addhandler cgi-script .cgi
+	Options +ExecCGI -Indexes
 	AuthType Basic
 	AllowOverride None
 	AuthName "DSPAM Control Center"
+	AuthUserFile /etc/dspam/passwd
 	Require valid-user
+	DirectoryIndex dspam.cgi
     </Directory>
+</VirtualHost>
+
+# The above configuration is provided only as an example.  For serious work
+# over the internet, it should be set up as a proper name-based VirtualHost and
+# SSL should be used to protect the user's credentials.  If the site has many
+# users, consider using one of the db-based authentication methods,
+# e.g. mod_auth_mysql.

Modified: trunk/debian/dspam-webfrontend.dirs
==============================================================================
--- trunk/debian/dspam-webfrontend.dirs	(original)
+++ trunk/debian/dspam-webfrontend.dirs	Wed Jul 30 20:12:08 2008
@@ -1,3 +1,2 @@
-etc/dspam/
-var/spool/dspam/
 var/www/dspam/
+etc/dspam/templates/

Modified: trunk/debian/dspam-webfrontend.install
==============================================================================
--- trunk/debian/dspam-webfrontend.install	(original)
+++ trunk/debian/dspam-webfrontend.install	Wed Jul 30 20:12:08 2008
@@ -2,9 +2,10 @@
 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/upstream-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/
-debian/dspam-apache2.conf 		etc/dspam/
+webui/cgi-bin/templates/*.html	   	usr/share/dspam/templates/
+webui/cgi-bin/configure.pl		usr/share/dspam/
+webui/htdocs/base.css		   	usr/share/dspam/
+webui/htdocs/dspam-logo-small.gif 	usr/share/dspam/
+webui/cgi-bin/admins    	       	usr/share/dspam/
+webui/cgi-bin/rgb.txt    	 	usr/share/dspam/
+debian/dspam-apache2.conf 		usr/share/dspam/

Added: trunk/debian/dspam-webfrontend.links
==============================================================================
--- (empty file)
+++ trunk/debian/dspam-webfrontend.links	Wed Jul 30 20:12:08 2008
@@ -0,0 +1 @@
+/etc/dspam/dspam-apache2.conf /etc/apache2/sites-available/dspam

Modified: trunk/debian/dspam-webfrontend.lintian-overrides
==============================================================================
--- trunk/debian/dspam-webfrontend.lintian-overrides	(original)
+++ trunk/debian/dspam-webfrontend.lintian-overrides	Wed Jul 30 20:12:08 2008
@@ -1 +1 @@
-dspam-webfrontend: script-not-executable ./etc/dspam/webfrontend.conf
+dspam-webfrontend: script-not-executable ./usr/share/dspam/configure.pl

Modified: trunk/debian/dspam-webfrontend.postinst
==============================================================================
--- trunk/debian/dspam-webfrontend.postinst	(original)
+++ trunk/debian/dspam-webfrontend.postinst	Wed Jul 30 20:12:08 2008
@@ -16,17 +16,34 @@
             fi
         done
 	
+	ucf /usr/share/dspam/configure.pl \
+            /etc/dspam/webfrontend.conf
+	ucfr dspam-webfrontend /etc/dspam/webfrontend.conf
         if ! dpkg-statoverride --list /etc/dspam/webfrontend.conf >/dev/null
         then
-            dpkg-statoverride --update --add dspam dspam 0600 /etc/dspam/webfrontend.conf
+            dpkg-statoverride --update --add dspam dspam 0644 \
+                              /etc/dspam/webfrontend.conf
         fi
 
-        # Give users the chance to change the templates used for the
-        # webfrontend and give us the chance to update the templates properly.
-        ln -sf /usr/share/dspam/upstream-templates /usr/share/dspam/templates
+	for i in base.css dspam-logo-small.gif admins \
+                 rgb.txt dspam-apache2.conf
+	do
+	    ucf /usr/share/dspam/$i /etc/dspam/$i
+	    ucfr dspam-webfrontend /etc/dspam/$i
+	done
+	for i in /usr/share/dspam/templates/*
+	do
+	    base=`basename $i`
+	    ucf /usr/share/dspam/templates/$base /etc/dspam/templates/$base
+	    ucfr dspam-webfrontend /etc/dspam/templates/$base
+	done
 
-	# Make the apache2 suexec module available:
+	# Make sure the apache2 suexec module is available:
 	a2enmod suexec
+	# Enable the dspam VirtualHost:
+	a2ensite dspam
+	
+	apache2ctl restart
     ;;
 
     reconfigure|abort-upgrade|abort-remove|abort-deconfigure)
@@ -41,4 +58,3 @@
 #DEBHELPER#
 
 exit 0
-

Modified: trunk/debian/dspam-webfrontend.postrm
==============================================================================
--- trunk/debian/dspam-webfrontend.postrm	(original)
+++ trunk/debian/dspam-webfrontend.postrm	Wed Jul 30 20:12:08 2008
@@ -12,31 +12,29 @@
     do
        dpkg-statoverride --quiet --remove $i || true
     done
-    dpkg-statoverride --quiet --remove /etc/dspam/webfrontend.conf
+    dpkg-statoverride --quiet --remove /etc/dspam/webfrontend.conf || true
 }
 
 case "$1" in
     remove)
         remove_dspam_perms
+	a2dissite dspam
+    ;;
 
-        # Remove symlink added in postinst.
-        rm -f /usr/share/dspam/templates
-
-        # Remove other symlinks which are added by accident in the postinst
-        # script.
-        rm -f /usr/share/dspam/upstream-templates/dspam /usr/share/dspam/upstream-templates/upstream-templates
-        
-	if [ -f /usr/sbin/apache2ctl ]; then
-		rm -f /etc/apache2/conf.d/dspam-apache2.conf
-        	invoke-rc.d apache2 reload
-    	fi
-	# clean up Etch->Lenny upgrades if necessary:
-        if [ -f /usr/sbin/apache ]; then
-		rm -f /etc/apache/conf.d/dspam-apache.conf
-	fi
-	;;
+    purge)
+	# remove obsolete conffile:
+	rm -f /etc/dspam/dspam-apache.conf
+
+	for i in $(ucfq -w dspam-webfrontend | cut -d: -f1)
+	do
+	    # remove base file and any old saved versions:
+	    rm -f ${i}.*
+	    ucf --purge $i
+	done
+	rm -rf /etc/dspam/templates
+    ;;
 
-    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
 
     *)

Added: trunk/debian/dspam-webfrontend.preinst
==============================================================================
--- (empty file)
+++ trunk/debian/dspam-webfrontend.preinst	Wed Jul 30 20:12:08 2008
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+	if dpkg --compare-versions "$2" lt "3.6.8-9"; then
+        # remove bad symlinks created in previous package versions
+        # by removing the dspam directory:
+	    rm -rf /usr/share/dspam
+	fi
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

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	Wed Jul 30 20:12:08 2008
@@ -6,9 +6,9 @@
 ## DP: to make the scripts usable on a Debian system out-of-the-box
 
 @DPATCH@
-diff -urNad dspam-3.6.6~/webui/cgi-bin/admin.cgi dspam-3.6.6/webui/cgi-bin/admin.cgi
---- dspam-3.6.6~/webui/cgi-bin/admin.cgi	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/admin.cgi	2006-05-21 14:34:16.330489760 +0200
+diff -urNad dspam~/webui/cgi-bin/admin.cgi dspam/webui/cgi-bin/admin.cgi
+--- dspam~/webui/cgi-bin/admin.cgi	2006-05-13 08:17:31.000000000 -0400
++++ dspam/webui/cgi-bin/admin.cgi	2008-07-27 10:00:21.000000000 -0400
 @@ -24,7 +24,7 @@
  require "ctime.pl";
  
@@ -64,9 +64,9 @@
      }
                                                                                  
      if (! -e $FILE) {
-diff -urNad dspam-3.6.6~/webui/cgi-bin/admingraph.cgi dspam-3.6.6/webui/cgi-bin/admingraph.cgi
---- dspam-3.6.6~/webui/cgi-bin/admingraph.cgi	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/admingraph.cgi	2006-05-21 14:34:16.330489760 +0200
+diff -urNad dspam~/webui/cgi-bin/admingraph.cgi dspam/webui/cgi-bin/admingraph.cgi
+--- dspam~/webui/cgi-bin/admingraph.cgi	2006-05-13 08:17:31.000000000 -0400
++++ dspam/webui/cgi-bin/admingraph.cgi	2008-07-27 10:00:21.000000000 -0400
 @@ -24,11 +24,11 @@
  use vars qw { %CONFIG %FORM @spam @nonspam @period @data @inoc @sm @fp @wh };
  
@@ -81,24 +81,25 @@
  
  do {
    my($spam, $nonspam, $sm, $fp, $inoc, $wh, $period) = split(/\_/, $FORM{'data'});
-diff -urNad dspam-3.6.6~/webui/cgi-bin/configure.pl.in dspam-3.6.6/webui/cgi-bin/configure.pl.in
---- dspam-3.6.6~/webui/cgi-bin/configure.pl.in	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/configure.pl.in	2006-05-21 14:34:16.331489608 +0200
-@@ -29,11 +29,11 @@
+diff -urNad dspam~/webui/cgi-bin/configure.pl.in dspam/webui/cgi-bin/configure.pl.in
+--- dspam~/webui/cgi-bin/configure.pl.in	2006-05-13 08:17:31.000000000 -0400
++++ dspam/webui/cgi-bin/configure.pl.in	2008-07-27 10:02:55.000000000 -0400
+@@ -29,11 +29,12 @@
  $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/upstream-templates/";	# Location of HTML templates
++$CONFIG{'TEMPLATES'}	= "/etc/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";
  
 -$CONFIG{'WEB_ROOT'}     = ""; # URL location of included htdocs/ files
-+$CONFIG{'WEB_ROOT'}     = "./"; # URL location of included htdocs/ files
++# URL location of included htdocs/files (logo and base.css conffiles in Debian)
++$CONFIG{'WEB_ROOT'}     = $CONFIG{'TEMPLATES'} . "/..";
  
  # Default DSPAM display
  #$CONFIG{'DATE_FORMAT'}  = "%d.%m.%Y %H:%M"; # Date format in strftime style
-@@ -53,14 +53,14 @@
+@@ -53,14 +54,14 @@
  $ENV{'PATH'} = "$ENV{'PATH'}:$CONFIG{'DSPAM_BIN'}";
  
  # Autodetect filesystem layout and preference options
@@ -117,9 +118,9 @@
  
  $CONFIG{'DSPAM_CGI'} = "dspam.cgi";
  
-diff -urNad dspam-3.6.6~/webui/cgi-bin/dspam.cgi dspam-3.6.6/webui/cgi-bin/dspam.cgi
---- dspam-3.6.6~/webui/cgi-bin/dspam.cgi	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/dspam.cgi	2006-05-21 14:34:54.714654480 +0200
+diff -urNad dspam~/webui/cgi-bin/dspam.cgi dspam/webui/cgi-bin/dspam.cgi
+--- dspam~/webui/cgi-bin/dspam.cgi	2006-05-13 08:17:31.000000000 -0400
++++ dspam/webui/cgi-bin/dspam.cgi	2008-07-27 10:00:21.000000000 -0400
 @@ -25,7 +25,7 @@
  require "ctime.pl";
  
@@ -159,9 +160,9 @@
      while(<FILE>) {
        chomp;
        my($directive, $value) = split(/\=/);
-diff -urNad dspam-3.6.6~/webui/cgi-bin/graph.cgi dspam-3.6.6/webui/cgi-bin/graph.cgi
---- dspam-3.6.6~/webui/cgi-bin/graph.cgi	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/graph.cgi	2006-05-21 14:34:16.333489304 +0200
+diff -urNad dspam~/webui/cgi-bin/graph.cgi dspam/webui/cgi-bin/graph.cgi
+--- dspam~/webui/cgi-bin/graph.cgi	2006-05-13 08:17:31.000000000 -0400
++++ dspam/webui/cgi-bin/graph.cgi	2008-07-27 10:00:21.000000000 -0400
 @@ -25,11 +25,11 @@
  use vars qw { %CONFIG %FORM @spam_day @nonspam_day @period @data };
  

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Wed Jul 30 20:12:08 2008
@@ -89,7 +89,6 @@
 	# remove any Alioth website brought in by svn:
 	rm -rf htdocs
 	#
-	rm -rf debian/dspam-webfrontend
 	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) maintainer-clean
 	# maintainer-clean doesn't catch all the Makefile.in:
@@ -102,12 +101,6 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	# Install configure.pl as /etc/dspam/webfrontend.conf
-	install -d -g root -m 755 -o root \
-	        $(CURDIR)/debian/dspam-webfrontend/etc/dspam
-	cp webui/cgi-bin/configure.pl \
-	   $(CURDIR)/debian/dspam-webfrontend/etc/dspam/webfrontend.conf
 	# Install PostgreSQL data file
 	cp debian/sqlfiles/pgsql-dbadmin $(CURDIR)/debian/libdspam7-drv-pgsql/usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin/pgsql
 
@@ -118,8 +111,6 @@
 	dh_install -i
 	dh_installdocs -i
 	dh_lintian -i
-	# removing svn-related directory from dspam-doc package
-	#find debian/dspam-doc -type d -name '.svn' -exec rm -rf {} \; || true
 	dh_compress -i -A
 	dh_link -i
 	dh_fixperms -i



More information about the Pkg-dspam-commits mailing list