Fix filename collision with app-crypt/mit-krb5

Package-Manager: portage-2.1.3.19

4 files changed, 167 insertions, 15 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index c211f6f6713a..be007145c89f 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.123 2007/11/23 20:39:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.124 2007/11/23 22:26:02 stefaan Exp $
+
+*openafs-1.4.5-r1 (23 Nov 2007)
+
+  23 Nov 2007; Stefaan De Roeck <stefaan@gentoo.org>
+  +openafs-1.4.5-r1.ebuild:
+  Fix filename collision with app-crypt/mit-krb5
 
   23 Nov 2007; Markus Meier <maekke@gentoo.org> openafs-1.4.5.ebuild:
   x86 stable, bug #199876
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 378ced614eb1..8aa4a946a09d 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX CellServDB 41 RMD160 60358d0208a7fd49e099915c4e5ed8b8d1f7f468 SHA1 e3aaed78f76d43770380541760942ac8258244f6 SHA256 0f3bbc0a460a982a0b1b616b9873aa03b4d9adc8e03614a7105eeb701f36e976
 MD5 4584cc6910401787e1ebd81cfa06f060 files/CellServDB 41
 RMD160 60358d0208a7fd49e099915c4e5ed8b8d1f7f468 files/CellServDB 41
@@ -62,6 +59,10 @@ EBUILD openafs-1.4.4_p20070724.ebuild 10046 RMD160 5511c137881599c6a50fae791052e
 MD5 8915d0e4c468ff00dbfc59d3d0434cef openafs-1.4.4_p20070724.ebuild 10046
 RMD160 5511c137881599c6a50fae791052ed567513a143 openafs-1.4.4_p20070724.ebuild 10046
 SHA256 7095722f594d4f6130350640939fd604ccb9828b0e47701dc9af3f5517776a11 openafs-1.4.4_p20070724.ebuild 10046
+EBUILD openafs-1.4.5-r1.ebuild 4297 RMD160 239ff1a4529ca6f19932683ba2f9346327d5f591 SHA1 718fbc981670428eafcd2717b8c35dbaac659e5c SHA256 f742400dd9697c07862f6b5adc6f0497c7b25efac7a48de6fb53ed6c68b32247
+MD5 27c9480323499a6084c80080d60798aa openafs-1.4.5-r1.ebuild 4297
+RMD160 239ff1a4529ca6f19932683ba2f9346327d5f591 openafs-1.4.5-r1.ebuild 4297
+SHA256 f742400dd9697c07862f6b5adc6f0497c7b25efac7a48de6fb53ed6c68b32247 openafs-1.4.5-r1.ebuild 4297
 EBUILD openafs-1.4.5.ebuild 4336 RMD160 ae9b0ede90b67df93ec40962834ca1e618194266 SHA1 c5c05dfe304461c5261e8212aaa38ca3d7799a6d SHA256 6162db786fdb7e734eb1188f21ca99ade04aff1af209ea5feb13e72c15097c41
 MD5 dee593f59a0c0cdcb49dbc8f67b956b9 openafs-1.4.5.ebuild 4336
 RMD160 ae9b0ede90b67df93ec40962834ca1e618194266 openafs-1.4.5.ebuild 4336
@@ -78,10 +79,10 @@ EBUILD openafs-1.5.27.ebuild 10146 RMD160 1f2b3466fcd237c82f7689cf53d66634d7c8ff
 MD5 ff9bccef57f3429b94a859f5d6d5eea7 openafs-1.5.27.ebuild 10146
 RMD160 1f2b3466fcd237c82f7689cf53d66634d7c8ff6a openafs-1.5.27.ebuild 10146
 SHA256 cd24a67d7fa9f7337e424fdb87376ba617123bb6d4869bbcd468b5ca4f139360 openafs-1.5.27.ebuild 10146
