Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/libreswan/
Date: Sat, 24 Apr 2021 05:46:27
Message-Id: 1619243180.31b9f3af27efef67dd9e954c20a5570016e34ce5.graaff@gentoo
1 commit: 31b9f3af27efef67dd9e954c20a5570016e34ce5
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 24 05:39:35 2021 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 24 05:46:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b9f3af
7
8 net-vpn/libreswan: cleanup
9
10 Package-Manager: Portage-3.0.17, Repoman-3.0.2
11 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
12
13 net-vpn/libreswan/Manifest | 1 -
14 net-vpn/libreswan/libreswan-4.1-r1.ebuild | 120 ------------------------------
15 net-vpn/libreswan/libreswan-4.1.ebuild | 117 -----------------------------
16 3 files changed, 238 deletions(-)
17
18 diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
19 index 9029b88f1a6..22bb856c19c 100644
20 --- a/net-vpn/libreswan/Manifest
21 +++ b/net-vpn/libreswan/Manifest
22 @@ -1,4 +1,3 @@
23 DIST libreswan-3.32.tar.gz 4141631 BLAKE2B 37a4cb5c1f52d69b17ba60abd2b7a181d9f5567914a453ab875185110aeda4d33ecdaacfc83e361f153860a1db66faec70e0ad06af65e310af28ae72ce68fc6a SHA512 bb65512351059e2fac6f1c3ed1e291eabd6835faacf6d9c58649dd71dab1bb4fe6d6074178dea6dea01f24d39f3fbefd84c6060e4d8436b5d057fa55ae4467f3
24 -DIST libreswan-4.1.tar.gz 3427012 BLAKE2B 2ec58a53756efd2dc8e6a9e305c1efd1e3b8b1aaa089d783e86cf19d747b99838de451a2f94965981e0e2342d5866c16f36c4cf07e7ab971f3e689f8616c28f6 SHA512 c98dfdf6bff17eda6f028e35653b822941665989e37974266bcc54fda20e05f71b86c1dfee858a8ba9a544f86e9217e8e08fa2dfe03ab011f6c2d039b4ee05fe
25 DIST libreswan-4.2.tar.gz 3467095 BLAKE2B 0630e9f7cf7ce6182712b4837688fd6b7a1ad1644f167f7ded4e63c7a0aac960a38d903cefbf0189da22b6ddb8c15f217ff3134f220b64020812789c1a196d29 SHA512 290be2e36fb41959c9889597aad8ab5df1edc1999ed7315e8f2e50213de073732c91ad497a2b5634f7bc83bca84089ef9f711420a77309c6cce243f1419a2d0f
26 DIST libreswan-4.3.tar.gz 3489322 BLAKE2B 36908bf043fb1085f40b4a5f35ca6dc1563e1a1701f9cced9cb6765094bb2ef603b6d6d4b076a333d540f6454c10b6350d9b8c20de8bc3f27b19915b4cf42b9f SHA512 4687c867d34655cd33997edf4ab7887b2121af41c99d1bd9c794fce1c1eef412f5528de7a338e92a44c1c5d0aaa8fbeb756b89849fcad3deb45a418751e64045
27
28 diff --git a/net-vpn/libreswan/libreswan-4.1-r1.ebuild b/net-vpn/libreswan/libreswan-4.1-r1.ebuild
29 deleted file mode 100644
30 index e837a675077..00000000000
31 --- a/net-vpn/libreswan/libreswan-4.1-r1.ebuild
32 +++ /dev/null
33 @@ -1,120 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit systemd toolchain-funcs
40 -
41 -SRC_URI="https://download.libreswan.org/${P}.tar.gz"
42 -KEYWORDS="~amd64 ~arm ~ppc ~x86"
43 -
44 -DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
45 -HOMEPAGE="https://libreswan.org/"
46 -
47 -LICENSE="GPL-2 BSD-4 RSA DES"
48 -SLOT="0"
49 -IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
50 -RESTRICT="!test? ( test )"
51 -
52 -DEPEND="
53 - dev-libs/gmp:0=
54 - dev-libs/libevent:0=
55 - dev-libs/nspr
56 - >=dev-libs/nss-3.42
57 - >=sys-kernel/linux-headers-4.19
58 - caps? ( sys-libs/libcap-ng )
59 - curl? ( net-misc/curl )
60 - dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
61 - ldap? ( net-nds/openldap )
62 - pam? ( sys-libs/pam )
63 - seccomp? ( sys-libs/libseccomp )
64 - selinux? ( sys-libs/libselinux )
65 - systemd? ( sys-apps/systemd:0= )
66 -"
67 -BDEPEND="
68 - app-text/docbook-xml-dtd:4.1.2
69 - app-text/xmlto
70 - dev-libs/nss
71 - sys-devel/bison
72 - sys-devel/flex
73 - virtual/pkgconfig
74 - test? ( dev-python/setproctitle )
75 -"
76 -RDEPEND="${DEPEND}
77 - dev-libs/nss[utils(+)]
78 - sys-apps/iproute2
79 - !net-vpn/strongswan
80 - selinux? ( sec-policy/selinux-ipsec )
81 -"
82 -
83 -usetf() {
84 - usex "$1" true false
85 -}
86 -
87 -PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" )
88 -
89 -src_prepare() {
90 - sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
91 - sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
92 - default
93 -}
94 -
95 -src_configure() {
96 - tc-export AR CC
97 - export PREFIX=/usr
98 - export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
99 - export FINALDOCDIR=/usr/share/doc/${PF}/html
100 - export INITSYSTEM=openrc
101 - export INITDDIRS=
102 - export INITDDIR_DEFAULT=/etc/init.d
103 - export USERCOMPILE=${CFLAGS}
104 - export USERLINK=${LDFLAGS}
105 - export USE_DNSSEC=$(usetf dnssec)
106 - export USE_LABELED_IPSEC=$(usetf selinux)
107 - export USE_LIBCAP_NG=$(usetf caps)
108 - export USE_LIBCURL=$(usetf curl)
109 - export USE_LINUX_AUDIT=$(usetf selinux)
110 - export USE_LDAP=$(usetf ldap)
111 - export USE_NM=$(usetf networkmanager)
112 - export USE_SECCOMP=$(usetf seccomp)
113 - export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
114 - export SD_WATCHDOGSEC=$(usex systemd 200 0)
115 - export USE_XAUTHPAM=$(usetf pam)
116 - export DEBUG_CFLAGS=
117 - export OPTIMIZE_CFLAGS=
118 - export WERROR_CFLAGS=
119 -}
120 -
121 -src_compile() {
122 - emake all
123 - emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
124 -}
125 -
126 -src_test() {
127 - : # integration tests only that require set of kvms to be set up
128 -}
129 -
130 -src_install() {
131 - default
132 - emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
133 -
134 - echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
135 - fperms 0600 /etc/ipsec.secrets
136 -
137 - keepdir /var/lib/ipsec/nss
138 - fperms 0700 /var/lib/ipsec/nss
139 -
140 - dodoc -r docs
141 -
142 - find "${D}" -type d -empty -delete || die
143 -}
144 -
145 -pkg_postinst() {
146 - local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
147 - if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
148 - ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
149 - certutil -N -d "${IPSEC_CONFDIR}" --empty-password
150 - eend $?
151 - einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
152 - fi
153 -}
154
155 diff --git a/net-vpn/libreswan/libreswan-4.1.ebuild b/net-vpn/libreswan/libreswan-4.1.ebuild
156 deleted file mode 100644
157 index 71193442767..00000000000
158 --- a/net-vpn/libreswan/libreswan-4.1.ebuild
159 +++ /dev/null
160 @@ -1,117 +0,0 @@
161 -# Copyright 1999-2020 Gentoo Authors
162 -# Distributed under the terms of the GNU General Public License v2
163 -
164 -EAPI=7
165 -
166 -inherit systemd toolchain-funcs
167 -
168 -SRC_URI="https://download.libreswan.org/${P}.tar.gz"
169 -KEYWORDS="~amd64 ~arm ~ppc ~x86"
170 -
171 -DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
172 -HOMEPAGE="https://libreswan.org/"
173 -
174 -LICENSE="GPL-2 BSD-4 RSA DES"
175 -SLOT="0"
176 -IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
177 -RESTRICT="!test? ( test )"
178 -
179 -DEPEND="
180 - dev-libs/gmp:0=
181 - dev-libs/libevent:0=
182 - dev-libs/nspr
183 - >=dev-libs/nss-3.42
184 - >=sys-kernel/linux-headers-4.19
185 - caps? ( sys-libs/libcap-ng )
186 - curl? ( net-misc/curl )
187 - dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
188 - ldap? ( net-nds/openldap )
189 - pam? ( sys-libs/pam )
190 - seccomp? ( sys-libs/libseccomp )
191 - selinux? ( sys-libs/libselinux )
192 - systemd? ( sys-apps/systemd:0= )
193 -"
194 -BDEPEND="
195 - app-text/docbook-xml-dtd:4.1.2
196 - app-text/xmlto
197 - dev-libs/nss
198 - sys-devel/bison
199 - sys-devel/flex
200 - virtual/pkgconfig
201 - test? ( dev-python/setproctitle )
202 -"
203 -RDEPEND="${DEPEND}
204 - dev-libs/nss[utils(+)]
205 - sys-apps/iproute2
206 - !net-vpn/strongswan
207 - selinux? ( sec-policy/selinux-ipsec )
208 -"
209 -
210 -usetf() {
211 - usex "$1" true false
212 -}
213 -
214 -PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" )
215 -
216 -src_prepare() {
217 - sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
218 - sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
219 - default
220 -}
221 -
222 -src_configure() {
223 - tc-export AR CC
224 - export PREFIX=/usr
225 - export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
226 - export FINALDOCDIR=/usr/share/doc/${PF}/html
227 - export INITSYSTEM=openrc
228 - export INITDDIRS=
229 - export INITDDIR_DEFAULT=/etc/init.d
230 - export USERCOMPILE=${CFLAGS}
231 - export USERLINK=${LDFLAGS}
232 - export USE_DNSSEC=$(usetf dnssec)
233 - export USE_LABELED_IPSEC=$(usetf selinux)
234 - export USE_LIBCAP_NG=$(usetf caps)
235 - export USE_LIBCURL=$(usetf curl)
236 - export USE_LINUX_AUDIT=$(usetf selinux)
237 - export USE_LDAP=$(usetf ldap)
238 - export USE_NM=$(usetf networkmanager)
239 - export USE_SECCOMP=$(usetf seccomp)
240 - export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
241 - export SD_WATCHDOGSEC=$(usex systemd 200 0)
242 - export USE_XAUTHPAM=$(usetf pam)
243 - export DEBUG_CFLAGS=
244 - export OPTIMIZE_CFLAGS=
245 - export WERROR_CFLAGS=
246 -}
247 -
248 -src_compile() {
249 - emake all
250 - emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
251 -}
252 -
253 -src_test() {
254 - : # integration tests only that require set of kvms to be set up
255 -}
256 -
257 -src_install() {
258 - default
259 - emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
260 -
261 - echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
262 - fperms 0600 /etc/ipsec.secrets
263 -
264 - dodoc -r docs
265 -
266 - find "${D}" -type d -empty -delete || die
267 -}
268 -
269 -pkg_postinst() {
270 - local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
271 - if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
272 - ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
273 - certutil -N -d "${IPSEC_CONFDIR}" --empty-password
274 - eend $?
275 - einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
276 - fi
277 -}