Attached. You can see from the debian/changelog entry which bit of our
upstream diff can go away.
Scott K
diff -ruN clamav-0.96+dfsg/debian/changelog clamav-0.96.1+dfsg/debian/changelog
--- clamav-0.96+dfsg/debian/changelog 2010-05-25 17:35:02.000000000 -0400
+++ clamav-0.96.1+dfsg/debian/changelog 2010-05-25 17:35:51.000000000 -0400
@@ -1,14 +1,23 @@
-clamav (0.96+dfsg-4ubuntu1) maverick; urgency=low
+clamav (0.96.1+dfsg-0ubuntu1) maverick; urgency=low
- * Merge from debian unstable. Remaining changes:
+ * New upstream release
+ - Remove non-free libclamunrar directory and repack +dfsg tarball
+ - Remove win32/ for size reasons since the tarball is repacked already and
+ adjust Makefile.in/am
+ - Add support for new TestDatabases option in debian/clamav-
+ freshclam.postinst.in (match upstream default of yes)
+ - Add VirusAction option to debian/clamav-milter.postinst.in
+ - Drop powerpc clamd fix, incorporated upstream
+ - Drop diff in docs/man/clamd.conf.5.in, incorporated upstream
+ - Drop addition of COPYING.llvm, incorporated upstream
+ * Remaining differences from Debian:
- Drop initial signature definitions from clamav-base
- Drop build-dep on electric-fence (in Universe)
- Add apparmor profiles for clamd and freshclam along with maintainer
script changes
- Detect incorrect value for clamav-freshclam/NotifyClamd and set it to true
- - Cherry pick powerpc clamd failure to start from upstream (LP #574906)
- -- Scott Kitterman <[email protected]> Wed, 19 May 2010 22:44:24 -0400
+ -- Scott Kitterman <[email protected]> Thu, 20 May 2010 22:09:21 -0400
clamav (0.96+dfsg-4) unstable; urgency=low
diff -ruN clamav-0.96+dfsg/debian/clamav-freshclam.postinst.in clamav-0.96.1+dfsg/debian/clamav-freshclam.postinst.in
--- clamav-0.96+dfsg/debian/clamav-freshclam.postinst.in 2010-05-25 17:35:02.000000000 -0400
+++ clamav-0.96.1+dfsg/debian/clamav-freshclam.postinst.in 2010-05-25 17:35:51.000000000 -0400
@@ -186,6 +186,7 @@
[ -z "$PidFile" ] && PidFile='/var/run/clamav/freshclam.pid'
[ -z "$ConnectTimeout" ] && ConnectTimeout=30
[ -z "$ReceiveTimeout" ] && ReceiveTimeout=30
+ [ -z "$TestDatabases" ] && TestDatabases=yes
[ -z "$ScriptedUpdates" ] && ScriptedUpdates=yes
[ -z "$LogTime" ] && LogTime=true
[ -z "$CompressLocalDatabase" ] && CompressLocalDatabase=no
@@ -211,6 +212,7 @@
PidFile $PidFile
ConnectTimeout $ConnectTimeout
ReceiveTimeout $ReceiveTimeout
+TestDatabases $TestDatabases
ScriptedUpdates $ScriptedUpdates
CompressLocalDatabase $CompressLocalDatabase
Bytecode $bytecode
diff -ruN clamav-0.96+dfsg/debian/clamav-milter.postinst.in clamav-0.96.1+dfsg/debian/clamav-milter.postinst.in
--- clamav-0.96+dfsg/debian/clamav-milter.postinst.in 2010-05-25 17:35:02.000000000 -0400
+++ clamav-0.96.1+dfsg/debian/clamav-milter.postinst.in 2010-05-25 17:35:51.000000000 -0400
@@ -209,6 +209,7 @@
[ -n "$miltersocketgrp" ] && echo "MilterSocketGroup $miltersocketgrp" >> $DEBCONFFILE
[ -n "$miltersocketmode" ] && echo "MilterSocketMode $miltersocketmode" >> $DEBCONFFILE
[ -n "$ReportHostname" ] && echo "ReportHostname $ReportHostname" >> $DEBCONFFILE
+ [ -n "$VirusAction" ] && echo "VirusAction $VirusAction" >> $DEBCONFFILE
ucf_cleanup "$CLAMAVMILTERCONF"
ucf_upgrade_check "$CLAMAVMILTERCONF" "$DEBCONFFILE" /var/lib/ucf/cache/:etc:clamav:clamav-milter.conf
_______________________________________________
Pkg-clamav-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-clamav-devel
