* [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/, net-wireless/iwd/files/
@ 2018-06-25 15:29 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2018-06-25 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 1b9a91e62f7d319878244770ec23af1f47506941
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 15:29:30 2018 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 15:29:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b9a91e6
net-wireless/iwd: new package
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-wireless/iwd/Manifest | 1 +
net-wireless/iwd/files/iwd.initd | 12 +++++
net-wireless/iwd/iwd-0.3.ebuild | 97 ++++++++++++++++++++++++++++++++++++++++
net-wireless/iwd/iwd-9999.ebuild | 97 ++++++++++++++++++++++++++++++++++++++++
net-wireless/iwd/metadata.xml | 12 +++++
5 files changed, 219 insertions(+)
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
new file mode 100644
index 00000000000..04b8e4eb0fb
--- /dev/null
+++ b/net-wireless/iwd/Manifest
@@ -0,0 +1 @@
+DIST iwd-0.3.tar.xz 642012 BLAKE2B 9bd43a13760cb32c2ead0e54b5e4389159a6a9a9780651435c8fb3d09859606a89aed6f163183a1027c8afefe05ef848c00104bf87cc223d25408f5405dffd33 SHA512 9c34d98ecae18955cc39cb7a58c0724b500902e2070ebbc1967fa4e2ed3633e01052a6bcb592b8bbb806307d8f0db8271a0ac7ad105f8a8f42915b8627e429f6
diff --git a/net-wireless/iwd/files/iwd.initd b/net-wireless/iwd/files/iwd.initd
new file mode 100644
index 00000000000..12983c1ab2d
--- /dev/null
+++ b/net-wireless/iwd/files/iwd.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/iwd.pid"
+command="/usr/libexec/iwd"
+command_background="yes"
+
+depend() {
+ need dbus
+ keyword -shutdown
+}
diff --git a/net-wireless/iwd/iwd-0.3.ebuild b/net-wireless/iwd/iwd-0.3.ebuild
new file mode 100644
index 00000000000..889f7da0e55
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info systemd
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +monitor cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+RDEPEND="sys-apps/dbus
+ client? ( sys-libs/readline:0= )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_pretend() {
+ CONFIG_CHECK="
+ ~CRYPTO_USER_API_SKCIPHER
+ ~CRYPTO_USER_API_HASH
+ ~CRYPTO_RSA
+ ~CRYPTO_AES
+ ~CRYPTO_MD4
+ ~CRYPTO_ECB
+ ~CRYPTO_CMAC
+ ~CRYPTO_DES
+ ~KEY_DH_OPERATIONS
+ ~ASYMMETRIC_KEY_TYPE
+ ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+ ~X509_CERTIFICATE_PARSER
+ ~PKCS7_MESSAGE_PARSER
+ "
+ if use amd64;then
+ CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+ WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+ WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+ fi
+
+ if use cpu_flags_x86_aes;then
+ CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+ WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+ fi
+
+ if use cpu_flags_x86_ssse3; then
+ CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+ WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+ WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+ WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+ fi
+
+ check_extra_config
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf --sysconfdir=/etc/iwd --localstatedir=/var \
+ $(use_enable client) \
+ $(use_enable monitor) \
+ --enable-systemd-service \
+ --with-systemd-unitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+ default
+ keepdir /var/lib/${PN}
+
+ newinitd "${FILESDIR}/iwd.initd" iwd
+
+ if [[ ${PV} == "9999" ]] ; then
+ exeinto /usr/share/iwd/scripts/
+ doexe test/*
+ fi
+}
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
new file mode 100644
index 00000000000..889f7da0e55
--- /dev/null
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info systemd
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +monitor cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+RDEPEND="sys-apps/dbus
+ client? ( sys-libs/readline:0= )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_pretend() {
+ CONFIG_CHECK="
+ ~CRYPTO_USER_API_SKCIPHER
+ ~CRYPTO_USER_API_HASH
+ ~CRYPTO_RSA
+ ~CRYPTO_AES
+ ~CRYPTO_MD4
+ ~CRYPTO_ECB
+ ~CRYPTO_CMAC
+ ~CRYPTO_DES
+ ~KEY_DH_OPERATIONS
+ ~ASYMMETRIC_KEY_TYPE
+ ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+ ~X509_CERTIFICATE_PARSER
+ ~PKCS7_MESSAGE_PARSER
+ "
+ if use amd64;then
+ CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+ WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+ WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+ fi
+
+ if use cpu_flags_x86_aes;then
+ CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+ WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+ fi
+
+ if use cpu_flags_x86_ssse3; then
+ CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+ WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+ WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+ WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+ fi
+
+ check_extra_config
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf --sysconfdir=/etc/iwd --localstatedir=/var \
+ $(use_enable client) \
+ $(use_enable monitor) \
+ --enable-systemd-service \
+ --with-systemd-unitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+ default
+ keepdir /var/lib/${PN}
+
+ newinitd "${FILESDIR}/iwd.initd" iwd
+
+ if [[ ${PV} == "9999" ]] ; then
+ exeinto /usr/share/iwd/scripts/
+ doexe test/*
+ fi
+}
diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml
new file mode 100644
index 00000000000..96b6193f64c
--- /dev/null
+++ b/net-wireless/iwd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>bkohler@gentoo.org</email>
+ <name>Ben Kohler</name>
+ </maintainer>
+ <use>
+ <flag name='client'>Enable iwctl client tool</flag>
+ <flag name='monitor'>Enable iwmon monitor tool</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/, net-wireless/iwd/files/
@ 2019-04-12 19:33 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2019-04-12 19:33 UTC (permalink / raw
To: gentoo-commits
commit: fdfdf352dc37b123b50274d06f87c8d56e54138e
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 19:32:14 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 19:32:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfdf352
net-wireless/iwd: add upstream patch for bug 683198
Closes: https://bugs.gentoo.org/683198
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-wireless/iwd/files/iwd-have_config_h-fix.patch | 140 +++++++++++++++++++++
net-wireless/iwd/iwd-0.16.ebuild | 2 +
2 files changed, 142 insertions(+)
diff --git a/net-wireless/iwd/files/iwd-have_config_h-fix.patch b/net-wireless/iwd/files/iwd-have_config_h-fix.patch
new file mode 100644
index 00000000000..45ad8655127
--- /dev/null
+++ b/net-wireless/iwd/files/iwd-have_config_h-fix.patch
@@ -0,0 +1,140 @@
+From 23041a44dd6c3fcaa18e5cb3f63140e3cb76d6b8 Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Thu, 4 Apr 2019 14:02:38 +0200
+Subject: build: Add missing HAVE_CONFIG_H guards and include config.h
+
+---
+ plugins/ofono.c | 4 ++++
+ plugins/sim_hardcoded.c | 5 +++++
+ src/eap-mschapv2.c | 4 ++++
+ src/nl80211util.c | 4 ++++
+ src/plugin.c | 4 ++++
+ src/sae.c | 4 ++++
+ src/simauth.c | 4 ++++
+ src/simutil.c | 4 ++++
+ 8 files changed, 33 insertions(+)
+
+diff --git a/plugins/ofono.c b/plugins/ofono.c
+index 077045ff..fc2561f6 100644
+--- a/plugins/ofono.c
++++ b/plugins/ofono.c
+@@ -20,6 +20,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <stdio.h>
+diff --git a/plugins/sim_hardcoded.c b/plugins/sim_hardcoded.c
+index b5ea6b09..6e87f347 100644
+--- a/plugins/sim_hardcoded.c
++++ b/plugins/sim_hardcoded.c
+@@ -19,6 +19,11 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <errno.h>
+
+ #include <ell/ell.h>
+diff --git a/src/eap-mschapv2.c b/src/eap-mschapv2.c
+index 78404e22..e1f4ab5d 100644
+--- a/src/eap-mschapv2.c
++++ b/src/eap-mschapv2.c
+@@ -20,6 +20,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <errno.h>
+diff --git a/src/nl80211util.c b/src/nl80211util.c
+index 0d690e86..a9c3914a 100644
+--- a/src/nl80211util.c
++++ b/src/nl80211util.c
+@@ -20,6 +20,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <linux/if_ether.h>
+ #include <ell/ell.h>
+
+diff --git a/src/plugin.c b/src/plugin.c
+index 2d96f657..a62fb033 100644
+--- a/src/plugin.c
++++ b/src/plugin.c
+@@ -20,6 +20,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <fnmatch.h>
+
+ #include <ell/ell.h>
+diff --git a/src/sae.c b/src/sae.c
+index 782a3069..cab004bd 100644
+--- a/src/sae.c
++++ b/src/sae.c
+@@ -20,6 +20,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <ell/ell.h>
+
+ #include "src/util.h"
+diff --git a/src/simauth.c b/src/simauth.c
+index 5ed4dde7..4244304a 100644
+--- a/src/simauth.c
++++ b/src/simauth.c
+@@ -20,6 +20,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <errno.h>
+diff --git a/src/simutil.c b/src/simutil.c
+index 8de0645f..f0542c71 100644
+--- a/src/simutil.c
++++ b/src/simutil.c
+@@ -20,6 +20,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <errno.h>
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/net-wireless/iwd/iwd-0.16.ebuild b/net-wireless/iwd/iwd-0.16.ebuild
index 93969ee59cb..dac6f5ea824 100644
--- a/net-wireless/iwd/iwd-0.16.ebuild
+++ b/net-wireless/iwd/iwd-0.16.ebuild
@@ -19,6 +19,8 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+PATCHES=( "${FILESDIR}/iwd-have_config_h-fix.patch" )
+
RDEPEND="sys-apps/dbus
client? ( sys-libs/readline:0= )"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/, net-wireless/iwd/files/
@ 2019-05-13 13:48 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2019-05-13 13:48 UTC (permalink / raw
To: gentoo-commits
commit: 7b78a4a03e606538300003e5ac861798c707e5e8
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 13:47:48 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 13 13:48:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b78a4a0
net-wireless/iwd: drop old
Keeping latest ebuild with bundled ell for now
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-wireless/iwd/Manifest | 2 -
net-wireless/iwd/files/iwd-have_config_h-fix.patch | 140 ---------------------
net-wireless/iwd/iwd-0.14-r1.ebuild | 107 ----------------
net-wireless/iwd/iwd-0.14.ebuild | 106 ----------------
net-wireless/iwd/iwd-0.16.ebuild | 114 -----------------
net-wireless/iwd/iwd-0.17-r1.ebuild | 114 -----------------
6 files changed, 583 deletions(-)
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 17fdaeb244b..bc3274339e2 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,4 +1,2 @@
-DIST iwd-0.14.tar.xz 700844 BLAKE2B 69f3a1e5ead28cb602e7638e44d2a42a1b25831b837bf5f1d3436d3832a0548da7c3afe9f748688c194cf9e9bc5ea9303924ca1d36dea36d9e2233c245fc25eb SHA512 91713b3cbe8830abb95705e67c7b66f1ced368fe83eeaad36170da9df22b965e97485068e9342e09291aee669890de8f328e33fc3f092ba45097f523d83c7484
-DIST iwd-0.16.tar.xz 717880 BLAKE2B b4d1f3ebfc2f98920b205aefdf340cd55d803967a2b776e0798f1728cbd78e6be9b862f77b423ef2555b5f990341ef9b1e6f2aaf7460f08f37205a7edbaeda82 SHA512 33b10516fb203eb92651e18ebff8448874452fad9425470bf4306b4d75a512d386561ed4fcd251c54175ac6953e29f6574175e4e9b18c88e55009f670f29ddb1
DIST iwd-0.17.tar.xz 720500 BLAKE2B 8bd931421663b71eb7bbdc4a72e10fe325ede4a3d075a8d477ee80040f23d3a8645f1c8c24f8c5f3e615049273968ea48687bcbc5480d05af3aabf135d0e7118 SHA512 fcec43cb9d470dec783fcafd8485e2e25f7c5ccc4283bc58c299fb816609b4e03ca241f1fe9f73025a08863e89ae8d7b7ceb6ae02524eb681a61079c5a28534a
DIST iwd-0.18.tar.xz 738168 BLAKE2B b37bde01952542583d82439639c39c06a1a5b6c359bbd092e631be6d25975498eb9bad9f71f3eeaa4b571e9d195e6f1113b17f758f386d49e6ee2d2cf071387f SHA512 0eb5558f7bafe521aaf80f24e5818c1fb0dfa6445c671c4454d3a4f67f97643a1232709b1e9c376cbe09dd7ba521651e1e46328cce0bfe1befe15668d6081cd6
diff --git a/net-wireless/iwd/files/iwd-have_config_h-fix.patch b/net-wireless/iwd/files/iwd-have_config_h-fix.patch
deleted file mode 100644
index 45ad8655127..00000000000
--- a/net-wireless/iwd/files/iwd-have_config_h-fix.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 23041a44dd6c3fcaa18e5cb3f63140e3cb76d6b8 Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Thu, 4 Apr 2019 14:02:38 +0200
-Subject: build: Add missing HAVE_CONFIG_H guards and include config.h
-
----
- plugins/ofono.c | 4 ++++
- plugins/sim_hardcoded.c | 5 +++++
- src/eap-mschapv2.c | 4 ++++
- src/nl80211util.c | 4 ++++
- src/plugin.c | 4 ++++
- src/sae.c | 4 ++++
- src/simauth.c | 4 ++++
- src/simutil.c | 4 ++++
- 8 files changed, 33 insertions(+)
-
-diff --git a/plugins/ofono.c b/plugins/ofono.c
-index 077045ff..fc2561f6 100644
---- a/plugins/ofono.c
-+++ b/plugins/ofono.c
-@@ -20,6 +20,10 @@
- *
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <stdio.h>
- #include <ctype.h>
- #include <stdio.h>
-diff --git a/plugins/sim_hardcoded.c b/plugins/sim_hardcoded.c
-index b5ea6b09..6e87f347 100644
---- a/plugins/sim_hardcoded.c
-+++ b/plugins/sim_hardcoded.c
-@@ -19,6 +19,11 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <errno.h>
-
- #include <ell/ell.h>
-diff --git a/src/eap-mschapv2.c b/src/eap-mschapv2.c
-index 78404e22..e1f4ab5d 100644
---- a/src/eap-mschapv2.c
-+++ b/src/eap-mschapv2.c
-@@ -20,6 +20,10 @@
- *
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <ctype.h>
- #include <stdio.h>
- #include <errno.h>
-diff --git a/src/nl80211util.c b/src/nl80211util.c
-index 0d690e86..a9c3914a 100644
---- a/src/nl80211util.c
-+++ b/src/nl80211util.c
-@@ -20,6 +20,10 @@
- *
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <linux/if_ether.h>
- #include <ell/ell.h>
-
-diff --git a/src/plugin.c b/src/plugin.c
-index 2d96f657..a62fb033 100644
---- a/src/plugin.c
-+++ b/src/plugin.c
-@@ -20,6 +20,10 @@
- *
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <fnmatch.h>
-
- #include <ell/ell.h>
-diff --git a/src/sae.c b/src/sae.c
-index 782a3069..cab004bd 100644
---- a/src/sae.c
-+++ b/src/sae.c
-@@ -20,6 +20,10 @@
- *
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <ell/ell.h>
-
- #include "src/util.h"
-diff --git a/src/simauth.c b/src/simauth.c
-index 5ed4dde7..4244304a 100644
---- a/src/simauth.c
-+++ b/src/simauth.c
-@@ -20,6 +20,10 @@
- *
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <ctype.h>
- #include <stdio.h>
- #include <errno.h>
-diff --git a/src/simutil.c b/src/simutil.c
-index 8de0645f..f0542c71 100644
---- a/src/simutil.c
-+++ b/src/simutil.c
-@@ -20,6 +20,10 @@
- *
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <ctype.h>
- #include <stdio.h>
- #include <errno.h>
---
-cgit 1.2-0.3.lf.el7
-
diff --git a/net-wireless/iwd/iwd-0.14-r1.ebuild b/net-wireless/iwd/iwd-0.14-r1.ebuild
deleted file mode 100644
index bf525992339..00000000000
--- a/net-wireless/iwd/iwd-0.14-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic linux-info systemd
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
- inherit git-r3
-else
- SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-RDEPEND="sys-apps/dbus
- client? ( sys-libs/readline:0= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_pretend() {
- CONFIG_CHECK="
- ~ASYMMETRIC_KEY_TYPE
- ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
- ~CRYPTO_AES
- ~CRYPTO_ARC4
- ~CRYPTO_CBC
- ~CRYPTO_CMAC
- ~CRYPTO_DES
- ~CRYPTO_ECB
- ~CRYPTO_HMAC
- ~CRYPTO_MD4
- ~CRYPTO_MD5
- ~CRYPTO_RSA
- ~CRYPTO_SHA1
- ~CRYPTO_SHA256
- ~CRYPTO_SHA512
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_USER_API_SKCIPHER
- ~KEY_DH_OPERATIONS
- ~PKCS7_MESSAGE_PARSER
- ~X509_CERTIFICATE_PARSER
- "
- if use amd64;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
- WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
- WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
- fi
-
- if use cpu_flags_x86_aes;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
- WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
- fi
-
- if use cpu_flags_x86_ssse3; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
- WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
- fi
-
- check_extra_config
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
- else
- default
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cflags "-fsigned-char"
- econf --sysconfdir=/etc/iwd --localstatedir=/var \
- $(use_enable client) \
- $(use_enable monitor) \
- $(use_enable ofono) \
- $(use_enable wired) \
- --enable-systemd-service \
- --with-systemd-unitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
- default
- keepdir /var/lib/${PN}
-
- newinitd "${FILESDIR}/iwd.initd" iwd
-
- if [[ ${PV} == "9999" ]] ; then
- exeinto /usr/share/iwd/scripts/
- doexe test/*
- fi
-}
diff --git a/net-wireless/iwd/iwd-0.14.ebuild b/net-wireless/iwd/iwd-0.14.ebuild
deleted file mode 100644
index 5af13d86f0c..00000000000
--- a/net-wireless/iwd/iwd-0.14.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools linux-info systemd
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
- inherit git-r3
-else
- SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-RDEPEND="sys-apps/dbus
- client? ( sys-libs/readline:0= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_pretend() {
- CONFIG_CHECK="
- ~ASYMMETRIC_KEY_TYPE
- ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
- ~CRYPTO_AES
- ~CRYPTO_ARC4
- ~CRYPTO_CBC
- ~CRYPTO_CMAC
- ~CRYPTO_DES
- ~CRYPTO_ECB
- ~CRYPTO_HMAC
- ~CRYPTO_MD4
- ~CRYPTO_MD5
- ~CRYPTO_RSA
- ~CRYPTO_SHA1
- ~CRYPTO_SHA256
- ~CRYPTO_SHA512
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_USER_API_SKCIPHER
- ~KEY_DH_OPERATIONS
- ~PKCS7_MESSAGE_PARSER
- ~X509_CERTIFICATE_PARSER
- "
- if use amd64;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
- WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
- WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
- fi
-
- if use cpu_flags_x86_aes;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
- WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
- fi
-
- if use cpu_flags_x86_ssse3; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
- WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
- fi
-
- check_extra_config
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
- else
- default
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --sysconfdir=/etc/iwd --localstatedir=/var \
- $(use_enable client) \
- $(use_enable monitor) \
- $(use_enable ofono) \
- $(use_enable wired) \
- --enable-systemd-service \
- --with-systemd-unitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
- default
- keepdir /var/lib/${PN}
-
- newinitd "${FILESDIR}/iwd.initd" iwd
-
- if [[ ${PV} == "9999" ]] ; then
- exeinto /usr/share/iwd/scripts/
- doexe test/*
- fi
-}
diff --git a/net-wireless/iwd/iwd-0.16.ebuild b/net-wireless/iwd/iwd-0.16.ebuild
deleted file mode 100644
index dac6f5ea824..00000000000
--- a/net-wireless/iwd/iwd-0.16.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic linux-info systemd
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
- inherit git-r3
-else
- SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-PATCHES=( "${FILESDIR}/iwd-have_config_h-fix.patch" )
-
-RDEPEND="sys-apps/dbus
- client? ( sys-libs/readline:0= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_pretend() {
- CONFIG_CHECK="
- ~ASYMMETRIC_KEY_TYPE
- ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
- ~CRYPTO_AES
- ~CRYPTO_ARC4
- ~CRYPTO_CBC
- ~CRYPTO_CMAC
- ~CRYPTO_DES
- ~CRYPTO_ECB
- ~CRYPTO_HMAC
- ~CRYPTO_MD4
- ~CRYPTO_MD5
- ~CRYPTO_RSA
- ~CRYPTO_SHA1
- ~CRYPTO_SHA256
- ~CRYPTO_SHA512
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_USER_API_SKCIPHER
- ~KEY_DH_OPERATIONS
- ~PKCS7_MESSAGE_PARSER
- ~X509_CERTIFICATE_PARSER
- "
- if use amd64;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
- WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
- WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
- fi
-
- if use cpu_flags_x86_aes;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
- WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
- fi
-
- if use cpu_flags_x86_ssse3; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
- WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
- fi
-
- if use kernel_linux && kernel_is -ge 4 20; then
- CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
- fi
-
- check_extra_config
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
- else
- default
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cflags "-fsigned-char"
- econf --sysconfdir=/etc/iwd --localstatedir=/var \
- $(use_enable client) \
- $(use_enable monitor) \
- $(use_enable ofono) \
- $(use_enable wired) \
- --enable-systemd-service \
- --with-systemd-unitdir="$(systemd_get_systemunitdir)" \
- --with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
-}
-
-src_install() {
- default
- keepdir /var/lib/${PN}
-
- newinitd "${FILESDIR}/iwd.initd" iwd
-
- if [[ ${PV} == "9999" ]] ; then
- exeinto /usr/share/iwd/scripts/
- doexe test/*
- fi
-}
diff --git a/net-wireless/iwd/iwd-0.17-r1.ebuild b/net-wireless/iwd/iwd-0.17-r1.ebuild
deleted file mode 100644
index 416fab3d97b..00000000000
--- a/net-wireless/iwd/iwd-0.17-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic linux-info systemd
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
- inherit git-r3
-else
- SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-RDEPEND=">=dev-libs/ell-0.18
- sys-apps/dbus
- client? ( sys-libs/readline:0= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_pretend() {
- CONFIG_CHECK="
- ~ASYMMETRIC_KEY_TYPE
- ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
- ~CRYPTO_AES
- ~CRYPTO_ARC4
- ~CRYPTO_CBC
- ~CRYPTO_CMAC
- ~CRYPTO_DES
- ~CRYPTO_ECB
- ~CRYPTO_HMAC
- ~CRYPTO_MD4
- ~CRYPTO_MD5
- ~CRYPTO_RSA
- ~CRYPTO_SHA1
- ~CRYPTO_SHA256
- ~CRYPTO_SHA512
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_USER_API_SKCIPHER
- ~KEY_DH_OPERATIONS
- ~PKCS7_MESSAGE_PARSER
- ~X509_CERTIFICATE_PARSER
- "
- if use amd64;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
- WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
- WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
- fi
-
- if use cpu_flags_x86_aes;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
- WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
- fi
-
- if use cpu_flags_x86_ssse3; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
- WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
- fi
-
- if use kernel_linux && kernel_is -ge 4 20; then
- CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
- fi
-
- check_extra_config
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
- else
- default
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cflags "-fsigned-char"
- econf --sysconfdir=/etc/iwd --localstatedir=/var \
- $(use_enable client) \
- $(use_enable monitor) \
- $(use_enable ofono) \
- $(use_enable wired) \
- --enable-external-ell \
- --enable-systemd-service \
- --with-systemd-unitdir="$(systemd_get_systemunitdir)" \
- --with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
-}
-
-src_install() {
- default
- keepdir /var/lib/${PN}
-
- newinitd "${FILESDIR}/iwd.initd" iwd
-
- if [[ ${PV} == "9999" ]] ; then
- exeinto /usr/share/iwd/scripts/
- doexe test/*
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/, net-wireless/iwd/files/
@ 2021-01-08 1:05 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2021-01-08 1:05 UTC (permalink / raw
To: gentoo-commits
commit: ee2f492c617ac4cc8f8c1d4b01563cc170a803c8
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 8 01:01:58 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 01:02:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2f492c
net-wireless/iwd: drop old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-wireless/iwd/Manifest | 2 -
.../iwd-1.8-eapol-prevent-key-reinstallation.patch | 73 ---------
net-wireless/iwd/iwd-1.8-r3.ebuild | 160 ------------------
net-wireless/iwd/iwd-1.9-r1.ebuild | 180 ---------------------
4 files changed, 415 deletions(-)
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 69ff7417b70..c483850244a 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,4 +1,2 @@
DIST iwd-1.10.tar.xz 897928 BLAKE2B 1589300201c835b2b14c34a9adefb525173cc2f9c8154f0a5f12da64a1da3d383acf328c5138bb8d4903ff08f339b7d55f02e215896af90aa75d244f61c3de1f SHA512 c128ec764e9d727b4ae1157717826b3219c5d368746f7709a01cb816f077afaa32083052ee2a4ecd09a7fbd36c03ea9ba6bd1a84c2a33210398dd060e9020db5
DIST iwd-1.11.tar.xz 907020 BLAKE2B 3b2c0922745c699ba01a2f46061246fbad6e2c7ea1a2f58cd13b5bf2169e9517652740f2dd872b5a274d74a5b8f1962c8e4696eabe5481a0c4783f202217599e SHA512 09c5e5e105b6107d88eff4238bf023f7bf1a408f522b9f84fac890c123bff2e124b937b81e1559db7fe0720f0ac423dc7d37c1b6d502fc4a7b7403fcd798e01d
-DIST iwd-1.8.tar.xz 865668 BLAKE2B ba1be5c1658df950fe28deca6b8c3c9482eda260fbd05f721cb34cadcb2852768086e65e7c74940bc6ddd345d1438624b59bdfe4b6a5323dd122a0cd397008d7 SHA512 f1caa330b3ff18b4598efec596a4b9a22887833218a90d19d59717503679eff71fdb990cb63bd74b8f1523197a366cd803d799259e8002e5cde2745b03d51d8e
-DIST iwd-1.9.tar.xz 883616 BLAKE2B 57dd4a6e00d73bcfb752e1bd3661e97251d1dab4c05638d148ae7031bff35d606063f79e575ed4d3d3a60ff5514eb3fc340e1eec4c2e7074bf8d6d4b79832f6d SHA512 d8762495f7f5a342476653c0cf64c31b3b41a3064a05c4fcf49b9faf4394b0d7a5db6aae6324896bdc8f7b104697fb4c4315f7073a4fde4fc87f8f55d932538b
diff --git a/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch b/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
deleted file mode 100644
index dceb808297e..00000000000
--- a/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From f22ba5aebb569ca54521afd2babdc1f67e3904ea Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
-Date: Wed, 12 Aug 2020 15:17:21 +0400
-Subject: eapol: prevent key reinstallation on retransmitted Msg4/4
-
-Currently an adversary can retransmit EAPOL Msg4/4 to make the AP
-reinstall the PTK. Against older Linux kernels this can subsequently
-be used to decrypt, replay, and possibly decrypt frames. See the
-KRACK attacks research at krackattacks.com for attack scenarios.
-In this case no machine-in-the-middle position is needed to trigger
-the key reinstallation.
-
-Fix this by using the ptk_complete boolean to track when the 4-way
-handshake has completed (similar to its usage for clients). When
-receiving a retransmitted Msg4/4 accept this frame but do not reinstall
-the PTK.
-
-Credits to Chris M. Stone, Sam Thomas, and Tom Chothia of Birmingham
-University to help discover this issue.
----
- src/eapol.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/eapol.c b/src/eapol.c
-index b0036c10..e3581cfe 100644
---- a/src/eapol.c
-+++ b/src/eapol.c
-@@ -1462,7 +1462,6 @@ static void eapol_handle_ptk_2_of_4(struct eapol_sm *sm,
- memcpy(sm->handshake->snonce, ek->key_nonce,
- sizeof(sm->handshake->snonce));
- sm->handshake->have_snonce = true;
-- sm->handshake->ptk_complete = true;
-
- sm->frame_retry = 0;
-
-@@ -1782,7 +1781,15 @@ static void eapol_handle_ptk_4_of_4(struct eapol_sm *sm,
- l_timeout_remove(sm->timeout);
- sm->timeout = NULL;
-
-- handshake_state_install_ptk(sm->handshake);
-+ /*
-+ * If ptk_complete is set, then we are receiving Message 4 again.
-+ * This might be a retransmission, so accept but don't install
-+ * the keys again.
-+ */
-+ if (!sm->handshake->ptk_complete)
-+ handshake_state_install_ptk(sm->handshake);
-+
-+ sm->handshake->ptk_complete = true;
- }
-
- static void eapol_handle_gtk_1_of_2(struct eapol_sm *sm,
-@@ -2185,6 +2192,7 @@ static void eapol_auth_key_handle(struct eapol_sm *sm,
- size_t frame_len = 4 + L_BE16_TO_CPU(frame->header.packet_len);
- const struct eapol_key *ek = eapol_key_validate((const void *) frame,
- frame_len, sm->mic_len);
-+ uint16_t key_data_len;
-
- if (!ek)
- return;
-@@ -2199,7 +2207,8 @@ static void eapol_auth_key_handle(struct eapol_sm *sm,
- if (!sm->handshake->have_anonce)
- return; /* Not expecting an EAPoL-Key yet */
-
-- if (!sm->handshake->ptk_complete)
-+ key_data_len = EAPOL_KEY_DATA_LEN(ek, sm->mic_len);
-+ if (key_data_len != 0)
- eapol_handle_ptk_2_of_4(sm, ek);
- else
- eapol_handle_ptk_4_of_4(sm, ek);
---
-cgit 1.2.3-1.el7
-
diff --git a/net-wireless/iwd/iwd-1.8-r3.ebuild b/net-wireless/iwd/iwd-1.8-r3.ebuild
deleted file mode 100644
index a8c6fbd6ae4..00000000000
--- a/net-wireless/iwd/iwd-1.8-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.32"
-
-if [[ ${PV} == *9999* ]]; then
- inherit autotools git-r3
- IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
- ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-COMMON_DEPEND="sys-apps/dbus
- client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
- net-wireless/wireless-regdb
- crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-PATCHES=( "${FILESDIR}"/iwd-1.8-eapol-prevent-key-reinstallation.patch )
-
-pkg_setup() {
- CONFIG_CHECK="
- ~ASYMMETRIC_KEY_TYPE
- ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
- ~CFG80211
- ~CRYPTO_AES
- ~CRYPTO_ARC4
- ~CRYPTO_CBC
- ~CRYPTO_CMAC
- ~CRYPTO_DES
- ~CRYPTO_ECB
- ~CRYPTO_HMAC
- ~CRYPTO_MD4
- ~CRYPTO_MD5
- ~CRYPTO_RSA
- ~CRYPTO_SHA1
- ~CRYPTO_SHA256
- ~CRYPTO_SHA512
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_USER_API_SKCIPHER
- ~KEY_DH_OPERATIONS
- ~PKCS7_MESSAGE_PARSER
- ~RFKILL
- ~X509_CERTIFICATE_PARSER
- "
- if use crda;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
- WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
- fi
-
- if use amd64;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
- WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
- fi
-
- if use cpu_flags_x86_aes;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
- WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
- fi
-
- if use cpu_flags_x86_ssse3 && use amd64; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
- WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
- fi
-
- if use kernel_linux && kernel_is -ge 4 20; then
- CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
- fi
-
- check_extra_config
-
- if ! use crda; then
- if use kernel_linux && kernel_is -lt 4 15; then
- ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
- ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
- fi
- if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
- [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
- then
- ewarn ""
- ewarn "REGULATORY DOMAIN PROBLEM:"
- ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
- ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m"
- ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
- ewarn ""
- fi
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
- EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- default
- if [[ ${PV} == *9999* ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- append-cflags "-fsigned-char"
- local myeconfargs=(
- --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
- $(use_enable client)
- $(use_enable monitor)
- $(use_enable ofono)
- $(use_enable wired)
- --enable-systemd-service
- --with-systemd-unitdir="$(systemd_get_systemunitdir)"
- --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
- --with-systemd-networkdir="$(systemd_get_utildir)/network"
- )
- [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- keepdir /var/lib/${PN}
-
- newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
- if use wired;then
- newinitd "${FILESDIR}/ead.initd" ead
- fi
-
- if [[ ${PV} == *9999* ]] ; then
- exeinto /usr/share/iwd/scripts/
- doexe test/*
- fi
-}
diff --git a/net-wireless/iwd/iwd-1.9-r1.ebuild b/net-wireless/iwd/iwd-1.9-r1.ebuild
deleted file mode 100644
index c170b16a7f3..00000000000
--- a/net-wireless/iwd/iwd-1.9-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.33"
-
-if [[ ${PV} == *9999* ]]; then
- inherit autotools git-r3
- IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
- ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
-standalone systemd"
-
-COMMON_DEPEND="
- sys-apps/dbus
- client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
- ${COMMON_DEPEND}
- net-wireless/wireless-regdb
- crda? ( net-wireless/crda )
- standalone? (
- systemd? ( sys-apps/systemd )
- !systemd? ( virtual/resolvconf )
- )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-pkg_setup() {
- CONFIG_CHECK="
- ~ASYMMETRIC_KEY_TYPE
- ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
- ~CFG80211
- ~CRYPTO_AES
- ~CRYPTO_ARC4
- ~CRYPTO_CBC
- ~CRYPTO_CMAC
- ~CRYPTO_DES
- ~CRYPTO_ECB
- ~CRYPTO_HMAC
- ~CRYPTO_MD4
- ~CRYPTO_MD5
- ~CRYPTO_RSA
- ~CRYPTO_SHA1
- ~CRYPTO_SHA256
- ~CRYPTO_SHA512
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_USER_API_SKCIPHER
- ~KEY_DH_OPERATIONS
- ~PKCS7_MESSAGE_PARSER
- ~RFKILL
- ~X509_CERTIFICATE_PARSER
- "
- if use crda;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
- WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
- fi
-
- if use amd64;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
- WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
- fi
-
- if use cpu_flags_x86_aes;then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
- WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
- fi
-
- if use cpu_flags_x86_ssse3 && use amd64; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
- WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
- WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
- fi
-
- if use kernel_linux && kernel_is -ge 4 20; then
- CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
- fi
-
- check_extra_config
-
- if ! use crda; then
- if use kernel_linux && kernel_is -lt 4 15; then
- ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
- ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
- fi
- if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
- [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
- then
- ewarn ""
- ewarn "REGULATORY DOMAIN PROBLEM:"
- ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
- ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m"
- ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
- ewarn ""
- fi
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
- EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- default
- if [[ ${PV} == *9999* ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- append-cflags "-fsigned-char"
- local myeconfargs=(
- --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
- $(use_enable client)
- $(use_enable monitor)
- $(use_enable ofono)
- $(use_enable wired)
- --enable-systemd-service
- --with-systemd-unitdir="$(systemd_get_systemunitdir)"
- --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
- --with-systemd-networkdir="$(systemd_get_utildir)/network"
- )
- [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- keepdir /var/lib/${PN}
-
- newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
- if use wired;then
- newinitd "${FILESDIR}/ead.initd" ead
- fi
-
- if [[ ${PV} == *9999* ]] ; then
- exeinto /usr/share/iwd/scripts/
- doexe test/*
- fi
-
- if use standalone ; then
- local iwdconf="${ED}/etc/iwd/main.conf"
- dodir /etc/iwd
- echo "[General]" > "${iwdconf}"
- echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
- echo "[Network]" >> "${iwdconf}"
- echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
- dodir /etc/conf.d
- echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-08 1:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-12 19:33 [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/, net-wireless/iwd/files/ Ben Kohler
-- strict thread matches above, loose matches on Subject: below --
2021-01-08 1:05 Ben Kohler
2019-05-13 13:48 Ben Kohler
2018-06-25 15:29 Ben Kohler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox