Remove parts of a different security patch which slipped in but are not

supported yet. Don't bump revision as the package didn't build before.

13 files changed, 46 insertions, 47 deletions

diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo
index 223d0d9e201..3898bcd4dd3 100644
--- a/security/mit-krb5/distinfo
+++ b/security/mit-krb5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2008/06/07 18:36:06 tonnerre Exp $
+$NetBSD: distinfo,v 1.18 2008/06/07 20:22:18 tonnerre Exp $
 
 SHA1 (krb5-1.4.2-signed.tar) = bbc03bd319d539fb9523c2545d80ba0784522e88
 RMD160 (krb5-1.4.2-signed.tar) = 44500f5fab8e5959cf43f17f5f52f68e2dc73a1f
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = fc6d5e11cd827cdfbe1bfc3a3c7ca9f5a71c17d7
 SHA1 (patch-af) = c9631743e3c93aee2aab5c8a370e9bebfc4084e5
 SHA1 (patch-ag) = 5da57455f36a2bd40e0f97db94e93249e90e0b8e
 SHA1 (patch-ah) = 59a6bfc341a22234b38db406abe83b0d6d358a9f
-SHA1 (patch-ai) = 02cd8a292392b107609b48b6188cd15f4597f72b
+SHA1 (patch-ai) = 5b0f1ae222e50eb0eb3ed98c79188318ae0969b5
 SHA1 (patch-aj) = 5c633571ea932ce349065cbb4c3bf482cc971675
 SHA1 (patch-ak) = 9d95372fd8edddbf0366e83a51d7a0b8a507f218
 SHA1 (patch-al) = fb611fe47bd7c773d7baf11424e90cd3af70c422
@@ -23,14 +23,14 @@ SHA1 (patch-aq) = 52429b712ca7a478caeb76fd165585c7aab7fa02
 SHA1 (patch-ar) = 37807c14f03533aef8796ac90e5fac36ff98308a
 SHA1 (patch-as) = b155219fd512b59f698497af1bf6acf1ca4f4a34
 SHA1 (patch-at) = df0605b0f5fbaef6b7540f87079ae64b2acc464c
-SHA1 (patch-au) = d0201dcbc543d8a31520afc72d4ce624ce552a35
-SHA1 (patch-av) = 4166e5be21a72bf64cd634039fd71aa56594ebfd
-SHA1 (patch-aw) = f9a91c4b4d6963ab09f5df1c1377303066955f4c
-SHA1 (patch-ax) = f35194913d12d202389072ba399d70ef868c5432
-SHA1 (patch-ay) = 183c15b1c654c63902d5dbcf161a0879f70804a8
-SHA1 (patch-az) = 548d3275605934e6574efb878b7f4ddc97078d3d
-SHA1 (patch-ba) = 7faacf94c157854fc099aaf40abae870a2e61ba6
-SHA1 (patch-bb) = 06595821593100b718e3e76c8dc2e5f0b99c8d67
-SHA1 (patch-bc) = c7d2b014b1092c0d53de6b3adcc91af39653396b
-SHA1 (patch-bd) = 6a8906aaaf0f620c80f830551eb19b61d42741d6
-SHA1 (patch-be) = 09f737ae6a3a1ed0bbce4f9a26611972260523ca
+SHA1 (patch-au) = 238f497afd9ad129babc0b6c727eb23e9915536c
+SHA1 (patch-av) = db0fce68f58307be4c359758f2c9b31d62ab8348
+SHA1 (patch-aw) = 0e651b675d166e71f6543cbad8e29eece89d5b67
+SHA1 (patch-ax) = d403c910211e48c6d1dc27cb2dd98d5f20cc688d
+SHA1 (patch-ay) = 9f54c79c105d7baca3f1efa68a25f9b39dbf7683
+SHA1 (patch-az) = 79fd9cbbf34287b78d5c6c2faf72e147457f7f37
+SHA1 (patch-ba) = ae3071aa6039d52ba56eab8f2b105623d62e5689
+SHA1 (patch-bb) = 156d3341d1cf40cfbe5833f7ad68b5aec297d3fb
+SHA1 (patch-bc) = 8b422991ca22903596cf157ea3603abb741c50a5
+SHA1 (patch-bd) = 8cf0425d2fedea452f80fa599f3c4515e51d834c
+SHA1 (patch-be) = c4497d7b68cefd8109d615c2125d9dc7aa508e5d
diff --git a/security/mit-krb5/patches/patch-ai b/security/mit-krb5/patches/patch-ai
index 4c17776cdd3..005054695c0 100644
--- a/security/mit-krb5/patches/patch-ai
+++ b/security/mit-krb5/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.3 2008/06/07 18:36:06 tonnerre Exp $
+$NetBSD: patch-ai,v 1.4 2008/06/07 20:22:18 tonnerre Exp $
 
