From 9018906477a9962ccdf4873714d813fb96cc79ee1fd7b59d1003290bdbf21672 Mon Sep 17 00:00:00 2001
From: Michael Calmer <mc@suse.com>
Date: Fri, 22 Oct 2010 09:17:36 +0000
Subject: [PATCH] - update to krb5-1.8.3   * remove patches which are now
 upstrem     - krb5-1.7-MITKRB5-SA-2010-004.dif     -
 krb5-1.8.1-gssapi-error-table.dif     - krb5-MITKRB5-SA-2010-005.dif

OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=30
---
 krb5-1.7-MITKRB5-SA-2010-004.dif  | 20 ---------------
 krb5-1.7-manpaths.dif             | 42 +++++++++++++++----------------
 krb5-1.8.1-gssapi-error-table.dif | 13 ----------
 krb5-1.8.1.tar.bz2                |  3 ---
 krb5-1.8.3.tar.bz2                |  3 +++
 krb5-MITKRB5-SA-2010-005.dif      | 18 -------------
 krb5-doc.spec                     |  8 +++---
 krb5-mini.spec                    | 14 +++--------
 krb5.changes                      |  9 +++++++
 krb5.spec                         | 14 +++--------
 10 files changed, 45 insertions(+), 99 deletions(-)
 delete mode 100644 krb5-1.7-MITKRB5-SA-2010-004.dif
 delete mode 100644 krb5-1.8.1-gssapi-error-table.dif
 delete mode 100644 krb5-1.8.1.tar.bz2
 create mode 100644 krb5-1.8.3.tar.bz2
 delete mode 100644 krb5-MITKRB5-SA-2010-005.dif

diff --git a/krb5-1.7-MITKRB5-SA-2010-004.dif b/krb5-1.7-MITKRB5-SA-2010-004.dif
deleted file mode 100644
index cae64a7..0000000
--- a/krb5-1.7-MITKRB5-SA-2010-004.dif
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: krb5-1.8.1/src/kdc/do_tgs_req.c
-===================================================================
---- krb5-1.8.1.orig/src/kdc/do_tgs_req.c
-+++ krb5-1.8.1/src/kdc/do_tgs_req.c
-@@ -543,6 +543,7 @@ tgt_again:
-            to the caller */
-         ticket_reply = *(header_ticket);
-         enc_tkt_reply = *(header_ticket->enc_part2);
-+        enc_tkt_reply.authorization_data = NULL;
-         clear(enc_tkt_reply.flags, TKT_FLG_INVALID);
-     }
- 
-@@ -554,6 +555,7 @@ tgt_again:
-            to the caller */
-         ticket_reply = *(header_ticket);
-         enc_tkt_reply = *(header_ticket->enc_part2);
-+        enc_tkt_reply.authorization_data = NULL;
- 
-         old_life = enc_tkt_reply.times.endtime - enc_tkt_reply.times.starttime;
- 
diff --git a/krb5-1.7-manpaths.dif b/krb5-1.7-manpaths.dif
index a9c9e95..804b3c2 100644
--- a/krb5-1.7-manpaths.dif
+++ b/krb5-1.7-manpaths.dif
@@ -1,9 +1,9 @@
 
 
-Index: krb5-1.8-alpha1/src/appl/sample/sserver/sserver.M
+Index: krb5-1.8.3/src/appl/sample/sserver/sserver.M
 ===================================================================
---- krb5-1.8-alpha1.orig/src/appl/sample/sserver/sserver.M
-+++ krb5-1.8-alpha1/src/appl/sample/sserver/sserver.M
+--- krb5-1.8.3.orig/src/appl/sample/sserver/sserver.M
++++ krb5-1.8.3/src/appl/sample/sserver/sserver.M
 @@ -59,7 +59,7 @@ option allows for a different keytab tha
  using a line in
  /etc/inetd.conf that looks like this:
@@ -13,11 +13,11 @@ Index: krb5-1.8-alpha1/src/appl/sample/sserver/sserver.M
  .PP
  Since \fBsample\fP is normally not a port defined in /etc/services, you will
  usually have to add a line to /etc/services which looks like this:
-Index: krb5-1.8-alpha1/src/config-files/kdc.conf.M
+Index: krb5-1.8.3/src/config-files/kdc.conf.M
 ===================================================================
