Version bump to 1.6.5. Fixes bug #478498 which fixes security bug #478296, security bug #478282, bug #472184, bug #469992, bug #463477 and bug #460494. Proxied commit for Andrej Filipcic. Drop autotools eclass because none of its functions are used.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 175 insertions, 20 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 04bdcd8bb98d..9533c1d90b63 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.193 2013/04/13 14:21:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.194 2013/08/27 08:15:30 tomwij Exp $
+
+*openafs-1.6.5 (27 Aug 2013)
+
+  27 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +openafs-1.6.5.ebuild:
+  Version bump to 1.6.5. Fixes bug #478498 which fixes security bug #478296,
+  security bug #478282, bug #472184, bug #469992, bug #463477 and bug #460494.
+  Proxied commit for Andrej Filipcic.
 
   13 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -openafs-1.4.14.1-r1.ebuild,
   -openafs-1.4.14.1.ebuild, -openafs-1.6.1-r2.ebuild, -openafs-1.6.1-r3.ebuild,
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index ea48819e655a..92418c258717 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST openafs-1.6.2-doc.tar.bz2 3483994 SHA256 3b1fecde4cea104d62fde9d4ac78bc4f28c64bc2c4f527bfefd27789facaae1e SHA512 0fcee6fbc46f4df53f8abd875346e9a52bb07d539096b666a06c99b9194800eb44ef2358a8637c94154545fb2f7719ecf8a410c6fb6020b97bbb8d231b31a7a4 WHIRLPOOL d30a1b371ddaa88531d6f5ceccff9f80b23b9ddf4538be794772eb5b7e91044757fcb0ccbd1a7f4b05d60b37bde351319d676901eb5198f04fb12b37b4f575ba
 DIST openafs-1.6.2-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
 DIST openafs-1.6.2-src.tar.bz2 14378378 SHA256 0db0877cd42131a744472ad0abfa26a4402a5bad94adb4d1eada75c8b6895bc9 SHA512 769b82d4ba8fe391f7dacc1f422d0bca564450ee3e05da34296aa461fecab825956e2bea4849af65af8592ffe50853e725ee0a700c1afaea67652adf8a93c01c WHIRLPOOL 61947ee3f0e3d7107f3611add14bd90ca1f5744986f75a92a28f6ccda8936f16441ec819640eebbd0cfaffaaa716c3077980b28512a84e9be770a4320a19997a
