From 373653d911ee042931401e41e5248bcf16457f2c Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 31 Aug 2010 22:14:31 -0700 Subject: Drop patches conditional_module,_conditional_man and mkhomedir_linking.patch, which are included upstream. --- debian/changelog | 2 ++ .../conditional_module,_conditional_man | 26 -------------------- debian/patches-applied/mkhomedir_linking.patch | 28 ---------------------- debian/patches-applied/series | 2 -- 4 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 debian/patches-applied/conditional_module,_conditional_man delete mode 100644 debian/patches-applied/mkhomedir_linking.patch diff --git a/debian/changelog b/debian/changelog index f3b89012..17a82010 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ pam (1.1.1-5) UNRELEASED; urgency=low interface. Closes: #579402. * debian/patches-applied/007_modules_pam_unix: fix up patch for new upstream version which now implements minlen=, not min=. + * Drop patches conditional_module,_conditional_man and + mkhomedir_linking.patch, which are included upstream. -- Steve Langasek Sun, 29 Aug 2010 00:56:28 -0700 diff --git a/debian/patches-applied/conditional_module,_conditional_man b/debian/patches-applied/conditional_module,_conditional_man deleted file mode 100644 index 69e15a80..00000000 --- a/debian/patches-applied/conditional_module,_conditional_man +++ /dev/null @@ -1,26 +0,0 @@ -Description: don't install manpage for pam_tty_audit if the module isn't built - If we don't have the libraries required for building pam_tty_audit, we - shouldn't install the manpage either. -Author: Steve Langasek -Bug-Ubuntu: https://bugs.launchpad.net/bugs/588547 -Forwarded: <20100607181348.GA28895@dario.dodds.net> -Applied-Upstream: 987, http://bzr.debian.org/pkg-pam/upstream/branches/HEAD - -Index: pam.deb/modules/pam_tty_audit/Makefile.am -=================================================================== ---- pam.deb.orig/modules/pam_tty_audit/Makefile.am -+++ pam.deb/modules/pam_tty_audit/Makefile.am -@@ -5,9 +5,11 @@ - CLEANFILES = *~ - MAINTAINERCLEANFILES = $(MANS) README - --EXTRA_DIST = README $(MANS) $(XMLS) -+EXTRA_DIST = README pam_tty_audit.8 $(XMLS) - --man_MANS = pam_tty_audit.8 -+if HAVE_AUDIT_TTY_STATUS -+ man_MANS = pam_tty_audit.8 -+endif - XMLS = README.xml pam_tty_audit.8.xml - - securelibdir = $(SECUREDIR) diff --git a/debian/patches-applied/mkhomedir_linking.patch b/debian/patches-applied/mkhomedir_linking.patch deleted file mode 100644 index f629b2df..00000000 --- a/debian/patches-applied/mkhomedir_linking.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: don't pass --version-script options when linking executables, - only when linking libraries -Author: Julien Cristau -Bug-Debian: http://bugs.debian.org/582362 - -Index: pam/modules/pam_mkhomedir/Makefile.am -=================================================================== ---- pam.orig/modules/pam_mkhomedir/Makefile.am -+++ pam/modules/pam_mkhomedir/Makefile.am -@@ -19,14 +19,14 @@ - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\" --AM_LDFLAGS = -no-undefined -avoid-version -module --if HAVE_VERSIONING -- AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map --endif - - securelib_LTLIBRARIES = pam_mkhomedir.la - pam_mkhomedir_la_SOURCES = pam_mkhomedir.c - pam_mkhomedir_la_LIBADD = -L$(top_builddir)/libpam -lpam -+pam_mkhomedir_la_LDFLAGS = -no-undefined -avoid-version -module -+if HAVE_VERSIONING -+ pam_mkhomedir_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map -+endif - - sbin_PROGRAMS = mkhomedir_helper - mkhomedir_helper_SOURCES = mkhomedir_helper.c diff --git a/debian/patches-applied/series b/debian/patches-applied/series index 7455447a..1d1a6034 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -16,8 +16,6 @@ hurd_no_setfsuid 054_pam_security_abstract_securetty_handling 055_pam_unix_nullok_secure PAM-manpage-section -conditional_module,_conditional_man -mkhomedir_linking.patch autoconf.patch update-motd fix-man-crud -- cgit v1.2.3