---- src/appl/telnet/telnetd/sys_term.c.orig	2008-06-07 15:55:51.000000000 +0200
-+++ src/appl/telnet/telnetd/sys_term.c
+--- appl/telnet/telnetd/sys_term.c.orig	2008-06-07 15:55:51.000000000 +0200
++++ appl/telnet/telnetd/sys_term.c
 @@ -1287,6 +1287,16 @@ start_login(host, autologin, name)
  #endif
  #if	defined (AUTHENTICATION)
diff --git a/security/mit-krb5/patches/patch-au b/security/mit-krb5/patches/patch-au
index 7ad69984325..a330db70432 100644
--- a/security/mit-krb5/patches/patch-au
+++ b/security/mit-krb5/patches/patch-au
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/appl/telnet/telnetd/state.c.orig	2002-11-15 21:21:51.000000000 +0100
-+++ src/appl/telnet/telnetd/state.c
+--- appl/telnet/telnetd/state.c.orig	2002-11-15 21:21:51.000000000 +0100
++++ appl/telnet/telnetd/state.c
 @@ -1665,7 +1665,8 @@ static int envvarok(varp)
  	    strcmp(varp, "RESOLV_HOST_CONF") && /* linux */
  	    strcmp(varp, "NLSPATH") && /* locale stuff */
