summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2005-06-03 00:53:23 +0000
committerMark Loeser <halcy0n@gentoo.org>2005-06-03 00:53:23 +0000
commit41f5d913244a7431a9669fb235867005c83706e9 (patch)
treec26968b49ce8a02ea2e2e8eb502ac8a86bd7fbe1 /app-crypt
parentMake sure we search custom lib paths before system paths so broken libs dont ... (diff)
downloadgentoo-2-41f5d913244a7431a9669fb235867005c83706e9.tar.gz
gentoo-2-41f5d913244a7431a9669fb235867005c83706e9.tar.bz2
gentoo-2-41f5d913244a7431a9669fb235867005c83706e9.zip
gcc4 patch, thanks to wuno@lsvw.de
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/mit-krb5/ChangeLog6
-rw-r--r--app-crypt/mit-krb5/Manifest13
-rw-r--r--app-crypt/mit-krb5/files/mit-krb5-1.3.6-gcc4.patch31
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild3
4 files changed, 45 insertions, 8 deletions
diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 8783e5e47897..4d4e27c8bc27 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/mit-krb5
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.81 2005/04/08 20:41:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.82 2005/06/03 00:53:23 halcy0n Exp $
+
+ 03 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
+ +files/mit-krb5-1.3.6-gcc4.patch, mit-krb5-1.3.6-r2.ebuild:
+ Adding GCC4 patch, thanks to wuno@lsvw.de
08 Apr 2005; Seemant Kulleen <seemant@gentoo.org> mit-krb5-1.4.ebuild:
OK, so the scheme is settled -- includes in /usr/include/kerberos/mit, libs
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index ff1bcc63a4c8..049a3e72db43 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,15 +1,16 @@
MD5 70f05834941d08b6cdf7be00a9def660 ChangeLog 13889
-MD5 42a5ded136ca8eea0eb4cc64a6c4b92b mit-krb5-1.3.6-r2.ebuild 4239
-MD5 d1f151f61415d07f3b2865c3e160a480 mit-krb5-1.4.ebuild 2489
MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
-MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r2 67
+MD5 d1f151f61415d07f3b2865c3e160a480 mit-krb5-1.4.ebuild 2489
+MD5 93ad1e08857cabd89428ec5ad7f355c0 mit-krb5-1.3.6-r2.ebuild 4275
MD5 a02d4871edc472776ad7ccc23fb8331d files/digest-mit-krb5-1.4 65
-MD5 00e92c082ffe700b74cfd14c64260d18 files/mit-krb5-1.3.6-telnet.patch.bz2 841
-MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
MD5 07a38334b351973026f8616b79662cfb files/mit-krb5-1.4-2005-001.patch 2758
+MD5 1db67f7788b8dbae908d29565c7fca2b files/mit-krb5-1.3.6-gcc4.patch 1139
+MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
MD5 d7dcbbab51ce1849c77c083b8d363c15 files/krb5.initd 1486
+MD5 fa5e3bd6fb521c29db85ce623905087b files/mit-krb5-1.3.6-64bit.patch 923
MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
-MD5 fa5e3bd6fb521c29db85ce623905087b files/mit-krb5-1.3.6-64bit.patch 923
+MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r2 67
+MD5 00e92c082ffe700b74cfd14c64260d18 files/mit-krb5-1.3.6-telnet.patch.bz2 841
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.6-gcc4.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.6-gcc4.patch
new file mode 100644
index 000000000000..0378f51922e7
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.6-gcc4.patch
@@ -0,0 +1,31 @@
+diff -ur krb5-1.3.6-orig/src/appl/gssftp/ftpd/ftpd.c krb5-1.3.6/src/appl/gssftp/ftpd/ftpd.c
+--- krb5-1.3.6-orig/src/appl/gssftp/ftpd/ftpd.c 2005-06-02 19:49:22.000000000 -0400
++++ krb5-1.3.6/src/appl/gssftp/ftpd/ftpd.c 2005-06-02 19:58:24.000000000 -0400
+@@ -123,6 +123,7 @@
+ extern char *mktemp ();
+ char *ftpusers;
+ extern int yyparse(void);
++static char* gunique(char*);
+
+ #include <k5-util.h>
+ #include "port-sockets.h"
+@@ -1271,7 +1272,6 @@
+ FILE *fout, *din;
+ struct stat st;
+ int (*closefunc)();
+- static char *gunique();
+
+ if (logging > 1) syslog(LOG_NOTICE, "put %s", path_expand(name));
+
+diff -ur krb5-1.3.6-orig/src/lib/krb5/asn.1/asn1_k_decode.c krb5-1.3.6/src/lib/krb5/asn.1/asn1_k_decode.c
+--- krb5-1.3.6-orig/src/lib/krb5/asn.1/asn1_k_decode.c 2005-06-02 19:49:22.000000000 -0400
++++ krb5-1.3.6/src/lib/krb5/asn.1/asn1_k_decode.c 2005-06-02 19:59:12.000000000 -0400
+@@ -860,7 +860,7 @@
+ }
+
+
+-static asn1_error_code asn1_decode_etype_info_entry(asn1buf *buf, krb5_etype_info_entry *val )
++asn1_error_code asn1_decode_etype_info_entry(asn1buf *buf, krb5_etype_info_entry *val )
+ {
+ setup();
+ { begin_structure();
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild
index ce5171e8f7fb..41b666dcfa0c 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild,v 1.11 2005/05/05 02:31:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild,v 1.12 2005/06/03 00:53:23 halcy0n Exp $
inherit eutils
@@ -28,6 +28,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-64bit.patch
epatch ${FILESDIR}/${P}-telnet.patch.bz2
+ epatch ${FILESDIR}/${P}-gcc4.patch
}
src_compile() {