From d5dad15c2500e2725826aea91e6c4d7f8905a6a7 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 14 Apr 2007 00:43:47 +0000 Subject: [PATCH] remove krb4 as per bug #173354 Package-Manager: portage-2.1.2.2 --- app-crypt/heimdal/ChangeLog | 7 ++-- app-crypt/heimdal/Manifest | 16 ++++----- app-crypt/heimdal/heimdal-0.7.2-r3.ebuild | 44 +++++++++++------------ 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog index 03a5f10c58b6..0dbb7c155aa5 100644 --- a/app-crypt/heimdal/ChangeLog +++ b/app-crypt/heimdal/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/heimdal -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.115 2006/12/03 22:20:43 dev-zero Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.116 2007/04/14 00:43:47 dragonheart Exp $ + + 14 Apr 2007; heimdal-0.7.2-r3.ebuild: + remove krb4 as per bug #173354 03 Dec 2006; Tiziano Müller -heimdal-0.7.2.ebuild, -heimdal-0.7.2-r2.ebuild, heimdal-0.7.2-r3.ebuild: diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest index df1cdb017d23..db8d6e58a6f1 100644 --- a/app-crypt/heimdal/Manifest +++ b/app-crypt/heimdal/Manifest @@ -1,13 +1,13 @@ DIST heimdal-0.7.2-gentoo-patches-0.2.tar.bz2 7500 RMD160 87240de8914b05c552ceb7d2f92e7de68dad21b7 SHA1 f4b33a9816e973bee0fb99b3791e57e019161111 SHA256 cfbec87dcbab67941de5897370fc9e0b3a085292f53cbeb20b8e9d2667109c05 DIST heimdal-0.7.2.tar.gz 4525734 RMD160 0f028a9d5a6a66e8efc0397e4d8c8adc2183b409 SHA1 a902e6ad7c31d940b588dc0235b348936f0d719d SHA256 28661862ac8cbbd62ddddbda7db760b622b903c88c06f2fbdbf7b97be47eac60 -EBUILD heimdal-0.7.2-r3.ebuild 3540 RMD160 0b2095adbf17e94a2896d93baabef2fe8e385239 SHA1 b0391e9f492efd21ef4fb509f9780cae97d587f9 SHA256 7293afec676aab3cd21e4e1d4a799c05b59c6f4b0582a63574ae432adb0fbd8a -MD5 642acaaa37ea036d07e25d6cd2106971 heimdal-0.7.2-r3.ebuild 3540 -RMD160 0b2095adbf17e94a2896d93baabef2fe8e385239 heimdal-0.7.2-r3.ebuild 3540 -SHA256 7293afec676aab3cd21e4e1d4a799c05b59c6f4b0582a63574ae432adb0fbd8a heimdal-0.7.2-r3.ebuild 3540 -MISC ChangeLog 18647 RMD160 288333dfe28eeaa7c1c26dc7383759f761897240 SHA1 1811d90c57655ca48ef761cde89849a0d9cba162 SHA256 c8d0c8d3c82fe86c86d5249a3cd3d4e4e7876471b4698697a0fab92c201d9196 -MD5 ded61156443c90cc42d32ec2b22d7e6b ChangeLog 18647 -RMD160 288333dfe28eeaa7c1c26dc7383759f761897240 ChangeLog 18647 -SHA256 c8d0c8d3c82fe86c86d5249a3cd3d4e4e7876471b4698697a0fab92c201d9196 ChangeLog 18647 +EBUILD heimdal-0.7.2-r3.ebuild 3444 RMD160 897351cb0c1ced9d1fd5148902c8f41ce3d55305 SHA1 dd5ddd91726cbd4e93ff5ccc2005dc36227f485c SHA256 cf5c5576f759c8579d1673dd76de0441e32fada37ec43ac0702f86f83126b5e0 +MD5 f0b33c5fe329f417d755451a1c209fb1 heimdal-0.7.2-r3.ebuild 3444 +RMD160 897351cb0c1ced9d1fd5148902c8f41ce3d55305 heimdal-0.7.2-r3.ebuild 3444 +SHA256 cf5c5576f759c8579d1673dd76de0441e32fada37ec43ac0702f86f83126b5e0 heimdal-0.7.2-r3.ebuild 3444 +MISC ChangeLog 18741 RMD160 02fae68160cd3630fc85b03536810050c341b98e SHA1 e82e6133416f17a345c704627bdcb9c8db3bcad6 SHA256 7d387bc765f9133208b1ec517faba6cf67b1a5fe15b40cda33d1fa1d1660fe36 +MD5 43db779e2e2acf923aefabbc8dd0eebb ChangeLog 18741 +RMD160 02fae68160cd3630fc85b03536810050c341b98e ChangeLog 18741 +SHA256 7d387bc765f9133208b1ec517faba6cf67b1a5fe15b40cda33d1fa1d1660fe36 ChangeLog 18741 MISC metadata.xml 231 RMD160 1be9e973a8223227be2a819d21b20400ec0c2eeb SHA1 9ef61083af843eed7a918f2d91f3aef87b925e50 SHA256 a8adb0e7f6a178f4af8bfabe77a247ef7d6ad2216eb1e15d02e2954143c48d0a MD5 6c9cbfc951ebeca1a88d8722de4dde80 metadata.xml 231 RMD160 1be9e973a8223227be2a819d21b20400ec0c2eeb metadata.xml 231 diff --git a/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild b/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild index 562e3894e8be..409aa743a6d4 100644 --- a/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild +++ b/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild,v 1.12 2006/12/03 22:20:43 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild,v 1.13 2007/04/14 00:43:47 dragonheart Exp $ WANT_AUTOMAKE=1.8 WANT_AUTOCONF=latest @@ -19,11 +19,10 @@ SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz LICENSE="as-is" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="ssl berkdb ipv6 krb4 ldap X" +IUSE="ssl berkdb ipv6 ldap X" RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) - krb4? ( >=app-crypt/kth-krb-1.2.2-r2 ) ldap? ( net-nds/openldap ) sys-libs/ss sys-libs/com_err @@ -38,7 +37,7 @@ src_unpack() { unpack ${A} cd "${S}" - EPATCH_SUFFIX="patch" epatch ${GENTOODIR}/patches + EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches AT_M4DIR="cf" eautoreconf } @@ -46,9 +45,6 @@ src_unpack() { src_compile() { local myconf="" - use krb4 \ - && myconf="${myconf} --with-krb4-config=/usr/athena/bin/krb4-config" - use ldap && myconf="${myconf} --with-openldap=/usr" econf \ @@ -56,7 +52,7 @@ src_compile() { $(use_with berkdb berkeley-db) \ $(use_with ssl openssl) \ $(use_with X x) \ - $(use_with krb4) \ + --disable-krb4 \ --enable-kcm \ --enable-shared \ --includedir=/usr/include/heimdal \ @@ -69,7 +65,7 @@ src_compile() { cd lib/kadm5 tc-export CC ${CC} -shared -fPIC \ - ${CFLAGS} -I${S}/include \ + ${CFLAGS} -I"${S}"/include \ -DDICTPATH=\"/usr/$(get_libdir)/cracklib_dict\" \ -o sample_passwd_check.so sample_passwd_check.c -lcrack || \ die "Failed to compile password checker" @@ -80,9 +76,9 @@ src_test() { addpredict /proc/fs/nnpfs/afs_ioctl if use X ; then - KRB5_CONFIG=${S}/krb5.conf Xmake check || die + KRB5_CONFIG="${S}"/krb5.conf Xmake check || die else - KRB5_CONFIG=${S}/krb5.conf make check || die + KRB5_CONFIG="${S}"/krb5.conf make check || die fi } @@ -96,18 +92,18 @@ src_install() { # Begin client rename and install for i in {telnetd,ftpd,rshd} do - mv ${D}/usr/share/man/man8/{,k}${i}.8 - mv ${D}/usr/sbin/{,k}${i} + mv "${D}"/usr/share/man/man8/{,k}${i}.8 + mv "${D}"/usr/sbin/{,k}${i} done for i in {rcp,rsh,telnet,ftp,su,login} do - mv ${D}/usr/share/man/man1/{,k}${i}.1 - mv ${D}/usr/bin/{,k}${i} + mv "${D}"/usr/share/man/man1/{,k}${i}.1 + mv "${D}"/usr/bin/{,k}${i} done - mv ${D}/usr/share/man/man5/{,k}ftpusers.5 - mv ${D}/usr/share/man/man5/{,k}login.access.5 + mv "${D}"/usr/share/man/man5/{,k}ftpusers.5 + mv "${D}"/usr/share/man/man5/{,k}login.access.5 # Create symlinks for the includes dosym heimdal /usr/include/gssapi @@ -120,18 +116,18 @@ src_install() { dosym heimdal/k524_err.h /usr/include/k524_err.h dosym heimdal/krb5-protos.h /usr/include/krb5-protos.h - doinitd ${GENTOODIR}/configs/heimdal-kdc - doinitd ${GENTOODIR}/configs/heimdal-kadmind - doinitd ${GENTOODIR}/configs/heimdal-kpasswdd + doinitd "${GENTOODIR}"/configs/heimdal-kdc + doinitd "${GENTOODIR}"/configs/heimdal-kadmind + doinitd "${GENTOODIR}"/configs/heimdal-kpasswdd insinto /etc - newins ${GENTOODIR}/configs/krb5.conf krb5.conf.example + newins "${GENTOODIR}"/configs/krb5.conf krb5.conf.example - sed -i "s:/lib:/$(get_libdir):" ${D}/etc/krb5.conf.example || die "sed failed" + sed -i "s:/lib:/$(get_libdir):" "${D}"/etc/krb5.conf.example || die "sed failed" if use ldap; then insinto /etc/openldap/schema - doins ${GENTOODIR}/configs/krb5-kdc.schema + doins "${GENTOODIR}"/configs/krb5-kdc.schema fi # default database dir -- 2.26.2