-EBUILD openafs-1.6.2.ebuild 4429 SHA256 96298b596776e7aad68e20afbc2201e114c6d2c5ea7438e5c94dc21b35463895 SHA512 3e9cf36e0e3571724f90dacd57bb8dae43e81c24f4fa2b8a608ef07b66873b49beac09741015194a872dba3a3dfdc9e6b6d3d0b406208204c213539629fe36a5 WHIRLPOOL 2edd6de52d5830616a9ba05d945a65d080bdf4a8ee1ed16e7c2a9e99f6ac683be1768c4387e8bf7fab8f7dfdc3c8a4687dcc6daf44f0147685de57dc5af2d060
-MISC ChangeLog 31021 SHA256 a346b85f7ff51b0872a213cd76b5d5199432b4006c46c1d7456a1de1847c01bd SHA512 6bb89cc1618396471d163cbfb0df90bf7277d3b686b91cb00a73637cc9804b782c1ad5ddeb058e54c72455c1184e6a3a032a2276a507c809beeb8dcf43e644e9 WHIRLPOOL 6baf75762e07e9873e98bfe21224a40c47cfef244b9c18cdfa7d73417760bd9ee8f6b6790afd423512669edd943ff9efd3f1fb657b5edf0ab4b24e37d9956e11
+DIST openafs-1.6.5-doc.tar.bz2 3488188 SHA256 754ce1fd1c3b9026883453d5cde1705452568f4e54e86fbf02a75debf8f57f2f SHA512 e58ebf61970dcf083cb8b5f6ae43930e3f0f680df0dfafaa852a5cf44bcaa47fefe3ee3a62d2e73a4f484314e4e09669e049d939a69dcf0d5b3aec5e0c31b34a WHIRLPOOL 6b3c9a0262d0bbd2c603451990ddf98c92f8bc3ade69eb6ac289c9d0dcfad7b78b0ee6d311efe5810f006640f5eeb8b3ef508f28da95b892187aceba400dfbf0
+DIST openafs-1.6.5-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
+DIST openafs-1.6.5-src.tar.bz2 14400420 SHA256 176fab2d710d8dcf566f5aa229fd796dd8165561d57590e32790a3034a195ef2 SHA512 2a03b87499f3304c85664787602f1e2f1988a5baa34bc7754e28f8ead6a1b70d826e63cd6ce4b4c5a97ae48fff6255a51be973c098f8a176369ae557b18830f1 WHIRLPOOL 66c058a09396054dc675351b1b27628144a7f29b2255e7192906290bd0b76ea8c08a398d773031a9835edbdd2452990cc6e3273c02e4d25560d62ddcd7318c97
+EBUILD openafs-1.6.2.ebuild 4422 SHA256 13f6221d2235c06a9df1a1b00c3f9a3bb38558f8089379219d713cb52a168578 SHA512 103679e20d8b34943c28a56bf019f523370b035e8c2d08958f24e2667c4d93f41f3a7b0d48eb143d78280c57fff7697879f12a90588b252d3c5b41b2d78fb50c WHIRLPOOL fc775f3eb60a28d6adcc2f41d1de079b16d29d8504bc7b6d08ab4c9b28f65e72c686e5b766098b9f48ae263311622e2d055c520aa254514043f64fc2cbd03dbf
+EBUILD openafs-1.6.5.ebuild 4425 SHA256 6397f1fa02a2467bd19f5a9c7809a5a6f138bd42c510c01a34185eafa9fb8b9a SHA512 f9cea1e54b94ded516e0c0ed54adf954dac1bf6b4c19894bcf30f98940fc5d07e305dc94a99c4cd82dcdacdb89853a1be6c0cc2d1cc38672a450a26425b593f1 WHIRLPOOL 2e033139c11e298fe6c27b28c81bd15ff21f629d00c19c8ae396f9dc31245eea0761b6dfe5d24b22be98ee439a4e499dc58f08531c51452e7869550d3ddf5f80
+MISC ChangeLog 31319 SHA256 bf2a2658ad56743a22775804f2d901a7ca607f4fbdb5585b3f0e256aa577a677 SHA512 761b7d43fe3d20f6b16d63c2e224787a5fe32781038da7e942a7eaaf13d9242b137502356425de7ca930e03e1d228bca2a84e0c0c3634cfcc092812a4ba973ff WHIRLPOOL 6164904f8312bc95497f6d40da43183d8a2e2a85487885205a5b93f4931f5696058fcb17641be992b183c581079d5bceaf20eb8204ffde907524258dd5a0bc2a
 MISC metadata.xml 286 SHA256 b3e704b0f9a832001902f16472eafe5d2aa59afbf04b1eb6cf87f927316d87d3 SHA512 203f23847bccc6104cd62343070b5ead629a5033bf88b5468420628189d260f435606f7185c555a9849cee50ca855c370dfcb19426c6bc11b5c2da1b331e693e WHIRLPOOL 3fe5d977e05abd548bc36fa5f9be966e4cc5813f37c7052a57ba921b2540b61fd15d664c385e710ad857615a5643e599fb66fa623a29cb67420ab38a2e1d8730
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRaWnUAAoJELp701BxlEWfosgQAIe7OR48dRK/UYyobd7c3pWq
-xPQ5iBWnjQeQOEOQNLuRpVhTm1j9PHL9eizjmia/K1+ENbsj3E4H59p5J82tbxsn
-Qj/I6xLaUmzUCVo+USGJehW977zdoCqtJ78nQxzDPZiKoLu4qE3jJwfI4U8wVOcs
-oUoFMOvYZ+qPhez/f9QaLFncwKfxepOztIs55Ds9vnnX2DrDi+MeYP44ek1Y7rPG
-Aw0hRxp1ZvrY79t+j3rXhQSpCKNsDS91zmy0QXywEzw536epg3szDoMh7C72/4yY
-76HtRDSbOEVppklElCJ4Tl0ZInB9zybIO6ZEDNZac2YsoPDa4YX4ejsNGKMM0Ux1
-VzqbGyiH/y8wSmcwPA+abVLlmA9p8jt7PoTlYbBS9sJLWxpuO7MNtNe7OjaVz5tr
-ej2cCeo5CSsrxiNLAMU2EN+kTnCXI1wmkUM2NKXeVXbf2mtyG5oJ8NEml+UYjbmS
-sneBiZOfBA6KivcwbYjrS0Pcw2c7anoj8GQ8clPmI42wZQmrsNLm8SzvLm94RTqV
-5VngiTe55E9sIQTt1g3nI30Qs+cEwBWjwYaSLsqDYCZQo/xXIQQfU51etj1suJsM
-yaaZudEr+kOcli099qWC4PKOQwduK/dXgbh2LGnebg48LguZcyiFi5eroe45P4j2
-a/qz/uMX6E7fbJ3V3jIU
-=PeR1
+iQEcBAEBCAAGBQJSHGAnAAoJEJWyH81tNOV9wsoH/jHAQr//UDIOKv1J19abmN0D
+ZEs9zxWwiH+VTdVcM/DbmhFq88VS+n/PUHa6AbZtQ1lXoZc3JV0fyPS1S8Cca2ml
+p0gn2aya4G8eRi07hWT3MPs5Dmufo0hnjGw9kc5ZAKg1Mt2qLxloQryL1qT+wfZl
+Zpaf/f3nDGQCa6cBUZ/s24DKmIzKNnoYrQJgFtn+eBCFwElo44oYez5V4kpgfayV
++wb5lUQRXxAstTd4tMymRnRpqDT5idJ8kS3Ua37RB34euNh1xuvaYmLQhX4mla2j
+FxxSX2kQaSvh8h3uvYHCliLaDHtq70dEg4UjAGG4ryC6mouDKYVCHBGvZs9ukZE=
+=7tAK
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.6.2.ebuild b/net-fs/openafs/openafs-1.6.2.ebuild
index e87e1ab06127..324b20f90785 100644
--- a/net-fs/openafs/openafs-1.6.2.ebuild
+++ b/net-fs/openafs/openafs-1.6.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild,v 1.4 2013/04/13 14:20:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild,v 1.5 2013/08/27 08:15:30 tomwij Exp $
 
 EAPI="4"
 
-inherit flag-o-matic eutils autotools multilib toolchain-funcs versionator pam
+inherit flag-o-matic eutils multilib toolchain-funcs versionator pam
 
 MY_PV=$(delete_version_separator '_')
 MY_P="${PN}-${MY_PV}"
diff --git a/net-fs/openafs/openafs-1.6.5.ebuild b/net-fs/openafs/openafs-1.6.5.ebuild
new file mode 100644
index 000000000000..87a5a82bb755
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.5.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.5.ebuild,v 1.1 2013/08/27 08:15:30 tomwij Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils multilib toolchain-funcs versionator pam
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+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/openafs/${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc kerberos pam"
+
+RDEPEND="~net-fs/openafs-kernel-${PV}
+	sys-libs/ncurses
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	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
+}
+
+src_install() {
+	local CONFDIR=${WORKDIR}/gentoo/configs
+	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/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
+		find doc/{arch,examples,pdf,protocol,txt}/ -type f -exec dodoc {} +
+		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 "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/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"
+}