gentoo resync : 31.10.2017

5 files changed, 0 insertions, 149 deletions

diff --git a/app-crypt/heimdal/files/heimdal_db6.patch b/app-crypt/heimdal/files/heimdal_db6.patch
deleted file mode 100644
index 316cf1533791..000000000000
--- a/app-crypt/heimdal/files/heimdal_db6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/cf/db.m4
-+++ b/cf/db.m4
-@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5
-   #include <stdio.h>
-   #ifdef HAVE_DBHEADER
-   #include <$dbheader/db.h>
-+  #elif HAVE_DB6_DB_H
-+  #include <db6/db.h>
-   #elif HAVE_DB5_DB_H
-   #include <db5/db.h>
-   #elif HAVE_DB4_DB_H
---- a/lib/hdb/db3.c
-+++ b/lib/hdb/db3.c
-@@ -276,7 +276,7 @@
-     }
-     db->hdb_db = d;
- 
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
-     ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
- #else
-     ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
-@@ -284,7 +284,7 @@
- 
-     if (ret == ENOENT) {
- 	/* try to open without .db extension */
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
- 			 myflags, mode);
- #else
---- a/cf/db.m4
-+++ b/cf/db.m4
-@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno],
- 		    fi
- 		   ])],
-     [AC_CHECK_HEADERS([					\
-+	           db6/db.h				\
- 	           db5/db.h				\
- 	           db4/db.h				\
- 	           db3/db.h				\
diff --git a/app-crypt/heimdal/files/heimdal_link_order.patch b/app-crypt/heimdal/files/heimdal_link_order.patch
deleted file mode 100644
index fdf6a0af9bc9..000000000000
--- a/app-crypt/heimdal/files/heimdal_link_order.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- kadmin/Makefile.am.orig	2010-11-25 12:39:31.000000000 +0000
-+++ kadmin/Makefile.am	2011-02-14 21:37:29.000000000 +0000
-@@ -64,10 +64,10 @@
- 	$(top_builddir)/lib/krb5/libkrb5.la \
- 	$(LIB_hcrypto) \
- 	$(top_builddir)/lib/asn1/libasn1.la \
--	$(LIB_roken) \
- 	$(DBLIB)
- 
- kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
-+	$(LIB_roken) \
- 	../lib/gssapi/libgssapi.la \
- 	$(LDADD_common) \
- 	$(LIB_pidfile) \
-@@ -78,12 +78,14 @@
- 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
- 	$(top_builddir)/lib/sl/libsl.la \
- 	$(LIB_readline) \
-+	$(LIB_roken) \
- 	$(LDADD_common) \
- 	$(LIB_dlopen)
- 
- add_random_users_LDADD = \
- 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
- 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
-+	$(LIB_roken) \
- 	$(LDADD_common) \
- 	$(LIB_dlopen)
- 
---- tests/plugin/check-pac.in.orig	2010-11-25 12:39:31.000000000 +0000
-+++ tests/plugin/check-pac.in	2011-02-16 13:24:50.000000000 +0000
-@@ -62,7 +62,8 @@
- test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
--export KRB5_CONFIG
-+LD_PRELOAD="../../lib/roken/.libs/libroken.so"
-+export KRB5_CONFIG LD_PRELOAD
- 
- rm -f ${keytabfile}
- rm -f current-db*
diff --git a/app-crypt/heimdal/files/heimdal_missing-include.patch b/app-crypt/heimdal/files/heimdal_missing-include.patch
deleted file mode 100644
index e245cf8fff07..000000000000
--- a/app-crypt/heimdal/files/heimdal_missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/test_base.c	2011-09-30 15:58:45.000000000 +0300
-+++ base/test_base.c	2011-12-27 23:04:50.482955923 +0200
-@@ -39,6 +39,8 @@
- #include "heimbase.h"
- #include "heimbasepriv.h"
- 
-+#include <stdlib.h>
-+
- static void
- memory_free(heim_object_t obj)
- {
diff --git a/app-crypt/heimdal/files/heimdal_missing_symbols.patch b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
deleted file mode 100644
index aa915fb130dd..000000000000
--- a/app-crypt/heimdal/files/heimdal_missing_symbols.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add missing symbols.  Cherry picked from upstream master.
-Bug #420821.
-
---- a/lib/krb5/version-script.map	2012-01-10 21:53:51.000000000 +0000
-+++ b/lib/krb5/version-script.map	2012-06-13 16:23:26.000000000 +0000
-@@ -42,6 +42,7 @@
- 		krb5_auth_con_getrcache;
- 		krb5_auth_con_getremoteseqnumber;
- 		krb5_auth_con_getremotesubkey;
-+		krb5_auth_con_getsendsubkey;
- 		krb5_auth_con_init;
- 		krb5_auth_con_removeflags;
- 		krb5_auth_con_setaddrs;
-@@ -383,6 +384,14 @@
- 		krb5_h_errno_to_heim_errno;
- 		krb5_have_error_string;
- 		krb5_hmac;
-+		krb5_init_creds_init;
-+		krb5_init_creds_set_service;
-+		krb5_init_creds_set_keytab;
-+		krb5_init_creds_get;
-+		krb5_init_creds_set_password;
-+		krb5_init_creds_free;
-+		krb5_init_creds_get_creds;
-+		krb5_init_creds_get_error;
- 		krb5_init_context;
- 		krb5_init_ets;
- 		krb5_initlog;
diff --git a/app-crypt/heimdal/files/heimdal_texinfo-5.patch b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
deleted file mode 100644
index b16a90cefdb0..000000000000
--- a/app-crypt/heimdal/files/heimdal_texinfo-5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/doc/whatis.texi
-+++ b/doc/whatis.texi
-@@ -35,10 +35,11 @@ services can authenticate each other.
- @end macro
- @end ifinfo
- 
--@tex
--@def@xsub#1{$_{#1}$}
--@global@let@sub=@xsub
--@end tex
-+@iftex
-+@macro sub{arg}
-+@textsubscript{\arg\}
-+@end macro
-+@end iftex
- 
- @ifhtml
- @macro sub{arg}
---- a/doc/win2k.texi
-+++ b/doc/win2k.texi
-@@ -311,4 +311,5 @@ Other useful programs include these:
- 
- @itemize @bullet
- @item pwdump2
--@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize
-+@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}
-+@end itemize
-