---- krb5-1.8-alpha1.orig/src/config-files/kdc.conf.M
-+++ krb5-1.8-alpha1/src/config-files/kdc.conf.M
-@@ -82,14 +82,14 @@ This
+--- krb5-1.8.3.orig/src/config-files/kdc.conf.M
++++ krb5-1.8.3/src/config-files/kdc.conf.M
+@@ -92,14 +92,14 @@ This
  .B string
  specifies the location of the access control list (acl) file that
  kadmin uses to determine which principals are allowed which permissions
@@ -34,7 +34,7 @@ Index: krb5-1.8-alpha1/src/config-files/kdc.conf.M
  
  .IP database_name
  This
-@@ -254,7 +254,7 @@ tickets should be checked against the tr
+@@ -274,7 +274,7 @@ tickets should be checked against the tr
  realm names and the [capaths] section of its krb5.conf file
  
  .SH FILES 
@@ -43,11 +43,11 @@ Index: krb5-1.8-alpha1/src/config-files/kdc.conf.M
  
  .SH SEE ALSO
  krb5.conf(5), krb5kdc(8)
-Index: krb5-1.8-alpha1/src/configure.in
+Index: krb5-1.8.3/src/configure.in
 ===================================================================
---- krb5-1.8-alpha1.orig/src/configure.in
-+++ krb5-1.8-alpha1/src/configure.in
-@@ -1052,6 +1052,58 @@ if test "$ac_cv_lib_socket" = "yes" -a "
+--- krb5-1.8.3.orig/src/configure.in
++++ krb5-1.8.3/src/configure.in
+@@ -1057,6 +1057,58 @@ if test "$ac_cv_lib_socket" = "yes" -a "
  fi
  
  AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
