More prototyping, fix bug #158537

(Portage version: 2.1.2_rc4-r6)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 340 deletions

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 6c8912f87049..cb8ebb0cf72c 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -14,6 +14,10 @@ AUX afs.rc.rc6 5429 RMD160 554ea311be3b965f58c22760f7bd68583dfa0330 SHA1 b13da50
 MD5 4f3ec773401fff6eeeacd14345ba89c1 files/afs.rc.rc6 5429
 RMD160 554ea311be3b965f58c22760f7bd68583dfa0330 files/afs.rc.rc6 5429
 SHA256 756550b022ee2cf1ac771a495a9073b4bc5be505f8169e079264d722d9628453 files/afs.rc.rc6 5429
+AUX fs-fix.patch 252 RMD160 39174e59993590904612dda53c31e68f6cd65ea3 SHA1 5e0d0866c1c8604520c145b57f50f9e853f4da26 SHA256 6360ff8f45255782c92fd7de8556045f6e9015101055340e908a102457c55d78
+MD5 2f1ad826108697542a7283c94a51fba5 files/fs-fix.patch 252
+RMD160 39174e59993590904612dda53c31e68f6cd65ea3 files/fs-fix.patch 252
+SHA256 6360ff8f45255782c92fd7de8556045f6e9015101055340e908a102457c55d78 files/fs-fix.patch 252
 AUX openafs-pinstall-execve-1.2.10.patch 1242 RMD160 51ed3ebe3c36a39a7c2e367c92bc78d325dfc244 SHA1 0d7df693321ff8d6fbcf16265a336d778977ffec SHA256 9c7168d077dcf3a539b34cd9fb234097ba8a5896511967f075616e65d464f84c
 MD5 36dc33d8c6e647e8aacf8e69849a28a3 files/openafs-pinstall-execve-1.2.10.patch 1242
 RMD160 51ed3ebe3c36a39a7c2e367c92bc78d325dfc244 files/openafs-pinstall-execve-1.2.10.patch 1242
@@ -49,18 +53,18 @@ EBUILD openafs-1.4.2.ebuild 9991 RMD160 4c199360eb2b3df0d84b8aeabcc050a2086afeff
 MD5 3b8a4cc61776499701adef60a472d09d openafs-1.4.2.ebuild 9991
 RMD160 4c199360eb2b3df0d84b8aeabcc050a2086afeff openafs-1.4.2.ebuild 9991
 SHA256 c1045252b0c76ee1a8f59a00e874ea8d6613c1e8ab248843812e5cb74683c38c openafs-1.4.2.ebuild 9991
-EBUILD openafs-1.4.3_pre20061220.ebuild 10125 RMD160 a10f9354b816dbf5fdb11153c5830d33c7543984 SHA1 312ee5698fe53e88239378c0a5c0a8261aa4045e SHA256 46891953887d8bb8e68bd644502209c13409ea5413b8f577a5c853bd906250fb
-MD5 e92546dc74a9639d9a5bfe7aa505ad85 openafs-1.4.3_pre20061220.ebuild 10125
-RMD160 a10f9354b816dbf5fdb11153c5830d33c7543984 openafs-1.4.3_pre20061220.ebuild 10125
-SHA256 46891953887d8bb8e68bd644502209c13409ea5413b8f577a5c853bd906250fb openafs-1.4.3_pre20061220.ebuild 10125
+EBUILD openafs-1.4.3_pre20061220-r1.ebuild 10162 RMD160 a8acf3f51d06c3c77a83e8ec82e40242bf2889a3 SHA1 045b99bfd10f496feffbbdcebb7ee4e419030e53 SHA256 a10c76da2cf8affbdae21b705f9fcc75081979ac24e913c02a8ad7e17177d6b2
+MD5 a109565e6a231d83693ff08751c9139b openafs-1.4.3_pre20061220-r1.ebuild 10162
+RMD160 a8acf3f51d06c3c77a83e8ec82e40242bf2889a3 openafs-1.4.3_pre20061220-r1.ebuild 10162
+SHA256 a10c76da2cf8affbdae21b705f9fcc75081979ac24e913c02a8ad7e17177d6b2 openafs-1.4.3_pre20061220-r1.ebuild 10162
 EBUILD openafs-1.5.12.ebuild 10014 RMD160 f42d8aa5f3bc498801c0081b5e743a6a2f2e84d3 SHA1 a024a8102ae99678e5e2d3680556bd5c951eca0b SHA256 ecd85eec7e3f7e0ce07ba80ef3b6b8de1abe97491e3c93d6a05c2f5fc733e976
 MD5 5c4358e48da34cdd5077f76189418089 openafs-1.5.12.ebuild 10014
 RMD160 f42d8aa5f3bc498801c0081b5e743a6a2f2e84d3 openafs-1.5.12.ebuild 10014
 SHA256 ecd85eec7e3f7e0ce07ba80ef3b6b8de1abe97491e3c93d6a05c2f5fc733e976 openafs-1.5.12.ebuild 10014
