(Second try. Now really with diff) Am 01.12.2012 14:41, schrieb Julien Cristau: > On Mon, Oct 8, 2012 at 18:04:05 +0200, Christoph Martin wrote: > >> Package: release.debian.org >> Severity: normal >> User: release.debian.org@packages.debian.org >> Usertags: unblock >> >> Please unblock package mimedefang >> >> Version 2.73-2 fixes release critical Bug #688196 (piuparts). >> > Please prepare a fix for that bug against the 2.71-2 version currently > in testing. I don't think we'll upgrade to 2.73 at this point, sorry. Attached is a debdiff for a 2.71-3 version which includes the fix for 688196, a debconf translation a lintian cleanup like in 2.73-2. Please let me know, if I can upload it and let me know if I should upload to testing. Christoph
diff -u mimedefang-2.71/debian/changelog mimedefang-2.71/debian/changelog --- mimedefang-2.71/debian/changelog +++ mimedefang-2.71/debian/changelog @@ -1,3 +1,21 @@ +mimedefang (2.71-3) testing; urgency=low + + [ gregor herrmann ] + * Fix "modifies conffiles (policy 10.7.3): /etc/default/mimedefang": + - debian/{dir,rules}: install configuration file under /usr/share + - debian/mimedefang.postinst: copy it to /etc/default if necessary + - debian/mimedefang.postrm: remove it on purge + - debian/config: also handle no/false case + (Closes: #688196) + + [ Christoph Martin ] + * add new nb debconf translation (Closes: #654452) + * correct some lintian warnings + * Add MX_RECIPOK_PERDOMAIN_LIMIT to the reference configuration in + /usr/share/mimedefang/mimedefang.conf + + -- Christoph Martin <christoph.martin@uni-mainz.de> Tue, 11 Dec 2012 15:22:00 +0100 + mimedefang (2.71-2) unstable; urgency=low [ Salvatore Bonaccorso ] diff -u mimedefang-2.71/debian/control mimedefang-2.71/debian/control --- mimedefang-2.71/debian/control +++ mimedefang-2.71/debian/control @@ -3,7 +3,7 @@ Priority: extra Maintainer: Christoph Martin <christoph.martin@uni-mainz.de> Build-Depends: debhelper (>= 5), po-debconf, libmilter-dev, bsd-mailx, libunix-syslog-perl, libperl-dev, libmime-tools-perl, libmail-spamassassin-perl, sanitizer, libhtml-parser-perl, libfile-scan-perl, libarchive-zip-perl -Standards-Version: 3.8.4 +Standards-Version: 3.9.3 Package: mimedefang Architecture: any diff -u mimedefang-2.71/debian/rules mimedefang-2.71/debian/rules --- mimedefang-2.71/debian/rules +++ mimedefang-2.71/debian/rules @@ -28,7 +28,9 @@ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-anti-virus --with-confsubdir=/ --with-quarantinedir=/var/spool/MIMEDefang $(NO_EMBED) -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: config.status dh_testdir @@ -68,7 +70,7 @@ # Add here commands to install the package into debian/mimedefang. $(MAKE) install DESTDIR=$(CURDIR)/debian/mimedefang - cp debian/mimedefang.conf debian/mimedefang/etc/default/mimedefang + cp debian/mimedefang.conf debian/mimedefang/usr/share/mimedefang cp debian/mimedefang.pl.conf debian/mimedefang/etc/mail/mimedefang.pl.conf rmdir debian/mimedefang/usr/sbin # rmdir debian/mimedefang/etc/spamassassin diff -u mimedefang-2.71/debian/mimedefang.conf mimedefang-2.71/debian/mimedefang.conf --- mimedefang-2.71/debian/mimedefang.conf +++ mimedefang-2.71/debian/mimedefang.conf @@ -116,6 +116,10 @@ # considered dead. The default is 30 seconds; we suggest 300. # MX_BUSY=300 +# Maximum number of concurrent recipok requests on a per-domain basis. +# 0 means no limit +MX_RECIPOK_PERDOMAIN_LIMIT=0 + # Extra sendmail macros to pass. Actually, you can add any extra # mimedefang options here... # MD_EXTRA="-a auth_author" diff -u mimedefang-2.71/debian/mimedefang.dirs mimedefang-2.71/debian/mimedefang.dirs --- mimedefang-2.71/debian/mimedefang.dirs +++ mimedefang-2.71/debian/mimedefang.dirs @@ -4 +4 @@ -etc/default +usr/share/mimedefang diff -u mimedefang-2.71/debian/NEWS mimedefang-2.71/debian/NEWS --- mimedefang-2.71/debian/NEWS +++ mimedefang-2.71/debian/NEWS @@ -1,3 +1,8 @@ +mimedefang (2.71-3) unstable; urgency=low + + - /etc/default/mimedefang is no longer managed by dpkg. (See #688196) + /usr/share/mimedefang/mimedefang.conf can be used as a reference. + mimedefang (2.56-1) unstable; urgency=low - mimedefang.pl.in: The filter_begin function is now passed diff -u mimedefang-2.71/debian/config mimedefang-2.71/debian/config --- mimedefang-2.71/debian/config +++ mimedefang-2.71/debian/config @@ -17,6 +17,9 @@ if [ "$MX_EMBED_PERL"x = "yes"x ] then db_set mimedefang/embedperl true + elif [ "$MX_EMBED_PERL"x = "no"x ] + then + db_set mimedefang/embedperl false fi fi diff -u mimedefang-2.71/debian/mimedefang.postinst mimedefang-2.71/debian/mimedefang.postinst --- mimedefang-2.71/debian/mimedefang.postinst +++ mimedefang-2.71/debian/mimedefang.postinst @@ -90,8 +90,12 @@ rm -f /etc/mail/mimedefang.conf fi # Setup embeded perl - db_get mimedefang/embedperl || true CONFFILE=/etc/default/mimedefang + # Copy file if it doesn't exist + if [ ! -e $CONFFILE ]; then + cp /usr/share/mimedefang/mimedefang.conf $CONFFILE + fi + db_get mimedefang/embedperl || true if [ "$RET" = 'true' ]; then set_value $CONFFILE MX_EMBED_PERL yes else diff -u mimedefang-2.71/debian/mimedefang.postrm mimedefang-2.71/debian/mimedefang.postrm --- mimedefang-2.71/debian/mimedefang.postrm +++ mimedefang-2.71/debian/mimedefang.postrm @@ -23,6 +23,7 @@ deluser --quiet defang 2> /dev/null || true deluser --quiet smmsp defang 2> /dev/null || true delgroup --quiet defang 2> /dev/null || true + rm -f /etc/default/mimedefang fi case "$1" in diff -u mimedefang-2.71/debian/po/nb.po mimedefang-2.71/debian/po/nb.po --- mimedefang-2.71/debian/po/nb.po +++ mimedefang-2.71/debian/po/nb.po @@ -5,33 +5,34 @@ -# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2008. +# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2008, 2012. msgid "" msgstr "" "Project-Id-Version: templates.pot_[9CexDb]\n" "Report-Msgid-Bugs-To: christoph.martin@uni-mainz.de\n" "POT-Creation-Date: 2008-03-11 14:58+0100\n" -"PO-Revision-Date: 2008-02-04 10:51+0100\n" +"PO-Revision-Date: 2012-01-03 21:25+0100\n" "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy msgid "Should MIMEDefang use an embedded Perl interpreter? " -msgstr "Skal MIMEdefang bruke den innebygde Perl-tolkeren? " +msgstr "Skal MIMEdefang bruke en innebygget Perl-tolker? " #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy msgid "" "Choosing this option is generally safe and will significantly improve " "performance. However, some systems do not support it. See mimedefang-" "multiplexor(8) for more details on using an embedded Perl interpreter" msgstr "" -"Det er som regel trygt å velge dette, og detgir vesentlig bedre ytelse, men " -"noen systemer støtter det ikke." +"Det er som regel trygt å velge dette, og det gir vesentlig bedre ytelse, men " +"noen systemer støtter det ikke. Se manualsida mimedefang-multiplexor(8) for " +"fler detaljer om å bruke en innebygget Perl-tolker." +
Attachment:
signature.asc
Description: OpenPGP digital signature