summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2008-07-27 01:07:10 -0700
committerSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 17:28:17 -0800
commit47c98f2062c89f63656b48bd44db462317d842b9 (patch)
treeb2145195d9ac797fd46eac82fc0656d211047c13 /debian
parent39291ae866a06109cc31e69583c5bfe76c31074e (diff)
Drop another patch that's integrated upstream
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches-applied/065_pam_unix_cracklib_disable21
-rw-r--r--debian/patches-applied/series1
3 files changed, 2 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog
index 3e126c55..1d6b5534 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,8 @@ pam (1.0.1-1) UNRELEASED; urgency=low
019_pam_listfile_quiet, 024_debian_cracklib_dict_path, 038_support_hurd,
043_pam_unix_unknown_user_not_alert, 046_pam_group_example,
no_pthread_mutexes, limits_wrong_strncpy, misc_conv_allow_sigint.patch,
- pam_tally_audit.patch, and 057_pam_unix_passwd_OOM_check, which have been
- merged upstream.
+ pam_tally_audit.patch, 057_pam_unix_passwd_OOM_check, and
+ 065_pam_unix_cracklib_disable which have been merged upstream.
* Patch 022_pam_unix_group_time_miscfixes: partially merged upstream;
now is really just "pam_group_miscfixes".
* Patch 007_modules_pam_unix partially superseded upstream; stripping
diff --git a/debian/patches-applied/065_pam_unix_cracklib_disable b/debian/patches-applied/065_pam_unix_cracklib_disable
deleted file mode 100644
index 7e90796a..00000000
--- a/debian/patches-applied/065_pam_unix_cracklib_disable
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: pam.debian/modules/pam_unix/Makefile.am
-===================================================================
---- pam.debian.orig/modules/pam_unix/Makefile.am
-+++ pam.debian/modules/pam_unix/Makefile.am
-@@ -21,15 +21,12 @@
- if HAVE_LIBSELINUX
- AM_CFLAGS += -D"WITH_SELINUX"
- endif
--if HAVE_LIBCRACK
-- AM_CFLAGS += -D"USE_CRACKLIB"
--endif
-
- pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module
- if HAVE_VERSIONING
- pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
- endif
--pam_unix_la_LIBADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam \
-+pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \
- @LIBCRYPT@ @LIBSELINUX@ \
- ../pam_securetty/tty_secure.lo
-
diff --git a/debian/patches-applied/series b/debian/patches-applied/series
index 83c6c0f6..99e79ece 100644
--- a/debian/patches-applied/series
+++ b/debian/patches-applied/series
@@ -17,7 +17,6 @@ hurd_no_setfsuid
045_pam_dispatch_jump_is_ignore
054_pam_security_abstract_securetty_handling
055_pam_unix_nullok_secure
-065_pam_unix_cracklib_disable
PAM-manpage-section
pam_env_ignore_garbage.patch -p2
autoconf.patch