-MISC ChangeLog 14669 RMD160 2571b5bee851e1d2922b35cb0d1bd93ea15fd745 SHA1 6f18339f17787a4192be33a4ae7e5eb58642fde5 SHA256 8b251dd8bff9b7f5bbce00b65f08b722f726ecc0187a77113e12c2f33b30cc72
-MD5 2f3d01640612ed66561e65669d600eb6 ChangeLog 14669
-RMD160 2571b5bee851e1d2922b35cb0d1bd93ea15fd745 ChangeLog 14669
-SHA256 8b251dd8bff9b7f5bbce00b65f08b722f726ecc0187a77113e12c2f33b30cc72 ChangeLog 14669
+MISC ChangeLog 14900 RMD160 ef76c5374fd82fd610955d8d1b25f9c9508d15f2 SHA1 0662895b5c6e71c50c79c57ef6a3292eb6dfa83f SHA256 bbc729ffc98e9649cc0c127c7ed2be3f3e853bad73a1c5d9460a0ed60d717d3d
+MD5 98e604b14770029e01b0c5f485e11367 ChangeLog 14900
+RMD160 ef76c5374fd82fd610955d8d1b25f9c9508d15f2 ChangeLog 14900
+SHA256 bbc729ffc98e9649cc0c127c7ed2be3f3e853bad73a1c5d9460a0ed60d717d3d ChangeLog 14900
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
 MD5 833551f00cc2163ac7f9eb367ee9caa8 metadata.xml 254
 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 metadata.xml 254
@@ -77,9 +81,9 @@ SHA256 1d1ba88647dd37aba651a5f2a2d8f9effefa0ec562c04d7abedb3e3f22c0ddd4 files/di
 MD5 79fab24eda891b8c4c6bbdaff79ba1f0 files/digest-openafs-1.4.2 777
 RMD160 c2a4e300bc51a9756e61a09e20a1934785c2944e files/digest-openafs-1.4.2 777
 SHA256 3bf6b95a5d6dacc94cf3812ab58cda86e8fb7c18610ea0245732feb38dd5e507 files/digest-openafs-1.4.2 777
-MD5 95455215251d3d54622d770b5a710b9c files/digest-openafs-1.4.3_pre20061220 852
-RMD160 d2488e9815c2fbc3dbc01650d1d461ee25f538f8 files/digest-openafs-1.4.3_pre20061220 852
-SHA256 f82a6c0348ef90bdb72ac3a2699a22f7aac89b84f8c2aa012553870a055f5ecc files/digest-openafs-1.4.3_pre20061220 852
+MD5 95455215251d3d54622d770b5a710b9c files/digest-openafs-1.4.3_pre20061220-r1 852
+RMD160 d2488e9815c2fbc3dbc01650d1d461ee25f538f8 files/digest-openafs-1.4.3_pre20061220-r1 852
+SHA256 f82a6c0348ef90bdb72ac3a2699a22f7aac89b84f8c2aa012553870a055f5ecc files/digest-openafs-1.4.3_pre20061220-r1 852
 MD5 e11c7fa7a3b44f3e459a87629b30b800 files/digest-openafs-1.5.12 786
 RMD160 23e3ba9fcd783d2a4403500e63a97cc983a3dabd files/digest-openafs-1.5.12 786
 SHA256 738266f983b73cf832b311c13cbb46a5b1e0db2078c04f65727c53cf790390c1 files/digest-openafs-1.5.12 786
