tags 688375 + patch tags 688375 + pending thanks Dear maintainer,
I've prepared an NMU for ntlmaps (versioned as 0.9.9.0.1-11.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Steppenwolf: Happy Birthday
diff -u ntlmaps-0.9.9.0.1/debian/changelog ntlmaps-0.9.9.0.1/debian/changelog --- ntlmaps-0.9.9.0.1/debian/changelog +++ ntlmaps-0.9.9.0.1/debian/changelog @@ -1,3 +1,18 @@ +ntlmaps (0.9.9.0.1-11.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "modifies conffiles (policy 10.7.3): /etc/ntlmaps/server.cfg": + - install server.cfg below /usr/share instead of /etc + (debian/install, debian/dirs) + - copy the template in debian/postinst if necessary + - remove it in new debian/postrm during purge + - (re)move parts of debian/rules and debian/lintian-overrides related + to server.cfg + - the rest of the modify-file-with-debconf machinery is already there + (Closes: #688375) + + -- gregor herrmann <gre...@debian.org> Tue, 02 Oct 2012 18:10:44 +0200 + ntlmaps (0.9.9.0.1-11.1) unstable; urgency=low * Non-maintainer upload. diff -u ntlmaps-0.9.9.0.1/debian/dirs ntlmaps-0.9.9.0.1/debian/dirs --- ntlmaps-0.9.9.0.1/debian/dirs +++ ntlmaps-0.9.9.0.1/debian/dirs @@ -1,3 +1,4 @@ +etc/ntlmaps usr/share/ntlmaps usr/share/doc/ntlmaps/doc usr/share/lintian/overrides diff -u ntlmaps-0.9.9.0.1/debian/install ntlmaps-0.9.9.0.1/debian/install --- ntlmaps-0.9.9.0.1/debian/install +++ ntlmaps-0.9.9.0.1/debian/install @@ -1,4 +1,4 @@ -server.cfg etc/ntlmaps +server.cfg usr/share/ntlmaps/ main.py usr/share/ntlmaps/ __init__.py usr/share/ntlmaps/ lib usr/share/ntlmaps/ diff -u ntlmaps-0.9.9.0.1/debian/rules ntlmaps-0.9.9.0.1/debian/rules --- ntlmaps-0.9.9.0.1/debian/rules +++ ntlmaps-0.9.9.0.1/debian/rules @@ -54,10 +54,6 @@ dh_link dh_strip dh_compress - # server.cfg has special no-read permissions set below - dh_fixperms --exclude etc/ntlmaps/server.cfg - # the config file may contain passwords, so make it non-world-readable - chmod og-r debian/ntlmaps/etc/ntlmaps/server.cfg dh_pysupport /usr/share/ntlmaps dh_python /usr/share/ntlmaps dh_installdeb diff -u ntlmaps-0.9.9.0.1/debian/lintian-override ntlmaps-0.9.9.0.1/debian/lintian-override --- ntlmaps-0.9.9.0.1/debian/lintian-override +++ ntlmaps-0.9.9.0.1/debian/lintian-override @@ -1,7 +1,3 @@ -# We use a non-standard permission to help protect passwords in -# /etc/ntlmaps/server.cfg -ntlmaps binary: non-standard-file-perm etc/ntlmaps/server.cfg 0600 != 0644 - # '[[' in config and postinst refers to grep syntax [[:blank:]], not bash. ## Disabling the override, however, since there is no mechanism here to ## allow for wild cards, but I do not want to override bashism checks for all diff -u ntlmaps-0.9.9.0.1/debian/postinst ntlmaps-0.9.9.0.1/debian/postinst --- ntlmaps-0.9.9.0.1/debian/postinst +++ ntlmaps-0.9.9.0.1/debian/postinst @@ -13,6 +13,12 @@ NTPASSWD_ENTRY=PASSWORD +# copy configuration file template if necessary +if [ ! -e $CONFIG_FILE ] ; then + cp /usr/share/ntlmaps/server.cfg /etc/ntlmaps/ + # the config file may contain passwords, so make it non-world-readable + chmod 600 $CONFIG_FILE +fi LISTENPORT=5865 db_get ntlmaps/listen_port only in patch2: unchanged: --- ntlmaps-0.9.9.0.1.orig/debian/postrm +++ ntlmaps-0.9.9.0.1/debian/postrm @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +CONFIG_FILE=/etc/ntlmaps/server.cfg + +if [ "$1" = "purge" ] ; then + rm -f $CONFIG_FILE +fi + +#DEBHELPER# + +exit 0 +
signature.asc
Description: Digital signature
