gentoo resync : 19.05.2018

7 files changed, 32 insertions, 13 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 8a8f21813336..063f5547dd19 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/osmo-fl2k/Manifest b/net-wireless/osmo-fl2k/Manifest
index 21eefcb3054f..14e5809ae0ac 100644
--- a/net-wireless/osmo-fl2k/Manifest
+++ b/net-wireless/osmo-fl2k/Manifest
@@ -1,4 +1,4 @@
-DIST osmo-fl2k-0.1.1.tar.xz 59196 BLAKE2B 031b9bdf7f03f3e9c3bcb158bf5695b3771381d5cbabb94853580c57cf8a7bafcacba6168815b6ff46d6fb4e463ea6caff0e1d289692510801409d8b4cf28b72 SHA512 fb19c34919956970106fe7a69632e691f01caef3a1bc212501304f9d910dd08389f95b8d031b3336d009afc08744d846ea3bc349e1d9446bbfd13e11ec95ceff
-EBUILD osmo-fl2k-0.1.1.ebuild 1076 BLAKE2B 4ea025abae89747ec298edead411de981d76f3c2221b47af56a335474dd9d559b9d466d313545ac3b7d09b01cc6972a779a5638a01c95e8c7dca9c0f1bd25a87 SHA512 706599597c1f99901b52dc9939823835f419d300275af0761cbbf17519e651b511a523b45b76a197639887c1d753f7d861924ebda214a600d0790f6381a9c862
-EBUILD osmo-fl2k-9999.ebuild 1076 BLAKE2B 4ea025abae89747ec298edead411de981d76f3c2221b47af56a335474dd9d559b9d466d313545ac3b7d09b01cc6972a779a5638a01c95e8c7dca9c0f1bd25a87 SHA512 706599597c1f99901b52dc9939823835f419d300275af0761cbbf17519e651b511a523b45b76a197639887c1d753f7d861924ebda214a600d0790f6381a9c862
+DIST osmo-fl2k-0.1.1.tar.gz 68811 BLAKE2B 6c1b602b47d5e0816d93750e0470ed4530e587341f28e2e93c3aef634d7108b981cc4a96b758d72796316f15e4401ef746b91a983f374e63103ac76d8b7168c1 SHA512 55b384e18cfa5a1ab660860874cc6f6256b812ee867c863b6cd12c67cfc3517632469fc1ed6b83a35c956aa5371e1198634a52b292b109da828bee60c23f5140
+EBUILD osmo-fl2k-0.1.1.ebuild 1129 BLAKE2B fb703d8fdf14b0c7589a73d019fcafcfeb582d4cc9b389d2c33575c956846cf735f21c0c8c50878f297aa72ff21f6765fb8d652556fae17ec72c4a3e091b509c SHA512 ea525b40ec655afe6c7b0b3a5bbf2ba62d1c15b07821f9183ac872c83c8657c92b52451924ade3c81d2838e926d6843eafd3cd9b923b963f9950dfe5e2966dd1
+EBUILD osmo-fl2k-9999.ebuild 1129 BLAKE2B fb703d8fdf14b0c7589a73d019fcafcfeb582d4cc9b389d2c33575c956846cf735f21c0c8c50878f297aa72ff21f6765fb8d652556fae17ec72c4a3e091b509c SHA512 ea525b40ec655afe6c7b0b3a5bbf2ba62d1c15b07821f9183ac872c83c8657c92b52451924ade3c81d2838e926d6843eafd3cd9b923b963f9950dfe5e2966dd1
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild
index 8125eb474ee7..5c0705ae8729 100644
--- a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild
+++ b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://git.osmocom.org/osmo-fl2k"
 else
 	KEYWORDS="~amd64"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	SRC_URI="https://git.osmocom.org/osmo-fl2k/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2+"
@@ -23,8 +23,8 @@ SLOT="0"
 IUSE="udev"
 
 DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}
-	media-sound/sox
+RDEPEND="${DEPEND}"
+PDEPEND="media-sound/sox
 	sys-apps/pv"
 
 # continguous memory allocator can optionally be used for zero-copy transfer
diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
index 8125eb474ee7..5c0705ae8729 100644
--- a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
+++ b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://git.osmocom.org/osmo-fl2k"
 else
 	KEYWORDS="~amd64"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	SRC_URI="https://git.osmocom.org/osmo-fl2k/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2+"
@@ -23,8 +23,8 @@ SLOT="0"
 IUSE="udev"
 
 DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}
-	media-sound/sox
+RDEPEND="${DEPEND}"
+PDEPEND="media-sound/sox
 	sys-apps/pv"
 
 # continguous memory allocator can optionally be used for zero-copy transfer
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 932c643f97c7..5eff372dfde0 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -17,5 +17,5 @@ DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 99c61326c402f60b384fa6c9a7381e43d
 EBUILD wpa_supplicant-2.6-r3.ebuild 11044 BLAKE2B ec092b2d8c8094c19ce1e019642ff074cfcc8ab40045d394e01c219fad6cb306dd0c8e6e33879c33d950d95af5bb5e851a667030aad5cc1fe6c9b5aeb6d9fc7d SHA512 2e2b23824a0a073a44e7c40cf21bc06f797a34d8768ecd645aa0f7216c81e1f0425fb09129824b1d927166f0d6fce0f4cff87afd1f65214db4546d83031c1e62
 EBUILD wpa_supplicant-2.6-r5.ebuild 11782 BLAKE2B b74866e78cc82cb5e3600135052024c11b628371932b52634754fa578c6f31ed0d58f5ba2e980fdd7f1ddf50c92e721e538098af2270a9061c64ee5e902940fe SHA512 afd5fc95a798031f7ac84fb17737a113db720686d9ad304d2abfd56b4c16468fc446926594ff87b17438d2b9c39762865782de794019a780074df87f9479307e
 EBUILD wpa_supplicant-2.6-r6.ebuild 11812 BLAKE2B b9ab92e75bc23b3f577d25f01c975b4819fe70c80a7b7af97bfebd3d472a10f0989d956d76b149661ebb0c35efb846e785ae0f7d5fab854d52913d549558c6a0 SHA512 2c02e63568357f8b2772a338225b7aa384479a1a3d98883bcd6e5fcaf79f7108300531b4672e8df6420a6eec40fc217b366bfde487948adfc1fa24c909085f5a