diff --git a/net-fs/openafs/files/digest-openafs-1.4.3_pre20061220 b/net-fs/openafs/files/digest-openafs-1.4.3_pre20061220
deleted file mode 100644
index 4dd5339d84be..000000000000
--- a/net-fs/openafs/files/digest-openafs-1.4.3_pre20061220
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 c8332936ad31f7bb745d6edc16b60106 openafs-1.4.3_pre20061220-doc.tar.bz2 2809222
-RMD160 5d3c62b4e220c05affc0c3ac1c8396297395c2a5 openafs-1.4.3_pre20061220-doc.tar.bz2 2809222
-SHA256 1a49c14962958083473071209acb8c3e45f00831e76d6bcaf697f33d2965b3da openafs-1.4.3_pre20061220-doc.tar.bz2 2809222
-MD5 34678c9ca855eef88f5331f8ee49d513 openafs-1.4.3_pre20061220-src.tar.bz2 12424132
-RMD160 2cd3ded3ff60a5dea7e8f5ec747ad2e0d8247c1e openafs-1.4.3_pre20061220-src.tar.bz2 12424132
-SHA256 4463d09c6f8c460238afedd4c48df4b521ceea55978158501e84117873909dcd openafs-1.4.3_pre20061220-src.tar.bz2 12424132
-MD5 9505e98e7d7b45115250921f4d4ee30c openafs-gentoo-0.11.tar.bz2 16805
-RMD160 36436aaef5a1ebf0131a5f386424fb4ea0223f3c openafs-gentoo-0.11.tar.bz2 16805
-SHA256 39a9b12a7ea67855911098322e16110b6074442230bc4991d21ad426017e4666 openafs-gentoo-0.11.tar.bz2 16805
diff --git a/net-fs/openafs/openafs-1.4.3_pre20061220.ebuild b/net-fs/openafs/openafs-1.4.3_pre20061220.ebuild
deleted file mode 100644
index fc78378ee0d8..000000000000
--- a/net-fs/openafs/openafs-1.4.3_pre20061220.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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.3_pre20061220.ebuild,v 1.2 2007/01/04 20:51:41 stefaan Exp $
-
-inherit flag-o-matic eutils toolchain-funcs versionator
-
-PATCHVER=0.11
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PN}/${PV}/${P}-src.tar.bz2
-	doc? ( http://openafs.org/dl/${PN}/${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 ~ia64 ~ppc ~ppc64 ~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
-
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		$(use_enable debug) \
-		--enable-largefile-fileserver \
-		--enable-supergroups \
-		${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
-		dodir /$(get_libdir)/security
-		mv ${D}/usr/$(get_libdir)/pam_afs* ${D}/$(get_libdir)/security
-	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 doc/man-pages/man1; mv kpasswd.1 kpasswd_afs.1)
-
-	# minimal documentation
-	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB
-
-	# documentation package
-	if use doc; then
-		# install manuals
-		doman doc/man-pages/man?/*.?
-
-		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
-}
-
-migrate_to_fhs() {
-	# conventions:
-	# only automatically migrate if the destination directories are
-	# as of yet non-existant
-
-	# path translations
-	local oldafsconfdir=${ROOT}usr/afs/etc
-	local newafsconfdir=${ROOT}etc/openafs/server
-	local oldviceetcdir=${ROOT}usr/vice/etc
-	local newviceetcdir=${ROOT}etc/openafs
-	local oldafslocaldir=${ROOT}usr/afs/local
-	local newafslocaldir=${ROOT}var/lib/openafs
-	local oldafsdbdir=${ROOT}usr/afs/db
-	local newafsdbdir=${ROOT}var/lib/openafs/db
-
-	# detect Transarc afsconfdir
-	local afsconfdir=0
-	[ ! -L ${oldafsconfdir} -a -d ${oldafsconfdir} -a ! -e ${newafsconfdir} ] && afsconfdir=1
-
-	# detect Transarc viceetcdir
-	local viceetcdir=0
-	local viceetcsoftlink=0
-	if [ -d ${oldviceetcdir} -a ! -e ${newviceetcdir} ]; then
-		if [ ! -L ${oldviceetcdir} ]; then
-			viceetcdir=1
-		else
-			if [ $(readlink ${oldviceetcdir}) = /etc/afs ]; then
-				viceetcdir=1
-				viceetcsoftlink=1
-			fi
-		fi
-	fi
-
-	# detect Transarc afslocaldir
-	local afslocaldir=0
-	[ ! -L ${oldafslocaldir} -a -d ${oldafslocaldir} -a ! -e ${newafslocaldir} ] && afslocaldir=1
-
-	# detect Transarc afsdbdir
-	local afsdbdir=0
-	[ ! -L ${oldafsdbdir} -a -d ${oldafsdbdir} -a ! -e ${newafsdbdir} ] && afsdbdir=1
-
-	# detect Transarc afsbosconfigdir
-	local afsbosconfigdir=0
-	[ ${afslocaldir} = 1 -a -f ${oldafslocaldir}/BosConfig ] && afsbosconfigdir=1
-
-	# any of these?
-	local any=$((${afsconfdir}+${viceetcdir}+${afsdbdir}+${afslocaldir}))
-
-	# No migration needed?  Then bail out
-	if [ ${any} = 0 ]; then
-		return 0
-	fi
-
-	# Root not / ?  Then do not attempt automatic migration
-	if [ "$ROOT" != "/" ]; then
-		ewarn Old-style configuration files found, but not migrating
-		ewarn because installation rootdir is not /
-		ebeep 5
-		return 0
-	fi
-
-	# detect whether an installation with old config files is running
-	local pid
-	if pid=$(pgrep -n -U 0 bosserver) &>/dev/null; then
-		# find location of executable
-		if ! executable=$(readlink /proc/${pid}/exe); then
-			die "Couldn't execute readlink on bosserver process"
-		fi
-		# if executable is not located in /usr/sbin, assume Transarc locations
-		if [[ $executable != ${ROOT}usr/sbin/* ]]; then
-			ewarn "Found a running process with the name \"bosserver\" and pid ${pid}"
-			ewarn "that is not located in /usr/sbin.  This suggests a running"
-			ewarn "OpenAFS-server with traditional TransARC path conventions."
-			ewarn "This installation procedure aims to migrate old"
-			ewarn "configuration files to new FHS-conform locations."
-			ewarn "Please stop the running server and reattempt the upgrade"
-			die "Installation aborted because of running OpenAFS server"
-		fi
-	fi
-
-	# warn about migration
-	ewarn
-	ewarn "OpenAFS configuration/data-files have been found in old"
-	ewarn "TransARC-style locations, for which the standard FHS equivalents"
-	ewarn "do not exist yet.  "
-	ewarn "Following procedure will copy those files to the new locations such"
-	ewarn "that, given a previously working configuration, both server"
-	ewarn "and client should restart without problems.  Files will be copied"
-	ewarn "only, and not removed from the old locations.  For assistance"
-	ewarn "in removing the old files, consult the section on Upgrading in"
-	ewarn "the Gentoo OpenAFS documentation"
-	ewarn "(see http://www.gentoo.org/doc/en/openafs.xml)"
-	ewarn "Will continue in 30 seconds, press Ctrl-C to abort"
-	ewarn
-	ebeep 10
-	epause 20
-
-	# fortunately, there's no overlap between the old locations and the new ones
-
-	# afsconfdir: migrate /usr/afs/etc to /etc/openafs/server
-	if [ ${afsconfdir} = 1 ]; then
-		mkdir -m 755 -p ${newafsconfdir}
-		cp ${oldafsconfdir}/* ${newafsconfdir}
-	fi
-
-	# viceetcdir: migrate /usr/vice/etc (likely a link to /etc/afs) to /etc/openafs
-	if [ ${viceetcdir} = 1 ]; then
-		mkdir -m 755 -p ${newviceetcdir}
-		cp ${oldviceetcdir}/* ${newviceetcdir}
-	fi
-
-	# afslocaldir: migrate /usr/afs/local to /var/lib/openafs
-	if [ ${afslocaldir} = 1 ]; then
-		mkdir -m 700 -p ${newafslocaldir}
-		cp ${oldafslocaldir}/* ${newafslocaldir}
-
-		# afsbosconfigdir: migrate /usr/afs/local/BosConfig to /etc/openafs/BosConfig
-		if [ ${afsbosconfigdir} = 1 ]; then
-			sed -i \
-				-e 's:/usr/afs/bin/:/usr/libexec/openafs/:g' \
-				-e 's:/usr/afs/etc:/etc/openafs/server:g' \
-				-e 's:/usr/afs/bin:/usr/bin:g' \
-				${newafslocaldir}/BosConfig
-			if [ -d ${newviceetcdir} ]; then
-				mv ${newafslocaldir}/BosConfig ${newviceetcdir}
-			else
-				ewarn
-				ewarn "No ${newviceetcdir} found, couldn't move BosConfig there,"
-				ewarn "it will remain in ${newafslocaldir}.  Please investigate"
-				ewarn "before attempting to start the server"
-				ewarn
-				ebeep 3
-			fi
-		fi
-	fi
-
-	# afsdbdir: migrate /usr/afs/db to /var/lib/openafs/db
-	if [ ${afsdbdir} = 1 ]; then
-		mkdir -m 700 -p ${newafsdbdir}
-		cp ${oldafsdbdir}/* ${newafsdbdir}
-	fi
-
-	ewarn "Migration finished"
-	ewarn "Please remember to manually migrate disk-cache (if present)"
-	ewarn "Alter /etc/openafs/cacheinfo to do so"
-	ebeep 5
-}
-
-migrate_configfile() {
-	local oldconfigfile=${ROOT}etc/conf.d/afs
-	local oldconfigfile2=${ROOT}etc/conf.d/afs-client
-	local newconfigfile=${ROOT}etc/conf.d/openafs-client
-
-	if [ -f ${oldconfigfile} -a ! -e ${newconfigfile} ]; then
-		cp ${oldconfigfile} ${newconfigfile}
-	elif [ -f ${oldconfigfile2} -a ! -e ${newconfigfile} ]; then
-		cp ${oldconfigfile2} ${newconfigfile}
-	fi
-
-	oldconfigfile=${ROOT}etc/conf.d/afs-server
-	newconfigfile=${ROOT}etc/conf.d/openafs-server
-	if [ -f ${oldconfigfile} -a ! -e ${newconfigfile} ]; then
-		cp ${oldconfigfile} ${newconfigfile}
-	fi
-}
-
-pkg_preinst() {
-	migrate_to_fhs
-	migrate_configfile
-
-	## 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 ${IMAGE}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" > ${IMAGE}etc/openafs/cacheinfo
-	fi
-	# ThisCell: default to "openafs.org"
-	if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-		echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
-	fi
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "If you are upgrading from a < 1.4.0_rc8 version of the ebuild,"
-	einfo "we urge you to look at the upgrade-section of the"
-	einfo "Gentoo OpenAFS documentation.  (If you're upgrading from"
-	einfo "< 1.3.85, then you really really should)"
-
-	ebeep 5
-
-	einfo ""
-	einfo "This installation should work out of the box (at least the"
-	einfo "client part doing global afs-cell browsing, unless you had"
-	einfo "a previous and different configuration).  If you want to"
-	einfo "set up your own cell or modify the standard config,"
-	einfo "please have a look at the Gentoo OpenAFS documentation"
-	einfo "(warning: it is not yet up to date wrt the new file locations)"
-	einfo ""
-	einfo "The documentation can be found at:"
-	einfo "  http://www.gentoo.org/doc/en/openafs.xml"
-
-	epause 5
-}
-