f-prot-installer in stable still needs update
Hi there,
f-prot-installer in stable still needs an update to fix bug #347190
Meanwhile it has been uploaded to volatile.debian.net, but still,
having a broken version in the official archive is not exactly
desirable.
Inter version diff is attached. This version is the same as in
volatile except that I have stripped debconf message/translation
updates to be in line with the stable policy.
I would be happy for a yes/no
Thanks,
Johannes
diff -uNr f-prot-installer-0.5.14.sarge.1/debian/changelog f-prot-installer-0.5.14.sarge.3/debian/changelog
--- f-prot-installer-0.5.14.sarge.1/debian/changelog 2005-09-10 20:34:24.000000000 +0200
+++ f-prot-installer-0.5.14.sarge.3/debian/changelog 2006-01-22 12:31:52.000000000 +0100
@@ -1,3 +1,22 @@
+f-prot-installer (0.5.14.sarge.3) stable; urgency=low
+
+ * Installer script again broken by vendor-side changes. Hopefully we
+ have a more durable fix now through using a config file
+ /etc/f-prot.conf containing the location of the virus definition
+ files. The file is read by the check-updates script which consequently
+ no longer needs to be patchend. (closes: #347198)
+
+ -- Johannes Rohr <jr.debian@rohr.org> Sun, 22 Jan 2006 12:31:52 +0100
+
+f-prot-installer (0.5.14.sarge.2) stable; urgency=low
+
+ * Sigh. Vendor has modified check-updates.pl, making it incompatible
+ with our wonderful update-f-prot script. To solve this, when patching
+ check-updates.pl, we have to delete the line containing the string
+ "Couldn't determine signature file directory". (closes: #335598)
+
+ -- Johannes Rohr <jr.debian@rohr.org> Sat, 31 Dec 2005 11:19:24 +0100
+
f-prot-installer (0.5.14.sarge.1) stable; urgency=medium
* Package was rendered unusable by external changes. Fix: Instead of
diff -uNr f-prot-installer-0.5.14.sarge.1/debian/control f-prot-installer-0.5.14.sarge.3/debian/control
--- f-prot-installer-0.5.14.sarge.1/debian/control 2005-09-10 20:32:39.000000000 +0200
+++ f-prot-installer-0.5.14.sarge.3/debian/control 2006-01-09 21:22:56.000000000 +0100
@@ -2,7 +2,7 @@
Section: contrib/utils
Priority: optional
Maintainer: Johannes Rohr <jr.debian@rohr.org>
-Uploaders: Matthias Klose <doko@debian.org>
+Uploaders: Matthias Klose <doko@debian.org>, Sebastien Bacher <seb128@debian.org>, Martin Zobel-Helas <zobel@ftbfs.de>
Build-Depends: debhelper (>= 4.1.68),docbook-to-man
Standards-Version: 3.6.1.0
diff -uNr f-prot-installer-0.5.14.sarge.1/debian/rules f-prot-installer-0.5.14.sarge.3/debian/rules
--- f-prot-installer-0.5.14.sarge.1/debian/rules 2004-04-01 09:50:37.000000000 +0200
+++ f-prot-installer-0.5.14.sarge.3/debian/rules 2006-01-09 21:23:18.000000000 +0100
@@ -38,6 +38,7 @@
# cp -p debian/crontab $(d)/etc/cron.d/f-prot
# chmod 644 $(d)/etc/cron.d/f-prot
install -m 755 debian/update-f-prot $(d)/usr/sbin/
+ echo /var/lib/f-prot > $(d)/etc/f-prot.conf
# install -m 755 ip-up.d/f-prot-installer $(d)/etc/ppp/ip-up.d/
mkdir -p $(d)/usr/share/lintian/overrides
echo "f-prot-installer: postinst-uses-db-input" > \
diff -uNr f-prot-installer-0.5.14.sarge.1/debian/update-f-prot f-prot-installer-0.5.14.sarge.3/debian/update-f-prot
--- f-prot-installer-0.5.14.sarge.1/debian/update-f-prot 2005-09-10 20:44:06.000000000 +0200
+++ f-prot-installer-0.5.14.sarge.3/debian/update-f-prot 2006-01-09 21:23:18.000000000 +0100
@@ -19,6 +19,7 @@
MD5SUM_STORED=$FPROTSTATE_DIR/$MD5SUM
MD5SUM_NEW=$DL_DIR/$MD5SUM
TARBALL_NEW=$DL_DIR/$TARBALL
+CONFFILE=/etc/f-prot.conf
abort=no
# Some functions we need
do_abort()
@@ -236,7 +237,6 @@
do
echo Patching $f ...
sed \
- -e "s,^my \$signatureDirectory = .*,my \$signatureDirectory = \'/var/lib/f-prot/\';,g" \
-e 's,/usr/local/f-prot,/usr/lib/f-prot,g' \
-e 's,check-updates\.pl,check-updates,g' \
$f > $f.new
@@ -315,6 +315,7 @@
;;
f|+f)
echo Reinstallation forced
+ DO_INSTALL=true
FORCE_INSTALL=true
;;
d|+d)
@@ -356,7 +357,23 @@
shift `expr $OPTIND - 1`
## Oh, well, hope that this was all preparation necessary. Now, let's go to work..
+## First, make sure that the configuration file exists
+if [ ! -f $CONFFILE ]; then
+ cat <<EOF
+ Configuration file $CONFFILE was not found,
+ check-updates will most likely fail.
+ Please create it by running
+
+ "echo /var/lib/f-prot > /etc/f-prot.conf"
+ If this fails, please reinstall f-prot by running
+
+ "update-f-prot -fi"
+
+EOF
+ exit 1
+
+fi
if [ $DO_INSTALL = "true" ]; then
## this is an additional sanity test meant to fix bug #191688: If an
## earlier installation has failed, but still for some reason there is
diff -uNr f-prot-installer-0.5.14.sarge.1/f-prot.conf f-prot-installer-0.5.14.sarge.3/f-prot.conf
--- f-prot-installer-0.5.14.sarge.1/f-prot.conf 1970-01-01 01:00:00.000000000 +0100
+++ f-prot-installer-0.5.14.sarge.3/f-prot.conf 2006-01-09 21:23:18.000000000 +0100
@@ -0,0 +1 @@
+/var/lib/f-prot
Reply to: