gentoo resync : 27.01.2018

5 files changed, 19 insertions, 7 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index ac8dd4216367..2e104847925b 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 6b4a9f0b46da..d133990f6a6e 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,7 +1,7 @@
-DIST libreswan-3.20.tar.gz 8898915 BLAKE2B 5b1d10e5eef757062604d0ccac2502114b81bfcadc4cec927e07ff89e859eea2559eabf6b734e63a8049506d81e3dc9c131594759e72d5e5f0d7b7eb87989689 SHA512 89f562412d03e0e9af1bceeda18ab73a749046c37e05dab719468cb537e16803a3b270781de9de88416b2d63b7b0fd85df0c593ca59c30ba3d681526f272fc93
 DIST libreswan-3.21.tar.gz 8945666 BLAKE2B 88a96310d54f44c28eb676689c76737a44bfaf17c02146297f1759f1019d8cbb6effc15175880c18bf08b265778a2aba9d055172ea710c259e14cbe2fd84c158 SHA512 f1ef002b3e0869920edfebfc8efd73d9a9f84f64a77ad4832f46b12dfdd3c31cdf48c1473522b63f155058592c46af05995756af5440ca3e9c0fa5207436e0fc
 DIST libreswan-3.22.tar.gz 6910418 BLAKE2B c06134fa2d1096231797f1ea93de8ed61121472b10ae30ee9a843250dce4ef9f21e7d3bf63f38daf53fbfd8d1e435cfdc704743d0fdcbde8ecac137d9becac48 SHA512 93868327394527750590e1297443d3eb1c9a528d680348098fd2913123dac52c9fecd73b855ee00586c2516b8aa00f7f0d158d8e9b19d7487b5fb26432b86aff
-EBUILD libreswan-3.20.ebuild 2336 BLAKE2B 9d3ff96d09ceee945128bec6b2575322ac994c89ddfc491db4f50522f22ce2d559d3a02b21ce8ee86f8736455a72bb0d2c0f82bebcac5a4fe1e9bae5c1b70269 SHA512 4c6ecfb7ebcf4d7e27edab37079a84ae0a39b0bf5a6f0b44b194e960c98caccc52d54f51e1a36a39899ea1ce5295561d1f6aa4a66c416c220d1c4e9d083e740d
+DIST libreswan-3.23.tar.gz 3836073 BLAKE2B ffb27ed75618afcf39c36b7326bb1e4b70ea8337bb4b13951bef95dc13989613c226fe83e031eeba080f55f98262df432b776c3ac5b7b4fb740506f918172ed3 SHA512 3645af522ea9ac868c55bfadfd2cf27dc5acb247543f43290cbe677a90cd00316be6520ca2128b9aaecce2b0293710ae6a2bd710a7d93198b8cb81e32276ced8
 EBUILD libreswan-3.21.ebuild 2568 BLAKE2B 1df86e3bdaebd713fc430d09270bd36d6585696920c936ec1e80d63ca14d829eeb097597d7aa2001fc3f1d7e3aa598d1d72c8a10baf5e5661b4a292a9c1f463b SHA512 65fa1471cd46cbf5cb816f3b4bfe9f29a09b0ffb8d28e688544be044c5b794673d0b89c108c810b43d44fca4ca3107b4c8ff6cf364899211a7c0ea9442d45bfa
 EBUILD libreswan-3.22.ebuild 2814 BLAKE2B 585feda36983c3ac31d4bb5995655576d7d775878488661990f10f457f953b133e574fd91ae84e5bfc3b3fcf1f9bf687c4f495e81df27d4e8f1253f77515c178 SHA512 4c49bb8a4cfc2fb4f52a07484e6bff60ad46a21337465b438733a9d37f6be690b1b124b0bfbf78998a471e4187487a4907757757d91013dfb41c19eb1d14a9a1
+EBUILD libreswan-3.23.ebuild 2814 BLAKE2B 75a2bd92b38261da8141c05e287e9ee33d55b2a19aaddfb30b2f76fea4e944979345512ba1d29465342066646d69cabfef85f4417e471350a05f8becd7f73f9a SHA512 c5c8409272f7bb661e9578ff7d97c52fd07f291b8392826031b106998f1c516f6a6f343813cafdeef4c6245e4123509c764dd303a40200a9b0f98b0821c14a1e
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.20.ebuild b/net-vpn/libreswan/libreswan-3.23.ebuild
index 11837d0212da..b71d536ae106 100644
--- a/net-vpn/libreswan/libreswan-3.20.ebuild
+++ b/net-vpn/libreswan/libreswan-3.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,14 +6,14 @@ EAPI=6
 inherit systemd toolchain-funcs
 
 SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~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 systemd"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
 
 COMMON_DEPEND="
 	dev-libs/gmp:0=
