Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi Release Team Please unblock package fprobe-ulog I have prepared a NMU upload for #687942 in fprobe-ulog: "modifies conffiles (policy 10.7.3): /etc/default/fprobe-ulog". I used the approach which was already used for the similar bugs about policy 10.7.3 violations. Attached is the debdiff against current version in testing. unblock fprobe-ulog/1.1-7.3 Many thanks Salvatore - -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCgAGBQJQd6z9AAoJEHidbwV/2GP+rwQQAJUy4BRJ8iBiYdZ3xk+zN/SO Vd+R/P3wIAXmwkpgwDvBx7mcSBKsGFao2MNn1vPpzs2MtiV66vh6m0DSdyFsvnDW b2I29z3CbaY57xL3zNpXivYWBXQATMLY4omMArsfyE55rGTLbtoGtnP2eSoRoG48 VpULSeI3jQwJ7TW1M3M9Raf16OsfBn36qBKWuKEnJx55EwJfpzsFgwhMbwdxpC4F qAx7wwnjP3SWaV0ranLHOkZxcICBsJv8OBUw36VpMOW4WAI2NZYsi3Uf4wb14z3J 4yd8sk6/apbeA+gEMGgfSXWTdw/AnuzAVN5Eyee9ezXGt1iPypObNMM2+RZ8ectQ 9ExM6GAPAKdJS6W5q4R3iG1iCYhsSm34e753G68JblvBZPqw4vegPbF2jOYLD016 lRvvjktxVOlSOr/JAhOmEmqdLmGwE5xLaxXAh9St4JkuRraVZ5MtQf5h3qrk+oXX SgXe1NrWLrLGMIs8umZY3QLJ5Ofz1s0H3DuhN/qRHx47bbVocD5A7m4uJeSM1B8P 22Gpq7PyhOD2W/tw5YYiZ2R+b0BISQ4K4t955j9xGn3aIh1U3WmwHgZL5I0lpZWr eDKRfOGbz84FxR5zT8a7tC1HdZPfUvELNP/azh6TOmWitJ9HKZsudNaQDLP9ue4G whtk/BYrDfXTP+hPPOJD =atTO -----END PGP SIGNATURE-----
Base version: fprobe-ulog_1.1-7.2 from testing Target version: fprobe-ulog_1.1-7.3 from unstable No hints in place. debian/default | 6 ------ debian/postrm | 9 +++++++++ fprobe-ulog-1.1/debian/changelog | 18 ++++++++++++++++++ fprobe-ulog-1.1/debian/config | 8 ++++++++ fprobe-ulog-1.1/debian/postinst | 24 ++++++++++++++++++++++-- 5 files changed, 57 insertions(+), 8 deletions(-) diff -u fprobe-ulog-1.1/debian/changelog fprobe-ulog-1.1/debian/changelog --- fprobe-ulog-1.1/debian/changelog +++ fprobe-ulog-1.1/debian/changelog @@ -1,3 +1,21 @@ +fprobe-ulog (1.1-7.3) unstable; urgency=low + + * Non-maintainer upload. + * Fix "modifies conffiles (policy 10.7.3): /etc/default/fprobe-ulog" + (Closes: #687942). + - Don't install /etc/default/fprobe-ulog via dh_installinit + - Read /etc/default/fprobe-ulog in fprobe-ulog.config. + Read /etc/default/fprobe-ulog into Debconf in fprobe-ulog.config + if the file exists. + - Create /etc/default/fprobe-ulog in postinst. + Create /etc/default/fprobe-ulog if it does not yet exists in + postinst. If admin furthermore deleted or commented some variables + but then set them via debconf, (re-)add them to the configuration + file in postinst. + - Remove configuration file on purge in postrm script + + -- Salvatore Bonaccorso <car...@debian.org> Mon, 08 Oct 2012 01:07:43 +0200 + fprobe-ulog (1.1-7.2) unstable; urgency=low * Non-maintainer upload. reverted: --- fprobe-ulog-1.1/debian/default +++ fprobe-ulog-1.1.orig/debian/default @@ -1,6 +0,0 @@ -#fprobe-ulog default configuration file - - -INTERFACE="eth0:100" -FLOW_COLLECTOR="localhost:2055" -OTHER_ARGS="" diff -u fprobe-ulog-1.1/debian/config fprobe-ulog-1.1/debian/config --- fprobe-ulog-1.1/debian/config +++ fprobe-ulog-1.1/debian/config @@ -7,6 +7,14 @@ # Use debconf. . /usr/share/debconf/confmodule +# Load config file, if it exists. +if [ -e /etc/default/fprobe-ulog ]; then + . /etc/default/fprobe-ulog || true + + # Store values from config file into debconf db. + db_set fprobe-ulog/interface "$INTERFACE" + db_set fprobe-ulog/collector "$FLOW_COLLECTOR" +fi db_input high fprobe-ulog/interface || true db_input high fprobe-ulog/collector || true diff -u fprobe-ulog-1.1/debian/postinst fprobe-ulog-1.1/debian/postinst --- fprobe-ulog-1.1/debian/postinst +++ fprobe-ulog-1.1/debian/postinst @@ -4,10 +4,30 @@ # Use debconf. . /usr/share/debconf/confmodule -if [ "$1" = "configure" ] && [ -z "$2" ]; then +# generate default file if it doesn't exist +if [ ! -e /etc/default/fprobe-ulog ]; then + cat > /etc/default/fprobe-ulog <<-END + #fprobe-ulog default configuration file + + + INTERFACE="eth0:100" + FLOW_COLLECTOR="localhost:2055" + OTHER_ARGS="" + END +fi + +if [ "$1" = "configure" ]; then db_get fprobe-ulog/interface && interface="$RET" db_get fprobe-ulog/collector && collector="$RET" - + + # If the admin deleted or commented some variables but then set + # them via debconf, (re-)add them to the conffile. + test -z "$interface" || grep -Eq '^ *INTERFACE=' /etc/default/fprobe-ulog || \ + echo "INTERFACE=" >> /etc/default/fprobe-ulog + test -z "$collector" || grep -Eq '^ *FLOW_COLLECTOR=' /etc/default/fprobe-ulog || \ + echo "FLOW_COLLECTOR=" >> /etc/default/fprobe-ulog + + sed -i "s/^INTERFACE=.*$/INTERFACE=\"$interface\"/" /etc/default/fprobe-ulog sed -i "s/^FLOW_COLLECTOR=.*$/FLOW_COLLECTOR=\"$collector\"/" /etc/default/fprobe-ulog fi only in patch2: unchanged: --- fprobe-ulog-1.1.orig/debian/postrm +++ fprobe-ulog-1.1/debian/postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ]; then + rm -f /etc/default/fprobe-ulog +fi + +#DEBHELPER# Hints needed: unblock fprobe-ulog/1.1-7.3