From: NP-Hardass Date: Thu, 13 Aug 2015 05:02:07 +0000 (-0400) Subject: net-fs/openafs{,-kernel}: Version bump to 1.6.13, security release X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9efec53b4f5ef40bde122190f0105e091dec0680;p=gentoo.git net-fs/openafs{,-kernel}: Version bump to 1.6.13, security release Package-Manager: portage-2.2.20 --- diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest index 746c5ef5ea0e..b08b12942f08 100644 --- a/net-fs/openafs-kernel/Manifest +++ b/net-fs/openafs-kernel/Manifest @@ -5,5 +5,7 @@ DIST openafs-1.6.11.1-doc.tar.bz2 3530413 SHA256 cb398583931e7f0edf17b2321a858af DIST openafs-1.6.11.1-src.tar.bz2 14603197 SHA256 ae1a87faec8ee273f7d4baa69d1346f798415b38de72888decde011405423dc7 SHA512 43238d16d52498c62f6de944e030edeafdce9373074f961820d383bf82034511a484e79f1f655d5152f39abb38dfb744a9d02c47bb762c59e505de165bcc5579 WHIRLPOOL eb56015aaec4aa8c2a0d5aa901f4291a043e373d533bed5a48620e3b3a472226599dd083a4837ecc5a8763e7448ed1fb8c08aeec7ca53cf82db8be39d63dc522 DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e8f08099eb1b2a4308ae8f0638199963 SHA512 b0389f5aecce913a50e827204c3d3f19964473d4b8b0e6e39d91d00971e4be57b4cfece0b4bc40fb3b6f5d7d60ee40b079883505625413f0748035452c3c2686 WHIRLPOOL a795b70caf84e17d5bea720a12e2c1aa159a34105f51dbcf60a464b2c8bf81a9624e8beede566c9c4b6ceeff424db7925bf588a7383f0860df8ec65828d32cc1 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9 +DIST openafs-1.6.13-doc.tar.bz2 3501580 SHA256 a0517efcb665efc70ac0813256730443be68fb8635da2f90e221bb2c6cc23736 SHA512 cc0bb28429b301a514ee50de7069ecd74cb9f6673dcdb607e1ce9ad36641d6750bae7d7809303d2e5190e5518f06db7555f98af087b615bbeee9b8bb4acc02b1 WHIRLPOOL af0f3ddf23bf0e85602d75c9d7fe1e60d6dfc0054c1115784d4507ad56213be29e02b619996c09aceb7420a10cce44ba92fcc424004319144ea22018620ae681 +DIST openafs-1.6.13-src.tar.bz2 14373447 SHA256 6139370633b48f0149d4dacdd01af7ee29b800b0866c2d18a679c1669e317b26 SHA512 1c50ff5c482be76af8ca1a62bd4d0402c33f8107b8ee5bcbf2b582b734619a26ba54ec49251360583a5d1b3e43827314742e7fe1aee95223c995730e9e00d887 WHIRLPOOL 6cffed9877a27531f7eb49857bdc7bead44fa804b7be36e983dffeb6587cadc1a7372502cd83072b8f3c63c67151ac807e83bdb0e2a6e4fec4042f557937c98c DIST openafs-patches-20150503.tar.xz 9736 SHA256 066f61fe795e2cb3235a0a991abe8c5e876758bae7ea9bec61e98a3f601c9d7d SHA512 c687be78c7a6442b81c1362cab6ba215301911bdefcf39d2758ffeddecfa3efaa67990ea8277bbc1dedc14ad70a33213a37dbc45c43cd53871eec089759596c6 WHIRLPOOL 0935946c9a535f8e9ce6dd292801c671aef1c40f2a3f51aa4a85e5f4181fb46c3b2df55be56eec56c7fcab0eaf27d97cc6cef98c1b70178ba8cd7258174036cf DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2 diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.13.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.13.ebuild new file mode 100644 index 000000000000..93681afba6e7 --- /dev/null +++ b/net-fs/openafs-kernel/openafs-kernel-1.6.13.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools eutils linux-mod multilib toolchain-funcs versionator + +MY_PV=$(delete_version_separator '_') +MY_PN="${PN/-kernel}" +MY_P="${MY_PN}-${MY_PV}" +PVER="20150626" + +DESCRIPTION="The OpenAFS distributed file system kernel module" +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/afs/${MY_PN}-patches-${PVER}.tar.xz +" + +LICENSE="IBM BSD openafs-krb5-a APSL-2" +SLOT="0" +KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux" +IUSE="" + +S=${WORKDIR}/${MY_P} + +CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS" +ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option" +ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!" +ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled" + +QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko" +QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko" + +pkg_pretend() { + if use kernel_linux && kernel_is ge 4 2 ; then + ewarn "Gentoo supports kernels which are supported by OpenAFS" + ewarn "which are limited to the kernel versions: <4.2" + ewarn "" + ewarn "You are free to utilize epatch_user to provide whatever" + ewarn "support you feel is appropriate, but will not receive" + ewarn "support as a result of those changes." + ewarn "" + ewarn "Please do not file a bug report about this." + fi +} + +pkg_setup() { + if use kernel_linux; then + linux-mod_pkg_setup + fi +} + +src_prepare() { + # do not tamper with CFLAGS for the kernel module + EPATCH_EXCLUDE="040_all_flags.patch" \ + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/gentoo/patches + epatch_user + + # 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() { + local myconf="" + # OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option + if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then + myconf="--enable-linux-d_splice_alias-extra-iput" + fi + + local ARCH="$(tc-arch-kernel)" + local MY_ARCH="$(tc-arch)" + local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC" + + if use kernel_linux; then + myconf+=( --with-linux-kernel-headers="${KV_DIR}" \ + --with-linux-kernel-build="${KV_OUT_DIR}" + ) + elif use kernel_FreeBSD; then + myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" ) + fi + econf "${myconf[@]}" +} + +src_compile() { + ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs +} + +src_install() { + if use kernel_linux; then + local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*) + [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module" + + MODULE_NAMES="libafs(fs/openafs:${srcdir})" + + linux-mod_src_install + elif use kernel_FreeBSD; then + insinto /boot/modules + doins "${S}"/src/libafs/MODLOAD/libafs.ko + fi +} + +pkg_postinst() { + # Update linker.hints file + use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" + use kernel_linux && linux-mod_pkg_postinst +} + +pkg_postrm() { + # Update linker.hints file + use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" + use kernel_linux && linux-mod_pkg_postrm +} diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest index 746c5ef5ea0e..b08b12942f08 100644 --- a/net-fs/openafs/Manifest +++ b/net-fs/openafs/Manifest @@ -5,5 +5,7 @@ DIST openafs-1.6.11.1-doc.tar.bz2 3530413 SHA256 cb398583931e7f0edf17b2321a858af DIST openafs-1.6.11.1-src.tar.bz2 14603197 SHA256 ae1a87faec8ee273f7d4baa69d1346f798415b38de72888decde011405423dc7 SHA512 43238d16d52498c62f6de944e030edeafdce9373074f961820d383bf82034511a484e79f1f655d5152f39abb38dfb744a9d02c47bb762c59e505de165bcc5579 WHIRLPOOL eb56015aaec4aa8c2a0d5aa901f4291a043e373d533bed5a48620e3b3a472226599dd083a4837ecc5a8763e7448ed1fb8c08aeec7ca53cf82db8be39d63dc522 DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e8f08099eb1b2a4308ae8f0638199963 SHA512 b0389f5aecce913a50e827204c3d3f19964473d4b8b0e6e39d91d00971e4be57b4cfece0b4bc40fb3b6f5d7d60ee40b079883505625413f0748035452c3c2686 WHIRLPOOL a795b70caf84e17d5bea720a12e2c1aa159a34105f51dbcf60a464b2c8bf81a9624e8beede566c9c4b6ceeff424db7925bf588a7383f0860df8ec65828d32cc1 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9 +DIST openafs-1.6.13-doc.tar.bz2 3501580 SHA256 a0517efcb665efc70ac0813256730443be68fb8635da2f90e221bb2c6cc23736 SHA512 cc0bb28429b301a514ee50de7069ecd74cb9f6673dcdb607e1ce9ad36641d6750bae7d7809303d2e5190e5518f06db7555f98af087b615bbeee9b8bb4acc02b1 WHIRLPOOL af0f3ddf23bf0e85602d75c9d7fe1e60d6dfc0054c1115784d4507ad56213be29e02b619996c09aceb7420a10cce44ba92fcc424004319144ea22018620ae681 +DIST openafs-1.6.13-src.tar.bz2 14373447 SHA256 6139370633b48f0149d4dacdd01af7ee29b800b0866c2d18a679c1669e317b26 SHA512 1c50ff5c482be76af8ca1a62bd4d0402c33f8107b8ee5bcbf2b582b734619a26ba54ec49251360583a5d1b3e43827314742e7fe1aee95223c995730e9e00d887 WHIRLPOOL 6cffed9877a27531f7eb49857bdc7bead44fa804b7be36e983dffeb6587cadc1a7372502cd83072b8f3c63c67151ac807e83bdb0e2a6e4fec4042f557937c98c DIST openafs-patches-20150503.tar.xz 9736 SHA256 066f61fe795e2cb3235a0a991abe8c5e876758bae7ea9bec61e98a3f601c9d7d SHA512 c687be78c7a6442b81c1362cab6ba215301911bdefcf39d2758ffeddecfa3efaa67990ea8277bbc1dedc14ad70a33213a37dbc45c43cd53871eec089759596c6 WHIRLPOOL 0935946c9a535f8e9ce6dd292801c671aef1c40f2a3f51aa4a85e5f4181fb46c3b2df55be56eec56c7fcab0eaf27d97cc6cef98c1b70178ba8cd7258174036cf DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2 diff --git a/net-fs/openafs/openafs-1.6.13.ebuild b/net-fs/openafs/openafs-1.6.13.ebuild new file mode 100644 index 000000000000..fa1869fd6daf --- /dev/null +++ b/net-fs/openafs/openafs-1.6.13.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator + +MY_PV=$(delete_version_separator '_') +MY_P="${PN}-${MY_PV}" +PVER="20150626" + +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/afs/${PN}-patches-${PVER}.tar.xz +" + +LICENSE="IBM BSD openafs-krb5-a APSL-2" +SLOT="0" +KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux" + +IUSE="doc kerberos +modules pam" + +CDEPEND=" + sys-libs/ncurses + pam? ( virtual/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/\ "${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:<([^>]*)>::' \ + "${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 + + # 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" +}