From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A149139695 for ; Sat, 13 May 2017 09:55:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A0FEE0C5A; Sat, 13 May 2017 09:55:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29101E0C5A for ; Sat, 13 May 2017 09:55:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A9EA341708 for ; Sat, 13 May 2017 09:55:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57D0D7452 for ; Sat, 13 May 2017 09:55:24 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1494669316.c3b8f4c700a73e8f25727fa9e4a6c9c4c9318330.bircoph@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/openafs/Manifest net-fs/openafs/openafs-1.6.18.3.ebuild X-VCS-Directories: net-fs/openafs/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: c3b8f4c700a73e8f25727fa9e4a6c9c4c9318330 X-VCS-Branch: master Date: Sat, 13 May 2017 09:55:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6156a35b-8c4c-4d2d-aec0-26459c57b2a2 X-Archives-Hash: 1ce8ae9ae336a74944527e200e1fe321 commit: c3b8f4c700a73e8f25727fa9e4a6c9c4c9318330 Author: Andrew Savchenko gentoo org> AuthorDate: Sat May 13 09:52:32 2017 +0000 Commit: Andrew Savchenko gentoo org> CommitDate: Sat May 13 09:55:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b8f4c7 net-fs/openafs: remove old security cleanup, bug 608446 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Signed-off-by: Andrew Savchenko gentoo.org> net-fs/openafs/Manifest | 2 - net-fs/openafs/openafs-1.6.18.3.ebuild | 222 --------------------------------- 2 files changed, 224 deletions(-) diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest index 0307c427c05..d9f20995060 100644 --- a/net-fs/openafs/Manifest +++ b/net-fs/openafs/Manifest @@ -1,5 +1,3 @@ -DIST openafs-1.6.18.3-doc.tar.bz2 3531415 SHA256 96644f5c53827e4e37738899f9b0215c880c180c98501e0c59566d927694e506 SHA512 2373d3d13f991e4927dfd292dd8725d375f4b68419dd22d7e5dd8a7730eaff3d4c47663c4ba9a43b6e3103be58074b60130039bd2491166176a4bd666f4d2619 WHIRLPOOL f66f893ff155709e6f96fe7c2c9b37f4337278b14438f4a93347db250a4d334ae46c1ccf3d74dca49e476c9faa8b1b2695c70709fabc21023d6e50631973e0b3 -DIST openafs-1.6.18.3-src.tar.bz2 14668811 SHA256 b9cb45fdfd2aab543363e64da0b56167bfc1a302afdbcd5a076fb704a0c16a70 SHA512 679b463109c47fd252853e6f12c7e60148cf78f6d2699d468b1e1f85bbd5b392a909c3f2201460e3192ad7a60bad64c58489980c2efcd904ab4851df8724d47f WHIRLPOOL 8180188e3ecc87f002d5a4b4c4641949869a09b88474a75850e27dea1134dca1156ae4533f997494d64b8820aa4dc0f0ceb7b4dda01648c95f70408c190d353b DIST openafs-1.6.20.1-doc.tar.bz2 3533007 SHA256 2c4bf6f53030e8a9cf3460d9c9292bcdbfea356930ed1d436506e8dc60db0f1c SHA512 53d36ae28ce303fd397635f888ba5e7b1a74967072919bab44dc68858881e6b0586b1e2339dcfdfe1de3bf69591077e4c09ad0c0444eb1a1557a71b39b793da4 WHIRLPOOL 39e50d9af1acda7be5f508392eceac2caf6b13d03e825719d09de539d9080386ff82b3a0f5e8c489f3e0c2e9051a08623baa3176be61816a154ad734dcd03644 DIST openafs-1.6.20.1-src.tar.bz2 14672548 SHA256 dc869eecf6c81949d3dd2021eaf87118ef9b90ec5012a35f64836a02a58a8826 SHA512 cd6a0cd5d48fffaf37d143a9f8f7cd84c78ada6a645ac1a6cd3cf5b4a8a5af602e84133506c797e62ef2e61180a1c89915ea8657ac95bb872ada018b1baf0d59 WHIRLPOOL e289125306024b5a4d651017f35c0b2a91cadfeecf5820298e5ecccebf8c94a8126f7b70c120a687c5edfc4ad769ecfe72f9597173c34fb0dec6e13a7619cf4c DIST openafs-patches-20170212.tar.xz 11008 SHA256 9e20ca0ce0af6178ba39e459e88ecf3da8e6d97947a8b77a65f3cb0e523f6b47 SHA512 13e525a3f612b43318ad2fefaa3edf15ad572153494e94826815400f90a253678d2ade44d6adae08b1cb0dc8f311f5407f5aa540ed0df7a2d2d6024695bd917f WHIRLPOOL 4f81b94ad5ae7aab8ab954a333aa5cf72692cf91784b441b16e55fd023e58b7fe575b0228073fbacb9036cd4a7bfccd7553795457872973d15bbe48b95ac4484 diff --git a/net-fs/openafs/openafs-1.6.18.3.ebuild b/net-fs/openafs/openafs-1.6.18.3.ebuild deleted file mode 100644 index 37fc178aa24..00000000000 --- a/net-fs/openafs/openafs-1.6.18.3.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator - -MY_PV=$(delete_version_separator '_') -MY_P="${PN}-${MY_PV}" -PVER="20170212" - -DESCRIPTION="The OpenAFS distributed file system" -HOMEPAGE="https://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=" - https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2 - https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2 - https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz -" - -LICENSE="IBM BSD openafs-krb5-a APSL-2" -SLOT="0" -KEYWORDS="amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - -IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups" - -CDEPEND=" - virtual/libintl - fuse? ( sys-fs/fuse ) - kerberos? ( virtual/krb5 ) - ncurses? ( sys-libs/ncurses:0= ) - pam? ( virtual/pam )" - -DEPEND="${CDEPEND} - virtual/yacc - doc? ( - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - )" - -RDEPEND="${CDEPEND} - modules? ( ~net-fs/openafs-kernel-${PV} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${WORKDIR}/gentoo/patches" ) - -src_prepare() { - default - - # 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 - DOCS=( "${WORKDIR}/gentoo/README.Gentoo" - src/afsd/CellServDB NEWS README ) - - # documentation package - if use doc ; then - DOCS+=( doc/{arch,examples,pdf,protocol,txt} ) - dohtml -r doc/xml/ - fi - - einstalldocs - - # 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 - systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf - systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf - - # 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" - elog - elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before" - elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited." -} - -pkg_config() { - elog "Setting cache options for systemd." - - SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf - [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found." - - CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo) - [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo." - - if [ ${CACHESIZE} -lt 131070 ]; then - AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50" - elif [ ${CACHESIZE} -lt 524288 ]; then - AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70" - elif [ ${CACHESIZE} -lt 1048576 ]; then - AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" - elif [ ${CACHESIZE} -lt 2209715 ]; then - AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000" - else - AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000" - fi - - # Replace existing env var if exists, else append line - grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \ - sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \ - sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \ - die "Updating ${SERVICED_FILE} failed." -}