-MISC ChangeLog 19650 RMD160 161e1633e9a4b9c0d169277d3cd2edba1b70e8dd SHA1 e99b930ea45e5a4e70111fd6d54b75c8261e1615 SHA256 f2d5f3e708d3466004115dec908a679bdc2fefdcec64883ea681b2ffc9d5cd04
-MD5 5b645b308427efe91de600e931f5bd7d ChangeLog 19650
-RMD160 161e1633e9a4b9c0d169277d3cd2edba1b70e8dd ChangeLog 19650
-SHA256 f2d5f3e708d3466004115dec908a679bdc2fefdcec64883ea681b2ffc9d5cd04 ChangeLog 19650
+MISC ChangeLog 19815 RMD160 e9b7559dac9f6910ab046b1a37d0f6c4eff59efb SHA1 852807b0b9ee1fb478380b199ec7ec78e1c15b76 SHA256 64e9b0af7e7d1b2bc560a557e1eb3c11d2e18a923cf0b930bf95d652b2708ab5
+MD5 8dd22fb276696ae73a6429b6c0cdea7d ChangeLog 19815
+RMD160 e9b7559dac9f6910ab046b1a37d0f6c4eff59efb ChangeLog 19815
+SHA256 64e9b0af7e7d1b2bc560a557e1eb3c11d2e18a923cf0b930bf95d652b2708ab5 ChangeLog 19815
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
 MD5 833551f00cc2163ac7f9eb367ee9caa8 metadata.xml 254
 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 metadata.xml 254
@@ -104,6 +105,9 @@ SHA256 2c5ca2e0f580e9cae7fdbaf837c0342c98f30a44a739e3889494b0e3f65894d6 files/di
 MD5 0bc615bf75752861d59fff902b30b2ec files/digest-openafs-1.4.5 780
 RMD160 c6e82e5ec69b12259d0d3ce2410ce3c792232ccc files/digest-openafs-1.4.5 780
 SHA256 1b6c7532a0b2d1c8e85deb5670a017cac8d3e25c9ca8335aa3c242b9ed57cd17 files/digest-openafs-1.4.5 780
+MD5 0bc615bf75752861d59fff902b30b2ec files/digest-openafs-1.4.5-r1 780
+RMD160 c6e82e5ec69b12259d0d3ce2410ce3c792232ccc files/digest-openafs-1.4.5-r1 780
+SHA256 1b6c7532a0b2d1c8e85deb5670a017cac8d3e25c9ca8335aa3c242b9ed57cd17 files/digest-openafs-1.4.5-r1 780
 MD5 2b1177bb0e9c74ac728f673a04fd9f1b files/digest-openafs-1.4.5_pre1 810
 RMD160 7934cf4cf8278c3f14633f356869d641fe75953c files/digest-openafs-1.4.5_pre1 810
 SHA256 d8a3286fb72d4aa40b5774bcf07b365023b7fb9829f854cb27bba4ce1ecf036b files/digest-openafs-1.4.5_pre1 810
