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 63C7A138350 for ; Tue, 21 Apr 2020 07:07:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A58AAE0921; Tue, 21 Apr 2020 07:07:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78303E0920 for ; Tue, 21 Apr 2020 07:07:16 +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 E452434F11F for ; Tue, 21 Apr 2020 07:07:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 989931C5 for ; Tue, 21 Apr 2020 07:07:13 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1587452794.249985c549075b2608d9859e9f4659fee64a8e4f.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/libreswan/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/libreswan/Manifest net-vpn/libreswan/libreswan-3.30.ebuild net-vpn/libreswan/libreswan-3.31.ebuild X-VCS-Directories: net-vpn/libreswan/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 249985c549075b2608d9859e9f4659fee64a8e4f X-VCS-Branch: master Date: Tue, 21 Apr 2020 07:07:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1856c61b-1bdf-493d-8b98-aecf6e33b5c8 X-Archives-Hash: ccc2af00ad3581985a1d1383bf62d049 commit: 249985c549075b2608d9859e9f4659fee64a8e4f Author: Hans de Graaff gentoo org> AuthorDate: Tue Apr 21 07:06:34 2020 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Tue Apr 21 07:06:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249985c5 net-vpn/libreswan: cleanup Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Hans de Graaff gentoo.org> net-vpn/libreswan/Manifest | 1 - net-vpn/libreswan/libreswan-3.30.ebuild | 117 -------------------------------- net-vpn/libreswan/libreswan-3.31.ebuild | 2 +- 3 files changed, 1 insertion(+), 119 deletions(-) diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest index e59bf3aa5ee..9f374abd04b 100644 --- a/net-vpn/libreswan/Manifest +++ b/net-vpn/libreswan/Manifest @@ -1,3 +1,2 @@ DIST libreswan-3.29.tar.gz 3848730 BLAKE2B 32dc839186fb511534a4959014082f8efe27708da7bc09dc5977532ffc7ea0ccdc92407932b3c3166f14b9ff85933e9a3f76325bbe620e09a5fa5a5c496d1f44 SHA512 4b4d91204d8b1724e0a9ad3ed55fc232c9a526211c3b47b6cc33fd160feb72538ef1661becca250bde815b9d7b75709bf16c7b372476605557b47c785cdf2535 -DIST libreswan-3.30.tar.gz 4119139 BLAKE2B 64c528b84bce10a01dceece473016a1836c47da0d1878c4fd413f859e6c5edc05bded1ac54d60e6979005f6654ab4819b8b05aba5b16658d493bb300bf773823 SHA512 1ea3505938231bacb762ec13c278b584239660e20994030423f0200ff32fcc0f0a0c74649b1470bbfc1165a762d3b60d0b1c5c56bff81a52415c7666736b5b99 DIST libreswan-3.31.tar.gz 4127675 BLAKE2B 0b773e4cfda761a88e8cb6ed412ecdd50bb52df7a58029141d41c77f959ad06c6cd04625b9094efa8586328381e3c75050ff68c2d8dd6d832ed5dd6e747d9391 SHA512 edaddeb209c4fb974b16790ba843a41f4f1d269dd28333aa02b820801a222435c2ca5622e77558d1e95970b4ef24a663d9c44ef4ede7ff4e66e1f0d9b6e880d2 diff --git a/net-vpn/libreswan/libreswan-3.30.ebuild b/net-vpn/libreswan/libreswan-3.30.ebuild deleted file mode 100644 index b16d469b9d0..00000000000 --- a/net-vpn/libreswan/libreswan-3.30.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -SRC_URI="https://download.libreswan.org/${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~ppc ~x86" - -DESCRIPTION="IPsec implementation for Linux, fork of Openswan" -HOMEPAGE="https://libreswan.org/" - -LICENSE="GPL-2 BSD-4 RSA DES" -SLOT="0" -IUSE="caps curl dnssec ldap pam seccomp selinux systemd test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/gmp:0= - dev-libs/libevent:0= - dev-libs/nspr - >=dev-libs/nss-3.42 - >=sys-kernel/linux-headers-4.19 - caps? ( sys-libs/libcap-ng ) - curl? ( net-misc/curl ) - dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) - ldap? ( net-nds/openldap ) - pam? ( sys-libs/pam ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sys-libs/libselinux ) - systemd? ( sys-apps/systemd:0= ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - dev-libs/nss - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - test? ( dev-python/setproctitle ) -" -RDEPEND="${DEPEND} - dev-libs/nss[utils(+)] - sys-apps/iproute2 - !net-vpn/strongswan - selinux? ( sec-policy/selinux-ipsec ) -" - -usetf() { - usex "$1" true false -} - -PATCHES=( "${FILESDIR}/${P}-ip-path.patch" ) - -src_prepare() { - sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die - sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die - default -} - -src_configure() { - tc-export AR CC - export INC_USRLOCAL=/usr - export INC_MANDIR=share/man - export FINALEXAMPLECONFDIR=/usr/share/doc/${PF} - export FINALDOCDIR=/usr/share/doc/${PF}/html - export INITSYSTEM=openrc - export INC_RCDIRS= - export INC_RCDEFAULT=/etc/init.d - export USERCOMPILE= - export USERLINK= - export USE_DNSSEC=$(usetf dnssec) - export USE_LABELED_IPSEC=$(usetf selinux) - export USE_LIBCAP_NG=$(usetf caps) - export USE_LIBCURL=$(usetf curl) - export USE_LINUX_AUDIT=$(usetf selinux) - export USE_LDAP=$(usetf ldap) - export USE_SECCOMP=$(usetf seccomp) - export USE_SYSTEMD_WATCHDOG=$(usetf systemd) - export SD_WATCHDOGSEC=$(usex systemd 200 0) - export USE_XAUTHPAM=$(usetf pam) - export DEBUG_CFLAGS= - export OPTIMIZE_CFLAGS= - export WERROR_CFLAGS= -} - -src_compile() { - emake all - emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all -} - -src_test() { - : # integration tests only that require set of kvms to be set up -} - -src_install() { - default - emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install - - echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets - fperms 0600 /etc/ipsec.secrets - - dodoc -r docs - - find "${D}" -type d -empty -delete || die -} - -pkg_postinst() { - local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d - if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then - ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password" - certutil -N -d "${IPSEC_CONFDIR}" --empty-password - eend $? - einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}" - fi -} diff --git a/net-vpn/libreswan/libreswan-3.31.ebuild b/net-vpn/libreswan/libreswan-3.31.ebuild index f81f028d3f9..88f6f4c6f12 100644 --- a/net-vpn/libreswan/libreswan-3.31.ebuild +++ b/net-vpn/libreswan/libreswan-3.31.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit systemd toolchain-funcs SRC_URI="https://download.libreswan.org/${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ~ppc x86" DESCRIPTION="IPsec implementation for Linux, fork of Openswan" HOMEPAGE="https://libreswan.org/"