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