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