Drop test suite patch

* Drop upstream patch to modify the test suite, since the upstream test
  suite now correctly handles a system CrackLib library.

diff --git a/debian/changelog b/debian/changelog
index cc05ac2bdf284e90bc138cd18a83d33c00241c93..9f43541fba06285503c41bda7f21403cb5b1b368 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ krb5-strength (3.2-1) UNRELEASED; urgency=medium
     - New --check-only option to heimdal-history.
     - Increase hash iterations for heimdal-history for new hashes.
     - Use explicit_bzero to overwrite copies of passwords.
+  * Drop upstream patch to modify the test suite, since the upstream test
+    suite now correctly handles a system CrackLib library.
   * Include the full text of the license of the embedded copy of cracklib
     (not used in the Debian build) in debian/copyright, since it's not
     identical to the Artistic license included in common-licenses.

diff --git a/debian/patches/0001-Change-CrackLib-tests-for-system-CrackLib.patch b/debian/patches/0001-Change-CrackLib-tests-for-system-CrackLib.patch
deleted file mode 100644 (file)
index 6df3039..0000000
--- a/debian/patches/0001-Change-CrackLib-tests-for-system-CrackLib.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Russ Allbery <eagle@eyrie.org>
-Date: Sun, 25 Dec 2016 11:50:14 -0800
-Subject: Change CrackLib tests for system CrackLib
-
-The upstream test suite contains a few tests that fail with the
-normal system CrackLib rules.  Modify them to expect passes so
-that we can run the full test suite during the build.
-
-Also remove CrackLib when testing character classes, since it
-rejects the passwords used for minimum_different testing as too
-simplistic.
----
- tests/data/passwords/cracklib.json |  8 ++------
- tests/plugin/mit-t.c               | 12 ++++++------
- 2 files changed, 8 insertions(+), 12 deletions(-)
-
-diff --git a/tests/data/passwords/cracklib.json b/tests/data/passwords/cracklib.json
-index 037a70f..b69e700 100644
---- a/tests/data/passwords/cracklib.json
-+++ b/tests/data/passwords/cracklib.json
-@@ -22,9 +22,7 @@
-     {
-         "name": "in dictionary (repeated)",
-         "principal": "test@EXAMPLE.ORG",
--        "password": "stanfordstanford",
--        "code": "KADM5_PASS_Q_GENERIC",
--        "error": "it is based on a (duplicated) dictionary word"
-+        "password": "stanfordstanford"
-     },
-     {
-         "name": "in dictionary (reversed)",
-@@ -36,9 +34,7 @@
-     {
-         "name": "seven characters",
-         "principal": "test@EXAMPLE.ORG",
--        "password": "dfareas",
--        "code": "KADM5_PASS_Q_GENERIC",
--        "error": "it is too short"
-+        "password": "dfareas"
-     },
-     {
-         "name": "four characters",
-diff --git a/tests/plugin/mit-t.c b/tests/plugin/mit-t.c
-index 7eba594..4406e38 100644
---- a/tests/plugin/mit-t.c
-+++ b/tests/plugin/mit-t.c
-@@ -272,13 +272,13 @@ main(void)
-     vtable->close(ctx, data);
- 
-     /* Add simple character class configuration to krb5.conf. */
--    setup_argv[5] = (char *) "minimum_different";
--    setup_argv[6] = (char *) "8";
--    setup_argv[7] = (char *) "require_ascii_printable";
-+    setup_argv[3] = (char *) "minimum_different";
-+    setup_argv[4] = (char *) "8";
-+    setup_argv[5] = (char *) "require_ascii_printable";
-+    setup_argv[6] = (char *) "true";
-+    setup_argv[7] = (char *) "require_non_letter";
-     setup_argv[8] = (char *) "true";
--    setup_argv[9] = (char *) "require_non_letter";
--    setup_argv[10] = (char *) "true";
--    setup_argv[11] = NULL;
-+    setup_argv[9] = NULL;
-     run_setup((const char **) setup_argv);
- 
-     /* Obtain a new Kerberos context with that krb5.conf file. */

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index ec5913b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Change-CrackLib-tests-for-system-CrackLib.patch