@@ -106,10 +106,10 @@ Index: krb5-1.8-alpha1/src/configure.in
  V5_AC_OUTPUT_MAKEFILE(.
  
  	util util/support util/profile util/send-pr
-Index: krb5-1.8-alpha1/src/kadmin/cli/kadmin.M
+Index: krb5-1.8.3/src/kadmin/cli/kadmin.M
 ===================================================================
---- krb5-1.8-alpha1.orig/src/kadmin/cli/kadmin.M
-+++ krb5-1.8-alpha1/src/kadmin/cli/kadmin.M
+--- krb5-1.8.3.orig/src/kadmin/cli/kadmin.M
++++ krb5-1.8.3/src/kadmin/cli/kadmin.M
 @@ -869,9 +869,9 @@ option is specified, less verbose status
  .RS
  .TP
@@ -131,10 +131,10 @@ Index: krb5-1.8-alpha1/src/kadmin/cli/kadmin.M
  OpenVision Kerberos administration program.
  .SH SEE ALSO
  .IR kerberos (1),
-Index: krb5-1.8-alpha1/src/slave/kprop.M
+Index: krb5-1.8.3/src/slave/kprop.M
 ===================================================================
---- krb5-1.8-alpha1.orig/src/slave/kprop.M
-+++ krb5-1.8-alpha1/src/slave/kprop.M
+--- krb5-1.8.3.orig/src/slave/kprop.M
++++ krb5-1.8.3/src/slave/kprop.M
 @@ -39,7 +39,7 @@ Kerberos server to a slave Kerberos serv
  This is done by transmitting the dumped database file to the slave
  server over an encrypted, secure channel.  The dump file must be created
@@ -153,10 +153,10 @@ Index: krb5-1.8-alpha1/src/slave/kprop.M
  .TP
  \fB\-P\fP \fIport\fP
  specifies the port to use to contact the
-Index: krb5-1.8-alpha1/src/slave/kpropd.M
+Index: krb5-1.8.3/src/slave/kpropd.M
 ===================================================================
---- krb5-1.8-alpha1.orig/src/slave/kpropd.M
-+++ krb5-1.8-alpha1/src/slave/kpropd.M
+--- krb5-1.8.3.orig/src/slave/kpropd.M
++++ krb5-1.8.3/src/slave/kpropd.M
 @@ -74,7 +74,7 @@ Normally, kpropd is invoked out of
  This is done by adding a line to the inetd.conf file which looks like
  this:
diff --git a/krb5-1.8.1-gssapi-error-table.dif b/krb5-1.8.1-gssapi-error-table.dif
deleted file mode 100644
index fddfc1e..0000000
--- a/krb5-1.8.1-gssapi-error-table.dif
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: krb5-1.8.1/src/lib/gssapi/krb5/gssapi_krb5.c
-===================================================================
---- krb5-1.8.1.orig/src/lib/gssapi/krb5/gssapi_krb5.c
-+++ krb5-1.8.1/src/lib/gssapi/krb5/gssapi_krb5.c
-@@ -740,7 +740,7 @@ int gss_krb5int_lib_init(void)
-     printf("gss_krb5int_lib_init\n");
- #endif
- 
--    add_error_table(&et_ggss_error_table);
-+    add_error_table(&et_k5g_error_table);
- 
- #ifndef LEAN_CLIENT
-     err = k5_mutex_finish_init(&gssint_krb5_keytab_lock);
diff --git a/krb5-1.8.1.tar.bz2 b/krb5-1.8.1.tar.bz2
deleted file mode 100644
index c5d6fed..0000000
--- a/krb5-1.8.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:215e71364b4ac6e49cfb2629a109a2f473845d68643859eccc038834de1f4746
-size 9960127
diff --git a/krb5-1.8.3.tar.bz2 b/krb5-1.8.3.tar.bz2
new file mode 100644
index 0000000..1bad97c
--- /dev/null
+++ b/krb5-1.8.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93fa3b1f604a35a6a00fc32a65764b25ba218dd921ed00d79cbffa0d7cd64e3f
+size 9968381
diff --git a/krb5-MITKRB5-SA-2010-005.dif b/krb5-MITKRB5-SA-2010-005.dif
deleted file mode 100644
index 1cceed7..0000000
--- a/krb5-MITKRB5-SA-2010-005.dif
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: krb5-1.8.1/src/lib/gssapi/krb5/accept_sec_context.c
-===================================================================
---- krb5-1.8.1.orig/src/lib/gssapi/krb5/accept_sec_context.c
-+++ krb5-1.8.1/src/lib/gssapi/krb5/accept_sec_context.c
-@@ -647,6 +647,13 @@ kg_accept_krb5(minor_status, context_han
-             goto fail;
-         }
- 
-+        if (authdat->checksum == NULL) {
-+	   /* missing checksum counts as "inappropriate type" */
-+	   code = KRB5KRB_AP_ERR_INAPP_CKSUM;
-+	   major_status = GSS_S_FAILURE;
-+	   goto fail;
-+	}
-+
-         /* verify that the checksum is correct */
- 
-         /*
diff --git a/krb5-doc.spec b/krb5-doc.spec
index d266bc3..28089ec 100644
--- a/krb5-doc.spec
+++ b/krb5-doc.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package krb5-doc (Version 1.8.1)
+# spec file for package krb5-doc (Version 1.8.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,14 +20,14 @@
 
 Name:           krb5-doc
 BuildRequires:  ghostscript-library latex2html texlive
-Version:        1.8.1
+Version:        1.8.3
 Release:        7
-%define srcRoot krb5-1.8.1
+%define srcRoot krb5-1.8.3
 Summary:        MIT Kerberos5 Implementation--Documentation
 License:        MIT License (or similar)
 Url:            http://web.mit.edu/kerberos/www/
 Group:          Documentation/Other
-Source:         krb5-1.8.1.tar.bz2
+Source:         krb5-1.8.3.tar.bz2
 Source3:        %{name}-%{version}-rpmlintrc
 Patch0:         krb5-1.3.5-perlfix.dif
 Patch1:         krb5-1.6.3-texi2dvi-fix.dif
diff --git a/krb5-mini.spec b/krb5-mini.spec
index f992a1a..76293de 100644
--- a/krb5-mini.spec
+++ b/krb5-mini.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package krb5 (Version 1.8.1)
+# spec file for package krb5 (Version 1.8.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define build_mini 1
-%define srcRoot krb5-1.8.1
+%define srcRoot krb5-1.8.3
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
 
@@ -27,7 +27,7 @@ License:        MIT License (or similar)
 Url:            http://web.mit.edu/kerberos/www/
 BuildRequires:  bison libcom_err-devel ncurses-devel
 BuildRequires:  keyutils keyutils-devel
-Version:        1.8.1
+Version:        1.8.3
 Release:        7
 %if ! 0%{?build_mini}
 BuildRequires:  libopenssl-devel openldap2-devel
@@ -42,7 +42,7 @@ Group:          Productivity/Networking/Security
 Summary:        MIT Kerberos5 Implementation--Libraries
 Group:          Productivity/Networking/Security
 %endif
-Source:         krb5-1.8.1.tar.bz2
+Source:         krb5-1.8.3.tar.bz2
 Source1:        vendor-files.tar.bz2
 Source2:        baselibs.conf
 Source5:        krb5-%{version}-rpmlintrc
@@ -55,9 +55,6 @@ Patch5:         krb5-1.6.3-gssapi_improve_errormessages.dif
 Patch6:         krb5-1.6.3-kpasswd_tcp.patch
 Patch7:         krb5-1.6.3-ktutil-manpage.dif
 Patch8:         krb5-1.6.3-fix-ipv6-query.dif
-Patch9:         krb5-1.7-MITKRB5-SA-2010-004.dif
-Patch10:        krb5-MITKRB5-SA-2010-005.dif
-Patch11:        krb5-1.8.1-gssapi-error-table.dif
 Patch12:        krb5-1.8-MITKRB5-SA-2010-006.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         mktemp, grep, /bin/touch, coreutils
@@ -206,9 +203,6 @@ Authors:
 %patch6 
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 %patch12 -p1
 # Rename the man pages so that they'll get generated correctly.
 pushd src
diff --git a/krb5.changes b/krb5.changes
index 19ddf46..a678540 100644
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Oct 22 11:15:43 CEST 2010 - mc@suse.de
+
+- update to krb5-1.8.3
+  * remove patches which are now upstrem
+    - krb5-1.7-MITKRB5-SA-2010-004.dif 
+    - krb5-1.8.1-gssapi-error-table.dif 
+    - krb5-MITKRB5-SA-2010-005.dif 
+
 -------------------------------------------------------------------
 Fri Oct 22 10:49:11 CEST 2010 - mc@suse.de
 
diff --git a/krb5.spec b/krb5.spec
index 6884430..b602a00 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package krb5 (Version 1.8.1)
+# spec file for package krb5 (Version 1.8.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define build_mini 0
-%define srcRoot krb5-1.8.1
+%define srcRoot krb5-1.8.3
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
 
@@ -27,7 +27,7 @@ License:        MIT License (or similar)
 Url:            http://web.mit.edu/kerberos/www/
 BuildRequires:  bison libcom_err-devel ncurses-devel
 BuildRequires:  keyutils keyutils-devel
-Version:        1.8.1
+Version:        1.8.3
 Release:        7
 %if ! 0%{?build_mini}
 BuildRequires:  libopenssl-devel openldap2-devel
@@ -42,7 +42,7 @@ Group:          Productivity/Networking/Security
 Summary:        MIT Kerberos5 Implementation--Libraries
 Group:          Productivity/Networking/Security
 %endif
-Source:         krb5-1.8.1.tar.bz2
+Source:         krb5-1.8.3.tar.bz2
 Source1:        vendor-files.tar.bz2
 Source2:        baselibs.conf
 Source5:        krb5-%{version}-rpmlintrc
@@ -55,9 +55,6 @@ Patch5:         krb5-1.6.3-gssapi_improve_errormessages.dif
 Patch6:         krb5-1.6.3-kpasswd_tcp.patch
 Patch7:         krb5-1.6.3-ktutil-manpage.dif
 Patch8:         krb5-1.6.3-fix-ipv6-query.dif
-Patch9:         krb5-1.7-MITKRB5-SA-2010-004.dif
-Patch10:        krb5-MITKRB5-SA-2010-005.dif
-Patch11:        krb5-1.8.1-gssapi-error-table.dif
 Patch12:        krb5-1.8-MITKRB5-SA-2010-006.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         mktemp, grep, /bin/touch, coreutils
@@ -206,9 +203,6 @@ Authors:
 %patch6 
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 %patch12 -p1
 # Rename the man pages so that they'll get generated correctly.
 pushd src