[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-18-g9a6f87a

Julien Valroff julien at kirya.net
Fri Jul 1 20:27:22 UTC 2011 

The following commit has been merged in the master branch:
commit 3c628de639b549441672f6367c6264bb70cbbcaf
Author: Julien Valroff <julien at kirya.net>
Date:   Wed Jun 29 20:39:39 2011 +0200

    Add libdspam7-drv-hash package - for now, conffile is not moved
    
    Conflicts:
    
    	debian/control
    	debian/dspam.install

diff --git a/debian/control b/debian/control
index 9996ae6..043ffe2 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-dspam/dspam.git;a=summary
 
 Package: dspam
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, lsb-base (>= 3.0-6)
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, lsb-base (>= 3.0-6), libdspam7-drv-hash (= ${source:Version}) | libdspam7-drv-mysql (= ${source:Version}) | libdspam7-drv-pgsql (= ${source:Version}) | libdspam7-drv-sqlite3 (= ${source:Version})
 Recommends: procmail | maildrop | courier-maildrop | sensible-mda, dspam-doc
 Suggests: clamav-daemon, dspam-webfrontend
 Description: Scalable, fast and statistical anti-spam filter
@@ -77,6 +77,22 @@ Description: Development headers for libdspam
  .
  This package contains the development headers for libdspam.
 
+Package: libdspam7-drv-hash
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version})
+Provides: libdspam7-drv
+Multi-Arch: same
+Description: Hash backend for DSPAM anti-spam filter
+ DSPAM is a dedicated statistical filter with minimal resources. It includes
+ many new algorithms to fight against spam including:
+  * Concept Identification
+  * Message Inoculation
+  * Advanced de-obfuscation techniques
+  * Bayesian Noise Reduction
+ .
+ This package contains the hash backend.
+
 Package: libdspam7-drv-pgsql
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, ucf (>= 0.28), postgresql-client
diff --git a/debian/dspam.install b/debian/dspam.install
index 8a34dfa..db6ff33 100644
--- a/debian/dspam.install
+++ b/debian/dspam.install
@@ -1,22 +1,20 @@
-contrib/dspam_maintenance/dspam_maintenance  usr/bin/
-debian/tmp/etc/dspam/*                       etc/dspam/
-debian/tmp/usr/bin/cssclean                  usr/bin/
-debian/tmp/usr/bin/csscompress               usr/bin/
-debian/tmp/usr/bin/cssconvert                usr/bin/
-debian/tmp/usr/bin/cssstat                   usr/bin/
-debian/tmp/usr/bin/dspam_2sql                usr/bin/
-debian/tmp/usr/bin/dspam_admin               usr/bin/
-debian/tmp/usr/bin/dspam_clean               usr/bin/
-debian/tmp/usr/bin/dspam_crc                 usr/bin/
-debian/tmp/usr/bin/dspamc                    usr/bin/
-debian/tmp/usr/bin/dspam_dump                usr/bin/
-debian/tmp/usr/bin/dspam_logrotate           usr/bin/
-debian/tmp/usr/bin/dspam_merge               usr/bin/
-debian/tmp/usr/bin/dspam_stats               usr/bin/
-debian/tmp/usr/bin/dspam_train               usr/bin/
-debian/tmp/usr/bin/dspam                     usr/bin/
-debian/tmp/usr/lib/dspam/libhash_drv.so*     usr/lib/dspam
-src/extlookup.conf                           etc/dspam/dspam.d/
-src/hash.conf                                etc/dspam/dspam.d/
-txt/*.txt                                    etc/dspam/txt/
-webui/cgi-bin/default.prefs                  etc/dspam/
+contrib/dspam_maintenance/dspam_maintenance     usr/bin/
+etc/dspam
+usr/bin/cssclean
+usr/bin/csscompress
+usr/bin/cssconvert
+usr/bin/cssstat
+usr/bin/dspam_2sql
+usr/bin/dspam_admin
+usr/bin/dspam_clean
+usr/bin/dspam_crc
+usr/bin/dspamc
+usr/bin/dspam_dump
+usr/bin/dspam_logrotate
+usr/bin/dspam_merge
+usr/bin/dspam_stats
+usr/bin/dspam_train
+usr/bin/dspam
+src/extlookup.conf                              etc/dspam/dspam.d/
+txt/*.txt                                       etc/dspam/txt/
+webui/cgi-bin/default.prefs                     etc/dspam/
diff --git a/debian/dspam.postinst b/debian/dspam.postinst
index 6b44945..8ce2346 100644
--- a/debian/dspam.postinst
+++ b/debian/dspam.postinst
@@ -5,10 +5,10 @@ set_dspam_perms() {
 
     # If you add any other permission/ownership tweaks here, then
     # remember to add a corresponding remove operation to the
-    # dspam.postinst
+    # dspam.postrm
 
     # Database password info is contained in dspam.conf and other conffiles
-    for config_file in dspam.conf dspam.d/hash.conf dspam.d/extlookup.conf ; do
+    for config_file in dspam.conf dspam.d/extlookup.conf ; do
         if ! dpkg-statoverride --list /etc/dspam/$config_file >/dev/null
         then
             dpkg-statoverride --update --add dspam dspam 0640 /etc/dspam/$config_file
diff --git a/debian/dspam.postrm b/debian/dspam.postrm
index ee1aff2..5326abe 100644
--- a/debian/dspam.postrm
+++ b/debian/dspam.postrm
@@ -5,7 +5,6 @@ case "$1" in
     purge)
         for i in \
             /etc/dspam/dspam.conf \
-            /etc/dspam/dspam.d/hash.conf \
             /etc/dspam/dspam.d/extlookup.conf \
             /usr/bin/dspam \
             /usr/bin/dspamc \
diff --git a/debian/libdspam7-drv-hash.install b/debian/libdspam7-drv-hash.install
new file mode 100644
index 0000000..ec23bdd
--- /dev/null
+++ b/debian/libdspam7-drv-hash.install
@@ -0,0 +1,2 @@
+usr/lib/*/dspam/libhash_drv.so*
+src/hash.conf                                   etc/dspam/dspam.d/
diff --git a/debian/libdspam7-drv-hash.postinst b/debian/libdspam7-drv-hash.postinst
new file mode 100644
index 0000000..d747345
--- /dev/null
+++ b/debian/libdspam7-drv-hash.postinst
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    configure)
+        if ! dpkg-statoverride --list /etc/dspam/dspam.d/hash.conf >/dev/null
+        then
+            dpkg-statoverride --update --add dspam dspam 0640 /etc/dspam/dspam.d/hash.conf
+        fi
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libdspam7-drv-hash.postrm b/debian/libdspam7-drv-hash.postrm
new file mode 100644
index 0000000..dd8f178
--- /dev/null
+++ b/debian/libdspam7-drv-hash.postrm
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    purge)
+        dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/hash.conf || true
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 57a61ee..84a35d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ override_dh_auto_configure:
 	./debian/split-config.sh
 
 override_dh_makeshlibs:
-	dh_makeshlibs -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-sqlite3 -Ndspam
+	dh_makeshlibs -Nlibdspam7-drv-hash -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-sqlite3
 
 override_dh_strip:
 	dh_strip --dbg-package=dspam-dbg

-- 
Debian packages for the DSPAM anti-spam filter

More information about the Pkg-dspam-commits mailing list