summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefaan De Roeck <stefaan@gentoo.org>2007-12-13 10:27:46 +0000
committerStefaan De Roeck <stefaan@gentoo.org>2007-12-13 10:27:46 +0000
commitcbb5e3e9affec0d66c634dc334f6dd2751fcace9 (patch)
treee98c7dcfe9ae19ecb52c36e964e758131389ca4b /net-fs/openafs
parentbump, reported in bug #181329 (diff)
downloadhistorical-cbb5e3e9affec0d66c634dc334f6dd2751fcace9.tar.gz
historical-cbb5e3e9affec0d66c634dc334f6dd2751fcace9.tar.bz2
historical-cbb5e3e9affec0d66c634dc334f6dd2751fcace9.zip
Remove obsolete files
Package-Manager: portage-2.1.4_rc9
Diffstat (limited to 'net-fs/openafs')
-rw-r--r--net-fs/openafs/ChangeLog6
-rw-r--r--net-fs/openafs/files/digest-openafs-1.4.4_p20070724-r112
-rw-r--r--net-fs/openafs/files/openafs-ppc64.patch29
-rw-r--r--net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild322
4 files changed, 5 insertions, 364 deletions
diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index c0f32bad6750..05d8590c5859 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,10 @@
# 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.131 2007/12/06 20:33:40 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.132 2007/12/13 10:24:47 stefaan Exp $
+
+ 13 Dec 2007; Stefaan De Roeck <stefaan@gentoo.org>
+ -files/openafs-ppc64.patch, -openafs-1.4.4_p20070724-r1.ebuild:
+ Remove obsolete files
06 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org>
openafs-1.4.5-r2.ebuild:
diff --git a/net-fs/openafs/files/digest-openafs-1.4.4_p20070724-r1 b/net-fs/openafs/files/digest-openafs-1.4.4_p20070724-r1
deleted file mode 100644
index 2051752482df..000000000000
--- a/net-fs/openafs/files/digest-openafs-1.4.4_p20070724-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 09e5fd0d92579373687391b6f0579614 openafs-1.4.4-cvs20070724.patch.bz2 86943
-RMD160 26daf5867f89691ba2cf6f578a729cae8894c646 openafs-1.4.4-cvs20070724.patch.bz2 86943
-SHA256 2fffc29f58db15f46eb7b1695744f7982ccb836b84f7964308de893d4345b724 openafs-1.4.4-cvs20070724.patch.bz2 86943
-MD5 f7cba911edd2db13694715c5df11f9c9 openafs-1.4.4-doc.tar.bz2 3082297
-RMD160 edaad28846574c0937f84d2566a8530762655cc0 openafs-1.4.4-doc.tar.bz2 3082297
-SHA256 df6cd4ba8eb04c9acc7ade99e2a4bb5d012e66474984dc4b79f360ddc474a752 openafs-1.4.4-doc.tar.bz2 3082297
-MD5 59cd499c6bf337b1f2215f83a7404794 openafs-1.4.4-src.tar.bz2 12500224
-RMD160 712907afc74ced010996dd43f785b341ac24da46 openafs-1.4.4-src.tar.bz2 12500224
-SHA256 a417c4d5eab6cf68c6082b6bd93d7ca70410635794308b731269b246ba80f7e4 openafs-1.4.4-src.tar.bz2 12500224
-MD5 9c7119b44628c1f0a7b251e096e94d16 openafs-gentoo-0.13.tar.bz2 16814
-RMD160 98bd851081bcdccec87b50139e7bd9e52663c12b openafs-gentoo-0.13.tar.bz2 16814
-SHA256 a39c0c9656a82e586bff7bd9543d8ccd175991777d68c7fe47de1c724cbe19f2 openafs-gentoo-0.13.tar.bz2 16814
diff --git a/net-fs/openafs/files/openafs-ppc64.patch b/net-fs/openafs/files/openafs-ppc64.patch
deleted file mode 100644
index ae444e52a90f..000000000000
--- a/net-fs/openafs/files/openafs-ppc64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/afs/afs_call.c.old 2007-09-09 14:38:44.000000000 +0400
-+++ src/afs/afs_call.c 2007-09-09 14:50:18.460222354 +0400
-@@ -1340,7 +1340,11 @@ copyin_iparam(caddr_t cmarg, struct ipar
- if (current->thread.flags & THREAD_IA32)
-
- #elif defined(AFS_PPC64_LINUX26_ENV)
-- if (current->thread_info->flags & _TIF_32BIT)
-+#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
-+ if (current->thread_info->flags & _TIF_32BIT)
-+#else
-+ if (current_thread_info()->flags & _TIF_32BIT)
-+#endif
- #elif defined(AFS_PPC64_LINUX20_ENV)
- if (current->thread.flags & PPC_FLAG_32BIT)
-
---- src/afs/afs_pioctl.c.bak 2007-09-18 01:12:03.000000000 -0400
-+++ src/afs/afs_pioctl.c 2007-09-18 01:12:40.000000000 -0400
-@@ -284,7 +284,11 @@
- if (current->thread.flags & THREAD_IA32)
-
- #elif defined(AFS_PPC64_LINUX26_ENV)
-+#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
- if (current->thread_info->flags & _TIF_32BIT)
-+#else
-+ if (current_thread_info()->flags & _TIF_32BIT)
-+#endif
- #elif defined(AFS_PPC64_LINUX20_ENV)
- if (current->thread.flags & PPC_FLAG_32BIT)
-
diff --git a/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild b/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild
deleted file mode 100644
index 6c641c53b866..000000000000
--- a/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild
+++ /dev/null
@@ -1,322 +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.4_p20070724-r1.ebuild,v 1.5 2007/10/02 14:19:11 stefaan Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs versionator pam
-
-PATCHVER=0.13
-MY_PV_DATE=${PV#*_p}
-MY_PV=${PV%_p*}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PN}/${MY_PV}/${MY_P}-src.tar.bz2
- doc? ( http://openafs.org/dl/${PN}/${MY_PV}/${MY_P}-doc.tar.bz2 )
- mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2
- mirror://gentoo/${PN}-${MY_PV}-cvs${MY_PV_DATE}.patch.bz2"
-
-LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="alpha ~amd64 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
-
- epatch ${DISTDIR}/${MY_P}-cvs${MY_PV_DATE}.patch.bz2
-
- epatch ${FILESDIR}/openafs-ppc64.patch
-
- ./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
-
- ARCH="$(tc-arch-kernel)" \
- XCFLAGS="${CFLAGS}" \
- econf \
- $(use_enable pam) \
- $(use_enable debug) \
- --enable-largefile-fileserver \
- --enable-supergroups \
- --with-linux-kernel-headers=${KV_DIR} \
- ${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 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 ${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"
-
- epause 5
-}