Package: clamsmtp
Version: 1.8-5.1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my clamsmtp 1.8-5.2 NMU during the current BSP
which I'll upload to delayed-0.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u clamsmtp-1.8/debian/control clamsmtp-1.8/debian/control
--- clamsmtp-1.8/debian/control
+++ clamsmtp-1.8/debian/control
@@ -7,7 +7,7 @@
Package: clamsmtp
Architecture: any
-Depends: dpkg (>= 1.10.11), clamav-daemon (>= 0.75.1), ${shlibs:Depends}, ${misc:Depends}
+Depends: dpkg (>= 1.10.11), clamav-daemon (>= 0.75.1), adduser, ${shlibs:Depends}, ${misc:Depends}
Recommends: postfix | mail-transport-agent
Description: virus-scanning SMTP proxy
ClamSMTP is an SMTP proxy daemon that checks for viruses using the ClamAV
diff -u clamsmtp-1.8/debian/changelog clamsmtp-1.8/debian/changelog
--- clamsmtp-1.8/debian/changelog
+++ clamsmtp-1.8/debian/changelog
@@ -1,3 +1,12 @@
+clamsmtp (1.8-5.2) unstable; urgency=high
+
+ * Non-maintainer upload during BSP.
+ * Fix unconditional use of debconf in postrm (Closes: #416730).
+ * Add Dutch debconf translation (Closes: #419727).
+ * Add dependency on adduser as it is used in postinst.
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sat, 19 May 2007 15:50:40 +0200
+
clamsmtp (1.8-5.1) unstable; urgency=low
* Non-maintainer upload during BSP.
diff -u clamsmtp-1.8/debian/postrm clamsmtp-1.8/debian/postrm
--- clamsmtp-1.8/debian/postrm
+++ clamsmtp-1.8/debian/postrm
@@ -3,17 +3,17 @@
# postrm -- clamsmtp post-remove maintainer script
#
set -e
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
-fi
if [ "$1" = "purge" ]; then
- # Purge the clamsmtp spool directory?
- db_get clamsmtp/purge || true
- if [ "${RET:-no}" = "yes" -a -d /var/spool/clamsmtp ] ; then
- rm -rf /var/spool/clamsmtp || true
- elif [ -d /var/spool/clamsmtp ] ; then
- rmdir /var/spool/clamsmtp 2>/dev/null || true
+ if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ # Purge the clamsmtp spool directory?
+ db_get clamsmtp/purge || true
+ if [ "${RET:-no}" = "yes" -a -d /var/spool/clamsmtp ] ; then
+ rm -rf /var/spool/clamsmtp || true
+ elif [ -d /var/spool/clamsmtp ] ; then
+ rmdir /var/spool/clamsmtp 2>/dev/null || true
+ fi
fi
if [ -d /var/run/clamsmtp ] ; then
@@ -25,11 +25,15 @@
- deluser clamav clamsmtp || true
- # Attempt to stop and start clamav-daemon, getting
- # cleaned group permissions.
- (invoke-rc.d clamav-daemon stop && \
- invoke-rc.d clamav-daemon start) || true
+ if [ -x /usr/sbin/deluser ]; then
+ deluser clamav clamsmtp || true
+ fi
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ # Attempt to stop and start clamav-daemon, getting
+ # cleaned group permissions.
+ (invoke-rc.d clamav-daemon stop && \
+ invoke-rc.d clamav-daemon start) || true
+ fi
fi
fi
#DEBHELPER#
-db_stop
+db_stop || true
only in patch2:
unchanged:
--- clamsmtp-1.8.orig/debian/po/nl.po
+++ clamsmtp-1.8/debian/po/nl.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <[EMAIL PROTECTED]>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: clamsmtp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-03-11 04:30+0100\n"
+"PO-Revision-Date: 2007-04-06 12:09+0100\n"
+"Last-Translator: Bart Cornelis <[EMAIL PROTECTED]>\n"
+"Language-Team: debian-l10n-dutch <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Add a clamsmtp system user and group?"
+msgstr "Wilt u dat er een gebruiker en groep 'clamsmtp' wordt toegevoegd op dit systeem?"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "New installations of clamsmtp install with a system user and group of \"clamsmtp\". The \"clamav\" user is added to the clamsmtp group to allow the clamav-daemon process to view the quarantine directory. If you answer \"yes\" to this question, the installation process will also update the ownership and permissions of the quarantine and run directories."
+msgstr "Nieuwe installaties van clamsmtp installeren met de gebruiker en groep 'clamsmtp' als eigenaar. Om de clamav-achtergronddienst toe te laten om de quarantainemap in te kijken wordt de 'clamav' gebruiker toegevoegd aan de groep 'clamsmtp'. Als u 'ja' antwoord op deze vraag zal het installatieproces ook de eigenaar en rechten van de quarantaine en run mappen bijwerken."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Fix directory permissions?"
+msgstr "Wilt u de maprechten bijwerken?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "clamsmtpd needs read and write permissions to the virus spool directory, and the run directory in which its PID file is created. Additionally, the Clam AV daemon must have read access to the spool directory to scan for viruses."
+msgstr "clamsmtpd heeft lees- en schrijfrechten nodig op de virus-spoolmap, en op de run-map waarin het PID-bestand aangemaakt wordt. Verder heeft de Clam AV-achtergronddienst leesrechten nodig in de spoolmap om naar virussen te scannen."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Would you like the post-installation script to fix the permissions and ownership of these two directories? It will consult the /etc/clamsmtpd.conf and /etc/default/clamsmtp files for the administratively assigned TempDirectory, PidFile, User, and Group variables, and then update the two directories appropriately."
+msgstr "Wil u dat het post-installatiescript de rechten en de eigenaar van deze twee mappen aanpast? De bestanden /etc/clamsmtpd.conf en /etc/default/clamsmtp worden nagekeken om de door de beheerder bepaalde TempDirectory, PidFile, User, en Group variabelen te bepalen; de twee mappen worden overeenkomstig bijgewerkt."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Warning! Use this option at your own risk, and be sure to check directory permissions after running the 'start' or 'restart' commands for the init script."
+msgstr "Waarshuwing! Gebruik van deze optie is op eigen risico, gelieve na het uitvoeren van deze optie en na het aanroepen van het initscript met 'start' of 'restart' de maprechten te controleren."
+
+#. Type: select
+#. Description
+#: ../templates:3001
+msgid "Purge spool directory on --purge?"
+msgstr "Wilt u de spoolmap wissen bij het wissen van dit pakket?"
+
+#. Type: select
+#. Description
+#: ../templates:3001
+msgid "The virus spool directory may contain quarantined viruses. Do you want these files to be removed when you specify the '--purge' option to dpkg or apt?"
+msgstr "De virus-spoolmap bevat virussen in quarantaine. Wilt u dat deze bestanden verwijderd worden wanneer u dit pakket wist (--purge optie bij dpkg of apt)?"
+
