diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/libpam-runtime.lintian | 4 | ||||
| -rw-r--r-- | debian/patches-applied/pam_mail-fix-quiet | 37 | ||||
| -rw-r--r-- | debian/patches-applied/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | debian/source.lintian-overrides | 1 |
7 files changed, 56 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 9e3f81b7..8666f373 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,13 @@ pam (1.0.1-10) UNRELEASED; urgency=low for MINDAYS-Field regression (closes: #514437). * debian/control: add missing misc:Depends for packages that need it. + [ Sam Hartman ] + * Remove conflicts information for transitions prior to woody release + * Fix lintian overrides for libpam-runtime + * Overrides for lintian finding quilt patches + * pam_mail-fix-quiet: patch from Andreas Henriksson + applied upstream to fix quiet option of pam_mail, Closes: #439268 + [ Dustin Kirkland ] * debian/patches/update-motd: run the update-motd scripts in pam_motd; render update-motd obsolete, LP: #399071 diff --git a/debian/control b/debian/control index f6297e6f..aef0b765 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Homepage: http://pam.sourceforge.net/ Package: libpam0g Priority: required Architecture: any -Conflicts: libpam0 (<= 0.56-2), libpam Replaces: libpam0g-util Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime Suggests: libpam-doc @@ -32,7 +31,7 @@ Section: admin Priority: required Architecture: any Pre-Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libpam0g-modules (= 0.66-1), libpam-motd, libpam-mkhomedir, libpam-umask, suidmanager (<< 0.50) +Conflicts: libpam-motd, libpam-mkhomedir, libpam-umask Replaces: libpam0g-util, libpam-umask Provides: libpam-motd, libpam-mkhomedir, libpam-umask Description: Pluggable Authentication Modules for PAM @@ -45,7 +44,7 @@ Priority: required Architecture: all Depends: ${misc:Depends}, debconf (>= 1.5.19) Replaces: libpam0g-util, libpam0g-dev -Conflicts: libpam0g-util, libpam0g (<< 0.66-0) +Conflicts: libpam0g-util Description: Runtime support for the PAM library Contains configuration files and directories required for authentication to work on Debian systems. This package is required @@ -56,8 +55,6 @@ Section: libdevel Priority: optional Architecture: any Depends: ${misc:Depends}, libpam0g (= ${binary:Version}), libc6-dev|libc-dev -Conflicts: libpam-dev, libpam-dbg -Replaces: libpam0g (<= 0.65) Provides: libpam-dev Description: Development files for PAM Contains C header files and development shared libraries for libpam, the diff --git a/debian/libpam-runtime.lintian b/debian/libpam-runtime.lintian index d84c207a..7a8b1a70 100644 --- a/debian/libpam-runtime.lintian +++ b/debian/libpam-runtime.lintian @@ -1,5 +1,5 @@ # deliberate. -W: libpam-runtime: no-debconf-config +libpam-runtime: no-debconf-config # this warning is just plain crack, there's no reason that using debconf # outside of a maintainer script implies an error. -W: libpam-runtime: debconf-is-not-a-registry ./usr/sbin/pam-auth-update +libpam-runtime: debconf-is-not-a-registry usr/sbin/pam-auth-update diff --git a/debian/patches-applied/pam_mail-fix-quiet b/debian/patches-applied/pam_mail-fix-quiet new file mode 100644 index 00000000..7673effa --- /dev/null +++ b/debian/patches-applied/pam_mail-fix-quiet @@ -0,0 +1,37 @@ +Make quiet option of pam_mail work. Fixes http://bugs.debian.org/439268 + +Author: Andreas Henriksson <andreas@fatal.se> +Upstream status: applied in upstream CVS September 2008 + +Index: sid/modules/pam_mail/pam_mail.c +=================================================================== +--- sid.orig/modules/pam_mail/pam_mail.c 2009-05-30 17:02:33.000000000 -0400 ++++ sid/modules/pam_mail/pam_mail.c 2009-05-30 17:20:28.000000000 -0400 +@@ -303,8 +303,13 @@ + { + int retval; + +- if (!(ctrl & PAM_MAIL_SILENT) || +- ((ctrl & PAM_QUIET_MAIL) && type == HAVE_NEW_MAIL)) ++ if ((ctrl & PAM_MAIL_SILENT) || ++ ((ctrl & PAM_QUIET_MAIL) && type != HAVE_NEW_MAIL)) ++ { ++ D(("keeping quiet")); ++ retval = PAM_SUCCESS; ++ } ++ else + { + if (ctrl & PAM_STANDARD_MAIL) + switch (type) +@@ -345,11 +350,6 @@ + break; + } + } +- else +- { +- D(("keeping quiet")); +- retval = PAM_SUCCESS; +- } + + D(("returning %s", pam_strerror(pamh, retval))); + return retval; diff --git a/debian/patches-applied/series b/debian/patches-applied/series index e5fbab49..3e763c96 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -24,3 +24,5 @@ autoconf.patch dont_freeze_password_chain -p0 pam_1.0.4_mindays update-motd +pam_mail-fix-quiet + diff --git a/debian/rules b/debian/rules index 4ea85b83..63c4aee6 100755 --- a/debian/rules +++ b/debian/rules @@ -99,6 +99,10 @@ binary-indep: install dh_installdebconf -i dh_installchangelogs -i $(BUILD_TREE)/ChangeLog dh_compress -i -X.html + for pkg in libpam-runtime; do \ + install -m 0644 -D $(d)/$$pkg.lintian $(d)/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \ + done + dh_link -i dh_fixperms -i dh_installdeb -i @@ -131,7 +135,7 @@ binary-arch: install dh_installcron -a dh_installchangelogs -a $(BUILD_TREE)/ChangeLog - for pkg in libpam0g libpam-modules libpam-runtime; do \ + for pkg in libpam0g libpam-modules ; do \ install -m 0644 -D $(d)/$$pkg.lintian $(d)/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \ done diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides new file mode 100644 index 00000000..f197d338 --- /dev/null +++ b/debian/source.lintian-overrides @@ -0,0 +1 @@ +pam source: quilt-build-dep-but-no-series-file pam |