Control: tags -1 + patch pending

Dear Maintainer,

Andreas Beckmann <deb...@abeckmann.de> writes:

> Package: openvas-server
> Version: 2.0.3-6
> Severity: serious
> Tags: squeeze-ignore
> User: debian...@lists.debian.org
> Usertags: piuparts
> Control: found -1 2.0.3-3
>
> during a test with piuparts I noticed your package modifies conffiles.
> This is forbidden by the policy, see
> http://www.debian.org/doc/debian-policy/ch-files.html#s-config-files

[...]

> debsums reports modification of the following files,
> from the attached log (scroll to the bottom...):
>
>   /etc/openvas/openvasd.conf

I have uploaded to DELAYED/5 a NMU of openvas-server versioned 2.0.3-6.1
which fixes that bug. The debdiff is attached. Don't hesitate to tell me
if I should delay the upload longer.

Regards,
diff -u openvas-server-2.0.3/debian/openvas-server.postinst openvas-server-2.0.3/debian/openvas-server.postinst
--- openvas-server-2.0.3/debian/openvas-server.postinst
+++ openvas-server-2.0.3/debian/openvas-server.postinst
@@ -293,6 +293,10 @@
 
 if [ "$1" = "configure" ]; then
 
+  if [ ! -f /etc/openvas/openvasd.conf ]; then
+      cp /usr/share/openvas-server/openvasd.conf.template /etc/openvas/openvasd.conf
+  fi
+
   if [ ! -f /var/lib/openvas/CA/cacert.pem ] || [ ! -f /var/lib/openvas/CA/servercert.pem ]; then
 
 	db_get openvas-server/califetime   || true; CACERT_LIFETIME="$RET"
diff -u openvas-server-2.0.3/debian/rules openvas-server-2.0.3/debian/rules
--- openvas-server-2.0.3/debian/rules
+++ openvas-server-2.0.3/debian/rules
@@ -65,7 +65,7 @@
 
 	# Add here commands to install the package into debian/tmp
 	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc localstatedir=$(CURDIR)/debian/tmp/var install
-	install -m 640 debian/openvasd.conf debian/tmp/etc/openvas
+	install -m 644 -D debian/openvasd.conf debian/tmp/usr/share/openvas-server/openvasd.conf.template
 	for file in $(CURDIR)/debian/tmp/usr/*bin/openvas-* ; do \
 		if file $$file | grep -q "POSIX shell script"; then \
 			echo "Checking $$file for bashisms..." ; \
diff -u openvas-server-2.0.3/debian/openvas-server.install openvas-server-2.0.3/debian/openvas-server.install
--- openvas-server-2.0.3/debian/openvas-server.install
+++ openvas-server-2.0.3/debian/openvas-server.install
@@ -4,5 +4,5 @@
+usr/share/openvas-server/openvasd.conf.template
 usr/share/man/man1/openvas-mkcert-client.1
 usr/share/man/man1/openvas-mkrand.1
 usr/share/man/man8/*
 var/lib/openvas/openvas-services
-etc/openvas/openvasd.conf
diff -u openvas-server-2.0.3/debian/openvas-server.dirs openvas-server-2.0.3/debian/openvas-server.dirs
--- openvas-server-2.0.3/debian/openvas-server.dirs
+++ openvas-server-2.0.3/debian/openvas-server.dirs
@@ -1,5 +1,6 @@
 usr/bin
 usr/sbin
+usr/share/openvas-server
 usr/share/man
 usr/share/man/man1
 usr/share/man/man8
diff -u openvas-server-2.0.3/debian/changelog openvas-server-2.0.3/debian/changelog
--- openvas-server-2.0.3/debian/changelog
+++ openvas-server-2.0.3/debian/changelog
@@ -1,3 +1,12 @@
+openvas-server (2.0.3-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * No longer ship /etc/openvas/openvasd.conf as a conffile. Instead,
+    create that file in the postinst script using a template.
+    (Closes: #688379)
+
+ -- Sébastien Villemot <sebast...@debian.org>  Thu, 01 Nov 2012 21:16:56 +0100
+
 openvas-server (2.0.3-6) unstable; urgency=low
 
   * debian/openvas-server.config: Change the template names to openvas-server
-- 
 .''`.    Sébastien Villemot
: :' :    Debian Developer
`. `'     http://www.dynare.org/sebastien
  `-      GPG Key: 4096R/381A7594

Attachment: pgpAuei4c3KeN.pgp
Description: PGP signature

Reply via email to