diff options
| -rw-r--r-- | app-crypt/kth-krb/ChangeLog | 5 | ||||
| -rw-r--r-- | app-crypt/kth-krb/Manifest | 11 | ||||
| -rw-r--r-- | app-crypt/kth-krb/files/kth-gentoo-ssl.patch | 198 | ||||
| -rw-r--r-- | app-crypt/kth-krb/kth-krb-1.2.2-r1.ebuild | 3 |
4 files changed, 210 insertions, 7 deletions
diff --git a/app-crypt/kth-krb/ChangeLog b/app-crypt/kth-krb/ChangeLog index fff718175e49..919cadf6d34b 100644 --- a/app-crypt/kth-krb/ChangeLog +++ b/app-crypt/kth-krb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/kth-krb # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/ChangeLog,v 1.16 2003/12/16 17:41:51 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/ChangeLog,v 1.17 2004/01/14 21:27:10 rphillips Exp $ + + 14 Jan 2004; <rphillips@gentoo.org> kth-krb-1.2.2-r1.ebuild: + Added John Hunt's SSL patch 16 Dec 2003; Jason Wever <weeve@gentoo.org> kth-krb-1.2.2-r1.ebuild: Added ~sparc keyword. diff --git a/app-crypt/kth-krb/Manifest b/app-crypt/kth-krb/Manifest index df5dfe551aaa..9d5ea30efc0b 100644 --- a/app-crypt/kth-krb/Manifest +++ b/app-crypt/kth-krb/Manifest @@ -1,12 +1,13 @@ -MD5 4f46fd94c48658e8280c439751cd6d11 ChangeLog 1883 -MD5 52d6c61f464a1dbbb09907a4d4a998d6 kth-krb-1.2.1.ebuild 1233 -MD5 2c4b46b7154396197156bdaf31d985eb kth-krb-1.2.2-r1.ebuild 1398 -MD5 c3279d8211021886f9136f98304ba5a1 kth-krb-1.2.2.ebuild 1233 MD5 40c5c3794b6a5da86ddd5ae068c43582 kth-krb-1.2.ebuild 1228 +MD5 7ca5167a07e7e76d3fd94f6daf190780 kth-krb-1.2.2-r1.ebuild 1443 +MD5 c3279d8211021886f9136f98304ba5a1 kth-krb-1.2.2.ebuild 1233 +MD5 723177a0aedc77a7094ca77286209c35 ChangeLog 1981 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225 -MD5 be7f2f326e6022797dca6608b6248b7e files/02kth-krb 118 +MD5 52d6c61f464a1dbbb09907a4d4a998d6 kth-krb-1.2.1.ebuild 1233 MD5 2884941e77f936011c4c56d9af159ae6 files/digest-kth-krb-1.2 61 +MD5 55f56de790181ad8a1df5176a53551dd files/kth-gentoo-ssl.patch 6873 MD5 38a19d9c77f2f822ae597ae120f34fc9 files/digest-kth-krb-1.2.1 63 MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2 63 MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2-r1 63 +MD5 be7f2f326e6022797dca6608b6248b7e files/02kth-krb 118 MD5 c6ac0230ef8dc2b0476517e265a1bc4c files/kth-gentoo.patch 426 diff --git a/app-crypt/kth-krb/files/kth-gentoo-ssl.patch b/app-crypt/kth-krb/files/kth-gentoo-ssl.patch new file mode 100644 index 000000000000..b21889d3a5c2 --- /dev/null +++ b/app-crypt/kth-krb/files/kth-gentoo-ssl.patch @@ -0,0 +1,198 @@ +diff -urN krb4-1.2.2.old/admin/adm_locl.h krb4-1.2.2/admin/adm_locl.h +--- krb4-1.2.2.old/admin/adm_locl.h 2001-08-25 20:40:36.000000000 -0500 ++++ krb4-1.2.2/admin/adm_locl.h 2003-11-21 18:12:23.000000000 -0600 +@@ -82,6 +82,9 @@ + #include <roken.h> + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/appl/afsutil/kstring2key.c krb4-1.2.2/appl/afsutil/kstring2key.c +--- krb4-1.2.2.old/appl/afsutil/kstring2key.c 2001-08-25 20:40:37.000000000 -0500 ++++ krb4-1.2.2/appl/afsutil/kstring2key.c 2003-11-21 18:12:52.000000000 -0600 +@@ -43,6 +43,9 @@ + #include <roken.h> + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/appl/bsd/bsd_locl.h krb4-1.2.2/appl/bsd/bsd_locl.h +--- krb4-1.2.2.old/appl/bsd/bsd_locl.h 2002-08-28 13:55:41.000000000 -0500 ++++ krb4-1.2.2/appl/bsd/bsd_locl.h 2003-11-21 18:13:06.000000000 -0600 +@@ -271,6 +271,9 @@ + #endif + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/appl/ftp/ftp/ftp_locl.h krb4-1.2.2/appl/ftp/ftp/ftp_locl.h +--- krb4-1.2.2.old/appl/ftp/ftp/ftp_locl.h 2001-08-22 15:30:19.000000000 -0500 ++++ krb4-1.2.2/appl/ftp/ftp/ftp_locl.h 2003-11-21 18:14:24.000000000 -0600 +@@ -132,6 +132,9 @@ + + /* des_read_pw_string */ + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/appl/movemail/pop.c krb4-1.2.2/appl/movemail/pop.c +--- krb4-1.2.2.old/appl/movemail/pop.c 2002-08-28 15:10:02.000000000 -0500 ++++ krb4-1.2.2/appl/movemail/pop.c 2003-11-21 18:13:33.000000000 -0600 +@@ -66,6 +66,9 @@ + #endif + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/appl/otp/otp_locl.h krb4-1.2.2/appl/otp/otp_locl.h +--- krb4-1.2.2.old/appl/otp/otp_locl.h 2001-08-22 15:30:21.000000000 -0500 ++++ krb4-1.2.2/appl/otp/otp_locl.h 2003-11-21 18:13:46.000000000 -0600 +@@ -53,6 +53,9 @@ + #include <roken.h> + #include <err.h> + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/appl/telnet/libtelnet/enc_des.c krb4-1.2.2/appl/telnet/libtelnet/enc_des.c +--- krb4-1.2.2.old/appl/telnet/libtelnet/enc_des.c 2001-08-28 19:45:19.000000000 -0500 ++++ krb4-1.2.2/appl/telnet/libtelnet/enc_des.c 2003-11-21 18:13:56.000000000 -0600 +@@ -51,6 +51,9 @@ + #include "misc-proto.h" + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/appl/telnet/libtelnet/encrypt.h krb4-1.2.2/appl/telnet/libtelnet/encrypt.h +--- krb4-1.2.2.old/appl/telnet/libtelnet/encrypt.h 2001-08-22 15:30:22.000000000 -0500 ++++ krb4-1.2.2/appl/telnet/libtelnet/encrypt.h 2003-11-21 18:14:07.000000000 -0600 +@@ -91,6 +91,9 @@ + #define SK_DES 1 /* Matched Kerberos v5 KEYTYPE_DES */ + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #define des_new_random_key des_random_key + #else +diff -urN krb4-1.2.2.old/include/Makefile.in krb4-1.2.2/include/Makefile.in +--- krb4-1.2.2.old/include/Makefile.in 2003-03-17 04:05:37.000000000 -0600 ++++ krb4-1.2.2/include/Makefile.in 2003-11-21 18:17:33.000000000 -0600 +@@ -642,7 +642,10 @@ + .et.c: + $(COMPILE_ET) $< + @HAVE_OPENSSL_TRUE@des.h: +-@HAVE_OPENSSL_TRUE@ echo '#include <@DES_H@>' > des.h ++@HAVE_OPENSSL_TRUE@ echo '#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY' > des.h ++@HAVE_OPENSSL_TRUE@ echo '#define OPENSSL_DES_LIBDES_COMPATIBILITY 1' >> des.h ++@HAVE_OPENSSL_TRUE@ echo '#endif' >> des.h ++@HAVE_OPENSSL_TRUE@ echo '#include <@DES_H@>' >> des.h + + ktypes.h: bits$(EXEEXT) + ./bits$(EXEEXT) ktypes.h +diff -urN krb4-1.2.2.old/kadmin/kadm_locl.h krb4-1.2.2/kadmin/kadm_locl.h +--- krb4-1.2.2.old/kadmin/kadm_locl.h 2001-12-05 08:49:07.000000000 -0600 ++++ krb4-1.2.2/kadmin/kadm_locl.h 2003-11-21 18:17:49.000000000 -0600 +@@ -112,6 +112,9 @@ + #include <sl.h> + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/lib/kadm/kadm_locl.h krb4-1.2.2/lib/kadm/kadm_locl.h +--- krb4-1.2.2.old/lib/kadm/kadm_locl.h 2002-09-09 10:26:17.000000000 -0500 ++++ krb4-1.2.2/lib/kadm/kadm_locl.h 2003-11-21 18:18:09.000000000 -0600 +@@ -70,6 +70,9 @@ + #include <roken.h> + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/lib/krb/krb.h.in krb4-1.2.2/lib/krb/krb.h.in +--- krb4-1.2.2.old/lib/krb/krb.h.in 2001-08-25 20:42:29.000000000 -0500 ++++ krb4-1.2.2/lib/krb/krb.h.in 2003-11-21 18:25:50.000000000 -0600 +@@ -48,6 +48,9 @@ + #if !defined(NOPROTO) && !defined(__STDC__) + #define NOPROTO + #endif ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <@DES_H@> + + /* CNS compatibility ahead! */ +@@ -224,6 +227,13 @@ + int admin; + }; + ++/* ++ * Fixes Gentoo bug #30575, See the following threads for details: ++ * https://lists.openafs.org/pipermail/openafs-info/2003-October/010904.html ++ * https://lists.openafs.org/pipermail/openafs-info/2003-October/010910.html ++ */ ++#define des_ks_struct _ossl_old_des_ks_struct ++ + /* Location of ticket file for save_cred and get_cred */ + #define TKT_FILE tkt_string() + #ifndef TKT_ROOT +diff -urN krb4-1.2.2.old/lib/rxkad/rxkad_locl.h krb4-1.2.2/lib/rxkad/rxkad_locl.h +--- krb4-1.2.2.old/lib/rxkad/rxkad_locl.h 2001-08-25 20:40:45.000000000 -0500 ++++ krb4-1.2.2/lib/rxkad/rxkad_locl.h 2003-11-21 18:18:23.000000000 -0600 +@@ -54,6 +54,9 @@ + #endif + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> +diff -urN krb4-1.2.2.old/server/kerberos.c krb4-1.2.2/server/kerberos.c +--- krb4-1.2.2.old/server/kerberos.c 2003-03-16 22:04:23.000000000 -0600 ++++ krb4-1.2.2/server/kerberos.c 2003-11-21 18:18:37.000000000 -0600 +@@ -80,6 +80,9 @@ + #include <base64.h> + + #ifdef HAVE_OPENSSL ++#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY ++#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 ++#endif + #include <openssl/des.h> + #else + #include <des.h> diff --git a/app-crypt/kth-krb/kth-krb-1.2.2-r1.ebuild b/app-crypt/kth-krb/kth-krb-1.2.2-r1.ebuild index 1f9c86a8cc74..cee149f198cc 100644 --- a/app-crypt/kth-krb/kth-krb-1.2.2-r1.ebuild +++ b/app-crypt/kth-krb/kth-krb-1.2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.2-r1.ebuild,v 1.3 2003/12/16 17:41:51 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.2-r1.ebuild,v 1.4 2004/01/14 21:27:10 rphillips Exp $ DESCRIPTION="Kerberos 4 implementation from KTH" SRC_URI="ftp://ftp.pdc.kth.se/pub/krb/src/krb4-${PV}.tar.gz" @@ -21,6 +21,7 @@ src_compile() { echo ${PORTAGE_TMPDIR} epatch ${FILESDIR}/kth-gentoo.patch + epatch ${FILESDIR}/kth-gentoo-ssl.patch use ssl && myconf="${myconf} --with-openssl=/usr" |