From 7abba12b8ad90ab04ee8f7603012e1eebc4243ce Mon Sep 17 00:00:00 2001 From: Stefaan De Roeck Date: Thu, 15 Feb 2007 17:48:27 +0000 Subject: Version bump for 1.5.x, remove obsolete ebuild Package-Manager: portage-2.1.2-r8 --- net-fs/openafs-kernel/ChangeLog | 8 +- .../files/digest-openafs-kernel-1.5.12 | 6 - .../files/digest-openafs-kernel-1.5.15 | 6 + net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild | 56 ---- net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild | 53 ++++ net-fs/openafs/ChangeLog | 8 +- net-fs/openafs/files/digest-openafs-1.5.12 | 9 - net-fs/openafs/files/digest-openafs-1.5.15 | 9 + net-fs/openafs/openafs-1.5.12.ebuild | 318 -------------------- net-fs/openafs/openafs-1.5.15.ebuild | 322 +++++++++++++++++++++ 10 files changed, 404 insertions(+), 391 deletions(-) delete mode 100644 net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.12 create mode 100644 net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.15 delete mode 100644 net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild create mode 100644 net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild delete mode 100644 net-fs/openafs/files/digest-openafs-1.5.12 create mode 100644 net-fs/openafs/files/digest-openafs-1.5.15 delete mode 100644 net-fs/openafs/openafs-1.5.12.ebuild create mode 100644 net-fs/openafs/openafs-1.5.15.ebuild (limited to 'net-fs') diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog index 11d3c502f21c..a3301ff7837a 100644 --- a/net-fs/openafs-kernel/ChangeLog +++ b/net-fs/openafs-kernel/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/openafs-kernel # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.55 2007/02/15 15:44:04 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.56 2007/02/15 17:47:48 stefaan Exp $ + +*openafs-kernel-1.5.15 (15 Feb 2007) + + 15 Feb 2007; Stefaan De Roeck + -openafs-kernel-1.5.12.ebuild, +openafs-kernel-1.5.15.ebuild: + Version bump for 1.5.x, remove obsolete ebuild *openafs-kernel-1.4.3_rc2 (15 Feb 2007) diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.12 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.12 deleted file mode 100644 index fc46b729ec58..000000000000 --- a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.12 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 636e80d5c60a5ed10477b4085af452a3 openafs-1.5.12-src.tar.bz2 13090135 -RMD160 a778da90c28b71187b6af262909eb01ae8e1d720 openafs-1.5.12-src.tar.bz2 13090135 -SHA256 7c9af7b47b8a23824c6b0ebe6bc2cbfb9405e17d238a96212555c702c564f2b1 openafs-1.5.12-src.tar.bz2 13090135 -MD5 f3407a8924b2690e8774d8f1d6c11a5a openafs-gentoo-0.10.tar.bz2 16807 -RMD160 cf7c3e16387dbc274140e0f96b25a2a749e87b45 openafs-gentoo-0.10.tar.bz2 16807 -SHA256 d462f3168610d73153f20eb37057f7f8607d95c56342a5f1de8c984174300a6d openafs-gentoo-0.10.tar.bz2 16807 diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.15 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.15 new file mode 100644 index 000000000000..78a3c13556ee --- /dev/null +++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.5.15 @@ -0,0 +1,6 @@ +MD5 90eb3e6ead60dbad000c4358dc3f3334 openafs-1.5.15-src.tar.bz2 12962614 +RMD160 c93c92978c37b02d67396cea2320991eb1fdbb91 openafs-1.5.15-src.tar.bz2 12962614 +SHA256 1ae53aa1e04aa491c0e18883d2a884fe6575ae325b22b49efced419be962e9f1 openafs-1.5.15-src.tar.bz2 12962614 +MD5 7df64c331d40c0206e7ed4c707971efe openafs-gentoo-0.12.tar.bz2 16630 +RMD160 fdc543c1e4318e1685a1f785c615e89d7bbd9b89 openafs-gentoo-0.12.tar.bz2 16630 +SHA256 d5b832b938c18d1ed22f4c7353139f86d1c4c750f8a8713128c51cc193be6adb openafs-gentoo-0.12.tar.bz2 16630 diff --git a/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild deleted file mode 100644 index c523f4a18674..000000000000 --- a/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.5.12.ebuild,v 1.2 2006/12/22 14:52:24 stefaan Exp $ - -inherit eutils linux-mod versionator toolchain-funcs - -PATCHVER=0.10 -MY_PN=${PN/-kernel} -MY_P=${MY_PN}-${PV} -S=${WORKDIR}/${MY_P} -DESCRIPTION="The OpenAFS distributed file system kernel module" -HOMEPAGE="http://www.openafs.org/" -SRC_URI="http://openafs.org/dl/${MY_PN}/${PV}/${MY_P}-src.tar.bz2 - mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2" - -LICENSE="IPL-1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86" -IUSE="" - -PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2) - -CONFIG_CHECK="!DEBUG_RODATA" -DEBUG_RODATA_ERROR="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option" - -pkg_setup() { - linux-mod_pkg_setup -} - -src_unpack() { - unpack ${A}; cd ${S} - - EPATCH_SUFFIX="patch" epatch ${PATCHDIR} - - # fix unresolved symbol on amd64 (bug #149274) - epatch ${FILESDIR}/tasklist_lock_1.5.12.patch - - ./regen.sh || die "Failed: regenerating configure script" -} - -src_compile() { - ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf" - - ARCH="$(tc-arch-kernel)" make only_libafs || die "Failed: make" -} - -src_install() { - MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*) - [ -f ${MOD_SRCDIR}/libafs.${KV_OBJ} ] \ - || die "Couldn't find compiled kernel module" - - MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR) afspag(fs/openafs:$MOD_SRCDIR)' - - linux-mod_src_install -} - diff --git a/net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild new file mode 100644 index 000000000000..7fa19d27dc70 --- /dev/null +++ b/net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.5.15.ebuild,v 1.1 2007/02/15 17:47:48 stefaan Exp $ + +inherit eutils linux-mod versionator toolchain-funcs + +PATCHVER=0.12 +MY_PN=${PN/-kernel} +MY_P=${MY_PN}-${PV} +S=${WORKDIR}/${MY_P} +DESCRIPTION="The OpenAFS distributed file system kernel module" +HOMEPAGE="http://www.openafs.org/" +SRC_URI="http://openafs.org/dl/${MY_PN}/${PV}/${MY_P}-src.tar.bz2 + mirror://gentoo/${MY_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="" + +PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2) + +CONFIG_CHECK="!DEBUG_RODATA" +DEBUG_RODATA_ERROR="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option" + +pkg_setup() { + linux-mod_pkg_setup +} + +src_unpack() { + unpack ${A}; cd ${S} + + EPATCH_SUFFIX="patch" epatch ${PATCHDIR} + + ./regen.sh || die "Failed: regenerating configure script" +} + +src_compile() { + ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf" + + ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake" +} + +src_install() { + MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*) + [ -f ${MOD_SRCDIR}/libafs.${KV_OBJ} ] \ + || die "Couldn't find compiled kernel module" + + MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR) afspag(fs/openafs:$MOD_SRCDIR)' + + linux-mod_src_install +} + diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog index 8da4eeaf60d4..b969fb710034 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.96 2007/02/15 15:45:45 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.97 2007/02/15 17:48:27 stefaan Exp $ + +*openafs-1.5.15 (15 Feb 2007) + + 15 Feb 2007; Stefaan De Roeck -openafs-1.5.12.ebuild, + +openafs-1.5.15.ebuild: + Version bump for 1.5.x, remove obsolete ebuild *openafs-1.4.3_rc2 (15 Feb 2007) diff --git a/net-fs/openafs/files/digest-openafs-1.5.12 b/net-fs/openafs/files/digest-openafs-1.5.12 deleted file mode 100644 index 6eb15850829e..000000000000 --- a/net-fs/openafs/files/digest-openafs-1.5.12 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 675c5f5f80f96ff09af3409b1727b6e5 openafs-1.5.12-doc.tar.bz2 3083685 -RMD160 76608ea4b0d139beb0f33b071180c78a4de9e5d9 openafs-1.5.12-doc.tar.bz2 3083685 -SHA256 f178d08af3aab9211ea551876d7ba9a68b6ff0a6d82b82d5ef2fb798f18a50b2 openafs-1.5.12-doc.tar.bz2 3083685 -MD5 636e80d5c60a5ed10477b4085af452a3 openafs-1.5.12-src.tar.bz2 13090135 -RMD160 a778da90c28b71187b6af262909eb01ae8e1d720 openafs-1.5.12-src.tar.bz2 13090135 -SHA256 7c9af7b47b8a23824c6b0ebe6bc2cbfb9405e17d238a96212555c702c564f2b1 openafs-1.5.12-src.tar.bz2 13090135 -MD5 f3407a8924b2690e8774d8f1d6c11a5a openafs-gentoo-0.10.tar.bz2 16807 -RMD160 cf7c3e16387dbc274140e0f96b25a2a749e87b45 openafs-gentoo-0.10.tar.bz2 16807 -SHA256 d462f3168610d73153f20eb37057f7f8607d95c56342a5f1de8c984174300a6d openafs-gentoo-0.10.tar.bz2 16807 diff --git a/net-fs/openafs/files/digest-openafs-1.5.15 b/net-fs/openafs/files/digest-openafs-1.5.15 new file mode 100644 index 000000000000..b2cacb5d20d4 --- /dev/null +++ b/net-fs/openafs/files/digest-openafs-1.5.15 @@ -0,0 +1,9 @@ +MD5 c6383da882d4321036dc5bc1d6a9e50a openafs-1.5.15-doc.tar.bz2 3084560 +RMD160 073195d2954cfe991c1bea41f4d883b75dc5c67e openafs-1.5.15-doc.tar.bz2 3084560 +SHA256 393713381cee8438eaead0269c47ea4358c17d1bea9dff5c21d196f6cd84fe6c openafs-1.5.15-doc.tar.bz2 3084560 +MD5 90eb3e6ead60dbad000c4358dc3f3334 openafs-1.5.15-src.tar.bz2 12962614 +RMD160 c93c92978c37b02d67396cea2320991eb1fdbb91 openafs-1.5.15-src.tar.bz2 12962614 +SHA256 1ae53aa1e04aa491c0e18883d2a884fe6575ae325b22b49efced419be962e9f1 openafs-1.5.15-src.tar.bz2 12962614 +MD5 7df64c331d40c0206e7ed4c707971efe openafs-gentoo-0.12.tar.bz2 16630 +RMD160 fdc543c1e4318e1685a1f785c615e89d7bbd9b89 openafs-gentoo-0.12.tar.bz2 16630 +SHA256 d5b832b938c18d1ed22f4c7353139f86d1c4c750f8a8713128c51cc193be6adb openafs-gentoo-0.12.tar.bz2 16630 diff --git a/net-fs/openafs/openafs-1.5.12.ebuild b/net-fs/openafs/openafs-1.5.12.ebuild deleted file mode 100644 index a3fbad2edd56..000000000000 --- a/net-fs/openafs/openafs-1.5.12.ebuild +++ /dev/null @@ -1,318 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.12.ebuild,v 1.1 2006/12/03 08:17:44 stefaan Exp $ - -inherit flag-o-matic eutils toolchain-funcs versionator - -PATCHVER=0.10 -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="IPL-1" -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 - mv ${D}/usr/bin/kpasswd ${D}/usr/bin/kpasswd_afs - mv src/man/kpasswd.1 src/man/kpasswd_afs.1 - - # install manuals - doman src/man/*.? - - use kerberos && doman src/aklog/aklog.1 - use pam && doman src/pam/pam_afs.5 - - # minimal documentation - dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB - - # documentation package - if use doc; then - 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 -} - -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 -} - diff --git a/net-fs/openafs/openafs-1.5.15.ebuild b/net-fs/openafs/openafs-1.5.15.ebuild new file mode 100644 index 000000000000..ae0dc59ffa8e --- /dev/null +++ b/net-fs/openafs/openafs-1.5.15.ebuild @@ -0,0 +1,322 @@ +# 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.5.15.ebuild,v 1.1 2007/02/15 17:48:27 stefaan Exp $ + +inherit flag-o-matic eutils linux-mod toolchain-funcs versionator + +PATCHVER=0.12 +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 + + 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 + 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 +} + -- cgit v1.2.3-65-gdbad