drop patch for RT#7924, fixed in 1.12.2

2 files changed, 1 insertions, 151 deletions

diff --git a/krb5-1.12-tcl86.patch b/krb5-1.12-tcl86.patch
deleted file mode 100644
index 565a78d..0000000
--- a/krb5-1.12-tcl86.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-commit b63496d7b44f090ea5d300dc09b4fc043138ae38
-Author: Greg Hudson <ghudson@mit.edu>
-Date:   Wed May 28 18:06:59 2014 -0400
-
-    Make tcl_kadm5.c work with Tcl 8.6
-    
-    Directly accessing the result field of Tcl_Interp has been deprecated
-    for a long time, requires a special define in Tcl 8.6, and will be
-    impossible in Tcl 9.  Use Tcl_SetResult instead.  The new error
-    messages are less helpful than the old ones, but this is just support
-    infrastructure for old tests, so it isn't important.
-    
-    ticket: 7924
-
-diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c
-index 8338cc9..b2f51d3 100644
---- a/src/kadmin/testing/util/tcl_kadm5.c
-+++ b/src/kadmin/testing/util/tcl_kadm5.c
-@@ -801,8 +801,7 @@ static int parse_keysalts(Tcl_Interp *interp, const char *list,
-         return retcode;
-     }
-     if (argc != num_keysalts) {
--        sprintf(interp->result, "%d keysalts specified, "
--                "but num_keysalts is %d", argc, num_keysalts);
-+        Tcl_SetResult(interp, "wrong number of keysalts", TCL_STATIC);
-         retcode = TCL_ERROR;
-         goto finished;
-     }
-@@ -814,8 +813,7 @@ static int parse_keysalts(Tcl_Interp *interp, const char *list,
-             goto finished;
-         }
-         if (argc1 != 2) {
--            sprintf(interp->result, "wrong # fields in keysalt "
--                    "(%d should be 2)", argc1);
-+            Tcl_SetResult(interp, "wrong # of fields in keysalt", TCL_STATIC);
-             retcode = TCL_ERROR;
-             goto finished;
-         }
-@@ -856,8 +854,7 @@ static int parse_key_data(Tcl_Interp *interp, const char *list,
-     *key_data = NULL;
-     if (list == NULL) {
-         if (n_key_data != 0) {
--            sprintf(interp->result, "0 key_datas specified, "
--                    "but n_key_data is %d", n_key_data);
-+            Tcl_SetResult(interp, "wrong number of key_datas", TCL_STATIC);
-             retcode = TCL_ERROR;
-             goto finished;
-         } else
-@@ -868,14 +865,13 @@ static int parse_key_data(Tcl_Interp *interp, const char *list,
-         return retcode;
-     }
-     if (argc != n_key_data) {
--        sprintf(interp->result, "%d key_datas specified, "
--                "but n_key_data is %d", argc, n_key_data);
-+        Tcl_SetResult(interp, "wrong number of key_datas", TCL_STATIC);
-         retcode = TCL_ERROR;
-         goto finished;
-     }
- 
-     if (argc != 0) {
--        sprintf(interp->result, "cannot parse key_data yet");
-+        Tcl_SetResult(interp, "cannot parse key_data yet", TCL_STATIC);
-         retcode = TCL_ERROR;
-         goto finished;
-     }
-@@ -896,8 +892,7 @@ static int parse_tl_data(Tcl_Interp *interp, const char *list,
-     *tlp = NULL;
-     if (list == NULL) {
-         if (n_tl_data != 0) {
--            sprintf(interp->result, "0 tl_datas specified, "
--                    "but n_tl_data is %d", n_tl_data);
-+            Tcl_SetResult(interp, "wrong number of tl_datas", TCL_STATIC);
-             retcode = TCL_ERROR;
-             goto finished;
-         } else
-@@ -908,8 +903,7 @@ static int parse_tl_data(Tcl_Interp *interp, const char *list,
-         return retcode;
-     }
-     if (argc != n_tl_data) {
--        sprintf(interp->result, "%d tl_datas specified, "
--                "but n_tl_data is %d", argc, n_tl_data);
-+        Tcl_SetResult(interp, "wrong number of tl_datas", TCL_STATIC);
-         retcode = TCL_ERROR;
-         goto finished;
-     }
-@@ -929,8 +923,7 @@ static int parse_tl_data(Tcl_Interp *interp, const char *list,
-             goto finished;
-         }
-         if (argc1 != 3) {
--            sprintf(interp->result, "wrong # fields in tl_data "
--                    "(%d should be 3)", argc1);
-+            Tcl_SetResult(interp, "wrong # of fields in tl_data", TCL_STATIC);
-             retcode = TCL_ERROR;
-             goto finished;
-         }
-@@ -949,9 +942,7 @@ static int parse_tl_data(Tcl_Interp *interp, const char *list,
-         }
-         tl->tl_data_length = tmp;
-         if (tl->tl_data_length != strlen(argv1[2])) {
--            sprintf(interp->result, "specified length %d does not "
--                    "match length %lu of string \"%s\"", tmp,
--                    (unsigned long) strlen(argv1[2]), argv1[2]);
-+            Tcl_SetResult(interp, "length != string length", TCL_STATIC);
-             retcode = TCL_ERROR;
-             goto finished;
-         }
-@@ -962,7 +953,7 @@ static int parse_tl_data(Tcl_Interp *interp, const char *list,
-         tl = tl->tl_data_next;
-     }
-     if (tl != NULL) {
--        sprintf(interp->result, "tl is not NULL!");
-+        Tcl_SetResult(interp, "tl is not NULL!", TCL_STATIC);
-         retcode = TCL_ERROR;
-         goto finished;
-     }
-@@ -992,9 +983,8 @@ static int parse_config_params(Tcl_Interp *interp, char *list,
-     }
- 
-     if (argc != 20) {
--        sprintf(interp->result,
--                "wrong # args in config params structure (%d should be 20)",
--                argc);
-+        Tcl_SetResult(interp, "wrong # args in config params structure",
-+                      TCL_STATIC);
-         retcode = TCL_ERROR;
-         goto finished;
-     }
-@@ -1129,9 +1119,8 @@ static int parse_principal_ent(Tcl_Interp *interp, char *list,
-     }
- 
-     if (argc != 12 && argc != 20) {
--        sprintf(interp->result,
--                "wrong # args in principal structure (%d should be 12 or 20)",
--                argc);
-+        Tcl_SetResult(interp, "wrong # args in principal structure",
-+                      TCL_STATIC);
-         retcode = TCL_ERROR;
-         goto finished;
-     }
-@@ -1391,8 +1380,7 @@ static int parse_policy_ent(Tcl_Interp *interp, char *list,
-     }
- 
-     if (argc != 7 && argc != 10) {
--        sprintf(interp->result, "wrong # args in policy structure (%d should be 7 or 10)",
--                argc);
-+        Tcl_SetResult(interp, "wrong # args in policy structure", TCL_STATIC);
-         retcode = TCL_ERROR;
-         goto finished;
-     }
diff --git a/krb5.spec b/krb5.spec
index 81c16ef..09bb859 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -97,7 +97,6 @@ Patch137: krb5-master-rcache-acquirecred-cleanup.patch
 Patch139: krb5-master-rcache-acquirecred-source.patch
 Patch141: krb5-master-rcache-acquirecred-test.patch
 Patch142: krb5-master-move-otp-sockets.patch
-Patch144: krb5-1.12-tcl86.patch
 Patch145: krb5-master-mechd.patch
 Patch146: krb5-1.12-CVE-2014-4341_4342.patch
 Patch147: krb5-1.12-CVE-2014-4341_4342-tests.patch
@@ -351,7 +350,6 @@ ln -s NOTICE LICENSE
 %patch139 -p1 -b .rcache-acquirecred-source
 %patch141 -p1 -b .rcache-acquirecred-test
 %patch142 -p1 -b .move-otp-sockets
-%patch144 -p1 -b .tcl86
 %patch145 -p1 -b .master-mechd
 %patch146 -p1 -b .CVE-2014-4341_4342
 %patch147 -p1 -b .CVE-2014-4341_4342
@@ -1041,6 +1039,7 @@ exit 0
   - drop patch for RT#7818, fixed in 1.12.2
   - drop patch for RT#7836, fixed in 1.12.2
   - drop patch for RT#7858, fixed in 1.12.2
+  - drop patch for RT#7924, fixed in 1.12.2
 - replace older proposed changes for ksu with backports of the changes
   after review and merging upstream (#1015559, #1026099, #1118347)