[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-41-g703bbd3
Julien Valroff
julien at kirya.net
Sat Jul 30 07:50:53 UTC 2011
The following commit has been merged in the master branch:
commit 9ffdcf733bdc237c1db4ca949190ef7efafaa61a
Author: Julien Valroff <julien at kirya.net>
Date: Sat Jul 30 07:45:36 2011 +0200
New snapshot to prepare upcomming release
diff --git a/debian/changelog b/debian/changelog
index 1431580..3ef8b33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dspam (3.9.1~rc1+git20110514.347379b+dfsg-2) unstable; urgency=low
+dspam (3.9.1~rc1+git20110729.ae3fad4+dfsg-1) unstable; urgency=low
[ Julien Valroff ]
* Ensures system user is actually locked on purge, and unlocked in case
@@ -10,11 +10,12 @@ dspam (3.9.1~rc1+git20110514.347379b+dfsg-2) unstable; urgency=low
* Remove useless 001_drivers-in-usr_lib_dspam patch
* Remove useless calls to ucf in libdspam7-drv-{mysql,pgsql}.postinst
scripts
+ * New upstream snapshot
[ Thomas Preud'homme ]
* Set build flags (CPPFLAGS, CFLAGS and LDFLAGS) using dpkg-buildflags.
- -- Julien Valroff <julien at debian.org> Fri, 08 Jul 2011 15:47:48 +0200
+ -- Julien Valroff <julien at debian.org> Sat, 30 Jul 2011 07:45:09 +0200
dspam (3.9.1~rc1+git20110514.347379b+dfsg-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index a084204..cfc63bc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,35 +5,26 @@ Comment: Some parts of the DSPAM tarball shipped in contrib/ do not comply with
Free Software Guidelines and hence have been excluded from the Debian source package:
* contrib/dspam_alias_retraining/ - No license stated
* contrib/lotus_notes/ - Non DFSG-free license
- * contrib/OutloukAddin/ - No license stated
+ * contrib/OutlookAddin/ - No license stated
Files: *
Copyright: 2002-2011, DSPAM Project
-License: GPL-2
+License: AGPL-3+
Files: src/util.c
-Copyright: 1983, 1993, The Regents of the University of California
-License: GPL-2 and BSD-4-clause
+Copyright: 2002-2011, DSPAM Project
+ 1983, 1993, The Regents of the University of California
+License: AGPL-3+ and BSD-4-clause
Comment: inet_ntoa_r() is under BSD-4-clause license, the rest of the
- code is under GPL-2 license
+ code is under AGPL-3+ license
+
+Files: src/external_loopkup.*
+Copyright: 2006 Hugo Monteiro <hugo.monteiro at fct.unl.pt>
+License: GPL-2
Files: contrib/dspam_maintenance/*
Copyright: 2007-2010, Stevan Bajic <stevan at bajic.ch>
License: AGPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- The complete text of the GNU Affero General Public License
- can be found in the file `/usr/share/doc/dspam/AGPL-3.gz'.
Files: contrib/plugins/*
Copyright: Hugo Monteiro <hugo.monteiro at fct.unl.pt>
@@ -108,3 +99,19 @@ License: GPL-2
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
+
+License: AGPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU Affero General Public License
+ can be found in the file `/usr/share/doc/dspam/AGPL-3.gz'.
diff --git a/debian/dspam.docs b/debian/dspam.docs
index 9f82b21..fbf6869 100644
--- a/debian/dspam.docs
+++ b/debian/dspam.docs
@@ -1,5 +1,5 @@
README
-README.cssclean
+doc/cssclean.txt
UPGRADING
RELEASE.NOTES
debian/TODO.Debian
diff --git a/debian/patches/011_Document-hash-drv-support-daemon.diff b/debian/patches/011_Document-hash-drv-support-daemon.diff
deleted file mode 100644
index 0c9e621..0000000
--- a/debian/patches/011_Document-hash-drv-support-daemon.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: hash driver support daemon mode since version 3.6rc2 (see upstream CHANGELOG)
-Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
-Forwarded: https://sourceforge.net/mailarchive/message.php?msg_id=27669761
-
---- a/README
-+++ b/README
-@@ -1714,9 +1714,9 @@
-
- The DSPAM agent can be compiled with client/server support by configuring
- with --enable-daemon. You will need to use a multithread-safe storage driver
-- (presently mysql_drv and pgsql_drv are supported). Once you have compiled
-- with daemon support, you'll need to modify your dspam.conf to provide the
-- settings necessary for client/server mode:
-+ (presently mysql_drv, pgsql_drv and hash_drv are supported). Once you have
-+ compiled with daemon support, you'll need to modify your dspam.conf to
-+ provide the settings necessary for client/server mode:
-
- ServerHost 127.0.0.1
-
diff --git a/debian/patches/012_typo-dspam_maintenance.diff b/debian/patches/012_typo-dspam_maintenance.diff
deleted file mode 100644
index 099d7fc..0000000
--- a/debian/patches/012_typo-dspam_maintenance.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix typo in dspam_maintenance for pgsql backend
-Author: Rodolphe Pelloux-Prayer <rodolphe at damsy.net>
-Forwarded: https://sourceforge.net/mailarchive/message.php?msg_id=27669761
-
---- a/contrib/dspam_maintenance/dspam_maintenance.sh
-+++ b/contrib/dspam_maintenance/dspam_maintenance.sh
-@@ -504,7 +504,7 @@
- -e "/^DELETE FROM dspam_signature_data/,/COMMIT/{s:^\([\t ]*WHERE[\t ]\{1,\}created_on[\t ]\{1,\}<[\t ]\{1,\}CURRENT_DATE[\t ]\{1,\}\-[\t ]\{1,\}\)14\(.*\)$:\1${SIGNATURE_AGE}\2:g}" \
- -e "/^DELETE FROM dspam_token_data/,/COMMIT/{s:^\([\t ]*AND[\t ]\{1,\}last_hit[\t ]\{1,\}<[\t ]\{1,\}CURRENT_DATE[\t ]\{1,\}\-[\t ]\{1,\}\)[36]0\(.*\)$:\1${HAPAXES_AGE}\2:g}" \
- -e "/^DELETE FROM dspam_token_data/,/COMMIT/{s:^\([\t ]*AND[\t ]\{1,\}last_hit[\t ]\{1,\}<[\t ]\{1,\}CURRENT_DATE[\t ]\{1,\}\-[\t ]\{1,\}\)15\(.*\)$:\1${HITS1MAX}\2:g}" \
-- -e "/^DELETE FROM dspam_token_data/,/COMMIT/{s:^\([\t ]*\(AND\|WHERE\)[\t ]\{1,\}last_hit[\t ]\{1,\}<[\t ]\{1,\}CURRENT_DATE[\t ]\{1,\}\-[\t ]\{1,\}\)90\(.*\)$:\1${UNUSED_AGE}\2:g}" \
-+ -e "/^DELETE FROM dspam_token_data/,/COMMIT/{s:^\([\t ]*\(AND\|WHERE\)[\t ]\{1,\}last_hit[\t ]\{1,\}<[\t ]\{1,\}CURRENT_DATE[\t ]\{1,\}\-[\t ]\{1,\}\)90\(.*\)$:\1${UNUSED_AGE}\3:g}" \
- "${DSPAM_PgSQL_PURGE_SQL}">"${DSPAM_SQL_TMPFILE}"
- [ -r "${DSPAM_SQL_TMPFILE}" ] && DSPAM_PgSQL_PURGE_SQL="${DSPAM_SQL_TMPFILE}"
- fi
diff --git a/debian/patches/series b/debian/patches/series
index cbc8b4f..d39fce3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@
008_where-to-find-txt-files.diff
009_dspam-notify.diff
010_default-daemon-port.diff
-011_Document-hash-drv-support-daemon.diff
-012_typo-dspam_maintenance.diff
--
Debian packages for the DSPAM anti-spam filter
More information about the Pkg-dspam-commits
mailing list