[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2023-12-27 Thread Sam James
commit: 9821c1efc5bed6d5166951b3986baa5c73e11c3a
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:36:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:37:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9821c1ef

net-wireless/hostapd: drop 2.10-r1, 2.10-r2

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/Manifest   |   1 -
 net-wireless/hostapd/hostapd-2.10-r1.ebuild | 267 
 net-wireless/hostapd/hostapd-2.10-r2.ebuild | 267 
 net-wireless/hostapd/metadata.xml   |   1 -
 4 files changed, 536 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 6bcebd0b18ae..c70e3773b0ab 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,2 +1 @@
 DIST hostapd-2.10.tar.gz 2440435 BLAKE2B 
dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f
 SHA512 
243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f
-DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/hostapd-2.10-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.10-r1.ebuild
deleted file mode 100644
index 44a7d7287c2a..
--- a/net-wireless/hostapd/hostapd-2.10-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd savedconfig toolchain-funcs
-
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
-S="${S}/${PN}"
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then
-   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
-   else
-   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
-   fi
-
-   # Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps +crda"
-
-DEPEND="
-   internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
-   kernel_linux? (
-   >=dev-libs/libnl-3.2:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )
-"
-RDEPEND="
-   ${DEPEND}
-   selinux? ( sec-policy/selinux-hostapd )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-   if use internal-tls; then
-   ewarn "internal-tls implementation is experimental and provides 
fewer features"
-   fi
-}
-
-src_unpack() {
-   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
-   default
-
-   if [[ ${PV} ==  ]] ; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   default
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-}
-
-src_configure() {
-   local CONFIG="${S}"/.config
-
-   restore_config "${CONFIG}"
-   if [[ -f "${CONFIG}" ]]; then
-   default
-   return 0
-   fi
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG} || die
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG} || die
-   echo "CONFIG_ERP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
-
-   if use suiteb; then
-   echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
-   fi
-
-   if use internal-tls ; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG} || die
-   else
-   # SSL authentication methods
-   echo "CONFIG_DPP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_TLS=y" >> 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2023-11-04 Thread Sam James
commit: 30685301410b26e5e319ac83b24fa87c0b425f62
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  4 10:50:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  4 10:50:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30685301

net-wireless/hostapd: Stabilize 2.10-r3 arm64, #916801

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.10-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.10-r3.ebuild
index bd0231488bdb..6ca90c0361fa 100644
--- a/net-wireless/hostapd/hostapd-2.10-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10-r3.ebuild
@@ -20,7 +20,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 arm arm64 ~mips ~ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/files/, net-wireless/hostapd/

2023-09-24 Thread Sam James
commit: 7eac0bbc753a02c2a24de70e70e91d3297c1a7ed
Author: Paul Zander  gmail  com>
AuthorDate: Wed Jun 21 00:17:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 25 02:20:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eac0bbc

net-wireless/hostapd: move dead extra archive into files dir

The init and conf files were in the user dir of a now retired dev. Move
them into the files dir.

This also adds quotes around variables.

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32561
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/files/hostapd-conf.d  |   9 ++
 net-wireless/hostapd/files/hostapd-init.d  |  38 ++
 net-wireless/hostapd/files/hostapd.service |   9 ++
 ...{hostapd-.ebuild => hostapd-2.10-r3.ebuild} | 135 ++---
 net-wireless/hostapd/hostapd-.ebuild   | 135 ++---
 5 files changed, 188 insertions(+), 138 deletions(-)

diff --git a/net-wireless/hostapd/files/hostapd-conf.d 
b/net-wireless/hostapd/files/hostapd-conf.d
new file mode 100644
index ..7d05735eb3b4
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-conf.d
@@ -0,0 +1,9 @@
+# Space separated List of interfaces which needs to be started before
+# hostapd
+INTERFACES="wlan0"
+
+# Space separated list of configuration files
+CONFIGS="/etc/hostapd/hostapd.conf"
+
+# Extra options to pass to hostapd, see hostapd(8)
+OPTIONS=""

diff --git a/net-wireless/hostapd/files/hostapd-init.d 
b/net-wireless/hostapd/files/hostapd-init.d
new file mode 100644
index ..3c0fdc9e843b
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-init.d
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/${SVCNAME}.pid"
+command="/usr/sbin/hostapd"
+command_args="-P ${pidfile} -B ${OPTIONS} ${CONFIGS}"
+
+extra_started_commands="reload"
+
+depend() {
+   local myneeds=
+   for iface in ${INTERFACES}; do
+   myneeds="${myneeds} net.${iface}"
+   done
+
+   [ -n "${myneeds}" ] && need ${myneeds}
+   use logger
+}
+
+start_pre() {
+   local file
+
+   for file in ${CONFIGS}; do
+   if [ ! -r "${file}" ]; then
+   eerror "hostapd configuration file (${CONFIG}) not 
found"
+   return 1
+   fi
+   done
+}
+
+reload() {
+   start_pre || return 1
+
+   ebegin "Reloading ${SVCNAME} configuration"
+   kill -HUP $(cat ${pidfile}) > /dev/null 2>&1
+   eend $?
+}

diff --git a/net-wireless/hostapd/files/hostapd.service 
b/net-wireless/hostapd/files/hostapd.service
new file mode 100644
index ..8f0ee8e8f744
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS 
Authenticator
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/hostapd /etc/hostapd/hostapd.conf
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-2.10-r3.ebuild
similarity index 54%
copy from net-wireless/hostapd/hostapd-.ebuild
copy to net-wireless/hostapd/hostapd-2.10-r3.ebuild
index 81c6f18518bb..b1ed58c052a2 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10-r3.ebuild
@@ -5,11 +5,8 @@ EAPI=8
 
 inherit flag-o-matic systemd savedconfig toolchain-funcs
 
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
 S="${S}/${PN}"
 
 if [[ ${PV} ==  ]]; then
@@ -82,112 +79,112 @@ src_configure() {
fi
 
# toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG} || die
+   echo "CC = $(tc-getCC)" > "${CONFIG}" || die
 
# EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG} || die
-   echo "CONFIG_ERP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP=y" >> "${CONFIG}" || die
+   echo "CONFIG_ERP=y" >> "${CONFIG}" || die
+   echo "CONFIG_EAP_MD5=y" >> "${CONFIG}" || die
 
if use suiteb; then
-   echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
+   echo "CONFIG_SUITEB=y" >> "${CONFIG}" || die
+   echo "CONFIG_SUITEB192=y" >> "${CONFIG}" || die
fi
 
if use internal-tls ; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG} || die
+   echo "CONFIG_TLS=internal" >> "${CONFIG}" || die
else
# SSL authentication methods
-   echo "CONFIG_DPP=y" >> ${CONFIG} || die
-   

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2023-08-19 Thread Rick Farina
commit: aa36dcf8f9053c5d7760b4ef56d5d76a251818b0
Author: Rick Farina  gentoo  org>
AuthorDate: Sat Aug 19 17:10:18 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sat Aug 19 17:29:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa36dcf8

net-wireless/hostapd: drop 2.10

Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/hostapd/hostapd-2.10.ebuild | 262 ---
 1 file changed, 262 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
deleted file mode 100644
index c9c014c28576..
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd savedconfig toolchain-funcs
-
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
-S="${S}/${PN}"
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then
-   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
-   else
-   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
-   fi
-
-   # Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
-
-DEPEND="
-   internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
-   kernel_linux? (
-   >=dev-libs/libnl-3.2:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-   if use internal-tls; then
-   ewarn "internal-tls implementation is experimental and provides 
fewer features"
-   fi
-}
-
-src_unpack() {
-   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
-   default
-
-   if [[ ${PV} ==  ]] ; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   default
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-}
-
-src_configure() {
-   local CONFIG="${S}"/.config
-
-   restore_config "${CONFIG}"
-   if [[ -f "${CONFIG}" ]]; then
-   default
-   return 0
-   fi
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG} || die
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG} || die
-   echo "CONFIG_ERP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
-
-   if use suiteb; then
-   echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
-   fi
-
-   if use internal-tls ; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG} || die
-   else
-   # SSL authentication methods
-   echo "CONFIG_DPP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die
-   echo "CONFIG_OWE=y" >> ${CONFIG} || die
-   echo "CONFIG_SAE=y" >> ${CONFIG} || die
-   echo "CONFIG_TLSV11=y" >> ${CONFIG} || die
-   echo "CONFIG_TLSV12=y" >> ${CONFIG} || die
-   fi
-
-   if use wps; then
-   # Enable Wi-Fi Protected Setup
-   echo "CONFIG_WPS=y" >> ${CONFIG} || die
-   echo "CONFIG_WPS2=y" >> ${CONFIG} || die
-   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die
-   echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die
-   einfo "Enabling Wi-Fi Protected Setup support"
-   fi
-
-   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_PAX=y" >> 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2023-08-19 Thread Rick Farina
commit: 693eff9aa68d29db33573e71849743809ff9d066
Author: Rick Farina  gentoo  org>
AuthorDate: Sat Aug 19 17:23:36 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sat Aug 19 17:29:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693eff9a

net-wireless/hostapd: make crda optional

net-wireless/wireless-regdb now handles crda and must be in rdep for
any/all wireless transmitters
Signed-off-by: Rick Farina  gentoo.org>

 .../hostapd/{hostapd-.ebuild => hostapd-2.10-r2.ebuild}   | 8 
 net-wireless/hostapd/hostapd-.ebuild  | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-2.10-r2.ebuild
similarity index 98%
copy from net-wireless/hostapd/hostapd-.ebuild
copy to net-wireless/hostapd/hostapd-2.10-r2.ebuild
index f96e871c975b..81c6f18518bb 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd savedconfig toolchain-funcs
 
@@ -28,17 +28,17 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps"
 
 DEPEND="
internal-tls? ( dev-libs/libtommath )
!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
kernel_linux? (
+   net-wireless/wireless-regdb
>=dev-libs/libnl-3.2:3
-   crda? ( net-wireless/crda )
)
netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="
${DEPEND}

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index f96e871c975b..81c6f18518bb 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd savedconfig toolchain-funcs
 
@@ -28,17 +28,17 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps"
 
 DEPEND="
internal-tls? ( dev-libs/libtommath )
!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
kernel_linux? (
+   net-wireless/wireless-regdb
>=dev-libs/libnl-3.2:3
-   crda? ( net-wireless/crda )
)
netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )
+   sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="
${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2023-06-28 Thread Sam James
commit: f2aedaf69eccbd250e94e846318fb3d794348e72
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 07:11:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 07:16:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2aedaf6

net-wireless/hostapd: add missing selinux policy dep

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.10-r1.ebuild | 10 +++---
 net-wireless/hostapd/hostapd-.ebuild| 12 
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.10-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.10-r1.ebuild
index 3f75b8580907..44a7d7287c2a 100644
--- a/net-wireless/hostapd/hostapd-2.10-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10-r1.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps +crda"
 
 DEPEND="
internal-tls? ( dev-libs/libtommath )
@@ -38,8 +38,12 @@ DEPEND="
crda? ( net-wireless/crda )
)
netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-RDEPEND="${DEPEND}"
+   sqlite? ( >=dev-db/sqlite-3 )
+"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-hostapd )
+"
 BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 6e9b6c0d78be..f96e871c975b 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps +crda"
 
 DEPEND="
internal-tls? ( dev-libs/libtommath )
@@ -38,8 +38,12 @@ DEPEND="
crda? ( net-wireless/crda )
)
netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-RDEPEND="${DEPEND}"
+   sqlite? ( >=dev-db/sqlite-3 )
+"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-hostapd )
+"
 BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2023-06-19 Thread Rick Farina
commit: bdf48db3ece65af6815e3a28819b5772ba886bb9
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Jun 19 20:37:26 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Jun 19 20:38:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf48db3

net-wireless/hostapd: moving ax support to 2.10-r1

PR https://github.com/gentoo/gentoo/pull/30697 added wifi 6 support in
place, however, just in case of issues I'd like to preserve the original
2.10 and add ax support in a bump
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/hostapd/{hostapd-2.10.ebuild => hostapd-2.10-r1.ebuild} | 2 +-
 net-wireless/hostapd/hostapd-2.10.ebuild | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10-r1.ebuild
similarity index 99%
copy from net-wireless/hostapd/hostapd-2.10.ebuild
copy to net-wireless/hostapd/hostapd-2.10-r1.ebuild
index 6f98472f8dbc..3f75b8580907 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
index 6f98472f8dbc..c9c014c28576 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -154,7 +154,6 @@ src_configure() {
echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
-   echo "CONFIG_IEEE80211AX=y" >> ${CONFIG} || die
echo "CONFIG_OCV=y" >> ${CONFIG} || die
echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2023-06-19 Thread Rick Farina
commit: 9fc032211d45b112eccf6a9e4fa53c6439b4886f
Author: groche97  gmail  com>
AuthorDate: Sat Apr 22 12:38:21 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Jun 19 20:38:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc03221

net-wireless/hostapd: Added support for wifi 6

Closes: https://bugs.gentoo.org/906575
Closes: https://github.com/gentoo/gentoo/pull/30697
Signed-off-by: groche97  gmail.com>
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/hostapd/hostapd-2.10.ebuild | 1 +
 net-wireless/hostapd/hostapd-.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
index 09e00a11c402..6f98472f8dbc 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10.ebuild
@@ -154,6 +154,7 @@ src_configure() {
echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+   echo "CONFIG_IEEE80211AX=y" >> ${CONFIG} || die
echo "CONFIG_OCV=y" >> ${CONFIG} || die
echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 7a10010c4725..6e9b6c0d78be 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -154,6 +154,7 @@ src_configure() {
echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+   echo "CONFIG_IEEE80211AX=y" >> ${CONFIG} || die
echo "CONFIG_OCV=y" >> ${CONFIG} || die
echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/files/, net-wireless/hostapd/

2022-12-09 Thread Sam James
commit: d6576b2463f3f2fbe8e4c6e3315337a9f8f22ae0
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 10 04:32:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 10 04:35:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6576b24

net-wireless/hostapd: drop 2.9-r6

Bug: https://bugs.gentoo.org/831332
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/Manifest  |   1 -
 ...-not-allow-event-subscriptions-with-URLs-.patch | 150 ---
 ...x-event-message-generation-using-a-long-U.patch |  59 -
 ...ndle-HTTP-initiation-failures-for-events-.patch |  47 
 ...y-ignore-management-frame-from-unexpected.patch |  73 --
 ...date-DigestAlgorithmIdentifier-parameters.patch | 115 -
 net-wireless/hostapd/hostapd-2.9-r6.ebuild | 275 -
 7 files changed, 720 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f33599c9daaa..6bcebd0b18ae 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,3 +1,2 @@
 DIST hostapd-2.10.tar.gz 2440435 BLAKE2B 
dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f
 SHA512 
243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f
-DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 
07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1ac9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01
 SHA512 
66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git 
a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 
b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
deleted file mode 100644
index 0aa8a5ea1de0..
--- 
a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen 
-Date: Wed, 3 Jun 2020 23:17:35 +0300
-Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
- other networks
-
-The UPnP Device Architecture 2.0 specification errata ("UDA errata
-16-04-2020.docx") addresses a problem with notifications being allowed
-to go out to other domains by disallowing such cases. Do such filtering
-for the notification callback URLs to avoid undesired connections to
-external networks based on subscriptions that any device in the local
-network could request when WPS support for external registrars is
-enabled (the upnp_iface parameter in hostapd configuration).
-
-Signed-off-by: Jouni Malinen 

- src/wps/wps_er.c |  2 +-
- src/wps/wps_upnp.c   | 38 --
- src/wps/wps_upnp_i.h |  3 ++-
- 3 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
-index 6bded14327f8..31d2e50e4cff 100644
 a/src/wps/wps_er.c
-+++ b/src/wps/wps_er.c
-@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, 
const char *filter)
-  "with %s", filter);
-   }
-   if (get_netif_info(er->ifname, >ip_addr, >ip_addr_text,
-- er->mac_addr)) {
-+ NULL, er->mac_addr)) {
-   wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
-  "for %s. Does it have IP address?", er->ifname);
-   wps_er_deinit(er, NULL, NULL);
-diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
-index 6e10e4bc0c3f..7d4b7439940e 100644
 a/src/wps/wps_upnp.c
