* [gentoo-commits] gentoo-x86 commit in net-fs/openafs: openafs-1.6.0_pre2.ebuild ChangeLog openafs-1.6.0_pre3.ebuild
@ 2011-03-20 9:58 Stefaan De Roeck (stefaan)
0 siblings, 0 replies; only message in thread
From: Stefaan De Roeck (stefaan) @ 2011-03-20 9:58 UTC (permalink / raw
To: gentoo-commits
stefaan 11/03/20 09:58:35
Modified: openafs-1.6.0_pre2.ebuild ChangeLog
Added: openafs-1.6.0_pre3.ebuild
Log:
Bump to openafs-1.6.0_pre3, backport one fix to pre2
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Revision Changes Path
1.2 net-fs/openafs/openafs-1.6.0_pre2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre2.ebuild?r1=1.1&r2=1.2
Index: openafs-1.6.0_pre2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openafs-1.6.0_pre2.ebuild 19 Mar 2011 13:07:05 -0000 1.1
+++ openafs-1.6.0_pre2.ebuild 20 Mar 2011 09:58:35 -0000 1.2
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre2.ebuild,v 1.1 2011/03/19 13:07:05 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre2.ebuild,v 1.2 2011/03/20 09:58:35 stefaan Exp $
EAPI="2"
-inherit flag-o-matic eutils toolchain-funcs versionator pam
+inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
MY_PV=$(delete_version_separator '_')
MY_P="${PN}-${MY_PV}"
@@ -32,7 +32,8 @@
epatch "${WORKDIR}"/gentoo/patches
# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
- sed -i '/^a/s:^:e:' regen.sh
+ sed -i 's/^\(\s*\)a/\1ea/' regen.sh
+ : # this line makes repoman ok with not calling eautoconf etc. directly
skipman=1
. regen.sh
}
1.171 net-fs/openafs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/ChangeLog?rev=1.171&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/ChangeLog?rev=1.171&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/ChangeLog?r1=1.170&r2=1.171
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- ChangeLog 19 Mar 2011 13:07:05 -0000 1.170
+++ ChangeLog 20 Mar 2011 09:58:35 -0000 1.171
@@ -1,6 +1,12 @@
# ChangeLog for net-fs/openafs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.170 2011/03/19 13:07:05 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.171 2011/03/20 09:58:35 stefaan Exp $
+
+*openafs-1.6.0_pre3 (20 Mar 2011)
+
+ 20 Mar 2011; <stefaan@gentoo.org> openafs-1.6.0_pre2.ebuild,
+ +openafs-1.6.0_pre3.ebuild:
+ Bump to openafs-1.6.0_pre3, backport one fix to pre2
*openafs-1.6.0_pre2 (19 Mar 2011)
1.1 net-fs/openafs/openafs-1.6.0_pre3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre3.ebuild?rev=1.1&content-type=text/plain
Index: openafs-1.6.0_pre3.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre3.ebuild,v 1.1 2011/03/20 09:58:35 stefaan Exp $
EAPI="2"
inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
MY_PV=$(delete_version_separator '_')
MY_P="${PN}-${MY_PV}"
S="${WORKDIR}/${MY_P}"
PVER="1"
DESCRIPTION="The OpenAFS distributed file system"
HOMEPAGE="http://www.openafs.org/"
# We always d/l the doc tarball as man pages are not USE=doc material
SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2
http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE="doc kerberos pam"
RDEPEND="~net-fs/openafs-kernel-${PV}
sys-libs/ncurses
pam? ( sys-libs/pam )
kerberos? ( virtual/krb5 )"
src_prepare() {
EPATCH_EXCLUDE="012_all_kbuild.patch" \
EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}"/gentoo/patches
# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
sed -i 's/^\(\s*\)a/\1ea/' regen.sh
: # this line makes repoman ok with not calling eautoconf etc. directly
skipman=1
. regen.sh
}
src_configure() {
# 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
AFS_SYSKVERS=26 \
XCFLAGS="${CFLAGS}" \
econf \
$(use_enable pam) \
--enable-supergroups \
--disable-kernel-module \
--disable-strip-binaries \
${myconf}
}
src_compile() {
emake all_nolibafs || die
}
src_install() {
local CONFDIR=${WORKDIR}/gentoo/configs
local SCRIPTDIR=${WORKDIR}/gentoo/scripts
emake DESTDIR="${D}" install_nolibafs || die
insinto /etc/openafs
doins src/afsd/CellServDB || die
echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
echo "openafs.org" > "${D}"/etc/openafs/ThisCell
# pam_afs and pam_afs.krb have been installed in irregular locations, fix
if use pam ; then
dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
fi
rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
# remove kdump stuff provided by kexec-tools #222455
rm -rf "${D}"/usr/sbin/kdump*
# avoid collision with mit_krb5's version of kpasswd
mv "${D}"/usr/bin/kpasswd{,_afs} || die
mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
# move lwp stuff around #200674 #330061
mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
# update paths to the relocated lwp headers
sed -ri \
-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
"${D}"/usr/include/*.h \
"${D}"/usr/include/*/*.h \
|| die
# minimal documentation
use pam && doman src/pam/pam_afs.5
dodoc "${CONFDIR}"/README src/afsd/CellServDB
# documentation package
if use doc ; then
dodoc doc/{arch,examples,pdf,protocol,txt}/*
dohtml -A xml -r doc/{html,xml}/*
fi
# Gentoo related scripts
newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
newconfd "${CONFDIR}"/openafs-client openafs-client || die
newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
newconfd "${CONFDIR}"/openafs-server openafs-server || die
# 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)
local x
for x in cacheinfo CellServDB ThisCell ; do
if [ -e "${ROOT}"/etc/openafs/${x} ] ; then
cp "${ROOT}"/etc/openafs/${x} "${D}"/etc/openafs/
fi
done
}
pkg_postinst() {
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"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-03-20 9:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-20 9:58 [gentoo-commits] gentoo-x86 commit in net-fs/openafs: openafs-1.6.0_pre2.ebuild ChangeLog openafs-1.6.0_pre3.ebuild Stefaan De Roeck (stefaan)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox