tags 548383 + patch tags 548383 + pending thanks Dear maintainer,
I've prepared an NMU for qpopper (versioned as 4.0.9.dfsg-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. A git import of the package is available from http://git.debian.org/?p=users/smcv/qa/qpopper.git if you want it. Regards, Simon
diffstat for qpopper_4.0.9.dfsg-1.1 qpopper_4.0.9.dfsg-1.2
debian/patches/qpopper-memset.patch | 25 +++++++++++++++++++++++++
qpopper-4.0.9.dfsg/debian/changelog | 11 +++++++++++
qpopper-4.0.9.dfsg/debian/control | 4 ++--
qpopper-4.0.9.dfsg/debian/patches/series | 1 +
qpopper-4.0.9.dfsg/debian/qpopper.pam | 13 +++++++++++--
5 files changed, 50 insertions(+), 4 deletions(-)
diff -u qpopper-4.0.9.dfsg/debian/control qpopper-4.0.9.dfsg/debian/control
--- qpopper-4.0.9.dfsg/debian/control
+++ qpopper-4.0.9.dfsg/debian/control
@@ -8,7 +8,7 @@
Package: qpopper
Architecture: any
-Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, openbsd-inetd | inet-superserver
+Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, openbsd-inetd | inet-superserver, libpam-runtime
Conflicts: pop3-server
Provides: pop3-server
Description: Enhanced Post Office Protocol server (POP3)
@@ -19,7 +19,7 @@
Package: qpopper-drac
Architecture: any
-Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, openbsd-inetd | inet-superserver
+Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, openbsd-inetd | inet-superserver, libpam-runtime
Suggests: drac
Conflicts: pop3-server
Provides: pop3-server
diff -u qpopper-4.0.9.dfsg/debian/qpopper.pam qpopper-4.0.9.dfsg/debian/qpopper.pam
--- qpopper-4.0.9.dfsg/debian/qpopper.pam
+++ qpopper-4.0.9.dfsg/debian/qpopper.pam
@@ -2,2 +2,11 @@
-auth required pam_unix_auth.so shadow
-account required pam_unix_acct.so
+# /etc/pam.d/qpopper - specify the PAM behaviour of qpopper
+#
+
+# We fall back to the system default in /etc/pam.d/common-*
+
+...@include common-auth
+...@include common-account
+
+# We don't use password or session modules at all
+# @include common-password
+# @include common-session
diff -u qpopper-4.0.9.dfsg/debian/changelog qpopper-4.0.9.dfsg/debian/changelog
--- qpopper-4.0.9.dfsg/debian/changelog
+++ qpopper-4.0.9.dfsg/debian/changelog
@@ -1,3 +1,14 @@
+qpopper (4.0.9.dfsg-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply patch from Keith Hellman to work with modern libpam-modules versions
+ (Closes: #548383)
+ * Depend on libpam-runtime to get common-auth and common-account
+ * Include string.h in drac.c to avoid incompatible implicit declaration
+ of memset, which could break 64-bit platforms
+
+ -- Simon McVittie <[email protected]> Wed, 24 Nov 2010 21:34:06 +0000
+
qpopper (4.0.9.dfsg-1.1) unstable; urgency=low
[Jari Aalto]
diff -u qpopper-4.0.9.dfsg/debian/patches/series qpopper-4.0.9.dfsg/debian/patches/series
--- qpopper-4.0.9.dfsg/debian/patches/series
+++ qpopper-4.0.9.dfsg/debian/patches/series
@@ -6,0 +7 @@
+qpopper-memset.patch
only in patch2:
unchanged:
--- qpopper-4.0.9.dfsg.orig/debian/patches/qpopper-memset.patch
+++ qpopper-4.0.9.dfsg/debian/patches/qpopper-memset.patch
@@ -0,0 +1,25 @@
+From 2117869dca3c2ce820546e0f93d6083507b68e96 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <[email protected]>
+Date: Wed, 24 Nov 2010 21:28:03 +0000
+Subject: [PATCH] Include string.h in drac.c to avoid incompatible implicit declaration
+
+This could break 64-bit platforms and is trivial to fix.
+---
+ popper/drac.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/popper/drac.c b/popper/drac.c
+index 6376bef..ea21358 100644
+--- a/popper/drac.c
++++ b/popper/drac.c
+@@ -21,6 +21,7 @@
+
+ #include <sys/types.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+--
+1.7.2.3
+
signature.asc
Description: Digital signature