@@ -24,6 +24,8 @@ COMMON_DEPEND="
 	dnssec? ( net-dns/unbound net-libs/ldns )
 	ldap? ( net-nds/openldap )
 	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
 	systemd? ( sys-apps/systemd:0= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -33,12 +35,14 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-libs/nss[utils(+)]
 	sys-apps/iproute2
 	!net-misc/openswan
 	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
 "
 
 usetf() {
@@ -47,6 +51,7 @@ usetf() {
 
 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
 }
 
@@ -62,9 +67,12 @@ src_configure() {
 	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)
@@ -78,6 +86,10 @@ src_compile() {
 	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all
 }
 
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
 src_install() {
 	default
 	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 944628f03b6e..be9e7f390a65 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,6 +2,6 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.5.3.tar.bz2 4768820 BLAKE2B 9f9da6c2ef27cec7f6a07f1cd5a7ecc8a92576fad2a5c6379b93d8a2e9d3b0804fe26dc0bc7b303754ef499ee938549c7cafbdf9a3f8f818d14cf88f613fe0fd SHA512 0b0b25d2102c98cda54300dc8c3c3a49a55e64f7c695dda65a24f2194f19bce0b7aab9e4f7486c243b552f9d1a94867d6a8782ee504aad1c9973809706d599ac
 DIST strongswan-5.6.0.tar.bz2 4850722 BLAKE2B edb9f2b277cd8bccf886a824e4b3fb3c06af7510d9e21283fcb8d8ba9cf234f38182fcd1ca0c350b4039945ab10888406986d9a0b8edac24fe09faf0b8967fb2 SHA512 9362069a01c3642e62864d88fdb409a3c7514bf7c92cbe36e552c6a80915119cf5bb91c39592aab2d15b562684a0628a764e4fa7636d3b5fd2ebaf165c0ce649
 EBUILD strongswan-5.5.3.ebuild 9280 BLAKE2B b6c402f593f7f7d7b15c5d0fe9dcf05aaddd4a86152e788cfdf62f7a26a93ae98a2f947b3ae5de554aa008fdc369ef4cdf1f9fb73532b2d1ab05becf6526ffc3 SHA512 0131f9d5a852379941bfae1259b3962eb6e1676510e798215b4859277deedc9c6adbce7c6aafc5e07cfc5546663cf036394c27c6a166b8cc098bb9afddc51bbf
-EBUILD strongswan-5.6.0-r1.ebuild 9317 BLAKE2B 10940b5090de8855717a7a54e63b8252848b3361e39f7eee1e12945438b846e67af0d1eea185c490bbaef94d49ddd80329f9db50fed5456f766f996be75388d3 SHA512 dbe3b2a87579f77d943fb674d8f4f60b4dc2d928af26649cc56b4d408aed13aa683279788c261d57234cc9bfcb5823674bac28c7b105e4409a024332056126e4
+EBUILD strongswan-5.6.0-r1.ebuild 9316 BLAKE2B 376087c977ce1ba389d1bdad9dedf782aa51a9de271b5728065da508cf7840dbe9cc1519cee75212bad803913fd90c05bdb81ef6003dfbd5a5123dca9257b71e SHA512 7fa010b7e81e4e4eb074059ba4acc20b50f0543b38674fd3e793ec380fa85776bca6897cf0878f9fa9534655aeff9d2c7eaa07c474f6b39af3b2e1511860f60c
 EBUILD strongswan-5.6.0.ebuild 9284 BLAKE2B 3f4da75ec2607a58c1e163010c2be07d71433392d741ab2d9b045df8873d2965936dec7f457615aadc00085809dba08c3a1fd339275e9d1d4f3a3346fe5662eb SHA512 c3f51e481bd8df4fd5f573a54214a1cd5a9098c5432c8e5926ad371d6bd9105391d2c658d61237ecf651f356dc5dd5f46d6fb91af0e347419c66e9ac48ab4494
 MISC metadata.xml 3660 BLAKE2B 3d25016e6a4f70aa3f8e5bc1081dd535220084529326af8f69a58906d3c4b9b0b8b4a56f17abd1315adbcdfb515c4dd63395bf1884939fab75f1ad2fcf09e434 SHA512 ec594568c35dc645d790b9582413dc5ca54a8d5ea73059299920854cb1053c22f232bd87d0044ff85108021c3fd4c0fc7ed6c7070fa438a159ad4e8e98048478
diff --git a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
index f6c8a771da54..7d50b595dfe1 100644
--- a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"