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 F12421382C5 for ; Sat, 24 Apr 2021 05:46:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC21BE0827; Sat, 24 Apr 2021 05:46:26 +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 8B41FE0827 for ; Sat, 24 Apr 2021 05:46:26 +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 4BAEA340DDE for ; Sat, 24 Apr 2021 05:46:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6F9D4C3 for ; Sat, 24 Apr 2021 05:46:23 +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: <1619243180.31b9f3af27efef67dd9e954c20a5570016e34ce5.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-4.1-r1.ebuild net-vpn/libreswan/libreswan-4.1.ebuild X-VCS-Directories: net-vpn/libreswan/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 31b9f3af27efef67dd9e954c20a5570016e34ce5 X-VCS-Branch: master Date: Sat, 24 Apr 2021 05:46:23 +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: e46fa979-5a0c-40b8-bd39-4a5d375673c6 X-Archives-Hash: bd36c0924f3302f0621b476b4296da49 commit: 31b9f3af27efef67dd9e954c20a5570016e34ce5 Author: Hans de Graaff gentoo org> AuthorDate: Sat Apr 24 05:39:35 2021 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Apr 24 05:46:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b9f3af net-vpn/libreswan: cleanup Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Hans de Graaff gentoo.org> net-vpn/libreswan/Manifest | 1 - net-vpn/libreswan/libreswan-4.1-r1.ebuild | 120 ------------------------------ net-vpn/libreswan/libreswan-4.1.ebuild | 117 ----------------------------- 3 files changed, 238 deletions(-) diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest index 9029b88f1a6..22bb856c19c 100644 --- a/net-vpn/libreswan/Manifest +++ b/net-vpn/libreswan/Manifest @@ -1,4 +1,3 @@ DIST libreswan-3.32.tar.gz 4141631 BLAKE2B 37a4cb5c1f52d69b17ba60abd2b7a181d9f5567914a453ab875185110aeda4d33ecdaacfc83e361f153860a1db66faec70e0ad06af65e310af28ae72ce68fc6a SHA512 bb65512351059e2fac6f1c3ed1e291eabd6835faacf6d9c58649dd71dab1bb4fe6d6074178dea6dea01f24d39f3fbefd84c6060e4d8436b5d057fa55ae4467f3 -DIST libreswan-4.1.tar.gz 3427012 BLAKE2B 2ec58a53756efd2dc8e6a9e305c1efd1e3b8b1aaa089d783e86cf19d747b99838de451a2f94965981e0e2342d5866c16f36c4cf07e7ab971f3e689f8616c28f6 SHA512 c98dfdf6bff17eda6f028e35653b822941665989e37974266bcc54fda20e05f71b86c1dfee858a8ba9a544f86e9217e8e08fa2dfe03ab011f6c2d039b4ee05fe DIST libreswan-4.2.tar.gz 3467095 BLAKE2B 0630e9f7cf7ce6182712b4837688fd6b7a1ad1644f167f7ded4e63c7a0aac960a38d903cefbf0189da22b6ddb8c15f217ff3134f220b64020812789c1a196d29 SHA512 290be2e36fb41959c9889597aad8ab5df1edc1999ed7315e8f2e50213de073732c91ad497a2b5634f7bc83bca84089ef9f711420a77309c6cce243f1419a2d0f DIST libreswan-4.3.tar.gz 3489322 BLAKE2B 36908bf043fb1085f40b4a5f35ca6dc1563e1a1701f9cced9cb6765094bb2ef603b6d6d4b076a333d540f6454c10b6350d9b8c20de8bc3f27b19915b4cf42b9f SHA512 4687c867d34655cd33997edf4ab7887b2121af41c99d1bd9c794fce1c1eef412f5528de7a338e92a44c1c5d0aaa8fbeb756b89849fcad3deb45a418751e64045 diff --git a/net-vpn/libreswan/libreswan-4.1-r1.ebuild b/net-vpn/libreswan/libreswan-4.1-r1.ebuild deleted file mode 100644 index e837a675077..00000000000 --- a/net-vpn/libreswan/libreswan-4.1-r1.ebuild +++ /dev/null @@ -1,120 +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 networkmanager 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}/${PN}-3.30-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 PREFIX=/usr - export FINALEXAMPLECONFDIR=/usr/share/doc/${PF} - export FINALDOCDIR=/usr/share/doc/${PF}/html - export INITSYSTEM=openrc - export INITDDIRS= - export INITDDIR_DEFAULT=/etc/init.d - export USERCOMPILE=${CFLAGS} - export USERLINK=${LDFLAGS} - 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_NM=$(usetf networkmanager) - 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 - - keepdir /var/lib/ipsec/nss - fperms 0700 /var/lib/ipsec/nss - - dodoc -r docs - - find "${D}" -type d -empty -delete || die -} - -pkg_postinst() { - local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss - 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-4.1.ebuild b/net-vpn/libreswan/libreswan-4.1.ebuild deleted file mode 100644 index 71193442767..00000000000 --- a/net-vpn/libreswan/libreswan-4.1.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 networkmanager 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}/${PN}-3.30-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 PREFIX=/usr - export FINALEXAMPLECONFDIR=/usr/share/doc/${PF} - export FINALDOCDIR=/usr/share/doc/${PF}/html - export INITSYSTEM=openrc - export INITDDIRS= - export INITDDIR_DEFAULT=/etc/init.d - export USERCOMPILE=${CFLAGS} - export USERLINK=${LDFLAGS} - 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_NM=$(usetf networkmanager) - 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 -}