revision bump straight to stable for all architectures. This fixes two security holes, as per bug #98799 by Thierry Carrez <koon@gentoo.org>

Package-Manager: portage-2.0.51.22-r1

10 files changed, 35 insertions, 250 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 9e02a14b8157..3d3fc40b8e2c 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,15 @@
 # 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.93 2005/07/06 18:23:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.94 2005/07/12 18:26:33 seemant Exp $
+
+*mit-krb5-1.4.1-r1 (12 Jul 2005)
+
+  12 Jul 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/mit-krb5-1.3.6-64bit.patch, -files/mit-krb5-1.3.6-gcc4.patch,
+  -files/mit-krb5-1.3.6-telnet.patch.bz2, -mit-krb5-1.3.6-r2.ebuild,
+  -mit-krb5-1.4.1.ebuild, +mit-krb5-1.4.1-r1.ebuild:
+  revision bump straight to stable for all architectures. This fixes two
+  security holes, as per bug #98799 by Thierry Carrez <koon@gentoo.org>
 
   06 Jul 2005; Seemant Kulleen <seemant@gentoo.org>
   -files/mit-krb5-1.4-2005-001.patch, -files/mit-krb5-1.4-lazyldflags.patch,
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 426fd9c3fd7b..a0a7a224ba11 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,26 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d7cbdf0b02d12f29d8901af011e7d86f ChangeLog 15807
-MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r2 67
-MD5 ff575ccdd0fff03962bb725872d4d51a files/digest-mit-krb5-1.4.1 67
+MD5 c2991daa42fbf0330feaf0a921da0a22 ChangeLog 16232
+MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
+MD5 d5238ae19478addace62ba5ba743e467 mit-krb5-1.4.1-r1.ebuild 2989
 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 1db67f7788b8dbae908d29565c7fca2b files/mit-krb5-1.3.6-gcc4.patch 1139
-MD5 00e92c082ffe700b74cfd14c64260d18 files/mit-krb5-1.3.6-telnet.patch.bz2 841
 MD5 ae7e2bde0b20e580f49d5a3c524b445b files/mit-krb5-1.4.1-lazyldflags.patch 509
 MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
 MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
-MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
-MD5 dee37fa5214f90980c93cef5943f0255 mit-krb5-1.3.6-r2.ebuild 4271
-MD5 1461ddabb40d77cd827397fdad6ff02c mit-krb5-1.4.1.ebuild 2603
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0Cb5I1lqEGTUzyQRAi05AJ487HvKUhU+h5khuYYuDZI7uVNqEACfUpvG
-EhdD3tqEG65xrZ31yRDBy2w=
-=p2ib
------END PGP SIGNATURE-----
+MD5 bd5b2d0e988dc8f634c70e965d75cb3a files/digest-mit-krb5-1.4.1-r1 200
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r2 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r2
deleted file mode 100644
index 11ae258ef189..000000000000
--- a/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18d5a6a8e1cce120536718d39a052a87 krb5-1.3.6-signed.tar 6533120
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.1 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.1
deleted file mode 100644
index cc16057a2c5e..000000000000
--- a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 617e0071fa5b74ab4116f064678af551 krb5-1.4.1-signed.tar 6666240
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.1-r1 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.1-r1
new file mode 100644
index 000000000000..b8a0edd02887
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.1-r1
@@ -0,0 +1,3 @@
+MD5 617e0071fa5b74ab4116f064678af551 krb5-1.4.1-signed.tar 6666240
+MD5 c00d48c6425ab6a40d7a0a9377a5a1da 2005-002-patch_1.4.1.txt 2482
+MD5 520eb464c5171563818ec9e3b82b0117 2005-003-patch_1.4.1.txt 885
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.6-64bit.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.6-64bit.patch
deleted file mode 100644
index 8ed8659d0ba8..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.6-64bit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/aclocal.m4.orig	2004-12-30 08:05:58.039924632 +0000
-+++ src/aclocal.m4	2004-12-30 08:07:55.232945888 +0000
-@@ -1229,10 +1229,21 @@
-     AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , -lnsl)))
-   KRB5_AC_ENABLE_DNS
-   if test "$enable_dns" = yes ; then
--    AC_CHECK_FUNC(res_search, , AC_CHECK_LIB(resolv, res_search,
--	LIBS="$LIBS -lresolv" ; RESOLV_LIB=-lresolv,
--	AC_MSG_ERROR(Cannot find resolver support routine res_search in -lresolv.)
--    ))
-+    AC_MSG_CHECKING(for res_search)
-+	AC_TRY_LINK_FUNC(res_search, AC_MSG_RESULT(yes),
-+	  AC_MSG_RESULT(no))
-+	saved_LIBS="$LIBS"
-+	LIBS="$LIBS -lresolv"
-+	AC_MSG_CHECKING(for res_search in -lresolv)
-+	AC_LINK_IFELSE([[
-+#include <resolv.h>
-+int main()
-+{
-+	res_search (0, 0, 0, 0, 0);
-+	return 0;
-+}]],
-+    LIBS="$LIBS -lresolv"; RESOLV_LIB=-lresolv; AC_MSG_RESULT(yes),
-+	LIBS="$saved_LIBS"; AC_MSG_RESULT(no))
-   fi
-   AC_SUBST(RESOLV_LIB)
-   ])
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
deleted file mode 100644
index 0378f51922e7..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.6-gcc4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/files/mit-krb5-1.3.6-telnet.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.6-telnet.patch.bz2
deleted file mode 100644
index c74ef4b8d5ec..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.6-telnet.patch.bz2
+++ /dev/null
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
deleted file mode 100644
index 8aa750d71857..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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.13 2005/07/09 19:34:53 swegener Exp $
-
-inherit eutils
-
-MY_P=${PN/mit-}-${PV}
-S=${WORKDIR}/${MY_P}/src
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/1.3/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="krb4 static"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	!virtual/krb5"
-RDEPEND="virtual/libc
-	!virtual/krb5"
-PROVIDE="virtual/krb5"
-
-src_unpack() {
-	unpack ${A}
-	tar -zxf ${MY_P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${P}-64bit.patch
-	epatch ${FILESDIR}/${P}-telnet.patch.bz2
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	ebegin "Updating configure"
-		autoconf
-		cd ${S}/util/et
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/util/ss
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/util/profile
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/util/pty
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/util/db2
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/include
-		WANT_AUTOCONF=2.5 autoconf -I ../
-		cd ${S}/lib/crypto
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/lib/krb5
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/lib/des425
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/lib/kdb
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/lib/gssapi
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/lib/rpc
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/lib/rpc/unit-test
-		WANT_AUTOCONF=2.5 autoconf -I ../../../
-		cd ${S}/lib/kadm5
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/kdc
-		WANT_AUTOCONF=2.5 autoconf -I ../
-		cd ${S}/kadmin
-		WANT_AUTOCONF=2.5 autoconf -I ../
-		cd ${S}/slave
-		WANT_AUTOCONF=2.5 autoconf -I ../
-		cd ${S}/clients
-		WANT_AUTOCONF=2.5 autoconf -I ../
-		cd ${S}/appl
-		WANT_AUTOCONF=2.5 autoconf -I ../
-		cd ${S}/appl/bsd
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/appl/gssftp
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/appl/telnet
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/appl/telnet/libtelnet
-		WANT_AUTOCONF=2.5 autoconf -I ../../../
-		cd ${S}/appl/telnet/telnet
-		WANT_AUTOCONF=2.5 autoconf -I ../../../
-		cd ${S}/appl/telnet/telnetd
-		WANT_AUTOCONF=2.5 autoconf -I ../../../
-		cd ${S}/tests
-		WANT_AUTOCONF=2.5 autoconf -I ../
-		cd ${S}/lib/krb4
-		WANT_AUTOCONF=2.5 autoconf -I ../../
-		cd ${S}/krb524
-		WANT_AUTOCONF=2.5 autoconf -I ../
-		cd ${S}
-	eend $?
-
-	local myconf
-
-	use krb4 && myconf="${myconf} --with-krb4 --enable-krb4" \
-		|| myconf="${myconf} --without-krb4 --disable-krb4"
-
-	use static && myconf="${myconf} --disable-shared --enable-static" \
-		|| myconf="${myconf} --enable-shared --disable-static"
-
-	CFLAGS=`echo ${CFLAGS} | xargs`
-	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
-	LDFLAGS=`echo ${LDFLAGS} | xargs`
-
-	CFLAGS="${CFLAGS}" \
-	CXXFLAGS="${CXXFLAGS}" \
-	LDFLAGS="${LDFLAGS}" \
-	econf \
-		--mandir=/usr/share/man \
-		--localstatedir=/etc \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--enable-dns \
-		${myconf} || die
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		einfo "Fixating Makefiles ..."
-		for i in `find ${S} -name Makefile`; \
-		do cp $i $i.old; sed -e 's/LDCOMBINE=ld -shared -h lib/LDCOMBINE=gcc -shared -h lib/' $i.old > $i; done
-	fi
-
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	cd ..
-	dodoc README
-	dohtml doc/*.html
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd}
-	do
-		mv ${D}/usr/share/man/man8/${i}.8 ${D}/usr/share/man/man8/k${i}.8
-		mv ${D}/usr/sbin/${i} ${D}/usr/sbin/k${i}
-	done
-	for i in {rcp,rsh,telnet,ftp,rlogin}
-	do
-		mv ${D}/usr/share/man/man1/${i}.1 ${D}/usr/share/man/man1/k${i}.1
-		mv ${D}/usr/bin/${i} ${D}/usr/bin/k${i}
-	done
-
-	insinto /etc
-		newins ${FILESDIR}/krb5.conf krb5.conf
-	insinto /etc/krb5kdc
-		newins ${FILESDIR}/kdc.conf kdc.conf
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/mit-krb5kadmind.initd mit-krb5kadmind
-		newexe ${FILESDIR}/mit-krb5kdc.initd mit-krb5kdc
-}
-
-pkg_postinst() {
-	einfo "See /usr/share/doc/${PF}/html/admin.html for documentation."
-	echo
-	einfo "The client apps are installed with the k prefix"
-	einfo "(ie. kftp, kftpd, ktelnet, ktelnetd, etc...)"
-	echo
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.4.1-r1.ebuild
index 37835aa64c6a..f6dd5a4d5f31 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.4.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.4.1-r1.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.4.1.ebuild,v 1.10 2005/07/09 19:34:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.1-r1.ebuild,v 1.1 2005/07/12 18:26:34 seemant Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -9,7 +9,9 @@ P_DIR=$(get_version_component_range 1-2)
 S=${WORKDIR}/${MY_P}/src
 DESCRIPTION="MIT Kerberos V"
 HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar
+	http://web.mit.edu/kerberos/advisories/2005-002-patch_${PV}.txt
+	http://web.mit.edu/kerberos/advisories/2005-003-patch_${PV}.txt"
 
 LICENSE="as-is"
 SLOT="0"
@@ -28,8 +30,13 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/krb5"
 
 src_unpack() {
-	unpack ${A}; tar zxf ${MY_P}.tar.gz; cd ${S}
+	unpack ${MY_P}-signed.tar; tar zxf ${MY_P}.tar.gz; cd ${S}
 	epatch ${FILESDIR}/${P}-lazyldflags.patch
+
+	EPATCH_SUFFIX="txt" \
+		epatch ${DISTDIR}/2005-002-patch_${PV}.txt
+	EPATCH_SUFFIX="txt" \
+		epatch ${DISTDIR}/2005-003-patch_${PV}.txt
 }
 
 src_compile() {
@@ -61,6 +68,10 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	einfo "Testing is being debugged, disabled for now"
+}
+
 src_install() {
 	make \
 		DESTDIR=${D} \
@@ -108,15 +119,16 @@ pkg_postinst() {
 	if use doc
 	then
 		einfo "See /usr/share/doc/${PF}/html/admin.html for documentation."
-		echo
+		echo ""
 	fi
 	einfo "The client apps are installed with the mit- prefix"
 	einfo "(ie. mit-ftp, mit-ftpd, mit-telnet, mit-telnetd, etc...)"
-	echo
+	echo ""
+	ewarn "PLEASE READ THIS"
 	einfo "This release of mit-krb5 now depends on an external version"
 	einfo "of the com_err library.  Please make sure to run revdep-rebuild"
 	einfo "to ensure the integrity of the linking on your system"
-	echo
+	echo ""
 	epause 10
 	ebeep