-EBUILD wpa_supplicant-2.6-r7.ebuild 11936 BLAKE2B 6c1e913a6614ea7f615c33b488bf68a193ae7323b058405e142e7db0fcb8b9bb1c737992ca4fb408c61703f53c802ae428831ec0910baadaa9577249bfde28ce SHA512 95142b3b8f81367a27bef80dc63ec6dc37407bfd674406da116ab0a7698a7d1ac4694dc78f655d19b20e67484537f8aee6b68e7b91d0e35398c6d07e52cc9318
-MISC metadata.xml 1321 BLAKE2B 803180e489eb69bc2992a1fb794e16aa897f7502904771653ca507e339eb211a15d805430a27ea8fd55e64ac23799ca70a65b33f4b35639e77d67f7dabe07d56 SHA512 bcc33ebea7348879a4dcaaaa7baeae3e316e5b75919b55310be1dc2dacac6a8e8d9993ac3481d3a790c12b5515f6fd3b1f778737b4c19ecf37eedc9c2e20a9ed
+EBUILD wpa_supplicant-2.6-r8.ebuild 12421 BLAKE2B 83f93e2381b3108939901b18a5222e0a632fd79913ba6f5c2d454e871bceb65f3d9a87dea0a5eaab2f556866ee1e554d570c7181a6e3aa12fb428a06eab677c6 SHA512 03667d27cc8c82df0b3223649f0c1649a055f3bc52dbd2cdaf6ef44a214033c9d073af41e0c569cd25cc8221db058c1112ece26f14697bc088a5719bc8327622
+MISC metadata.xml 1387 BLAKE2B d18ad59ec0e7852ed299596a6217d705f3344b1e215875fa5eb4afb9aeb91d17edd77ed35e5cb83b6868b529d3c173574f7d1810f2f145c8398860f72b0792fe SHA512 ab26df54e5dc68ef0db3f654df1dbf144b38d78e63d11d428bd04a4b374c6b704b334e3812a4042b4827bdab887bebe6de24a82c05edb7df7d614d4d4b8925fb
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index 77a7bbd4d699..885b7c3d6bbd 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="p2p">Add support for Wi-Fi Direct mode</flag>
 		<flag name="ps3">Add support for ps3 hypervisor driven gelic wifi</flag>
 		<flag name="privsep">Enable wpa_priv privledge separation binary</flag>
+		<flag name="suiteb">Enable enable NSA Suite B encryption</flag>
 		<flag name="tdls">Add support for Tunneled Direct Link Setup (802.11z)</flag>
 		<flag name="uncommon-eap-types">Add support for GPSK, SAKE, GPSK_SHA256, IKEV2 and EKE</flag>
 		<flag name="wps">Add support for Wi-Fi Protected Setup</flag>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r8.ebuild
index 08686df3b1f1..15d823b942f1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r7.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r8.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 REQUIRED_USE="smartcard? ( ssl )"
 
 CDEPEND="dbus? ( sys-apps/dbus )
@@ -231,18 +231,29 @@ src_configure() {
 		Kconfig_style_config WPA_CLI_EDIT
 	fi
 
+	if use suiteb; then
+		Kconfig_style_config SUITEB
+	fi
+
 	# SSL authentication methods
 	if use ssl ; then
 		if use gnutls ; then
 			Kconfig_style_config TLS gnutls
 			Kconfig_style_config GNUTLS_EXTRA
 		else
+			#this fails for gnutls
+			Kconfig_style_config SUITEB192
 			Kconfig_style_config TLS openssl
 			if ! use bindist; then
+			  #this fails for gnutls
 			  Kconfig_style_config EAP_PWD
+			  # SAE fails on gnutls and everything below here needs SAE
 			  # Enabling mesh networks.
 			  Kconfig_style_config MESH
-			  #we also need to disable OWE and FILS, except they aren't enabled yet
+			  #WPA3
+			  Kconfig_style_config OWE
+			  Kconfig_style_config SAE
+			  #we also need to disable FILS, except that isn't enabled yet
 			fi
 
 		fi
@@ -422,6 +433,13 @@ pkg_postinst() {
 		ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
 	fi
 
+	if use bindist || use gnutls; then
+		if ! use libressl; then
+			ewarn "Using bindist or gnutls use flags presently breaks WPA3 (specifically SAE and OWE)."
+			ewarn "This is incredibly undesirable"
+		fi
+	fi
+
 	# Mea culpa, feel free to remove that after some time --mgorny.
 	local fn
 	for fn in wpa_supplicant{,@wlan0}.service; do