version bump

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

3 files changed, 201 insertions, 15 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index aa6e9de53d98..66443031c08a 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.199 2015/03/17 18:44:55 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.200 2015/03/22 21:01:39 bircoph Exp $
+
+*openafs-1.6.11 (22 Mar 2015)
+
+  22 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> +openafs-1.6.11.ebuild:
+  Version bump based on proxied maintainer commit from NP-hardass
+  <np.hardass@gmail.com>. Fixes bugs 239369, 334413, 412119, 436596,
+  500378, 534488.
 
   17 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Update maintainers information.
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 41c56ad1267f..516a60c53703 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,30 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256 d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512 9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67 WHIRLPOOL 1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
+DIST openafs-1.6.11-patches.tar.xz 9628 SHA256 16fdf63d81bd986aea4112f43f4005912dd62175aeb355e7b729b309842c970c SHA512 8227cb156f7498afa70e3086f4bfd26672576229a8f847d24a85b495942270e4964aa715536d43c2e63bbd3f4ced7cd19971c76007cb8e2e5aef17fe0ceb9d1d WHIRLPOOL 9ae675c36ec5fe07b7d095705dc6ee02f4a4ac227d9396e29299d94cde10f18e217c06e3c62f73d3d2b07a43410b35e464e7b328e25710e6c497d093381ce158
+DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
 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
 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.11.ebuild 5150 SHA256 cc82b969c931e1d30ae0d3b57aab33d1771021a908432f66ba41b1595943e6e9 SHA512 b46824fe4a316a066f8f78e04d8a2d6b4e17b58ee0b555d55bc70bce8ece2259e415e255f3ab048b4f61662b504a454b5a946f6624286a05095cc313c71f26a0 WHIRLPOOL 373a81fdbfc9032ba5806a9197967aba726003b62a41d9ffad01b1d67a42f90841eb6d3479afc371a2e181c3eb50cfbdd937043249a44ddcf66942ad92720f90
 EBUILD openafs-1.6.2-r1.ebuild 4506 SHA256 f70a6878ccf5ff0a5870416e90e5a6edbf45a88e8e79f652fb322da7df1d6852 SHA512 102ba706eb805ec88dcbb49f4056e01fc2a1d6e052e5edf3d6027331edfd93ab7666f004ad2b56e653c38b26a9d0ad7d837363dc2f9160246b7efe3ea72fc3ad WHIRLPOOL 00b822b06c7687f1f260b4e3d394929e554e89bd663aa5774ad87e09e53ff34435f67e3159a10dec4e7a904aa0683393053b2f5a78438edbd02bfb672ecf396e
 EBUILD openafs-1.6.5-r1.ebuild 4524 SHA256 aa0362916b80e313f16d048a46c44c4b915d4fd7dd1c52100e058a77ac109b47 SHA512 3e14e0e439e73a2f255d4ea9e6dc41ab5fc157affedf9c9540ece75eba8f24bd0bc8ef7853910fd9264402fc4995afc581335b300b0b0ad45a0c4e5c8a51c8f7 WHIRLPOOL e307e0a260607c4ad0c93dcabc06bd2781bd0b88b290fd73c02ed7d135226c06fe03f833a16746f6e337d1385493b9ee54dde6422422790b69706005197063dc
-MISC ChangeLog 32208 SHA256 d60a626da52deca400e0127993098d84d53b43776ea7b979d0cbb193506e875e SHA512 6da1946bd75013ac8330ebc7ae336bc293918e43a5f20611b440a5e925f4d6d99838a52565788dba167c30a4e7bd18d76b4b8aa040a347dce02458745fd2062d WHIRLPOOL 1dd2536264568151d517ab7fec5ea72189144ccfcf409234baee6b68de2b3495ac46845d9b1d9feca9e2783f0887148af9cbe96d28c4cbeb8254a41cbd72a380
+MISC ChangeLog 32470 SHA256 645771e15c7436f7a279632d221a182ced29ad66d21a824f847bc3334ca9844f SHA512 8cdec6223a8ce3111ae98ca598358eed89665d90b5ad2cde2a503ebbf7a9e288d5d4fc09a60ae91e2a19f3e9893155018a964c588487c19a5e602515912c8f93 WHIRLPOOL 5b2452ddad949d30e4391e2f5dcbb5b9e34f922e8a71a4f83a57b2a3590d66ef401762ba249f4647831bcf1e3893bbf64d40dd318ff1b9a25c3ec4c460f814cd
 MISC metadata.xml 777 SHA256 ec3cab4f468a8af1770926801c13d31ba46aba22cacc231eb40510b811c07c2f SHA512 4641468811b7c6cad2111a1b21a890c082e1449ba68ae0703cf5096c7dbbd6b22715f9476d4b714048c9fb0630f651b5f68b10be4da867cbd7f8adcff1a2cfb4 WHIRLPOOL 4b5ebfaefa3631c6eb3ed7bf03278f85d4b95b0c7e7469d55f3603ae26829c210d31b5ca99d0db2392acbb75406ed2108420ecb5444fcbc9dc9575ad017fd3a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVCHY2AAoJEPZTWjO6HuSN18AP/iOh+//0QX6lZb7adCjcSHUr