diff --git a/security/mit-krb5/patches/patch-av b/security/mit-krb5/patches/patch-av
index 89fd5226733..321e8c5571e 100644
--- a/security/mit-krb5/patches/patch-av
+++ b/security/mit-krb5/patches/patch-av
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/kdc/kdc_util.c.orig	2004-02-13 05:20:56.000000000 +0100
-+++ src/kdc/kdc_util.c
+--- kdc/kdc_util.c.orig	2004-02-13 05:20:56.000000000 +0100
++++ kdc/kdc_util.c
 @@ -404,6 +404,7 @@ kdc_get_server_key(krb5_ticket *ticket, 
  
  	krb5_db_free_principal(kdc_context, &server, nprincs);
diff --git a/security/mit-krb5/patches/patch-aw b/security/mit-krb5/patches/patch-aw
index cd79b0625b2..9994307832d 100644
--- a/security/mit-krb5/patches/patch-aw
+++ b/security/mit-krb5/patches/patch-aw
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- src/kdc/do_tgs_req.c.orig	2005-07-12 22:59:51.000000000 +0200
-+++ src/kdc/do_tgs_req.c
-@@ -490,27 +490,40 @@ tgt_again:
+--- kdc/do_tgs_req.c.orig	2005-07-12 22:59:51.000000000 +0200
++++ kdc/do_tgs_req.c
+@@ -490,27 +490,38 @@ tgt_again:
  	newtransited = 1;
      }
      if (!isflagset (request->kdc_options, KDC_OPT_DISABLE_TRANSITED_CHECK)) {
@@ -33,7 +33,6 @@ $NetBSD$
 +			      enc_tkt_reply.transited.tr_contents.data,
 +			      tdots);
 +	else {
-+	    char *emsg = krb5_get_error_message(kdc_context, errcode);
  	    krb5_klog_syslog (LOG_ERR,
 -			      "unexpected error checking transit from '%s' to '%s' via '%.*s': %s",
 +			      "unexpected error checking transit from "
@@ -44,13 +43,12 @@ $NetBSD$
 +			      tlen,
  			      enc_tkt_reply.transited.tr_contents.data,
 -			      error_message (errcode));
-+			      tdots, emsg);
-+	    krb5_free_error_message(kdc_context, emsg);
++			      tdots, error_message (errcode));
 +	}
      } else
  	krb5_klog_syslog (LOG_INFO, "not checking transit path");
      if (reject_bad_transit
-@@ -538,6 +551,9 @@ tgt_again:
+@@ -538,6 +549,9 @@ tgt_again:
  	if (!krb5_principal_compare(kdc_context, request->server, client2)) {
  		if ((errcode = krb5_unparse_name(kdc_context, client2, &tmp)))
  			tmp = 0;
@@ -60,7 +58,7 @@ $NetBSD$
  		krb5_klog_syslog(LOG_INFO,
  				 "TGS_REQ %s: 2ND_TKT_MISMATCH: "
  				 "authtime %d, %s for %s, 2nd tkt client %s",
-@@ -800,6 +816,7 @@ find_alternate_tgs(krb5_kdc_req *request
+@@ -800,6 +814,7 @@ find_alternate_tgs(krb5_kdc_req *request
  		krb5_klog_syslog(LOG_INFO,
  		       "TGS_REQ: issuing alternate <un-unparseable> TGT");
  	    } else {
diff --git a/security/mit-krb5/patches/patch-ax b/security/mit-krb5/patches/patch-ax
index 85d9d4706b8..b10511d45d4 100644
--- a/security/mit-krb5/patches/patch-ax
+++ b/security/mit-krb5/patches/patch-ax
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/kadmin/server/ovsec_kadmd.c.orig	2004-09-21 20:20:16.000000000 +0200
-+++ src/kadmin/server/ovsec_kadmd.c
+--- kadmin/server/ovsec_kadmd.c.orig	2004-09-21 20:20:16.000000000 +0200
++++ kadmin/server/ovsec_kadmd.c
 @@ -952,13 +952,25 @@ void log_badverf(gss_name_t client_name,
       rpcproc_t proc;
       int i;
@@ -11,7 +11,8 @@ $NetBSD$
  
       (void) gss_display_name(&minor, client_name, &client, &gss_type);
       (void) gss_display_name(&minor, server_name, &server, &gss_type);
-      if (client.value == NULL)
+-     if (client.value == NULL)
++     if (client.value == NULL) {
  	 client.value = "(null)";
 -     if (server.value == NULL)
 +	 clen = sizeof("(null)") -1;
diff --git a/security/mit-krb5/patches/patch-ay b/security/mit-krb5/patches/patch-ay
index 2bccd981152..5001ee60e7e 100644
--- a/security/mit-krb5/patches/patch-ay
+++ b/security/mit-krb5/patches/patch-ay
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/kadmin/server/misc.h.orig	2004-10-28 00:12:48.000000000 +0200
-+++ src/kadmin/server/misc.h
+--- kadmin/server/misc.h.orig	2004-10-28 00:12:48.000000000 +0200
++++ kadmin/server/misc.h
 @@ -44,3 +44,5 @@ krb5_error_code process_chpw_request(krb
  #ifdef SVC_GETARGS
  void  kadm_1(struct svc_req *, SVCXPRT *);
diff --git a/security/mit-krb5/patches/patch-az b/security/mit-krb5/patches/patch-az
index c483f7ff0f4..db82de61702 100644
--- a/security/mit-krb5/patches/patch-az
+++ b/security/mit-krb5/patches/patch-az
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/kadmin/server/schpw.c.orig	2004-10-28 00:12:48.000000000 +0200
-+++ src/kadmin/server/schpw.c
+--- kadmin/server/schpw.c.orig	2004-10-28 00:12:48.000000000 +0200
++++ kadmin/server/schpw.c
 @@ -41,6 +41,8 @@ process_chpw_request(context, server_han
      int numresult;
      char strresult[1024];
@@ -22,7 +22,7 @@ $NetBSD$
  		     inet_ntoa(((struct sockaddr_in *)&remote_addr)->sin_addr),
 -		     clientstr, ret ? error_message(ret) : "success");
 +		     clen, clientstr, cdots,
-+		     ret ? krb5_get_error_message (context, ret) : "success");
++		     ret ? error_message(ret) : "success");
      krb5_free_unparsed_name(context, clientstr);
  
      if (ret) {
diff --git a/security/mit-krb5/patches/patch-ba b/security/mit-krb5/patches/patch-ba
index ec938526b95..90bcd6c8e88 100644
--- a/security/mit-krb5/patches/patch-ba
+++ b/security/mit-krb5/patches/patch-ba
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/kadmin/server/server_stubs.c.orig	2004-08-20 20:45:30.000000000 +0200
-+++ src/kadmin/server/server_stubs.c
+--- kadmin/server/server_stubs.c.orig	2004-08-20 20:45:30.000000000 +0200
++++ kadmin/server/server_stubs.c
 @@ -14,6 +14,7 @@
  #include <arpa/inet.h>  /* inet_ntoa */
  #include <krb5/adm_proto.h>  /* krb5_klog_syslog */
@@ -570,7 +570,7 @@ $NetBSD$
 +     slen = service_name.length;
 +     trunc_name(&slen, &sdots);
 +     krb5_klog_syslog(LOG_NOTICE, "Request: %s, %.*s%s, %s, "
-+	    client=%.*s%s, service=%.*s%s, addr=%s, flavor=%d",
++	    "client=%.*s%s, service=%.*s%s, addr=%s, flavor=%d",
  	    (ret.api_version == KADM5_API_VERSION_1 ?
  	     "kadm5_init (V1)" : "kadm5_init"),
 -	    client_name.value,
diff --git a/security/mit-krb5/patches/patch-bb b/security/mit-krb5/patches/patch-bb
index 7727b6187c6..c2da26fd0b7 100644
--- a/security/mit-krb5/patches/patch-bb
+++ b/security/mit-krb5/patches/patch-bb
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/kadmin/server/kadm_rpc_svc.c.orig	2004-06-16 05:11:51.000000000 +0200
-+++ src/kadmin/server/kadm_rpc_svc.c
+--- kadmin/server/kadm_rpc_svc.c.orig	2004-06-16 05:11:51.000000000 +0200
++++ kadmin/server/kadm_rpc_svc.c
 @@ -249,6 +249,8 @@ check_rpcsec_auth(struct svc_req *rqstp)
       krb5_data *c1, *c2, *realm;
       gss_buffer_desc gss_str;
diff --git a/security/mit-krb5/patches/patch-bc b/security/mit-krb5/patches/patch-bc
index b9800601b78..c267502a29f 100644
--- a/security/mit-krb5/patches/patch-bc
+++ b/security/mit-krb5/patches/patch-bc
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/kadmin/server/misc.c.orig	2004-10-29 01:41:10.000000000 +0200
-+++ src/kadmin/server/misc.c
+--- kadmin/server/misc.c.orig	2004-10-29 01:41:10.000000000 +0200
++++ kadmin/server/misc.c
 @@ -149,3 +149,12 @@ check_min_life(void *server_handle, krb5
  
      return kadm5_free_principal_ent(handle->lhandle, &princ);
diff --git a/security/mit-krb5/patches/patch-bd b/security/mit-krb5/patches/patch-bd
index 664933d5838..5e37a3adcd1 100644
--- a/security/mit-krb5/patches/patch-bd
+++ b/security/mit-krb5/patches/patch-bd
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/lib/kadm5/logger.c.orig	2002-09-18 22:44:13.000000000 +0200
-+++ src/lib/kadm5/logger.c
+--- lib/kadm5/logger.c.orig	2002-09-18 22:44:13.000000000 +0200
++++ lib/kadm5/logger.c
 @@ -45,7 +45,7 @@
  #include <varargs.h>
  #endif	/* HAVE_STDARG_H */
diff --git a/security/mit-krb5/patches/patch-be b/security/mit-krb5/patches/patch-be
index 6fe060e4aa9..4a2083c5d9d 100644
--- a/security/mit-krb5/patches/patch-be
+++ b/security/mit-krb5/patches/patch-be
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- src/lib/gssapi/krb5/k5unseal.c.orig	2004-04-13 22:00:19.000000000 +0200
-+++ src/lib/gssapi/krb5/k5unseal.c
+--- lib/gssapi/krb5/k5unseal.c.orig	2004-04-13 22:00:19.000000000 +0200
++++ lib/gssapi/krb5/k5unseal.c
 @@ -457,8 +457,11 @@ kg_unseal_v1(context, minor_status, ctx,
  
      if ((ctx->initiate && direction != 0xff) ||