-+++ b/src/wps/wps_upnp.c
-@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s)
- }
- 
- 
-+static int local_network_addr(struct upnp_wps_device_sm *sm,
-+struct sockaddr_in *addr)
-+{
-+  return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
-+  (sm->ip_addr & sm->netmask.s_addr);
-+}
-+
-+
- /* subscr_addr_add_url -- add address(es) for one url to subscription */
- static void subscr_addr_add_url(struct subscription *s, const char *url,
-   size_t url_len)
-@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, 
const char *url,
- 
-   for (rp = result; rp; rp = rp->ai_next) {
-   struct subscr_addr *a;
-+  struct sockaddr_in *addr = (struct 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2022-02-18 Thread Arthur Zamarin
commit: e8afdc7756197237e07acb397441c165edce728f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Feb 19 07:18:51 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 19 07:18:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8afdc77

net-wireless/hostapd: Stabilize 2.10 arm, #833576

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-wireless/hostapd/hostapd-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
index d70b4b738120..09e00a11c402 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm arm64 ~mips ppc x86"
+   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2022-02-18 Thread Sam James
commit: fc31c417554443bccdf275b8bfcbe50ca24e701e
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 00:36:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 00:36:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc31c417

net-wireless/hostapd: Stabilize 2.10 arm64, #833576

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
index 8c5e53f8e413..d70b4b738120 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
+   KEYWORDS="amd64 ~arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2022-02-17 Thread Agostino Sarubbo
commit: 22405fe38f86047168e13d698f4282bb872d14f5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Feb 18 07:40:14 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Feb 18 07:40:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22405fe3

net-wireless/hostapd: ppc stable wrt bug #833576

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/hostapd/hostapd-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
index d1a756b5b9ab..8c5e53f8e413 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2022-02-17 Thread Sam James
commit: 8b07c262f83b6510c048d01b752c2fa8ba03cd70
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 18 03:34:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 18 03:34:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b07c262

net-wireless/hostapd: Stabilize 2.10 amd64, #833576

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
index 7a10010c4725..dea5eafafbcb 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2022-02-17 Thread Sam James
commit: df6f82ff93dc73c354fb637397b26ed9af3a9eef
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 18 03:35:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 18 03:35:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df6f82ff

net-wireless/hostapd: Stabilize 2.10 x86, #833576

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
index dea5eafafbcb..d1a756b5b9ab 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2022-01-16 Thread Sam James
commit: 897e3fc7404602f02dd84b9258b6812a0167e99e
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 17 02:12:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 17 02:20:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897e3fc7

net-wireless/hostapd: add 2.10 (security bump)

Bug: https://bugs.gentoo.org/816957
Bug: https://bugs.gentoo.org/831332
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/Manifest   |  1 +
 .../{hostapd-.ebuild => hostapd-2.10.ebuild}| 17 +++--
 net-wireless/hostapd/hostapd-.ebuild| 17 +++--
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 5e2d0c597715..f33599c9daaa 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,2 +1,3 @@
+DIST hostapd-2.10.tar.gz 2440435 BLAKE2B 
dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f
 SHA512 
243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 
07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1ac9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01
 SHA512 
66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-2.10.ebuild
similarity index 95%
copy from net-wireless/hostapd/hostapd-.ebuild
copy to net-wireless/hostapd/hostapd-2.10.ebuild
index dacd094e49ee..7a10010c4725 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit flag-o-matic systemd savedconfig toolchain-funcs
 
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
 S="${S}/${PN}"
 
@@ -34,7 +34,7 @@ DEPEND="
internal-tls? ( dev-libs/libtommath )
!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
kernel_linux? (
-   dev-libs/libnl:3
+   >=dev-libs/libnl-3.2:3
crda? ( net-wireless/crda )
)
netlink? ( net-libs/libnfnetlink )
@@ -60,9 +60,9 @@ src_unpack() {
 src_prepare() {
# Allow users to apply patches to src/drivers for example,
# i.e. anything outside ${S}/${PN}
-   pushd ../ &>/dev/null || die
+   pushd ../ >/dev/null || die
default
-   popd &>/dev/null || die
+   popd >/dev/null || die
 
sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
"${S}/hostapd.conf" || die
@@ -180,10 +180,7 @@ src_configure() {
echo "CONFIG_SQLITE=y" >> ${CONFIG} || die
fi
 
-   # If we are using libnl 2.0 and above, enable support for it
-   # Removed for now, since the 3.2 version is broken, and we don't
-   # support it.
-   if has_version ">=dev-libs/libnl-3.2"; then
+   if use kernel_linux; then
echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0)
fi

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index dacd094e49ee..7a10010c4725 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit flag-o-matic systemd savedconfig toolchain-funcs
 
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
 S="${S}/${PN}"
 
@@ -34,7 +34,7 @@ DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-08-16 Thread Sam James
commit: f8781a5c3a43ae5282b6fc64793d6150366c6193
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Aug 16 14:51:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 16 16:17:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8781a5c

net-wireless/hostapd: Remove vulnerable 2.9-r5

Bug: https://bugs.gentoo.org/780135
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r5.ebuild | 270 -
 1 file changed, 270 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r5.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r5.ebuild
deleted file mode 100644
index 0e37a731413..000
--- a/net-wireless/hostapd/hostapd-2.9-r5.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
-S="${S}/${PN}"
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then
-   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
-   else
-   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
-   fi
-
-   # Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
-
-DEPEND="
-   internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
-   kernel_linux? (
-   dev-libs/libnl:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-   if use internal-tls; then
-   ewarn "internal-tls implementation is experimental and provides 
fewer features"
-   fi
-}
-
-src_unpack() {
-   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
-   default
-
-   if [[ ${PV} ==  ]] ; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   default
-
-   # CVE-2019-16275 (bug #696032)
-   eapply 
"${FILESDIR}"/${P}-AP-Silently-ignore-management-frame-from-unexpected.patch
-   # CVE-2020-12695 (bug #727542)
-   eapply 
"${FILESDIR}"/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
-   eapply 
"${FILESDIR}"/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
-   eapply 
"${FILESDIR}"/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
-
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-}
-
-src_configure() {
-   local CONFIG="${S}"/.config
-
-   restore_config "${CONFIG}"
-   if [[ -f "${CONFIG}" ]]; then
-   default
-   return 0
-   fi
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG} || die
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG} || die
-   echo "CONFIG_ERP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
-
-   if use suiteb; then
-   echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
-   fi
-
-   if use internal-tls ; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG} || die
-   else
-   # SSL authentication methods
-   echo "CONFIG_DPP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die
-   echo "CONFIG_OWE=y" >> ${CONFIG} || die
-   echo "CONFIG_SAE=y" >> ${CONFIG} || die
-   echo "CONFIG_TLSV11=y" >> ${CONFIG} || die
-   echo "CONFIG_TLSV12=y" >> ${CONFIG} || die
-   fi
-
-   if use wps; then
-   # Enable Wi-Fi Protected Setup
-   echo "CONFIG_WPS=y" >> ${CONFIG} || die
-   echo "CONFIG_WPS2=y" >> ${CONFIG} || die
-   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die
-   echo 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-08-16 Thread Sam James
commit: 51baf1a63c646e68217f5dfd81c0fb07a87c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Aug 16 14:54:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 16 16:17:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51baf1a6

net-wireless/hostapd: Correctly detect libnl when cross-compiling

* Build system tries to find libnl only on the host system, which
  breaks cross-compilation as it cannot find it:

```
Package libnl-3.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `libnl-3.0.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libnl-3.0', required by 'virtual:world', not found
```

* We can solve this using pkg-config to pass additional include
  for the cross-compilation libnl to the CFLAGS

Signed-off-by: Jakov Smolic  sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/22005
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r6.ebuild | 4 +++-
 net-wireless/hostapd/hostapd-.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r6.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
index 8878538c886..1b8727055c9 100644
--- a/net-wireless/hostapd/hostapd-2.9-r6.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs systemd savedconfig
+inherit flag-o-matic systemd savedconfig toolchain-funcs
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
@@ -40,6 +40,7 @@ DEPEND="
netlink? ( net-libs/libnfnetlink )
sqlite? ( >=dev-db/sqlite-3 )"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
if use internal-tls; then
@@ -194,6 +195,7 @@ src_configure() {
# support it.
if has_version ">=dev-libs/libnl-3.2"; then
echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
+   append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0)
fi
 
# TODO: Add support for BSD drivers

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index b9116b4cb25..dacd094e49e 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs systemd savedconfig
+inherit flag-o-matic systemd savedconfig toolchain-funcs
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
@@ -40,6 +40,7 @@ DEPEND="
netlink? ( net-libs/libnfnetlink )
sqlite? ( >=dev-db/sqlite-3 )"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
if use internal-tls; then
@@ -184,6 +185,7 @@ src_configure() {
# support it.
if has_version ">=dev-libs/libnl-3.2"; then
echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
+   append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0)
fi
 
# TODO: Add support for BSD drivers



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-21 Thread Sam James
commit: 64a06cd85a403ceb4113eb63d53df15d57156487
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 21 19:02:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 19:02:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a06cd8

net-wireless/hostapd: Stabilize 2.9-r6 arm64, #780135

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r6.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
index 40da6ec3c9f..8878538c886 100644
--- a/net-wireless/hostapd/hostapd-2.9-r6.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
+   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-21 Thread Sam James
commit: 67c336355d2614a46bb6a53f6fc6fddc431bc01f
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 21 07:18:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 07:18:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c33635

net-wireless/hostapd: Stabilize 2.9-r6 arm, #780135

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r6.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
index 4d01babb1d1..40da6ec3c9f 100644
--- a/net-wireless/hostapd/hostapd-2.9-r6.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
+   KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-21 Thread Agostino Sarubbo
commit: 540f26487d45fb8ddff1862733fa34b1768e8781
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 21 06:18:18 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 21 06:18:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=540f2648

net-wireless/hostapd: ppc stable wrt bug #780135

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r6.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
index 8ff2cbb99ab..4d01babb1d1 100644
--- a/net-wireless/hostapd/hostapd-2.9-r6.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-17 Thread Thomas Deutschmann
commit: 52123dae78919046f09b506709280128faad0a96
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 17 22:06:19 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun 17 22:18:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52123dae

net-wireless/hostapd: rev bump for commit 6915847f2

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/hostapd/{hostapd-2.9-r3.ebuild => hostapd-2.9-r5.ebuild} | 0
 net-wireless/hostapd/{hostapd-2.9-r4.ebuild => hostapd-2.9-r6.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r5.ebuild
similarity index 100%
rename from net-wireless/hostapd/hostapd-2.9-r3.ebuild
rename to net-wireless/hostapd/hostapd-2.9-r5.ebuild

diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
similarity index 100%
rename from net-wireless/hostapd/hostapd-2.9-r4.ebuild
rename to net-wireless/hostapd/hostapd-2.9-r6.ebuild



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-17 Thread Thomas Deutschmann
commit: 6915847f26a03a142144ef774328c1b68f947df0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 17 20:19:14 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun 17 20:32:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6915847f

net-wireless/hostapd: Fix MissingUseDepDefault for dev-libs/openssl[bindist]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 2 +-
 net-wireless/hostapd/hostapd-2.9-r4.ebuild | 2 +-
 net-wireless/hostapd/hostapd-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 174b3dd6157..0e37a731413 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -32,7 +32,7 @@ IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
kernel_linux? (
dev-libs/libnl:3
crda? ( net-wireless/crda )

diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
index a85a8914a7a..8ff2cbb99ab 100644
--- a/net-wireless/hostapd/hostapd-2.9-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
@@ -32,7 +32,7 @@ IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
kernel_linux? (
dev-libs/libnl:3
crda? ( net-wireless/crda )

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 6149f90b94e..b9116b4cb25 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -32,7 +32,7 @@ IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
kernel_linux? (
dev-libs/libnl:3
crda? ( net-wireless/crda )



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-17 Thread Sam James
commit: a285450833d405a2fbac1e363360f62da647816b
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 17 20:19:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 17 20:23:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2854508

net-wireless/hostapd: Stabilize 2.9-r4 x86, #780135

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
index 70ddbffac49..a85a8914a7a 100644
--- a/net-wireless/hostapd/hostapd-2.9-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-17 Thread Sam James
commit: ad488081fd035995d5a439e3fbdd77b7d8df4375
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 17 20:18:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 17 20:23:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad488081

net-wireless/hostapd: Stabilize 2.9-r4 amd64, #780135

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
index 4130241a64c..70ddbffac49 100644
--- a/net-wireless/hostapd/hostapd-2.9-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
@@ -23,7 +23,7 @@ else
fi
 
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-12 Thread Sam James
commit: 86cc0139a30af31444b0bb1cd43520c381162c68
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 12 10:46:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 12 10:54:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cc0139

net-wireless/hostapd: ebuild tidying

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 39 +--
 net-wireless/hostapd/hostapd-2.9-r4.ebuild | 43 ++
 net-wireless/hostapd/hostapd-.ebuild   | 27 +--
 net-wireless/hostapd/metadata.xml  |  2 --
 4 files changed, 50 insertions(+), 61 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 7a63076e50a..174b3dd6157 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -28,30 +28,29 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
-   internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
-
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
kernel_linux? (
dev-libs/libnl:3
crda? ( net-wireless/crda )
)
netlink? ( net-libs/libnfnetlink )
sqlite? ( >=dev-db/sqlite-3 )"
-
 RDEPEND="${DEPEND}"
 
 pkg_pretend() {
if use internal-tls; then
-   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   ewarn "internal-tls implementation is experimental and provides 
fewer features"
fi
 }
 
 src_unpack() {
# Override default one because we need the SRC_URI ones even in case of 
 ebuilds
default
+
if [[ ${PV} ==  ]] ; then
git-r3_src_unpack
fi
@@ -63,12 +62,12 @@ src_prepare() {
pushd ../ >/dev/null || die
default
 
-   # CVE-2019-16275 bug #696032
-   eapply 
"${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
-   # CVE-2020-12695 bug #727542
-   eapply 
"${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
-   eapply 
"${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
-   eapply 
"${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+   # CVE-2019-16275 (bug #696032)
+   eapply 
"${FILESDIR}"/${P}-AP-Silently-ignore-management-frame-from-unexpected.patch
+   # CVE-2020-12695 (bug #727542)
+   eapply 
"${FILESDIR}"/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
+   eapply 
"${FILESDIR}"/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
+   eapply 
"${FILESDIR}"/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
 
popd >/dev/null || die
 
@@ -77,7 +76,7 @@ src_prepare() {
 }
 
 src_configure() {
-   local CONFIG="${S}/.config"
+   local CONFIG="${S}"/.config
 
restore_config "${CONFIG}"
if [[ -f "${CONFIG}" ]]; then
@@ -233,20 +232,18 @@ src_install() {
docinto examples
dodoc wired.conf
 
-   if use logwatch; then
-   insinto /etc/log.d/conf/services/
-   doins logwatch/${PN}.conf
+   insinto /etc/log.d/conf/services/
+   doins logwatch/${PN}.conf
 
-   exeinto /etc/log.d/scripts/services/
-   doexe logwatch/${PN}
-   fi
+   exeinto /etc/log.d/scripts/services/
+   doexe logwatch/${PN}
 
save_config .config
 }
 
 pkg_postinst() {
einfo
-   einfo "If you are running openRC you need to follow this instructions:"
+   einfo "If you are running OpenRC you need to follow this instructions:"
einfo "In order to use ${PN} you need to set up your wireless card"
einfo "for master mode in /etc/conf.d/net and then start"
einfo "/etc/init.d/${PN}."
@@ -267,7 +264,7 @@ pkg_postinst() {
 
if use wps; then
einfo "You have enabled Wi-Fi Protected Setup support, please"
-   einfo "read the README-WPS file in /usr/share/doc/${P}"
+   einfo "read the README-WPS file in /usr/share/doc/${PF}"
einfo "for info on how to use WPS"
fi
 }

diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
index 8a63e598f55..4130241a64c 100644
--- a/net-wireless/hostapd/hostapd-2.9-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
@@ -28,30 +28,29 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
-   internal-tls? ( 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/, net-wireless/hostapd/files/

2021-06-02 Thread Thomas Deutschmann
commit: 56ce8ace503d45e60b72a79222bb6aada4c76124
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jun  2 12:41:04 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jun  2 12:59:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ce8ace

net-wireless/hostapd: fix CVE-2021-30004

Bug: https://bugs.gentoo.org/780135
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...date-DigestAlgorithmIdentifier-parameters.patch | 115 +
 .../{hostapd-.ebuild => hostapd-2.9-r4.ebuild} |   4 +-
 net-wireless/hostapd/hostapd-.ebuild   |   2 +
 3 files changed, 120 insertions(+), 1 deletion(-)

diff --git 
a/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
 
b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
new file mode 100644
index 000..8c8ba933550
--- /dev/null
+++ 
b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
@@ -0,0 +1,115 @@
+From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen 
+Date: Sat, 13 Mar 2021 18:19:31 +0200
+Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters
+
+The supported hash algorithms do not use AlgorithmIdentifier parameters.
+However, there are implementations that include NULL parameters in
+addition to ones that omit the parameters. Previous implementation did
+not check the parameters value at all which supported both these cases,
+but did not reject any other unexpected information.
+
+Use strict validation of digest algorithm parameters and reject any
+unexpected value when validating a signature. This is needed to prevent
+potential forging attacks.
+
+Signed-off-by: Jouni Malinen 
+---
+ src/tls/pkcs1.c  | 21 +
+ src/tls/x509v3.c | 20 
+ 2 files changed, 41 insertions(+)
+
+diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c
+index bbdb0d7..5761dfe 100644
+--- a/src/tls/pkcs1.c
 b/src/tls/pkcs1.c
+@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+   os_free(decrypted);
+   return -1;
+   }
++  wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo",
++  hdr.payload, hdr.length);
+ 
+   pos = hdr.payload;
+   end = pos + hdr.length;
+@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+   os_free(decrypted);
+   return -1;
+   }
++  wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier",
++  hdr.payload, hdr.length);
+   da_end = hdr.payload + hdr.length;
+ 
+   if (asn1_get_oid(hdr.payload, hdr.length, , )) {
+@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+   os_free(decrypted);
+   return -1;
+   }
++  wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters",
++  next, da_end - next);
++
++  /*
++   * RFC 5754: The correct encoding for the SHA2 algorithms would be to
++   * omit the parameters, but there are implementation that encode these
++   * as a NULL element. Allow these two cases and reject anything else.
++   */
++  if (da_end > next &&
++  (asn1_get_next(next, da_end - next, ) < 0 ||
++   !asn1_is_null() ||
++   hdr.payload + hdr.length != da_end)) {
++  wpa_printf(MSG_DEBUG,
++ "PKCS #1: Unexpected digest algorithm parameters");
++  os_free(decrypted);
++  return -1;
++  }
+ 
+   if (!asn1_oid_equal(, hash_alg)) {
+   char txt[100], txt2[100];
+diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c
+index a8944dd..df337ec 100644
+--- a/src/tls/x509v3.c
 b/src/tls/x509v3.c
+@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer,
+   os_free(data);
+   return -1;
+   }
++  wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length);
+ 
+   pos = hdr.payload;
+   end = pos + hdr.length;
+@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer,
+   os_free(data);
+   return -1;
+   }
++  wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier",
++  hdr.payload, hdr.length);
+   da_end = hdr.payload + hdr.length;
+ 
+   if (asn1_get_oid(hdr.payload, hdr.length, , )) {
+@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate 
*issuer,
+   os_free(data);
+   return -1;
+   }
++  wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters",
++  next, da_end - next);
++
++  /*
++   * RFC 5754: The correct encoding for the SHA2 algorithms would be to
++   * omit the parameters, but there are implementation that encode these

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-02 Thread Thomas Deutschmann
commit: 7a6a43b65ba6a96b1121aac9de2431b646aef0c0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jun  2 12:57:06 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jun  2 12:59:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6a43b6

net-wireless/hostapd: enable RSN operating channel validation support

Closes: https://bugs.gentoo.org/749753
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r4.ebuild | 1 +
 net-wireless/hostapd/hostapd-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
index c94f67d82ad..8a63e598f55 100644
--- a/net-wireless/hostapd/hostapd-2.9-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
@@ -164,6 +164,7 @@ src_configure() {
echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+   echo "CONFIG_OCV=y" >> ${CONFIG} || die
echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index e6450650cae..c9cb0fa9f95 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -154,6 +154,7 @@ src_configure() {
echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+   echo "CONFIG_OCV=y" >> ${CONFIG} || die
echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-02 Thread Thomas Deutschmann
commit: 03321e123f50ee1363d9e9c8805580dd25088ed6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jun  2 12:51:03 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jun  2 12:59:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03321e12

net-wireless/hostapd: unbreak live ebuild

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/hostapd/hostapd-.ebuild | 14 ++
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index c94f67d82ad..e6450650cae 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -60,19 +60,9 @@ src_unpack() {
 src_prepare() {
# Allow users to apply patches to src/drivers for example,
# i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
+   pushd ../ &>/dev/null || die
default
-
-   # CVE-2019-16275 bug #696032
-   eapply 
"${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
-   # CVE-2020-12695 bug #727542
-   eapply 
"${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
-   eapply 
"${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
-   eapply 
"${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
-   # CVE-2021-30004 bug #780135
-   eapply 
"${FILESDIR}/${P}-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch"
-
-   popd >/dev/null || die
+   popd &>/dev/null || die
 
sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
"${S}/hostapd.conf" || die



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-06-02 Thread Thomas Deutschmann
commit: 7c3847f54c77bc1f89b5f3379da76af8bf48e3db
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jun  2 12:44:27 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jun  2 12:59:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c3847f5

net-wireless/hostapd: fix USE=-internal-tls

Fixes: 1eb56d95 ("net-wireless/hostapd: remove libressl support")
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/hostapd/hostapd-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 92074dc1872..c94f67d82ad 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -204,7 +204,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if  use internal-tls; then
+   if ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-05-03 Thread Mikle Kolyada
commit: 792f835d5a52810f637183a52e3859f4304caef4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 11:05:37 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 11:05:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792f835d

net-wireless/hostapd: do not reference libressl in metadata

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-wireless/hostapd/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/metadata.xml 
b/net-wireless/hostapd/metadata.xml
index 09503282fa4..d518c0ca088 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -8,7 +8,7 @@


Add CRDA support
-   Use internal TLSv1 implementation 
instead of depending on OpenSSL, LibreSSL or GnuTLS
+   Use internal TLSv1 implementation 
instead of depending on OpenSSL or GnuTLS
Install support files for 
sys-apps/logwatch
Adding support for using netlink to create 
VLANs



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-05-03 Thread Mikle Kolyada
commit: 1eb56d9532c0a7a708492ce294448fccbe27ff29
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 09:37:25 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 09:39:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb56d95

net-wireless/hostapd: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 19 +--
 net-wireless/hostapd/hostapd-.ebuild   | 19 +--
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 6183c8c4e5f..7a63076e50a 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -28,17 +28,12 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
-
-# suiteb impl uses openssl feature not available in libressl, see bug 710992
-REQUIRED_USE="?? ( libressl suiteb )"
+IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? (
internal-tls? ( dev-libs/libtommath )
!internal-tls? ( dev-libs/openssl:0=[-bindist] )
-   )
+
kernel_linux? (
dev-libs/libnl:3
crda? ( net-wireless/crda )
@@ -50,11 +45,7 @@ RDEPEND="${DEPEND}"
 
 pkg_pretend() {
if use internal-tls; then
-   if use libressl; then
-   elog "libressl flag takes precedence over internal-tls"
-   else
ewarn "internal-tls implementation is experimental and 
provides fewer features"
-   fi
fi
 }
 
@@ -107,7 +98,7 @@ src_configure() {
echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
fi
 
-   if use internal-tls && ! use libressl; then
+   if use internal-tls ; then
echo "CONFIG_TLS=internal" >> ${CONFIG} || die
else
# SSL authentication methods
@@ -211,7 +202,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || ! use internal-tls; then
+   if ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -226,7 +217,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   if use libressl || ! use internal-tls; then
+   if ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
 

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 3ceb1520bd8..515d2b26e21 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -28,17 +28,12 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
-
-# suiteb impl uses openssl feature not available in libressl, see bug 710992
-REQUIRED_USE="?? ( libressl suiteb )"
+IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? (
internal-tls? ( dev-libs/libtommath )
!internal-tls? ( dev-libs/openssl:0=[-bindist] )
-   )
+
kernel_linux? (
dev-libs/libnl:3
crda? ( net-wireless/crda )
@@ -50,11 +45,7 @@ RDEPEND="${DEPEND}"
 
 pkg_pretend() {
if use internal-tls; then
-   if use libressl; then
-   elog "libressl flag takes precedence over internal-tls"
-   else
ewarn "internal-tls implementation is experimental and 
provides fewer features"
-   fi
fi
 }
 
@@ -107,7 +98,7 @@ src_configure() {
echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
fi
 
-   if use internal-tls && ! use libressl; then
+   if use internal-tls ; then
echo "CONFIG_TLS=internal" >> ${CONFIG} || die
else
# SSL authentication methods
@@ -211,7 +202,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || ! use internal-tls; then
+   if  use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -226,7 +217,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   if use libressl || ! use internal-tls; then
+   if ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-02-05 Thread Sam James
commit: 5563eec12b9c99c0dee872cc85922207c8220612
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 10:36:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 10:37:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5563eec1

net-wireless/hostapd: HTTPSify HOMEPAGE

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 2 +-
 net-wireless/hostapd/hostapd-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 61cac6a1e0c..ba66452e1f5 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi;
+HOMEPAGE="https://w1.fi;
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 97a5fee6569..530b6722d40 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi;
+HOMEPAGE="https://w1.fi;
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-02-05 Thread Sam James
commit: 104c5469a8a72684b7b6ba17bc55ac7cebceba70
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 10:37:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 10:37:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104c5469

net-wireless/hostapd: add git to HOMEPAGE

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 2 +-
 net-wireless/hostapd/hostapd-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index ba66452e1f5..6183c8c4e5f 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi;
+HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 530b6722d40..3ceb1520bd8 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi;
+HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/;
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-01-10 Thread Sam James
commit: 142119b897dbea138bc9609b00ebfa6e3a2d0ec4
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 10 14:42:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 10 14:42:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142119b8

net-wireless/hostapd: sync live

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-.ebuild | 147 ---
 1 file changed, 78 insertions(+), 69 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 06ae239217e..97a5fee6569 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs systemd savedconfig
 
@@ -10,16 +10,18 @@ HOMEPAGE="http://w1.fi;
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+S="${S}/${PN}"
 
-if [[ $PV ==  ]]; then
+if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then
SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
+
# Never stabilize snapshot ebuilds please
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
 fi
@@ -46,8 +48,6 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-S="${S}/${PN}"
-
 pkg_pretend() {
if use internal-tls; then
if use libressl; then
@@ -71,6 +71,14 @@ src_prepare() {
# i.e. anything outside ${S}/${PN}
pushd ../ >/dev/null || die
default
+
+   # CVE-2019-16275 bug #696032
+   eapply 
"${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+   # CVE-2020-12695 bug #727542
+   eapply 
"${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
+   eapply 
"${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
+   eapply 
"${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+
popd >/dev/null || die
 
sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
@@ -82,122 +90,122 @@ src_configure() {
 
restore_config "${CONFIG}"
if [[ -f "${CONFIG}" ]]; then
-   default_src_configure
+   default
return 0
fi
 
# toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
+   echo "CC = $(tc-getCC)" > ${CONFIG} || die
 
# EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-   echo "CONFIG_SAE=y" >> ${CONFIG}
-   echo "CONFIG_OWE=y" >> ${CONFIG}
-   echo "CONFIG_DPP=y" >> ${CONFIG}
+   echo "CONFIG_EAP=y" >> ${CONFIG} || die
+   echo "CONFIG_ERP=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
 
if use suiteb; then
-   echo "CONFIG_SUITEB=y" >> ${CONFIG}
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+   echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
+   echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
fi
 
if use internal-tls && ! use libressl; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   echo "CONFIG_TLS=internal" >> ${CONFIG} || die
else
# SSL authentication methods
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-   echo "CONFIG_TLSV11=y" >> ${CONFIG}
-   echo "CONFIG_TLSV12=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+   echo "CONFIG_DPP=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die
+   echo "CONFIG_OWE=y" >> ${CONFIG} || die
+   echo "CONFIG_SAE=y" >> ${CONFIG} || die
+   echo "CONFIG_TLSV11=y" >> ${CONFIG} || die
+   echo "CONFIG_TLSV12=y" >> ${CONFIG} || die
fi
 
if use wps; then
# 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-01-10 Thread Sam James
commit: f4831a30d002e33c50e18114f257d1c228c922c8
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Thu Oct 15 21:06:43 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 10 14:42:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4831a30

net-wireless/hostapd: Make bindist protocols depending on internal-tls

* Dragonfly (CONFIG_SAE)
* Opportunistic Wireless Encryption (CONFIG_OWE)
* Device Provisioning Protocol (CONFIG_DPP)

Bug: https://bugs.gentoo.org/727542
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alarig Le Lay  swordarmor.fr>
Closes: https://github.com/gentoo/gentoo/pull/17864
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index b93c40f9893..a8d7912544a 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -99,9 +99,6 @@ src_configure() {
echo "CONFIG_EAP=y" >> ${CONFIG}
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-   echo "CONFIG_SAE=y" >> ${CONFIG}
-   echo "CONFIG_OWE=y" >> ${CONFIG}
-   echo "CONFIG_DPP=y" >> ${CONFIG}
 
if use suiteb; then
echo "CONFIG_SUITEB=y" >> ${CONFIG}
@@ -112,14 +109,17 @@ src_configure() {
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
+   echo "CONFIG_DPP=y" >> ${CONFIG}
echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo "CONFIG_OWE=y" >> ${CONFIG}
+   echo "CONFIG_SAE=y" >> ${CONFIG}
echo "CONFIG_TLSV11=y" >> ${CONFIG}
echo "CONFIG_TLSV12=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
fi
 
if use wps; then



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2021-01-10 Thread Sam James
commit: b8784caf8f52ba3257e60ba0273a9ecfd224c073
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 10 14:41:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 10 14:42:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8784caf

net-wireless/hostapd: missing || dies

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 143 +++--
 1 file changed, 73 insertions(+), 70 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index a8d7912544a..61cac6a1e0c 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs systemd savedconfig
 
@@ -10,16 +10,18 @@ HOMEPAGE="http://w1.fi;
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+S="${S}/${PN}"
 
-if [[ $PV ==  ]]; then
+if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then
SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
+
# Never stabilize snapshot ebuilds please
KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
@@ -46,8 +48,6 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-S="${S}/${PN}"
-
 pkg_pretend() {
if use internal-tls; then
if use libressl; then
@@ -71,12 +71,14 @@ src_prepare() {
# i.e. anything outside ${S}/${PN}
pushd ../ >/dev/null || die
default
-   #CVE-2019-16275 bug #696032
+
+   # CVE-2019-16275 bug #696032
eapply 
"${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
# CVE-2020-12695 bug #727542
eapply 
"${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
eapply 
"${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
eapply 
"${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+
popd >/dev/null || die
 
sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
@@ -88,122 +90,122 @@ src_configure() {
 
restore_config "${CONFIG}"
if [[ -f "${CONFIG}" ]]; then
-   default_src_configure
+   default
return 0
fi
 
# toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
+   echo "CC = $(tc-getCC)" > ${CONFIG} || die
 
# EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+   echo "CONFIG_EAP=y" >> ${CONFIG} || die
+   echo "CONFIG_ERP=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
 
if use suiteb; then
-   echo "CONFIG_SUITEB=y" >> ${CONFIG}
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+   echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
+   echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
fi
 
if use internal-tls && ! use libressl; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   echo "CONFIG_TLS=internal" >> ${CONFIG} || die
else
# SSL authentication methods
-   echo "CONFIG_DPP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-   echo "CONFIG_OWE=y" >> ${CONFIG}
-   echo "CONFIG_SAE=y" >> ${CONFIG}
-   echo "CONFIG_TLSV11=y" >> ${CONFIG}
-   echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   echo "CONFIG_DPP=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die
+   echo "CONFIG_OWE=y" >> ${CONFIG} || die
+   echo "CONFIG_SAE=y" >> ${CONFIG} || die
+   echo "CONFIG_TLSV11=y" >> ${CONFIG} || die
+   echo "CONFIG_TLSV12=y" >> 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-12-19 Thread Sam James
commit: 96a076b77788b73a4ec4c889a5bc530315d3b0b8
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 20 06:27:56 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 20 06:27:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a076b7

net-wireless/hostapd: cleanup old

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r1.ebuild | 264 -
 1 file changed, 264 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
deleted file mode 100644
index 379f8c74ea7..000
--- a/net-wireless/hostapd/hostapd-2.9-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi;
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
-
-if [[ $PV ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
-   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
-   else
-   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
-   fi
-   # Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
-
-DEPEND="
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? (
-   internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
-   )
-   kernel_linux? (
-   dev-libs/libnl:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-pkg_pretend() {
-   if use internal-tls; then
-   if use libressl; then
-   elog "libressl flag takes precedence over internal-tls"
-   else
-   ewarn "internal-tls implementation is experimental and 
provides fewer features"
-   fi
-   fi
-}
-
-src_unpack() {
-   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
-   default
-   if [[ ${PV} ==  ]] ; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   default
-   #CVE-2019-16275 bug #696032
-   eapply 
"${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-}
-
-src_configure() {
-   local CONFIG="${S}/.config"
-
-   restore_config "${CONFIG}"
-   if [[ -f "${CONFIG}" ]]; then
-   default_src_configure
-   return 0
-   fi
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-   if use internal-tls && ! use libressl; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG}
-   else
-   # SSL authentication methods
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-   echo "CONFIG_TLSV11=y" >> ${CONFIG}
-   echo "CONFIG_TLSV12=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-   fi
-
-   if use wps; then
-   # Enable Wi-Fi Protected Setup
-   echo "CONFIG_WPS=y" >> ${CONFIG}
-   echo "CONFIG_WPS2=y" >> ${CONFIG}
-   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-   einfo "Enabling Wi-Fi Protected Setup support"
-   fi
-
-   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-   echo "CONFIG_EAP_SAKE=y" >> 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-10-09 Thread Agostino Sarubbo
commit: 6cc8684ace3b421f7e3e54201f4ff84af0251038
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct  9 08:40:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct  9 08:40:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc8684a

net-wireless/hostapd: x86 stable wrt bug #727542

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 1a7b79b5b57..b93c40f9893 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm arm64 ~mips ppc ~x86"
+   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-10-03 Thread Sam James
commit: beba6b204942d26fb51b905a439729072519ec8e
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  3 16:53:54 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  3 16:53:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beba6b20

net-wireless/hostapd: Stabilize 2.9-r3 amd64, #727542

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 80e1402c487..1a7b79b5b57 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 arm arm64 ~mips ppc ~x86"
+   KEYWORDS="amd64 arm arm64 ~mips ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-10-02 Thread Sam James
commit: 83318b3d9cd9659fe8d4d38a67d69c4dbc6ea929
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  2 20:38:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  2 20:40:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83318b3d

net-wireless/hostapd: Stabilize 2.9-r3 arm, #727542

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index af3b036853f..80e1402c487 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm arm64 ~mips ppc ~x86"
+   KEYWORDS="~amd64 arm arm64 ~mips ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-09-29 Thread Sam James
commit: c9ff12a303c961db67347d8173b3aaf3ea7ddf5f
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 29 22:16:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 29 22:16:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ff12a3

net-wireless/hostapd: Stabilize 2.9-r3 arm64, #727542

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 4731d3915d4..af3b036853f 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc ~x86"
+   KEYWORDS="~amd64 ~arm arm64 ~mips ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-09-29 Thread Sam James
commit: 5b6117808d2749b396549f19c34e243c597255d5
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 29 11:42:25 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 29 11:42:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b611780

net-wireless/hostapd: Stabilize 2.9-r3 ppc, #727542

Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 2fed1676ff6..4731d3915d4 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-09-27 Thread Sam James
commit: ec7f18ab0c53528559abb4df8d4d4afb54b9476b
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 27 16:58:58 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 27 16:58:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7f18ab

net-wireless/hostapd: cleanup old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r2.ebuild | 275 -
 1 file changed, 275 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
deleted file mode 100644
index e14a5f1ff72..000
--- a/net-wireless/hostapd/hostapd-2.9-r2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi;
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
-
-if [[ $PV ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
-   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
-   else
-   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
-   fi
-   # Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
-
-# suiteb impl uses openssl feature not available in libressl, see bug 710992
-REQUIRED_USE="?? ( libressl suiteb )"
-
-DEPEND="
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? (
-   internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
-   )
-   kernel_linux? (
-   dev-libs/libnl:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-pkg_pretend() {
-   if use internal-tls; then
-   if use libressl; then
-   elog "libressl flag takes precedence over internal-tls"
-   else
-   ewarn "internal-tls implementation is experimental and 
provides fewer features"
-   fi
-   fi
-}
-
-src_unpack() {
-   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
-   default
-   if [[ ${PV} ==  ]] ; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   default
-   #CVE-2019-16275 bug #696032
-   eapply 
"${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-}
-
-src_configure() {
-   local CONFIG="${S}/.config"
-
-   restore_config "${CONFIG}"
-   if [[ -f "${CONFIG}" ]]; then
-   default_src_configure
-   return 0
-   fi
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-   echo "CONFIG_SAE=y" >> ${CONFIG}
-   echo "CONFIG_OWE=y" >> ${CONFIG}
-   echo "CONFIG_DPP=y" >> ${CONFIG}
-
-   if use suiteb; then
-   echo "CONFIG_SUITEB=y" >> ${CONFIG}
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
-   fi
-
-   if use internal-tls && ! use libressl; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG}
-   else
-   # SSL authentication methods
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-   echo "CONFIG_TLSV11=y" >> ${CONFIG}
-   echo "CONFIG_TLSV12=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-   fi
-
-   if use wps; then
-   # Enable Wi-Fi Protected Setup
-   echo "CONFIG_WPS=y" >> ${CONFIG}
-   echo "CONFIG_WPS2=y" >> ${CONFIG}
-   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-   einfo "Enabling Wi-Fi Protected Setup support"
-   fi
-
-   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-   

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/files/, net-wireless/hostapd/

2020-09-27 Thread Sam James
commit: b8c17aa77fa1271caf2d881c92e36cc121578b94
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Sat Sep 12 11:38:05 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 27 16:56:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c17aa7

net-wireless/hostapd: fix CVE-2020-12695

Bug: https://bugs.gentoo.org/727542
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alarig Le Lay  swordarmor.fr>
Closes: https://github.com/gentoo/gentoo/pull/15990
Signed-off-by: Sam James  gentoo.org>

 ...-not-allow-event-subscriptions-with-URLs-.patch | 150 +
 ...x-event-message-generation-using-a-long-U.patch |  59 
 ...ndle-HTTP-initiation-failures-for-events-.patch |  47 +++
 net-wireless/hostapd/hostapd-2.9-r1.ebuild |   2 +-
 ...hostapd-2.9-r1.ebuild => hostapd-2.9-r3.ebuild} |  21 ++-
 5 files changed, 275 insertions(+), 4 deletions(-)

diff --git 
a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 
b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
new file mode 100644
index 000..0aa8a5ea1de
--- /dev/null
+++ 
b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
@@ -0,0 +1,150 @@
+From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen 
+Date: Wed, 3 Jun 2020 23:17:35 +0300
+Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
+ other networks
+
+The UPnP Device Architecture 2.0 specification errata ("UDA errata
+16-04-2020.docx") addresses a problem with notifications being allowed
+to go out to other domains by disallowing such cases. Do such filtering
+for the notification callback URLs to avoid undesired connections to
+external networks based on subscriptions that any device in the local
+network could request when WPS support for external registrars is
+enabled (the upnp_iface parameter in hostapd configuration).
+
+Signed-off-by: Jouni Malinen 
+---
+ src/wps/wps_er.c |  2 +-
+ src/wps/wps_upnp.c   | 38 --
+ src/wps/wps_upnp_i.h |  3 ++-
+ 3 files changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
+index 6bded14327f8..31d2e50e4cff 100644
+--- a/src/wps/wps_er.c
 b/src/wps/wps_er.c
+@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, 
const char *filter)
+  "with %s", filter);
+   }
+   if (get_netif_info(er->ifname, >ip_addr, >ip_addr_text,
+- er->mac_addr)) {
++ NULL, er->mac_addr)) {
+   wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+  "for %s. Does it have IP address?", er->ifname);
+   wps_er_deinit(er, NULL, NULL);
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 6e10e4bc0c3f..7d4b7439940e 100644
+--- a/src/wps/wps_upnp.c
 b/src/wps/wps_upnp.c
+@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s)
+ }
+ 
+ 
++static int local_network_addr(struct upnp_wps_device_sm *sm,
++struct sockaddr_in *addr)
++{
++  return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
++  (sm->ip_addr & sm->netmask.s_addr);
++}
++
++
+ /* subscr_addr_add_url -- add address(es) for one url to subscription */
+ static void subscr_addr_add_url(struct subscription *s, const char *url,
+   size_t url_len)
+@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, 
const char *url,
+ 
+   for (rp = result; rp; rp = rp->ai_next) {
+   struct subscr_addr *a;
++  struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr;
+ 
+   /* Limit no. of address to avoid denial of service attack */
+   if (dl_list_len(>addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) {
+@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, 
const char *url,
+   break;
+   }
+ 
++  if (!local_network_addr(s->sm, addr)) {
++  wpa_printf(MSG_INFO,
++ "WPS UPnP: Ignore a delivery URL that points 
to another network %s",
++ inet_ntoa(addr->sin_addr));
++  continue;
++  }
++
+   a = os_zalloc(sizeof(*a) + alloc_len);
+   if (a == NULL)
+   break;
+@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN])
+  * @net_if: Selected network interface name
+  * @ip_addr: Buffer for returning IP address in network byte order
+  * @ip_addr_text: Buffer for returning a pointer to allocated IP address text
++ * @netmask: Buffer for returning netmask or %NULL if not needed
+  * @mac: 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-07-27 Thread Sam James
commit: 103e640133ef1d7cab6806198bddd56e3057d6db
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 28 00:11:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 28 00:11:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=103e6401

net-wireless/hostapd: join as co-maintainer

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 net-wireless/hostapd/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-wireless/hostapd/metadata.xml 
b/net-wireless/hostapd/metadata.xml
index c840abc0945..09503282fa4 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -19,6 +19,10 @@
zeroch...@gentoo.org
Rick Farina

+   
+   s...@gentoo.org
+   Sam James
+   

cpe:/a:w1.fi:hostapd




[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-07-27 Thread Andrey Utkin
commit: e1b4d4976954beed731ed3b759cb1b1e0d0e1cdc
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jul 27 22:55:18 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jul 27 23:47:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b4d497

net-wireless/hostapd: remove myself from maintainers

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/net-wireless/hostapd/metadata.xml 
b/net-wireless/hostapd/metadata.xml
index 444076ebea2..c840abc0945 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -15,10 +15,6 @@
Adding support for NSA Suite B 
Cryptography
Add support for Wi-Fi Protected Setup

-   
-   andrey_ut...@gentoo.org
-   Andrey Utkin
-   

zeroch...@gentoo.org
Rick Farina



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-04-21 Thread Andrey Utkin
commit: f24ef74b43a105f8b0ac8377db6526d4a05c2a36
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Apr 21 22:01:28 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Apr 21 22:17:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24ef74b

net-wireless/hostapd: make USE flag for Suite B

Suite B functionality in hostapd uses OpenSSL feature unavailable in
LibreSSL. So, enabling that functionality conflicts with using LibreSSL.

Before hostapd-2.9-r2 ebuild, Suite B was disabled.
hostapd-2.9-r2 ebuild has enablied Suite B was unconditionally.
This commit enables it based on suiteb USE flag, which is enabled by
default, and which is declared conflicting with libressl USE flag.

Bug: https://bugs.gentoo.org/710992
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r2.ebuild | 12 +---
 net-wireless/hostapd/hostapd-.ebuild   | 12 +---
 net-wireless/hostapd/metadata.xml  |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
index 365c114a016..e14a5f1ff72 100644
--- a/net-wireless/hostapd/hostapd-2.9-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
@@ -26,7 +26,10 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
+
+# suiteb impl uses openssl feature not available in libressl, see bug 710992
+REQUIRED_USE="?? ( libressl suiteb )"
 
 DEPEND="
libressl? ( dev-libs/libressl:0= )
@@ -95,8 +98,11 @@ src_configure() {
echo "CONFIG_SAE=y" >> ${CONFIG}
echo "CONFIG_OWE=y" >> ${CONFIG}
echo "CONFIG_DPP=y" >> ${CONFIG}
-   echo "CONFIG_SUITEB=y" >> ${CONFIG}
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+
+   if use suiteb; then
+   echo "CONFIG_SUITEB=y" >> ${CONFIG}
+   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+   fi
 
if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 6ab77989092..06ae239217e 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -26,7 +26,10 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
+
+# suiteb impl uses openssl feature not available in libressl, see bug 710992
+REQUIRED_USE="?? ( libressl suiteb )"
 
 DEPEND="
libressl? ( dev-libs/libressl:0= )
@@ -93,8 +96,11 @@ src_configure() {
echo "CONFIG_SAE=y" >> ${CONFIG}
echo "CONFIG_OWE=y" >> ${CONFIG}
echo "CONFIG_DPP=y" >> ${CONFIG}
-   echo "CONFIG_SUITEB=y" >> ${CONFIG}
-   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+
+   if use suiteb; then
+   echo "CONFIG_SUITEB=y" >> ${CONFIG}
+   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+   fi
 
if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}

diff --git a/net-wireless/hostapd/metadata.xml 
b/net-wireless/hostapd/metadata.xml
index b06f07f2352..444076ebea2 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -12,6 +12,7 @@
Install support files for 
sys-apps/logwatch
Adding support for using netlink to create 
VLANs
+   Adding support for NSA Suite B 
Cryptography
Add support for Wi-Fi Protected Setup





[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-02-11 Thread Andrey Utkin
commit: ad164a2396598c39a01c706a9505aa6e4750e343
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jan 13 22:45:16 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Feb 11 23:39:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad164a23

net-wireless/hostapd: add new revision 2.9-r2

Cloned from 2.9-r1 with stable keywords downgraded to testing.

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r2.ebuild | 264 +
 1 file changed, 264 insertions(+)

diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
new file mode 100644
index 000..1c053ce40c2
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.7-r2"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
+   else
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   fi
+   # Never stabilize snapshot ebuilds please
+   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_unpack() {
+   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
+   default
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+   default
+   #CVE-2019-16275 bug #696032
+   eapply 
"${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use internal-tls && ! use libressl; then
+   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   else
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+   echo "CONFIG_TLSV11=y" >> ${CONFIG}
+   echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+   fi
+
+   if use wps; then
+   # Enable Wi-Fi Protected Setup
+   echo "CONFIG_WPS=y" >> ${CONFIG}
+   echo "CONFIG_WPS2=y" >> ${CONFIG}
+   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+   einfo "Enabling Wi-Fi Protected Setup support"
+   fi
+
+   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+   

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2020-02-11 Thread Andrey Utkin
commit: fe2801fc9c4ee250553eab9d9808098f39981f03
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Feb 11 22:48:32 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Feb 11 23:39:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2801fc

net-wireless/hostapd: enable new auth methods

Suggested-by: Rick Farina  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r2.ebuild | 5 +
 net-wireless/hostapd/hostapd-.ebuild   | 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
index 1c053ce40c2..365c114a016 100644
--- a/net-wireless/hostapd/hostapd-2.9-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
@@ -92,6 +92,11 @@ src_configure() {
echo "CONFIG_EAP=y" >> ${CONFIG}
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+   echo "CONFIG_SAE=y" >> ${CONFIG}
+   echo "CONFIG_OWE=y" >> ${CONFIG}
+   echo "CONFIG_DPP=y" >> ${CONFIG}
+   echo "CONFIG_SUITEB=y" >> ${CONFIG}
+   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
 
if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 382256f224b..6ab77989092 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -90,6 +90,11 @@ src_configure() {
echo "CONFIG_EAP=y" >> ${CONFIG}
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+   echo "CONFIG_SAE=y" >> ${CONFIG}
+   echo "CONFIG_OWE=y" >> ${CONFIG}
+   echo "CONFIG_DPP=y" >> ${CONFIG}
+   echo "CONFIG_SUITEB=y" >> ${CONFIG}
+   echo "CONFIG_SUITEB192=y" >> ${CONFIG}
 
if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-12-02 Thread Rick Farina
commit: 3f008547217a74d577f66807b796b6ecc19ef3c5
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Dec  2 15:40:03 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Dec  2 15:40:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f008547

net-wireless/hostapd: cleanup old

bug #696032

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/hostapd/Manifest   |   1 -
 net-wireless/hostapd/hostapd-2.8.ebuild | 262 
 net-wireless/hostapd/hostapd-2.9.ebuild | 262 
 3 files changed, 525 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 1497a6cf79d..5e2d0c59771 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,3 +1,2 @@
-DIST hostapd-2.8.tar.gz 2169018 BLAKE2B 
29e331d8ebb52732d2548734fe9ea55d8401826da7a35962705335da7d81232c785ffa89d77e8ee848148d82bea1d9141cc4d515706eebacb267754829cf7ed6
 SHA512 
5a352517470912bcb87755a592238eac2d814a7089d4ba1ecb7969f172dbb746a4e9a6c0d47c0d7c4a6a86b04b14ac39147d729fdf3163371c1067490a4897aa
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 
07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1ac9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01
 SHA512 
66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/hostapd-2.8.ebuild 
b/net-wireless/hostapd/hostapd-2.8.ebuild
deleted file mode 100644
index 631b845e31a..000
--- a/net-wireless/hostapd/hostapd-2.8.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi;
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
-
-if [[ $PV ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
-   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
-   else
-   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
-   fi
-   # Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
-
-DEPEND="
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? (
-   internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
-   )
-   kernel_linux? (
-   dev-libs/libnl:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-pkg_pretend() {
-   if use internal-tls; then
-   if use libressl; then
-   elog "libressl flag takes precedence over internal-tls"
-   else
-   ewarn "internal-tls implementation is experimental and 
provides fewer features"
-   fi
-   fi
-}
-
-src_unpack() {
-   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
-   default
-   if [[ ${PV} ==  ]] ; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   default
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-}
-
-src_configure() {
-   local CONFIG="${S}/.config"
-
-   restore_config "${CONFIG}"
-   if [[ -f "${CONFIG}" ]]; then
-   default_src_configure
-   return 0
-   fi
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-   if use internal-tls && ! use libressl; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG}
-   else
-   # SSL authentication methods
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-11-27 Thread Mikle Kolyada
commit: d60b4b8519948e5e930f3becc9851360e6d7de9c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Nov 27 13:14:17 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Nov 27 13:14:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60b4b85

net-wireless/hostapd: arm stable wrt bug #696032

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
index 4dc97f912f4..a2fbc42dc16 100644
--- a/net-wireless/hostapd/hostapd-2.9-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm arm64 ~mips ppc x86"
+   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-11-12 Thread Agostino Sarubbo
commit: aafd9c411d9da8b8e5880f0decc2c450a4c76aa5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 18:07:43 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 18:07:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafd9c41

net-wireless/hostapd: ppc stable wrt bug #696032

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/hostapd/hostapd-2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
index fd161a18896..4dc97f912f4 100644
--- a/net-wireless/hostapd/hostapd-2.9-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm arm64 ~mips ~ppc x86"
+   KEYWORDS="amd64 ~arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-11-06 Thread Aaron Bauman
commit: 847a6ac048a7246d3113367f8fe6bbe7dce8
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Nov  7 00:23:40 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Nov  7 00:23:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847a6ac0

net-wireless/hostapd: arm64 stable (bug #696032)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.17

 net-wireless/hostapd/hostapd-2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
index 8702d0125f5..fd161a18896 100644
--- a/net-wireless/hostapd/hostapd-2.9-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
+   KEYWORDS="amd64 ~arm arm64 ~mips ~ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/files/, net-wireless/hostapd/

2019-11-04 Thread Rick Farina
commit: e00db75c895fc30a6a4ec7429a2dd0035fa217c0
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Nov  4 16:40:57 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Nov  4 16:40:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00db75c

net-wireless/hostapd: fix and stabilize for bug #696032

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Rick Farina  gentoo.org>

 ...y-ignore-management-frame-from-unexpected.patch |  73 ++
 net-wireless/hostapd/hostapd-2.9-r1.ebuild | 264 +
 2 files changed, 337 insertions(+)

diff --git 
a/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
 
b/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
new file mode 100644
index 000..d764a9db016
--- /dev/null
+++ 
b/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
@@ -0,0 +1,73 @@
+From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen 
+Date: Thu, 29 Aug 2019 11:52:04 +0300
+Subject: [PATCH] AP: Silently ignore management frame from unexpected source
+ address
+
+Do not process any received Management frames with unexpected/invalid SA
+so that we do not add any state for unexpected STA addresses or end up
+sending out frames to unexpected destination. This prevents unexpected
+sequences where an unprotected frame might end up causing the AP to send
+out a response to another device and that other device processing the
+unexpected response.
+
+In particular, this prevents some potential denial of service cases
+where the unexpected response frame from the AP might result in a
+connected station dropping its association.
+
+Signed-off-by: Jouni Malinen 
+---
+ src/ap/drv_callbacks.c | 13 +
+ src/ap/ieee802_11.c| 12 
+ 2 files changed, 25 insertions(+)
+
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 31587685fe3b..34ca379edc3d 100644
+--- a/src/ap/drv_callbacks.c
 b/src/ap/drv_callbacks.c
+@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const 
u8 *addr,
+  "hostapd_notif_assoc: Skip event with no address");
+   return -1;
+   }
++
++  if (is_multicast_ether_addr(addr) ||
++  is_zero_ether_addr(addr) ||
++  os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
++  /* Do not process any frames with unexpected/invalid SA so that
++   * we do not add any state for unexpected STA addresses or end
++   * up sending out frames to unexpected destination. */
++  wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
++ " in received indication - ignore this indication 
silently",
++ __func__, MAC2STR(addr));
++  return 0;
++  }
++
+   random_add_randomness(addr, ETH_ALEN);
+ 
+   hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index c85a28db44b7..e7065372e158 100644
+--- a/src/ap/ieee802_11.c
 b/src/ap/ieee802_11.c
+@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 
*buf, size_t len,
+   fc = le_to_host16(mgmt->frame_control);
+   stype = WLAN_FC_GET_STYPE(fc);
+ 
++  if (is_multicast_ether_addr(mgmt->sa) ||
++  is_zero_ether_addr(mgmt->sa) ||
++  os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
++  /* Do not process any frames with unexpected/invalid SA so that
++   * we do not add any state for unexpected STA addresses or end
++   * up sending out frames to unexpected destination. */
++  wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
++ " in received frame - ignore this frame silently",
++ MAC2STR(mgmt->sa));
++  return 0;
++  }
++
+   if (stype == WLAN_FC_STYPE_BEACON) {
+   handle_beacon(hapd, mgmt, len, fi);
+   return 1;
+-- 
+2.20.1
+

diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
new file mode 100644
index 000..8702d0125f5
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.7-r2"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-09-01 Thread Mikle Kolyada
commit: ada83a81926ebda3fb8240fea67ff1a686ecaa66
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Sep  1 18:23:56 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Sep  1 18:23:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada83a81

net-wireless/hostapd: arm stable wrt bug #692540

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-wireless/hostapd/hostapd-2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9.ebuild 
b/net-wireless/hostapd/hostapd-2.9.ebuild
index 5cb3cb8b6dd..425e0b513fa 100644
--- a/net-wireless/hostapd/hostapd-2.9.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
+   KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-08-22 Thread Agostino Sarubbo
commit: 217ab1458a6d6170dbb9b3507e13350c50c6e08f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Aug 22 22:00:50 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Aug 22 22:00:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217ab145

net-wireless/hostapd: ppc stable wrt bug #692540

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/hostapd/hostapd-2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9.ebuild 
b/net-wireless/hostapd/hostapd-2.9.ebuild
index e52d191025d..5cb3cb8b6dd 100644
--- a/net-wireless/hostapd/hostapd-2.9.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-08-20 Thread Agostino Sarubbo
commit: 42b8e1168540a265fabc9adcb22f72da92089d4e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 20 22:54:37 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 20 22:54:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b8e116

net-wireless/hostapd: x86 stable wrt bug #692540

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/hostapd/hostapd-2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9.ebuild 
b/net-wireless/hostapd/hostapd-2.9.ebuild
index 8ec2de4d82d..e52d191025d 100644
--- a/net-wireless/hostapd/hostapd-2.9.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-08-19 Thread Agostino Sarubbo
commit: 0d381efcfa2035bba9637f04b20dd888f075fb26
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 19 20:04:55 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 19 20:04:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d381efc

net-wireless/hostapd: amd64 stable wrt bug #692540

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/hostapd/hostapd-2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.9.ebuild 
b/net-wireless/hostapd/hostapd-2.9.ebuild
index 382256f224b..8ec2de4d82d 100644
--- a/net-wireless/hostapd/hostapd-2.9.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-08-13 Thread Andrey Utkin
commit: 6ff6b0539ddd74b3f7c10a7c226d85754572a9fb
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Aug 13 12:46:59 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Aug 13 13:08:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff6b053

net-wireless/hostapd: add new version 2.9

Bug: https://bugs.gentoo.org/692060
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/Manifest   |   1 +
 net-wireless/hostapd/hostapd-2.9.ebuild | 262 
 2 files changed, 263 insertions(+)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index db024a402e7..1497a6cf79d 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,2 +1,3 @@
 DIST hostapd-2.8.tar.gz 2169018 BLAKE2B 
29e331d8ebb52732d2548734fe9ea55d8401826da7a35962705335da7d81232c785ffa89d77e8ee848148d82bea1d9141cc4d515706eebacb267754829cf7ed6
 SHA512 
5a352517470912bcb87755a592238eac2d814a7089d4ba1ecb7969f172dbb746a4e9a6c0d47c0d7c4a6a86b04b14ac39147d729fdf3163371c1067490a4897aa
+DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 
07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1ac9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01
 SHA512 
66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/hostapd-2.9.ebuild 
b/net-wireless/hostapd/hostapd-2.9.ebuild
new file mode 100644
index 000..382256f224b
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.9.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.7-r2"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
+   else
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   fi
+   # Never stabilize snapshot ebuilds please
+   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_unpack() {
+   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
+   default
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use internal-tls && ! use libressl; then
+   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   else
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-08-12 Thread Andrey Utkin
commit: 8a121e13f9fc8b4e1ac5df754a4279a03d0b4e84
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Aug 12 17:33:26 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Aug 12 17:34:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a121e13

net-wireless/hostapd: drop vulnerable old version 2.7

Bug: https://bugs.gentoo.org/688588
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/Manifest  |   1 -
 net-wireless/hostapd/hostapd-2.7-r2.ebuild | 266 -
 2 files changed, 267 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 8224998b89c..db024a402e7 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,3 +1,2 @@
-DIST hostapd-2.7.tar.gz 2101166 BLAKE2B 
4e88b7f0d2c57a02edf4214bb35efa08e87a2cbdac4eda9934a40b09f8c046da6cca1250fe5714cb403eb81739bd99e04ea5a9fad62e47bcee4d72106170905d
 SHA512 
1c9a210dfffb951fb667be19aa44ad8c66dccd2aed26cdab939185923550e3c1998a678ebe6975e560e1b3385bff2098f1b2cb773452ba66fb35246fdd3eb2c1
 DIST hostapd-2.8.tar.gz 2169018 BLAKE2B 
29e331d8ebb52732d2548734fe9ea55d8401826da7a35962705335da7d81232c785ffa89d77e8ee848148d82bea1d9141cc4d515706eebacb267754829cf7ed6
 SHA512 
5a352517470912bcb87755a592238eac2d814a7089d4ba1ecb7969f172dbb746a4e9a6c0d47c0d7c4a6a86b04b14ac39147d729fdf3163371c1067490a4897aa
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
deleted file mode 100644
index 7670a1e71d6..000
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi;
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
-
-if [[ $PV ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
-   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
-   else
-   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
-   fi
-   # Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
-
-DEPEND="
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? (
-   internal-tls? ( dev-libs/libtommath )
-   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
-   )
-   kernel_linux? (
-   dev-libs/libnl:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${WORKDIR}/${EXTRAS_NAME}/0001-bug672834-libressl-v2.patch"
-)
-
-S="${S}/${PN}"
-
-pkg_pretend() {
-   if use internal-tls; then
-   if use libressl; then
-   elog "libressl flag takes precedence over internal-tls"
-   else
-   ewarn "internal-tls implementation is experimental and 
provides fewer features"
-   fi
-   fi
-}
-
-src_unpack() {
-   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
-   default
-   if [[ ${PV} ==  ]] ; then
-   git-r3_src_unpack
-   fi
-}
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   default
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-}
-
-src_configure() {
-   local CONFIG="${S}/.config"
-
-   restore_config "${CONFIG}"
-   if [[ -f "${CONFIG}" ]]; then
-   default_src_configure
-   return 0
-   fi
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-   if use internal-tls && ! use libressl; then
-   echo "CONFIG_TLS=internal" >> ${CONFIG}
-   else
-   # SSL authentication methods
-   echo 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-07-28 Thread Mikle Kolyada
commit: eab465a339ec49d101753abeaddbf8231cec5594
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 28 13:47:14 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 28 13:47:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab465a3

net-wireless/hostapd: arm stable wrt bug #688726

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-wireless/hostapd/hostapd-2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.8.ebuild 
b/net-wireless/hostapd/hostapd-2.8.ebuild
index cd5351e4d34..631b845e31a 100644
--- a/net-wireless/hostapd/hostapd-2.8.ebuild
+++ b/net-wireless/hostapd/hostapd-2.8.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm arm64 ~mips ppc x86"
+   KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-07-22 Thread Aaron Bauman
commit: b35c1deb655f28fa9759bd5859c4e2584241207f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 22 16:30:47 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 22 16:30:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35c1deb

net-wireless/hostapd: arm64 stable (bug #688726)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 net-wireless/hostapd/hostapd-2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.8.ebuild 
b/net-wireless/hostapd/hostapd-2.8.ebuild
index 5cb3cb8b6dd..cd5351e4d34 100644
--- a/net-wireless/hostapd/hostapd-2.8.ebuild
+++ b/net-wireless/hostapd/hostapd-2.8.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
+   KEYWORDS="amd64 ~arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-06-27 Thread Sergei Trofimovich
commit: af393c9b86e7a299671208018594a80e9632a8f1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jun 27 07:25:35 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jun 27 07:25:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af393c9b

net-wireless/hostapd: stable 2.8 for ppc, bug #688726

Package-Manager: Portage-2.3.67, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-wireless/hostapd/hostapd-2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.8.ebuild 
b/net-wireless/hostapd/hostapd-2.8.ebuild
index e52d191025d..5cb3cb8b6dd 100644
--- a/net-wireless/hostapd/hostapd-2.8.ebuild
+++ b/net-wireless/hostapd/hostapd-2.8.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-06-26 Thread Agostino Sarubbo
commit: 176120de8c58e7bf23fe437c70b34130b63690a9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 26 09:44:18 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 26 09:44:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176120de

net-wireless/hostapd: x86 stable wrt bug #688726

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 net-wireless/hostapd/hostapd-2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.8.ebuild 
b/net-wireless/hostapd/hostapd-2.8.ebuild
index 8ec2de4d82d..e52d191025d 100644
--- a/net-wireless/hostapd/hostapd-2.8.ebuild
+++ b/net-wireless/hostapd/hostapd-2.8.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-06-26 Thread Agostino Sarubbo
commit: 8bdabae59c69ffce583a87f4560ab5c208dd48d1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 26 08:32:06 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 26 08:32:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdabae5

net-wireless/hostapd: amd64 stable wrt bug #688726

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-wireless/hostapd/hostapd-2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.8.ebuild 
b/net-wireless/hostapd/hostapd-2.8.ebuild
index 382256f224b..8ec2de4d82d 100644
--- a/net-wireless/hostapd/hostapd-2.8.ebuild
+++ b/net-wireless/hostapd/hostapd-2.8.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-06-24 Thread Andrey Utkin
commit: 8d054f705eea755094454959dcbe730a7f18ae34
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jun 24 11:57:18 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jun 24 13:28:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d054f70

net-wireless/hostapd: add new version 2.8

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/Manifest   |   1 +
 net-wireless/hostapd/hostapd-2.8.ebuild | 262 
 2 files changed, 263 insertions(+)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f18f59bcb9b..8224998b89c 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,2 +1,3 @@
 DIST hostapd-2.7.tar.gz 2101166 BLAKE2B 
4e88b7f0d2c57a02edf4214bb35efa08e87a2cbdac4eda9934a40b09f8c046da6cca1250fe5714cb403eb81739bd99e04ea5a9fad62e47bcee4d72106170905d
 SHA512 
1c9a210dfffb951fb667be19aa44ad8c66dccd2aed26cdab939185923550e3c1998a678ebe6975e560e1b3385bff2098f1b2cb773452ba66fb35246fdd3eb2c1
+DIST hostapd-2.8.tar.gz 2169018 BLAKE2B 
29e331d8ebb52732d2548734fe9ea55d8401826da7a35962705335da7d81232c785ffa89d77e8ee848148d82bea1d9141cc4d515706eebacb267754829cf7ed6
 SHA512 
5a352517470912bcb87755a592238eac2d814a7089d4ba1ecb7969f172dbb746a4e9a6c0d47c0d7c4a6a86b04b14ac39147d729fdf3163371c1067490a4897aa
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/hostapd-2.8.ebuild 
b/net-wireless/hostapd/hostapd-2.8.ebuild
new file mode 100644
index 000..382256f224b
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.8.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.7-r2"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
+   else
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   fi
+   # Never stabilize snapshot ebuilds please
+   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_unpack() {
+   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
+   default
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use internal-tls && ! use libressl; then
+   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   else
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-05-19 Thread Stephen Klimaszewski
commit: cdf83234e0add3a1d02ac6109deac44308ca78e3
Author: Steev Klimaszewski  gentoo  org>
AuthorDate: Sun May 19 20:38:27 2019 +
Commit: Stephen Klimaszewski  gentoo  org>
CommitDate: Sun May 19 20:40:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf83234

hostapd: Add ~arm64 keyword

Signed-off-by: Stephen Klimaszewski  gentoo.org>

 net-wireless/hostapd/hostapd-2.7-r2.ebuild | 2 +-
 net-wireless/hostapd/hostapd-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
index 61170b39678..7670a1e71d6 100644
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm ~mips ppc x86"
+   KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 645a653d562..382256f224b 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/files/2017-1/, net-wireless/hostapd/, ...

2019-04-08 Thread Andrey Utkin
commit: d29ac500f4bcced9c6cdf6ab71ef58552e598f95
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Apr  8 18:15:35 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Apr  8 18:21:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d29ac500

net-wireless/hostapd: drop old versions

Note: what was in files/, is now obtained from "extras" distfile to
satisfy the QA policy about FILESDIR size limits.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/Manifest  |   5 -
 ...-Avoid-key-reinstallation-in-FT-handshake.patch | 174 --
 ...nstallation-of-an-already-in-use-group-ke.patch | 250 ---
 ...ection-of-GTK-IGTK-reinstallation-of-WNM-.patch | 184 --
 ...04-Prevent-installation-of-an-all-zero-TK.patch |  79 --
 ...Fix-PTK-rekeying-to-generate-a-new-ANonce.patch |  64 -
 ...6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch | 132 --
 ...llow-multiple-Reassociation-Response-fram.patch |  82 ---
 .../files/hostapd-2.6-libressl-compatibility.patch | 106 
 net-wireless/hostapd/files/hostapd-conf.d  |   9 -
 net-wireless/hostapd/files/hostapd-init.d  |  38 ---
 net-wireless/hostapd/files/hostapd.service |   9 -
 net-wireless/hostapd/hostapd-2.6-r4.ebuild | 253 
 net-wireless/hostapd/hostapd-2.6-r5.ebuild | 256 
 net-wireless/hostapd/hostapd-2.6-r6.ebuild | 259 
 net-wireless/hostapd/hostapd-2.6_p20180822.ebuild  | 262 
 net-wireless/hostapd/hostapd-2.7-r1.ebuild | 266 -
 net-wireless/hostapd/hostapd-2.7.ebuild| 262 
 18 files changed, 2690 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 428bfc3a277..f18f59bcb9b 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,7 +1,2 @@
-DIST hostapd-2.6.tar.gz 1822341 BLAKE2B 
c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011
 SHA512 
e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
-DIST hostapd-2.6_p20180822.tar.xz 2912628 BLAKE2B 
df102e2ee8fbfaf83050264fcd0374fee3a249db0bacff1b60a23d8fae4a4db7f42f2741b435112c0d94ffa1482ff08708e94b760de340bee2f341e52b8eb15a
 SHA512 
c05edc48992edb617067bb258658210edebc6e72889af8d14e4ee5e0a2d79327798b4eb6985fd076da53973bbf965bff631afe1e1a048898433670783908f2ff
 DIST hostapd-2.7.tar.gz 2101166 BLAKE2B 
4e88b7f0d2c57a02edf4214bb35efa08e87a2cbdac4eda9934a40b09f8c046da6cca1250fe5714cb403eb81739bd99e04ea5a9fad62e47bcee4d72106170905d
 SHA512 
1c9a210dfffb951fb667be19aa44ad8c66dccd2aed26cdab939185923550e3c1998a678ebe6975e560e1b3385bff2098f1b2cb773452ba66fb35246fdd3eb2c1
-DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B 
fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981
 SHA512 
cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
-DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 
62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e661865e77759d33e38c8a5647537c0098e772f032a368b82be709
 SHA512 
c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612
-DIST net-wireless_hostapd_2.7-r1_extras.tar.xz 1792 BLAKE2B 
865d0170743432bf47bf3912316ae817bfea87ffa98df9cee77c0c366ffd2673d51b2d4e7b30339b3ad7abdcaa3addf9cd7ad9db51925ae8809d31888ec02445
 SHA512 
abea295f0b46b03ee829a3cecf1e89f1678f5bf326ad185d939f23e69e440544860ebafedc1b5b1a3b57c73709b6bb7bf45c4a45f9d58f8adeb7424946f34841
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git 
a/net-wireless/hostapd/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
 
b/net-wireless/hostapd/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
deleted file mode 100644
index 727684865db..000
--- 
a/net-wireless/hostapd/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef 
-Date: Fri, 14 Jul 2017 15:15:35 +0200
-Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake
-
-Do not reinstall TK to the driver during 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-04-08 Thread Andrey Utkin
commit: 808abfbb62982abfb468690dec85432e45fb32cd
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Apr  8 18:13:33 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Apr  8 18:21:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808abfbb

net-wireless/hostapd: : update extras version

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/hostapd-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 590d42c623a..645a653d562 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://w1.fi;
-EXTRAS_VER="2.6-r5"
+EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-04-01 Thread Thomas Deutschmann
commit: dcd3fb423379d1ab1c73db56ad90040ac7272365
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr  1 16:59:59 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr  1 16:59:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd3fb42

net-wireless/hostapd: x86 stable (bug #678322)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/hostapd/hostapd-2.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
index 4f062184baa..61170b39678 100644
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 arm ~mips ppc ~x86"
+   KEYWORDS="amd64 arm ~mips ppc x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-03-20 Thread Mikle Kolyada
commit: 2ebb7a37d3d990ce218e52c5704722b33ecf1976
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Mar 20 21:14:00 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Mar 20 21:14:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebb7a37

net-wireless/hostapd: arm stable wrt bug #678322

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 net-wireless/hostapd/hostapd-2.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
index 20f40c4c490..4f062184baa 100644
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~mips ppc ~x86"
+   KEYWORDS="amd64 arm ~mips ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-03-16 Thread Sergei Trofimovich
commit: f212da5b981b0974119fc1f857268202bee42ac4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 16 21:55:32 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 16 21:56:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f212da5b

net-wireless/hostapd: stable 2.7-r2 for ppc, bug #678322

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-wireless/hostapd/hostapd-2.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
index 402ad84b4e3..20f40c4c490 100644
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~mips ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-03-16 Thread Agostino Sarubbo
commit: a88b8664a24b3e8cb0ed43de25cce8425cde9024
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Mar 16 21:36:04 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Mar 16 21:36:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88b8664

net-wireless/hostapd: amd64 stable wrt bug #678322

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-wireless/hostapd/hostapd-2.7-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
index 8db8ecf612d..402ad84b4e3 100644
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
fi
# Never stabilize snapshot ebuilds please
-   KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-02-19 Thread Andrey Utkin
commit: 2066246a8775726a132c048fb9f07aac890113ea
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Feb 19 09:27:05 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Feb 19 09:27:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2066246a

net-wireless/hostapd: : drop unused inherit eutils

As highlighted by https://gentooqa.levelnine.at.

Leaving 2.7-r2 intact for now, just being paranoid here.
Also stablereq has already been issued for 2.7-r2, don't want to change
it under arch teams' feet.

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/hostapd-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 342d0151c2d..590d42c623a 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit toolchain-funcs eutils systemd savedconfig
+inherit toolchain-funcs systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://w1.fi;



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2019-02-18 Thread Andrey Utkin
commit: 9e2b90512b73c3fbc0f716bc6c729809db05c2ce
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Feb 18 19:21:05 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Feb 18 19:29:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e2b9051

net-wireless/hostapd: drop duplicate description of global USE flag

Thanks to authors of https://gentooqa.levelnine.at

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-wireless/hostapd/metadata.xml 
b/net-wireless/hostapd/metadata.xml
index 458eddb0459..7cce4a9bd8d 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -12,7 +12,6 @@
Install support files for 
sys-apps/logwatch
Adding support for using netlink to create 
VLANs
-   Adding sqlite support
Add support for Wi-Fi Protected Setup





[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-12-14 Thread Andrey Utkin
commit: 7896c30cc904cbbe6fa5d1806a9796095e5d48b9
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec 11 17:37:23 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Fri Dec 14 17:48:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7896c30c

net-wireless/hostapd: 2.7-r2: use better libressl patch

Suggested-by: Rosen Penev  gmail.com>
Link: http://lists.infradead.org/pipermail/hostap/2018-December/039109.html
Package-Manager: Portage-2.3.49, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/Manifest  | 1 +
 net-wireless/hostapd/hostapd-2.7-r2.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index eb0f21c7ece..428bfc3a277 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,3 +4,4 @@ DIST hostapd-2.7.tar.gz 2101166 BLAKE2B 
4e88b7f0d2c57a02edf4214bb35efa08e87a2cbd
 DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B 
fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981
 SHA512 
cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
 DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 
62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e661865e77759d33e38c8a5647537c0098e772f032a368b82be709
 SHA512 
c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612
 DIST net-wireless_hostapd_2.7-r1_extras.tar.xz 1792 BLAKE2B 
865d0170743432bf47bf3912316ae817bfea87ffa98df9cee77c0c366ffd2673d51b2d4e7b30339b3ad7abdcaa3addf9cd7ad9db51925ae8809d31888ec02445
 SHA512 
abea295f0b46b03ee829a3cecf1e89f1678f5bf326ad185d939f23e69e440544860ebafedc1b5b1a3b57c73709b6bb7bf45c4a45f9d58f8adeb7424946f34841
+DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
index a7e0d6678cb..8db8ecf612d 100644
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs eutils systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://w1.fi;
-EXTRAS_VER="2.7-r1"
+EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
 
@@ -44,7 +44,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-   "${WORKDIR}/${EXTRAS_NAME}/0001-bug672834-libressl.patch"
+   "${WORKDIR}/${EXTRAS_NAME}/0001-bug672834-libressl-v2.patch"
 )
 
 S="${S}/${PN}"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-12-14 Thread Andrey Utkin
commit: 9515ee1fdfa75ef87703aeb58cbba81a1ce86725
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec 11 17:31:44 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Fri Dec 14 17:48:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9515ee1f

net-wireless/hostapd: add new revision 2.7-r2

Cloned from 2.7-r1 verbatim, for further changes.

Package-Manager: Portage-2.3.49, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/hostapd-2.7-r2.ebuild | 266 +
 1 file changed, 266 insertions(+)

diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
new file mode 100644
index 000..a7e0d6678cb
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.7-r1"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
+   else
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   fi
+   # Never stabilize snapshot ebuilds please
+   KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${WORKDIR}/${EXTRAS_NAME}/0001-bug672834-libressl.patch"
+)
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_unpack() {
+   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
+   default
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use internal-tls && ! use libressl; then
+   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   else
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+   echo "CONFIG_TLSV11=y" >> ${CONFIG}
+   echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+   fi
+
+   if use wps; then
+   # Enable Wi-Fi Protected Setup
+   echo "CONFIG_WPS=y" >> ${CONFIG}
+   echo "CONFIG_WPS2=y" >> ${CONFIG}
+   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+   einfo "Enabling Wi-Fi Protected Setup support"
+   fi
+
+   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+   echo 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-12-11 Thread Andrey Utkin
commit: bea60d2300899cb8002f13d7cf71800d7be52f95
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec 11 14:05:35 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec 11 15:01:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea60d23

net-wireless/hostapd: add new revision 2.7-r1

Cloned from 2.7 verbatim, for further changes.

Package-Manager: Portage-2.3.49, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/hostapd-2.7-r1.ebuild | 262 +
 1 file changed, 262 insertions(+)

diff --git a/net-wireless/hostapd/hostapd-2.7-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r1.ebuild
new file mode 100644
index 000..6e23c9c8295
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.7-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.6-r5"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
+   else
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   fi
+   # Never stabilize snapshot ebuilds please
+   KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_unpack() {
+   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
+   default
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use internal-tls && ! use libressl; then
+   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   else
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+   echo "CONFIG_TLSV11=y" >> ${CONFIG}
+   echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+   fi
+
+   if use wps; then
+   # Enable Wi-Fi Protected Setup
+   echo "CONFIG_WPS=y" >> ${CONFIG}
+   echo "CONFIG_WPS2=y" >> ${CONFIG}
+   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+   einfo "Enabling Wi-Fi Protected Setup support"
+   fi
+
+   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+   echo 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-12-11 Thread Andrey Utkin
commit: dc294064e2abe741f6f57fe74d1e208479db8e23
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec 11 15:01:06 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec 11 15:01:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc294064

net-wireless/hostapd: 2.7-r1: fix USE=libressl

Bug: https://bugs.gentoo.org/672834
Package-Manager: Portage-2.3.49, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/Manifest  | 1 +
 net-wireless/hostapd/hostapd-2.7-r1.ebuild | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 9178a6f26cb..eb0f21c7ece 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -3,3 +3,4 @@ DIST hostapd-2.6_p20180822.tar.xz 2912628 BLAKE2B 
df102e2ee8fbfaf83050264fcd0374
 DIST hostapd-2.7.tar.gz 2101166 BLAKE2B 
4e88b7f0d2c57a02edf4214bb35efa08e87a2cbdac4eda9934a40b09f8c046da6cca1250fe5714cb403eb81739bd99e04ea5a9fad62e47bcee4d72106170905d
 SHA512 
1c9a210dfffb951fb667be19aa44ad8c66dccd2aed26cdab939185923550e3c1998a678ebe6975e560e1b3385bff2098f1b2cb773452ba66fb35246fdd3eb2c1
 DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B 
fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981
 SHA512 
cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
 DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 
62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e661865e77759d33e38c8a5647537c0098e772f032a368b82be709
 SHA512 
c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612
+DIST net-wireless_hostapd_2.7-r1_extras.tar.xz 1792 BLAKE2B 
865d0170743432bf47bf3912316ae817bfea87ffa98df9cee77c0c366ffd2673d51b2d4e7b30339b3ad7abdcaa3addf9cd7ad9db51925ae8809d31888ec02445
 SHA512 
abea295f0b46b03ee829a3cecf1e89f1678f5bf326ad185d939f23e69e440544860ebafedc1b5b1a3b57c73709b6bb7bf45c4a45f9d58f8adeb7424946f34841

diff --git a/net-wireless/hostapd/hostapd-2.7-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.7-r1.ebuild
index 6e23c9c8295..a7e0d6678cb 100644
--- a/net-wireless/hostapd/hostapd-2.7-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs eutils systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://w1.fi;
-EXTRAS_VER="2.6-r5"
+EXTRAS_VER="2.7-r1"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
 
@@ -43,6 +43,10 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${WORKDIR}/${EXTRAS_NAME}/0001-bug672834-libressl.patch"
+)
+
 S="${S}/${PN}"
 
 pkg_pretend() {



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-12-09 Thread Andrey Utkin
commit: 7ff1f5c7b6948aac176ea5382dfa8dde1152b75c
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sun Dec  9 01:01:27 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sun Dec  9 16:21:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff1f5c7

net-wireless/hostapd: add new 2.7 version

Cloned from  ebuild.

Package-Manager: Portage-2.3.49, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/Manifest   |   1 +
 net-wireless/hostapd/hostapd-2.7.ebuild | 262 
 2 files changed, 263 insertions(+)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 88ee671053a..9178a6f26cb 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,4 +1,5 @@
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B 
c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011
 SHA512 
e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
 DIST hostapd-2.6_p20180822.tar.xz 2912628 BLAKE2B 
df102e2ee8fbfaf83050264fcd0374fee3a249db0bacff1b60a23d8fae4a4db7f42f2741b435112c0d94ffa1482ff08708e94b760de340bee2f341e52b8eb15a
 SHA512 
c05edc48992edb617067bb258658210edebc6e72889af8d14e4ee5e0a2d79327798b4eb6985fd076da53973bbf965bff631afe1e1a048898433670783908f2ff
+DIST hostapd-2.7.tar.gz 2101166 BLAKE2B 
4e88b7f0d2c57a02edf4214bb35efa08e87a2cbdac4eda9934a40b09f8c046da6cca1250fe5714cb403eb81739bd99e04ea5a9fad62e47bcee4d72106170905d
 SHA512 
1c9a210dfffb951fb667be19aa44ad8c66dccd2aed26cdab939185923550e3c1998a678ebe6975e560e1b3385bff2098f1b2cb773452ba66fb35246fdd3eb2c1
 DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B 
fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981
 SHA512 
cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
 DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 
62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e661865e77759d33e38c8a5647537c0098e772f032a368b82be709
 SHA512 
c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612

diff --git a/net-wireless/hostapd/hostapd-2.7.ebuild 
b/net-wireless/hostapd/hostapd-2.7.ebuild
new file mode 100644
index 000..6e23c9c8295
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.7.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.6-r5"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
+   else
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   fi
+   # Never stabilize snapshot ebuilds please
+   KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_unpack() {
+   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
+   default
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-09-01 Thread Andrey Utkin
commit: 7db02bc020fc23ff5a9dbf4c84a9a22cc32c72e2
Author: Andrey Utkin  gentoo  org>
AuthorDate: Wed Aug 22 23:57:13 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sun Sep  2 02:43:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db02bc0

net-wireless/hostapd: : fix spacing in SRC_URI

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-wireless/hostapd/hostapd-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 2b99c9ab887..e7978ed1696 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -15,7 +15,7 @@ if [[ $PV ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   SRC_URI+="https://w1.fi/releases/${P}.tar.gz;
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-09-01 Thread Andrey Utkin
commit: 321e02c766fd96bd316c9732c14042e67d89c5a0
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sun Sep  2 02:39:50 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sun Sep  2 02:43:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321e02c7

net-wireless/hostapd: : add snapshot versions logic

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-wireless/hostapd/hostapd-.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index e7978ed1696..342d0151c2d 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -15,7 +15,12 @@ if [[ $PV ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
+   else
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   fi
+   # Never stabilize snapshot ebuilds please
KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-09-01 Thread Andrey Utkin
commit: f84fcba759697bd500fd7ccc9621ef5be1f4fc9b
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sun Sep  2 02:40:22 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sun Sep  2 02:43:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f84fcba7

net-wireless/hostapd: add snapshot ebuild

Upstream of hostapd, hostap-utils and wpa_supplicant hasn't issued a
proper release for 1.5 years already, and is not going to.

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-wireless/hostapd/Manifest |   1 +
 net-wireless/hostapd/hostapd-2.6_p20180822.ebuild | 262 ++
 2 files changed, 263 insertions(+)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 45eaaa812e7..88ee671053a 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,3 +1,4 @@
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B 
c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011
 SHA512 
e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
+DIST hostapd-2.6_p20180822.tar.xz 2912628 BLAKE2B 
df102e2ee8fbfaf83050264fcd0374fee3a249db0bacff1b60a23d8fae4a4db7f42f2741b435112c0d94ffa1482ff08708e94b760de340bee2f341e52b8eb15a
 SHA512 
c05edc48992edb617067bb258658210edebc6e72889af8d14e4ee5e0a2d79327798b4eb6985fd076da53973bbf965bff631afe1e1a048898433670783908f2ff
 DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B 
fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981
 SHA512 
cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
 DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 
62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e661865e77759d33e38c8a5647537c0098e772f032a368b82be709
 SHA512 
c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612

diff --git a/net-wireless/hostapd/hostapd-2.6_p20180822.ebuild 
b/net-wireless/hostapd/hostapd-2.6_p20180822.ebuild
new file mode 100644
index 000..342d0151c2d
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.6_p20180822.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.6-r5"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz;
+   else
+   SRC_URI+=" https://w1.fi/releases/${P}.tar.gz;
+   fi
+   # Never stabilize snapshot ebuilds please
+   KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_unpack() {
+   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
+   default
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+ 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-07-06 Thread Andrey Utkin
commit: 0732fe3e762b640eae848ea4accdae9d137a3471
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sat Jul  7 01:32:19 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sat Jul  7 01:33:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0732fe3e

net-wireless/hostapd: s/!use/! use/g

Fix syntax issue which caused errors.
In all relevant ebuilds including stable.

Suggested-by: Matt Turner  gentoo.org>
Bug: https://bugs.gentoo.org/660378
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r4.ebuild | 6 +++---
 net-wireless/hostapd/hostapd-2.6-r5.ebuild | 6 +++---
 net-wireless/hostapd/hostapd-2.6-r6.ebuild | 6 +++---
 net-wireless/hostapd/hostapd-.ebuild   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
index a0403321ea5..6f00dd91246 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -82,7 +82,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use internal-tls && !use libressl; then
+   if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -183,7 +183,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -198,7 +198,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
 

diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
index 67f105b8c77..82e50e8b7f0 100644
--- a/net-wireless/hostapd/hostapd-2.6-r5.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -85,7 +85,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use internal-tls && !use libressl; then
+   if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -186,7 +186,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -201,7 +201,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
 

diff --git a/net-wireless/hostapd/hostapd-2.6-r6.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
index ffca9d29e16..484677f3913 100644
--- a/net-wireless/hostapd/hostapd-2.6-r6.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
@@ -88,7 +88,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use internal-tls && !use libressl; then
+   if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -189,7 +189,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -204,7 +204,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
 

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 7cf65530325..2b99c9ab887 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -86,7 +86,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use internal-tls && !use libressl; then
+   if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -187,7 +187,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -202,7 +202,7 @@ src_install() {
dosbin ${PN}
 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-07-06 Thread Andrey Utkin
commit: 447db89c9723c30d65da760c049ac775ee60c685
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sat Jul  7 01:39:40 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sat Jul  7 01:39:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447db89c

net-wireless/hostapd: drop old 2.6-r1

2.6-r4 is the new stable revision.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r1.ebuild | 226 -
 1 file changed, 226 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r1.ebuild
deleted file mode 100644
index 8a0d613bea7..000
--- a/net-wireless/hostapd/hostapd-2.6-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils systemd
-
-# bogus commit to force manifest regeneration #596462
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi;
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl:*[-bindist] )
-   kernel_linux? (
-   dev-libs/libnl:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   # 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
-   default
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-
-}
-
-src_configure() {
-   local CONFIG="${S}/.config"
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-   if use ssl; then
-   # SSL authentication methods
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-   echo "CONFIG_TLSV11=y" >> ${CONFIG}
-   echo "CONFIG_TLSV12=y" >> ${CONFIG}
-   fi
-
-   if use wps; then
-   # Enable Wi-Fi Protected Setup
-   echo "CONFIG_WPS=y" >> ${CONFIG}
-   echo "CONFIG_WPS2=y" >> ${CONFIG}
-   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-   einfo "Enabling Wi-Fi Protected Setup support"
-   fi
-
-   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-   echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-
-   einfo "Enabling drivers: "
-
-   # drivers
-   echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-   einfo "  HostAP driver enabled"
-   echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-   einfo "  Wired driver enabled"
-   echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-   einfo "  Prism54 driver enabled"
-   echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-   einfo "  None driver enabled"
-
-   einfo "  nl80211 driver enabled"
-   echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-
-   # epoll
-   echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-07-06 Thread Andrey Utkin
commit: 0760b9f7094e991d19ce4f5807142ff852876776
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sat Jul  7 00:22:58 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sat Jul  7 01:25:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0760b9f7

net-wireless/hostapd: add backported bugfix

Suggested-by: Matt Turner  gentoo.org>
Bug: https://bugs.gentoo.org/660384
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/Manifest  |   1 +
 net-wireless/hostapd/hostapd-2.6-r6.ebuild | 259 +
 2 files changed, 260 insertions(+)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 34faab85331..45eaaa812e7 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,2 +1,3 @@
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B 
c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011
 SHA512 
e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
 DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B 
fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981
 SHA512 
cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
+DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 
62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e661865e77759d33e38c8a5647537c0098e772f032a368b82be709
 SHA512 
c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612

diff --git a/net-wireless/hostapd/hostapd-2.6-r6.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
new file mode 100644
index 000..ffca9d29e16
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.6-r6"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="http://w1.fi/releases/${P}.tar.gz
+   https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+
+   # Add LibreSSL compatibility patch bug (#567262)
+   eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch"
+
+   # 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/nl80211-Fix-NL80211_ATTR_SMPS_MODE-encoding.patch"
+
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-06-26 Thread Mikle Kolyada
commit: 9a7b670f48667e491d02afdb797695099c6c7d5e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Jun 26 15:57:30 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Jun 26 15:57:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a7b670f

net-wireless/hostapd: arm stable wrt bug #653524

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
index 8b200a641d5..a0403321ea5 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
+KEYWORDS="amd64 arm ~mips ppc x86"
 IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-06-13 Thread Andrey Utkin
commit: 65d1259988a2f59c664eeb168760e14b65dc9bed
Author: Andrey Utkin  gentoo  org>
AuthorDate: Wed Jun 13 14:44:50 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Wed Jun 13 14:45:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d12599

net-wireless/hostapd: 2.6-r{2,3}: drop obsolete

Dropping ebuild revisions which are not latest nor stable.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r2.ebuild | 232 
 net-wireless/hostapd/hostapd-2.6-r3.ebuild | 238 -
 2 files changed, 470 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r2.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r2.ebuild
deleted file mode 100644
index 250e07cfbe7..000
--- a/net-wireless/hostapd/hostapd-2.6-r2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi;
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl:*[-bindist] )
-   kernel_linux? (
-   dev-libs/libnl:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   # 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
-   default
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-
-}
-
-src_configure() {
-   local CONFIG="${S}/.config"
-
-   restore_config "${CONFIG}"
-   if [[ -f "${CONFIG}" ]]; then
-   default_src_configure
-   return 0
-   fi
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-   if use ssl; then
-   # SSL authentication methods
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-   echo "CONFIG_TLSV11=y" >> ${CONFIG}
-   echo "CONFIG_TLSV12=y" >> ${CONFIG}
-   fi
-
-   if use wps; then
-   # Enable Wi-Fi Protected Setup
-   echo "CONFIG_WPS=y" >> ${CONFIG}
-   echo "CONFIG_WPS2=y" >> ${CONFIG}
-   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-   einfo "Enabling Wi-Fi Protected Setup support"
-   fi
-
-   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-   echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-
-   einfo "Enabling drivers: "
-
-   # drivers
-   echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-   einfo "  HostAP driver enabled"
-   echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-   einfo "  Wired driver enabled"
-   echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-   einfo "  Prism54 driver enabled"
-   echo 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-06-13 Thread Andrey Utkin
commit: 64a94addbe03cb4915621043e88442a837a6d06f
Author: Andrey Utkin  gentoo  org>
AuthorDate: Wed Jun 13 14:20:21 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Wed Jun 13 14:28:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a94add

net-wireless/hostapd: add live ebuild

Current hostapd release is pretty old and does not work clean on recent
kernels (https://forums.gentoo.org/viewtopic-t-1080820.html), and there
are no response for new release request
(http://lists.infradead.org/pipermail/hostap/2018-April/038490.html)

Original work by Michael Perlov  gmail.com>

Link: https://github.com/gentoo/gentoo/pull/8673
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Signed-off-by: Andrey Utkin  gentoo.org>

 net-wireless/hostapd/hostapd-.ebuild | 257 +++
 1 file changed, 257 insertions(+)

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
new file mode 100644
index 000..7cf65530325
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.6-r5"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+if [[ $PV ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   SRC_URI+="https://w1.fi/releases/${P}.tar.gz;
+   KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_unpack() {
+   # Override default one because we need the SRC_URI ones even in case of 
 ebuilds
+   default
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use internal-tls && !use libressl; then
+   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   else
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+   echo "CONFIG_TLSV11=y" >> ${CONFIG}
+   echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+   fi
+
+   if use wps; then
+   # Enable Wi-Fi Protected Setup
+   echo "CONFIG_WPS=y" >> ${CONFIG}
+   echo "CONFIG_WPS2=y" >> ${CONFIG}
+   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+   einfo "Enabling Wi-Fi Protected Setup support"
+   fi
+
+   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SAKE=y" >> 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-06-10 Thread Thomas Deutschmann
commit: 60eba80350efc2462104384e9ee510d21bd21eee
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jun 10 18:39:41 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jun 10 18:46:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60eba803

net-wireless/hostapd: x86 stable (bug #653524)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
index 698eed98c0c..d7fb2f58e5b 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc x86"
 IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-06-09 Thread Aaron Bauman
commit: b5c596f4b9bcddf805ab5f6953a763310524a1ac
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Jun  9 19:30:50 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Jun  9 19:49:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c596f4

net-wireless/hostapd: amd64 stable wrt bug #653524

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
index ffc16c5ae29..698eed98c0c 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
 IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-06-07 Thread Andrey Utkin
commit: 5eb1f900583c5b709e061dcbfaee67084021f60d
Author: Andrey Utkin  gentoo  org>
AuthorDate: Thu Jun  7 21:23:16 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Thu Jun  7 21:43:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb1f900

net-wireless/hostapd: use extras distfile instead of files/

This is to comply with QA policy of keeping files/ small.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/Manifest  |  1 +
 net-wireless/hostapd/hostapd-2.6-r5.ebuild | 27 +++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 3e38dd5d7d7..34faab85331 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1 +1,2 @@
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B 
c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011
 SHA512 
e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
+DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B 
fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981
 SHA512 
cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70

diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
index ffc16c5ae29..da0fbd66921 100644
--- a/net-wireless/hostapd/hostapd-2.6-r5.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -7,7 +7,10 @@ inherit toolchain-funcs eutils systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://hostap.epitest.fi;
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
+EXTRAS_VER="2.6-r5"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+   https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
@@ -47,16 +50,16 @@ src_prepare() {
pushd ../ >/dev/null || die
 
# Add LibreSSL compatibility patch bug (#567262)
-   eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
+   eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch"
 
# 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
default
popd >/dev/null || die
 
@@ -202,9 +205,9 @@ src_install() {
dobin nt_password_hash hlr_auc_gw
fi
 
-   newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-   newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-   systemd_dounit "${FILESDIR}"/${PN}.service
+   newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+   newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+   systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
 
doman ${PN}{.8,_cli.1}
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-06-07 Thread Andrey Utkin
commit: 759f7a7cadfa855fb02d495f81994b86ef68e22d
Author: Andrey Utkin  gentoo  org>
AuthorDate: Thu Jun  7 21:06:42 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Thu Jun  7 21:43:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759f7a7c

net-wireless/hostapd: add 2.6-r5 for further enhancements

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r5.ebuild | 253 +
 1 file changed, 253 insertions(+)

diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
new file mode 100644
index 000..ffc16c5ae29
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi;
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+
+   # Add LibreSSL compatibility patch bug (#567262)
+   eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
+
+   # 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use internal-tls && !use libressl; then
+   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   else
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+   echo "CONFIG_TLSV11=y" >> ${CONFIG}
+   echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+   fi
+
+   if use wps; then
+   # Enable Wi-Fi Protected Setup
+   echo "CONFIG_WPS=y" >> ${CONFIG}
+   echo "CONFIG_WPS2=y" >> ${CONFIG}
+   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+   einfo "Enabling Wi-Fi Protected Setup support"
+   fi
+
+   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+   echo "CONFIG_EAP_EKE=y" >> 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-06-07 Thread Andrey Utkin
commit: b6c909305297496595622a71c7c64945b9d9eeca
Author: Andrey Utkin  gentoo  org>
AuthorDate: Thu Jun  7 21:46:24 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Thu Jun  7 21:46:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c90930

net-wireless/hostapd: update HOMEPAGE, SRC_URI domain

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
index da0fbd66921..67f105b8c77 100644
--- a/net-wireless/hostapd/hostapd-2.6-r5.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -6,10 +6,10 @@ EAPI="6"
 inherit toolchain-funcs eutils systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi;
+HOMEPAGE="http://w1.fi;
 EXTRAS_VER="2.6-r5"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+SRC_URI="http://w1.fi/releases/${P}.tar.gz
https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-05-02 Thread Andrey Utkin
commit: 9e6f35f746a3167551005b501a304375369fb488
Author: Andrey Utkin  gentoo  org>
AuthorDate: Fri Apr 27 21:18:59 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Wed May  2 10:08:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e6f35f7

net-wireless/hostapd: add 2.6-r4 for further enhancements

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r4.ebuild | 238 +
 1 file changed, 238 insertions(+)

diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
new file mode 100644
index 000..feebb2eda45
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi;
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="ipv6 libressl logwatch netlink sqlite +ssl +wps +crda"
+
+DEPEND="
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[-bindist] )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+
+   # Add LibreSSL compatibility patch bug (#567262)
+   eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
+
+   # 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if [[ -f "${CONFIG}" ]]; then
+   default_src_configure
+   return 0
+   fi
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use ssl; then
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+   echo "CONFIG_TLSV11=y" >> ${CONFIG}
+   echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   fi
+
+   if use wps; then
+   # Enable Wi-Fi Protected Setup
+   echo "CONFIG_WPS=y" >> ${CONFIG}
+   echo "CONFIG_WPS2=y" >> ${CONFIG}
+   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+   einfo "Enabling Wi-Fi Protected Setup support"
+   fi
+
+   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+
+   einfo "Enabling drivers: "
+
+   # drivers
+   echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+   einfo "  HostAP driver enabled"
+   echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+   einfo "  Wired driver enabled"
+   echo 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-05-02 Thread Andrey Utkin
commit: 3695b0a4d4b752e3401f679ecebfc6490aa2109b
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sat Apr 28 13:45:34 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Wed May  2 10:09:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3695b0a4

net-wireless/hostapd: drop defunct "ssl" USE flag, add "internal-tls"

Since hostapd-2.5, USE=-ssl fails to build.

Appears USE=-ssl was used to avoid openssl. Since libressl support was
added in 2.6-r3 ebuild, there is an alternative way to avoid openssl
now.

This commit adds another alternative, to use internal TLSv1
implementation instead of openssl/libressl. It doesn't allow to build
hostapd with all the features which are enabled with openssl, though.

I don't anticipate user need for USE=-ssl to have a build which does not
support any encryption at all. Of course I am open to such users'
requests, but at last they have "savedconfig" option to help themselves.

Acked-by: zerochaos  gentoo.org
Bug: https://bugs.gentoo.org/578798
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r4.ebuild | 31 ++
 net-wireless/hostapd/metadata.xml  |  1 +
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
index feebb2eda45..ffc16c5ae29 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -12,12 +12,13 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="ipv6 libressl logwatch netlink sqlite +ssl +wps +crda"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
 
 DEPEND="
-   ssl? (
-   !libressl? ( dev-libs/openssl:0=[-bindist] )
-   libressl? ( dev-libs/libressl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
)
kernel_linux? (
dev-libs/libnl:3
@@ -30,6 +31,16 @@ RDEPEND="${DEPEND}"
 
 S="${S}/${PN}"
 
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
 src_prepare() {
# Allow users to apply patches to src/drivers for example,
# i.e. anything outside ${S}/${PN}
@@ -71,7 +82,9 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use ssl; then
+   if use internal-tls && !use libressl; then
+   echo "CONFIG_TLS=internal" >> ${CONFIG}
+   else
# SSL authentication methods
echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
@@ -80,6 +93,7 @@ src_configure() {
echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
echo "CONFIG_TLSV11=y" >> ${CONFIG}
echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
fi
 
if use wps; then
@@ -103,7 +117,6 @@ src_configure() {
echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
 
einfo "Enabling drivers: "
 
@@ -170,7 +183,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use ssl; then
+   if use libressl || !use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -185,7 +198,9 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   use ssl && dobin nt_password_hash hlr_auc_gw
+   if use libressl || !use internal-tls; then
+   dobin nt_password_hash hlr_auc_gw
+   fi
 
newinitd "${FILESDIR}"/${PN}-init.d ${PN}
newconfd "${FILESDIR}"/${PN}-conf.d ${PN}

diff --git a/net-wireless/hostapd/metadata.xml 
b/net-wireless/hostapd/metadata.xml
index 59217d50546..458eddb0459 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -8,6 +8,7 @@


Add CRDA support
+   Use internal TLSv1 implementation 
instead of depending on OpenSSL, LibreSSL or GnuTLS
Install support files for 
sys-apps/logwatch
Adding support for using netlink to create 
VLANs



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-04-30 Thread Mikle Kolyada
commit: 6b2506132780e3a25a87256a85bcaadff584367f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Apr 30 17:50:58 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Apr 30 17:50:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b250613

net-wireless/hostapd: Fix whitespacing

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-wireless/hostapd/hostapd-2.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r3.ebuild
index da8ab633fed..feebb2eda45 100644
--- a/net-wireless/hostapd/hostapd-2.6-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r3.ebuild
@@ -34,7 +34,7 @@ src_prepare() {
# Allow users to apply patches to src/drivers for example,
# i.e. anything outside ${S}/${PN}
pushd ../ >/dev/null || die
-   
+
# Add LibreSSL compatibility patch bug (#567262)
eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-04-27 Thread Andrey Utkin
commit: acf212c3359ce5925ad85a791bbb55cb0e293904
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sun Apr 22 00:16:14 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Fri Apr 27 21:14:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf212c3

net-wireless/hostapd: don't enable nonexistent PRISM54 driver

PRISM54 driver support has been removed from hostapd in 2009, in commit
50b5bf4eda92 ("Remove obsolete Prism54.org driver support
(driver_prism54.c)").

Suggested-by: Conrad Kostecki 
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r3.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r3.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r3.ebuild
index 9b9078e5558..da8ab633fed 100644
--- a/net-wireless/hostapd/hostapd-2.6-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r3.ebuild
@@ -112,8 +112,6 @@ src_configure() {
einfo "  HostAP driver enabled"
echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
einfo "  Wired driver enabled"
-   echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-   einfo "  Prism54 driver enabled"
echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
einfo "  None driver enabled"
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/, net-wireless/hostapd/files/

2018-04-18 Thread Aaron Bauman
commit: 858ab8314e6296e4b45e78992d07c1f22f0bf7a5
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Apr 19 03:04:01 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr 19 03:04:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858ab831

net-wireless/hostapd: add LibreSSL support

This patch adds support for LibreSSL and ensures compatibility with
dev-libs/libressl-2.7.x. Patch was backported from upstream commits:

ba3658cfff2278bc2ba24c32773962b37648d0b2
dee566d98e85e00b917d3eff42cd7e969de089cc

Closes: https://bugs.gentoo.org/567262
Package-Manager: Portage-2.3.29, Repoman-2.3.9

 .../files/hostapd-2.6-libressl-compatibility.patch | 106 +
 net-wireless/hostapd/hostapd-2.6-r3.ebuild | 240 +
 2 files changed, 346 insertions(+)

diff --git 
a/net-wireless/hostapd/files/hostapd-2.6-libressl-compatibility.patch 
b/net-wireless/hostapd/files/hostapd-2.6-libressl-compatibility.patch
new file mode 100644
index 000..025da58028d
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-2.6-libressl-compatibility.patch
@@ -0,0 +1,106 @@
+diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
+index 19e0e2be8..6585c0245 100644
+--- a/src/crypto/crypto_openssl.c
 b/src/crypto/crypto_openssl.c
+@@ -33,7 +33,9 @@
+ #include "aes_wrap.h"
+ #include "crypto.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010L || \
++  (defined(LIBRESSL_VERSION_NUMBER) && \
++   LIBRESSL_VERSION_NUMBER < 0x2070L)
+ /* Compatibility wrappers for older versions. */
+ 
+ static HMAC_CTX * HMAC_CTX_new(void)
+@@ -79,7 +81,9 @@ static void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
+ 
+ static BIGNUM * get_group5_prime(void)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && \
++  !(defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+   return BN_get_rfc3526_prime_1536(NULL);
+ #elif !defined(OPENSSL_IS_BORINGSSL)
+   return get_rfc3526_prime_1536(NULL);
+@@ -611,7 +615,9 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
+ 
+ void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || \
++  (defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+   DH *dh;
+   struct wpabuf *pubkey = NULL, *privkey = NULL;
+   size_t publen, privlen;
+@@ -712,7 +718,9 @@ err:
+ 
+ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || \
++  (defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+   DH *dh;
+ 
+   dh = DH_new();
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 23ac64b48..91acc579d 100644
+--- a/src/crypto/tls_openssl.c
 b/src/crypto/tls_openssl.c
+@@ -59,7 +59,8 @@ typedef int stack_index_t;
+ #endif /* SSL_set_tlsext_status_type */
+ 
+ #if (OPENSSL_VERSION_NUMBER < 0x1010L || \
+- defined(LIBRESSL_VERSION_NUMBER)) &&\
++  (defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)) && \
+ !defined(BORINGSSL_API_VERSION)
+ /*
+  * SSL_get_client_random() and SSL_get_server_random() were added in OpenSSL
+@@ -919,7 +920,9 @@ void * tls_init(const struct tls_config *conf)
+   }
+ #endif /* OPENSSL_FIPS */
+ #endif /* CONFIG_FIPS */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || \
++(defined(LIBRESSL_VERSION_NUMBER) && \
++LIBRESSL_VERSION_NUMBER < 0x2070L)
+   SSL_load_error_strings();
+   SSL_library_init();
+ #ifndef OPENSSL_NO_SHA256
+@@ -1043,7 +1046,9 @@ void tls_deinit(void *ssl_ctx)
+ 
+   tls_openssl_ref_count--;
+   if (tls_openssl_ref_count == 0) {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || \
++  (defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #ifndef OPENSSL_NO_ENGINE
+   ENGINE_cleanup();
+ #endif /* OPENSSL_NO_ENGINE */
+@@ -3105,7 +3110,9 @@ int tls_connection_get_random(void *ssl_ctx, struct 
tls_connection *conn,
+ #ifdef OPENSSL_NEED_EAP_FAST_PRF
+ static int openssl_get_keyblock_size(SSL *ssl)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010L || \
++(defined(LIBRESSL_VERSION_NUMBER) && \
++LIBRESSL_VERSION_NUMBER < 0x2070L)
+   const EVP_CIPHER *c;
+   const EVP_MD *h;
+   int md_size;
+@@ -4159,7 +4166,9 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int 
*secret_len,
+   struct tls_connection *conn = arg;
+   int ret;

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-04-16 Thread Richard Farina
commit: 22f5d894b1c15270ee55e47d0b6559a957fbc44d
Author: Zero_Chaos  gentoo  org>
AuthorDate: Mon Apr 16 19:38:59 2018 +
Commit: Richard Farina  gentoo  org>
CommitDate: Mon Apr 16 19:38:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f5d894

net-wireless/hostapd: adding myself as maintainer to assist

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-wireless/hostapd/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-wireless/hostapd/metadata.xml 
b/net-wireless/hostapd/metadata.xml
index 1b21c81f591..59217d50546 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -18,4 +18,8 @@
andrey_ut...@gentoo.org
Andrey Utkin

+   
+   zeroch...@gentoo.org
+   Rick Farina
+   
 



  1   2   >