aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog4
-rw-r--r--patches-applied/064_pam_unix_cracklib_dictpath13
-rw-r--r--patches-applied/series1
3 files changed, 3 insertions, 15 deletions
diff --git a/changelog b/changelog
index 989abd35..4604e137 100644
--- a/changelog
+++ b/changelog
@@ -25,8 +25,10 @@ pam (0.99.7.1-4) UNRELEASED; urgency=low
real errors that should not be buried.
* Drop the remainder of 061_pam_issue_double_free, not required for the
original bugfix.
+ * Drop patch 064_pam_unix_cracklib_dictpath, which is not needed now that
+ we define CRACKLIB_DICTS in debian/rules.
- -- Steve Langasek <vorlon@debian.org> Thu, 30 Aug 2007 00:05:38 -0700
+ -- Steve Langasek <vorlon@debian.org> Thu, 30 Aug 2007 00:42:25 -0700
pam (0.99.7.1-3) unstable; urgency=low
diff --git a/patches-applied/064_pam_unix_cracklib_dictpath b/patches-applied/064_pam_unix_cracklib_dictpath
deleted file mode 100644
index 1902136d..00000000
--- a/patches-applied/064_pam_unix_cracklib_dictpath
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pam/Linux-PAM/modules/pam_unix/pam_unix_passwd.c
-===================================================================
---- pam.orig/Linux-PAM/modules/pam_unix/pam_unix_passwd.c
-+++ pam/Linux-PAM/modules/pam_unix/pam_unix_passwd.c
-@@ -122,7 +122,7 @@
- #define PW_TMPFILE "/etc/npasswd"
- #define SH_TMPFILE "/etc/nshadow"
- #ifndef CRACKLIB_DICTS
--#define CRACKLIB_DICTS NULL
-+#define CRACKLIB_DICTS CRACKLIB_DICTPATH
- #endif
- #define OPW_TMPFILE "/etc/security/nopasswd"
- #define OLD_PASSWORDS_FILE "/etc/security/opasswd"
diff --git a/patches-applied/series b/patches-applied/series
index db1c6f39..bed3bd5b 100644
--- a/patches-applied/series
+++ b/patches-applied/series
@@ -24,7 +24,6 @@ hurd_no_setfsuid -p0
055_pam_unix_nullok_secure -p0
057_pam_unix_passwd_OOM_check -p0
063_paswd_segv -p0
-064_pam_unix_cracklib_dictpath
065_pam_unix_cracklib_disable
PAM-manpage-section
no_pthread_mutexes