@@ -113,10 +117,3 @@ SHA256 939653221449ae2d8d76abc73b75a11e582996514fcf45f936276286b4ceea4d files/di
 MD5 5b23095ba43e763338fc70020abdcd77 files/digest-openafs-1.5.27 786
 RMD160 3e1886d85cfb1dc2a12ba4a92238386c3644974e files/digest-openafs-1.5.27 786
 SHA256 487e44efbf238a590020e11810cda3991c5cfefd372b6a3de82f9fb2de03f8de files/digest-openafs-1.5.27 786
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHRzrAkKaRLQcq0GIRAugQAKCpDVtWuObRX7j/L4gAJ+85pKE07QCgiUP7
-1FRLpf7gEO+JyAI5X0/hiKA=
-=Q9gW
------END PGP SIGNATURE-----
diff --git a/net-fs/openafs/files/digest-openafs-1.4.5-r1 b/net-fs/openafs/files/digest-openafs-1.4.5-r1
new file mode 100644
index 000000000000..bd26c6d32fc7
--- /dev/null
+++ b/net-fs/openafs/files/digest-openafs-1.4.5-r1
@@ -0,0 +1,9 @@
+MD5 358b935e773caf41266636b4b0a9910b openafs-1.4.5-doc.tar.bz2 3216392
+RMD160 5bf9a80086f1be95f86f603671e037ba695df0a3 openafs-1.4.5-doc.tar.bz2 3216392
+SHA256 3a126d31cf98d0ed1b555e35a9e68fecc10ad537220e043c0a59469c5d5da67b openafs-1.4.5-doc.tar.bz2 3216392
+MD5 fd92e736bac06668ad6151928dcc697e openafs-1.4.5-src.tar.bz2 12483615
+RMD160 baf00d0443ce113b380082b40b9b077cb4df5a17 openafs-1.4.5-src.tar.bz2 12483615
+SHA256 5c6a5f4f7f1f9e173af03a82e7394e6e588477b504ce89106b7722b9728effbe openafs-1.4.5-src.tar.bz2 12483615
+MD5 ba74f1663bc740bda8f993f54eef801f openafs-gentoo-0.14.tar.bz2 18293
+RMD160 2a7ed8a40395d402de2f972fe0f96154d811e2b6 openafs-gentoo-0.14.tar.bz2 18293
+SHA256 e27918d395d656659b6f0d288d8a4d2501bd4ca6582824b8f3bbd420b06e6f6c openafs-gentoo-0.14.tar.bz2 18293
diff --git a/net-fs/openafs/openafs-1.4.5-r1.ebuild b/net-fs/openafs/openafs-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..2582fe843510
--- /dev/null
+++ b/net-fs/openafs/openafs-1.4.5-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.5-r1.ebuild,v 1.1 2007/11/23 22:26:02 stefaan Exp $
+
+inherit flag-o-matic eutils toolchain-funcs versionator pam
+
+PATCHVER=0.14
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="http://www.openafs.org/"
+SRC_URI="http://openafs.org/dl/${PV}/${P}-src.tar.bz2
+	doc? ( http://openafs.org/dl/${PV}/${P}-doc.tar.bz2 )
+	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug kerberos pam doc"
+
+RDEPEND="~net-fs/openafs-kernel-${PV}
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )"
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+CONFDIR=${WORKDIR}/gentoo/configs
+SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	# Apply patches to apply chosen compiler settings, fix the hardcoded paths
+	# to be more FHS friendly, and the fix the incorrect typecasts for va_arg
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	sed -i 's/^[ \t]*XCFLAGS.*//' src/cf/osconf.m4
+
+	./regen.sh || die "Failed: regenerating configure script"
+}
+
+src_compile() {
+	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
+	local myconf=""
+	if use kerberos; then
+		myconf="--with-krb5-conf=$(type -p krb5-config)"
+	fi
+
+	# fix linux version at 2.6
+	AFS_SYSKVERS=26 \
+	XCFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable pam) \
+		$(use_enable debug) \
+		--enable-largefile-fileserver \
+		--enable-supergroups \
+		--disable-kernel-module \
+		${myconf} || die econf
+
+	emake -j1 all_nolibafs || die "Build failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install_nolibafs || die "Installing failed"
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam; then
+		dopammod "${D}"/usr/$(get_libdir)/pam_afs*
+		rm -f "${D}"/usr/$(get_libdir)/pam_afs*
+	fi
+
+	# compile_et collides with com_err.  Remove it from this package.
+	rm "${D}"/usr/bin/compile_et
+
+	# avoid collision with mit_krb5's version of kpasswd
+	(cd "${D}"/usr/bin; mv kpasswd kpasswd_afs)
+	use doc && (cd "${D}"/usr/share/man/man1; mv kpasswd.1 kpasswd_afs.1)
+
+	# minimal documentation
+	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB
+
+	# documentation package
+	if use doc; then
+		use pam && doman src/pam/pam_afs.5
+
+		cp -pPR doc/* "${D}"/usr/share/doc/${PF}
+	fi
+
+	# Gentoo related scripts
+	newconfd ${CONFDIR}/openafs-client openafs-client
+	newconfd ${CONFDIR}/openafs-server openafs-server
+	newinitd ${SCRIPTDIR}/openafs-client openafs-client
+	newinitd ${SCRIPTDIR}/openafs-server openafs-server
+
+	# used directories: client
+	keepdir /etc/openafs
+	keepdir /var/cache/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	# CellServDB
+	if [ ! -e "${ROOT}"etc/openafs/CellServDB ] \
+		|| grep "GCO Public CellServDB" "${ROOT}"etc/openafs/CellServDB &> /dev/null
+	then
+		cp ${CONFDIR}/CellServDB "${D}"etc/openafs
+	fi
+	# cacheinfo: use a default location cache, 200 megabyte in size
+	# (should be safe for about any root partition, the user can increase
+	# the size as required)
+	if [ ! -e "${ROOT}"etc/openafs/cacheinfo ]; then
+		echo "/afs:/var/cache/openafs:200000" > "${D}"etc/openafs/cacheinfo
+	fi
+	# ThisCell: default to "openafs.org"
+	if [ ! -e "${ROOT}"etc/openafs/ThisCell ]; then
+		echo "openafs.org" > "${D}"etc/openafs/ThisCell
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  http://www.gentoo.org/doc/en/openafs.xml"
+}