-IrKLohngV7Cve1dzE7pY2nyYWcKkIYDcSno4wIgo917oqMF0yXwdZxZoLqhG2y0I
-QZ12AFjLXI9Zwilpzlw3ztlUae50YgBOtAliZZWQpaH6AsP06An+2Oubm98thE2R
-HNApFm2FyOnkjCgGWJd7fkVU0LXJ4EffB61rL3ZcJu9JlvhDcP0iaGN+/d6huTrn
-ZCgCbDQlUsqrYKJRFglzALTcxYZ8i3jcIzTW3CAhVcZ3sHegM4RqLa2/WslVdavk
-E1NQPzFUO2q9AiFzSuhHYNNH31giaoP204bFKK4OQz1jk4KZbjCvcsGkUvGnQSqi
-KIrgjm/vDkPW/arYL73CmWUZFGNB6Y/FhmogP7XRNc267/xsHkgLR7O4nPsHoOWM
-vLhXAhw5zSDS+4kDS7YeBxqrXaS+YOxOfWc0H0kfqVfqbh+10SbnJN7gMb6c4+jO
-rjvT5XQ/jyT/qZxJmtoI4FTk1SeqO+EPdYccob7rNtFV29g9U01LHgJu+xxhTOZV
-jpwb/YPn2ujI0VmA1/Agoqzq9uySfe0960FdD2iYMwD685sKKNjMa2hQelzbcvU5
-LT65WGjzHqZ9yigUJ2RLXvy1YOHQ3aAG0BFSlz8/yfvdGWiAPSVb6t1xKSc1+/LQ
-HoC4fcqk+6ofrIaKBXif
-=uoW8
+iQIcBAEBCAAGBQJVDy20AAoJEPZTWjO6HuSNGWcP/RfGRweHAezCkCmFJAX621q3
+viO9CsVKSg5ytMK2Grg971pJJdFWhNEdT6MgLyQ4MYqybu2ZhtegnHDDB0V1nMcc
+CSZu9fbgVKpEZqhfc6tS256moAiTsyU8tegfxMZYL/UqKIuaYkFnqGWVHyEecZLs
+8OeIK9CU7KDUERMNtpNrhNkmBNXMYnp/xMNMF9O1lZSlFAfR5MwFgyIP+0rjzTJf
+5t2Y3bx5l6u0Tk1n2WR8zX17oyDGALSYOrpOB+y8Ck4yjUuA9lLChGuvc+DFLHCu
+KpWN5scvbJDH2Sj8rIH4/Vsuuz+YsgwmJ9GbF2Er7FEYUUOXbJ0ouX3DMTtz/et/
+4wn8apRcCU7vf32KpTmNSZYIvbncvvEIw7Ph9XYSvrbrz/1oh0UP6nqkfczpqSCQ
+b7KKpbqA3SNUaJhVh4abaqtBhC72mFbcun6RLPZj1DRfkaW/KaVTXnzBY0JrVWFd
++HMqTR4MK3lmLThdoTi1bULi4aVZZuJJdOCV9coGhrxRL6qBUoDl7Cif3Qxq3iUn
+ccv344Ir3R1X6M80vW453Yx5lGUpSfJx7TResae4Gd90KTdPlnSDIYy7I5Pkp0/T
+wWcVpBTp/Ruvqjdek1XWSyrRTczFSM51bWRBJzORvnaCwgGzfqQ8O4uVVjHIovG7
+CWXPxcVybJ8EYg07ZKrS
+=L0dD
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.6.11.ebuild b/net-fs/openafs/openafs-1.6.11.ebuild
new file mode 100644
index 000000000000..e28a52c3f30e
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.11.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.11.ebuild,v 1.1 2015/03/22 21:01:39 bircoph Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+
+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
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+	http://dev.gentoo.org/~bircoph/patches/${P}-patches.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc kerberos +modules pam"
+
+CDEPEND="
+	sys-libs/ncurses
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+RDEPEND="${CDEPEND}
+	modules? ( ~net-fs/openafs-kernel-${PV} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	EPATCH_EXCLUDE="050_all_job_server.patch" \
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+	epatch_user
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	AFS_SYSKVERS=26 \
+	econf \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		--enable-supergroups \
+		$(use_enable pam) \
+		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
+		$(use_with kerberos krb5)
+}
+
+src_compile() {
+	emake all_nolibafs
+	local d
+	if use doc; then
+		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+			emake -C "${d}" html;
+		done
+	fi
+}
+
+src_install() {
+	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+	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 "${WORKDIR}/gentoo/README" src/afsd/CellServDB
+
+	# documentation package
+	if use doc ; then
+		dodoc -r doc/{arch,examples,protocol,txt}
+		dohtml -r doc/xml/*
+	fi
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+
+	# 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 "  https://wiki.gentoo.org/wiki/OpenAFS"
+}