Drop backports for RT#7682

3 files changed, 1 insertions, 80 deletions

diff --git a/krb5-1.11-gss-methods1.patch b/krb5-1.11-gss-methods1.patch
deleted file mode 100644
index ad7b07f..0000000
--- a/krb5-1.11-gss-methods1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit ee53a887bead08ec1354de3e74659da537f87515
-Author: Simo Sorce <simo@redhat.com>
-Date:   Sat Jul 20 13:19:19 2013 -0400
-
-    Load cred store functions from GSS modules
-    
-    When the credential store feature was implement the related functions
-    were added to struct gss_config, but the initialization function that
-    dynamically loads modules was not changed to see if the plugin being
-    loaded provided such functions.
-    
-    This will allow non-builtin mechanism and interposer mechanism to
-    implement custom credential store extensions if they wish.
-    
-    ticket: 7682
-
-diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
-index f5b8b15..70cc4ee 100644
---- a/src/lib/gssapi/mechglue/g_initialize.c
-+++ b/src/lib/gssapi/mechglue/g_initialize.c
-@@ -680,6 +680,8 @@ build_dynamicMech(void *dl, const gss_OID mech_type)
-         GSS_ADD_DYNAMIC_METHOD_NOLOOP(dl, mech, gss_inquire_mech_for_saslname);
-         /* RFC 5587 */
-         GSS_ADD_DYNAMIC_METHOD_NOLOOP(dl, mech, gss_inquire_attrs_for_mech);
-+	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_acquire_cred_from);
-+	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_store_cred_into);
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_acquire_cred_with_password);
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_import_sec_context_by_mech);
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_import_name_by_mech);
-@@ -778,6 +780,8 @@ build_interMech(void *dl, const gss_OID mech_type)
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gss, _inquire_mech_for_saslname);
- 	/* RFC 5587 */
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gss, _inquire_attrs_for_mech);
-+	RESOLVE_GSSI_SYMBOL(dl, mech, gss, _acquire_cred_from);
-+	RESOLVE_GSSI_SYMBOL(dl, mech, gss, _store_cred_into);
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gssspi, _acquire_cred_with_password);
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gssspi, _import_sec_context_by_mech);
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gssspi, _import_name_by_mech);
diff --git a/krb5-1.11-gss-methods2.patch b/krb5-1.11-gss-methods2.patch
deleted file mode 100644
index 6d6e620..0000000
--- a/krb5-1.11-gss-methods2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 744d6f873393b6bbd12e1c1884738676a089fa65
-Author: Simo Sorce <simo@redhat.com>
-Date:   Sat Jul 20 13:20:43 2013 -0400
-
-    Load import/export cred functions from GSS modules
-    
-    When the import/export credential feature was implement the related
-    functions were added to struct gss_config, but the initialization
-    function that dynamically loads modules was not changed to see if
-    the plugin being loaded provided such functions.
-    
-    This will allow non-builtin mechanism and interposer mechanism to
-    implement custom import/export credential extensions if they wish.
-    
-    ticket: 7682
-
-diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
-index 70cc4ee..48a825e 100644
---- a/src/lib/gssapi/mechglue/g_initialize.c
-+++ b/src/lib/gssapi/mechglue/g_initialize.c
-@@ -683,6 +683,8 @@ build_dynamicMech(void *dl, const gss_OID mech_type)
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_acquire_cred_from);
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_store_cred_into);
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_acquire_cred_with_password);
-+	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_export_cred);
-+	GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_import_cred);
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_import_sec_context_by_mech);
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_import_name_by_mech);
- 	GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_import_cred_by_mech);
-@@ -783,6 +785,8 @@ build_interMech(void *dl, const gss_OID mech_type)
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gss, _acquire_cred_from);
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gss, _store_cred_into);
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gssspi, _acquire_cred_with_password);
-+	RESOLVE_GSSI_SYMBOL(dl, mech, gss, _export_cred);
-+	RESOLVE_GSSI_SYMBOL(dl, mech, gss, _import_cred);
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gssspi, _import_sec_context_by_mech);
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gssspi, _import_name_by_mech);
- 	RESOLVE_GSSI_SYMBOL(dl, mech, gssspi, _import_cred_by_mech);
diff --git a/krb5.spec b/krb5.spec
index 4a13b61..32eea08 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -92,8 +92,6 @@ Patch125: krb5-1.11.2-skew1.patch
 Patch126: krb5-1.11.2-skew2.patch
 Patch129: krb5-1.11-run_user_0.patch
 Patch131: krb5-1.11.3-skew3.patch
-Patch132: krb5-1.11-gss-methods1.patch
-Patch133: krb5-1.11-gss-methods2.patch 
 Patch134: krb5-1.11-kpasswdtest.patch
 Patch135: krb5-1.11-check_transited.patch
 Patch136: krb5-1.11.3-prompter1.patch
@@ -322,8 +320,6 @@ ln -s NOTICE LICENSE
 %patch129 -p1 -b .run_user_0
 
 %patch131 -p1 -b .skew3
-%patch132 -p1 -b .gss-methods1
-%patch133 -p1 -b .gss-methods2
 %patch134 -p1 -b .kpasswdtest
 %patch135 -p1 -b .check_transited
 %patch136 -p1 -b .prompter1
@@ -1027,6 +1023,7 @@ exit 0
   - drop patches from master to not test GSSRPC-over-UDP and to not
     depend on the portmapper, which are areas where our build systems
     often give us trouble, too; obsolete
+  - drop backports for RT#7682
 
 * Wed Oct 16 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-26
 - create and own /etc/gss (#1019937)