summaryrefslogtreecommitdiff
path: root/debian/patches-applied
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2010-08-31 22:14:31 -0700
committerSteve Langasek <vorlon@debian.org>2019-01-08 21:48:25 -0800
commit373653d911ee042931401e41e5248bcf16457f2c (patch)
tree3312a368cfbedc6c36dea5bd80332574a6d1402a /debian/patches-applied
parent708286ab96a796707850245dafbe95ac6cdae94d (diff)
Drop patches conditional_module,_conditional_man and
mkhomedir_linking.patch, which are included upstream.
Diffstat (limited to 'debian/patches-applied')
-rw-r--r--debian/patches-applied/conditional_module,_conditional_man26
-rw-r--r--debian/patches-applied/mkhomedir_linking.patch28
-rw-r--r--debian/patches-applied/series2
3 files changed, 0 insertions, 56 deletions
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 <steve.langasek@canonical.com>
-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 <jcristau@debian.org>
-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