From 5c3a3967ea0f473291d6dc559e3f256b6fb88402 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Mon, 19 Aug 2019 14:28:56 +0200 Subject: [PATCH] temp/{wpa_supplicant,networkmanager}: remove, upstreamed (!564) --- temp/networkmanager/APKBUILD | 120 ---- temp/networkmanager/fix-ppc64le-build.patch | 12 - temp/networkmanager/musl-basic.patch | 46 -- temp/networkmanager/musl-compar.patch | 18 - temp/networkmanager/musl-fix-includes.patch | 52 -- .../musl-has-not-secure-getenv.patch | 13 - .../networkmanager/musl-network-support.patch | 42 -- temp/networkmanager/musl-process-util.patch | 40 -- temp/networkmanager/networkmanager.conf | 2 - temp/networkmanager/networkmanager.initd | 17 - .../networkmanager/networkmanager.pre-install | 9 - .../networkmanager/networkmanager.pre-upgrade | 1 - temp/networkmanager/networkmanager.rules | 9 - temp/wpa_supplicant/APKBUILD | 119 ---- temp/wpa_supplicant/config | 550 ------------------ temp/wpa_supplicant/eloop.patch | 16 - temp/wpa_supplicant/wpa_cli.confd | 1 - temp/wpa_supplicant/wpa_cli.initd | 9 - temp/wpa_supplicant/wpa_cli.sh | 40 -- temp/wpa_supplicant/wpa_supplicant.confd | 7 - temp/wpa_supplicant/wpa_supplicant.initd | 60 -- 21 files changed, 1183 deletions(-) delete mode 100644 temp/networkmanager/APKBUILD delete mode 100644 temp/networkmanager/fix-ppc64le-build.patch delete mode 100644 temp/networkmanager/musl-basic.patch delete mode 100644 temp/networkmanager/musl-compar.patch delete mode 100644 temp/networkmanager/musl-fix-includes.patch delete mode 100644 temp/networkmanager/musl-has-not-secure-getenv.patch delete mode 100644 temp/networkmanager/musl-network-support.patch delete mode 100644 temp/networkmanager/musl-process-util.patch delete mode 100644 temp/networkmanager/networkmanager.conf delete mode 100644 temp/networkmanager/networkmanager.initd delete mode 100644 temp/networkmanager/networkmanager.pre-install delete mode 120000 temp/networkmanager/networkmanager.pre-upgrade delete mode 100644 temp/networkmanager/networkmanager.rules delete mode 100644 temp/wpa_supplicant/APKBUILD delete mode 100644 temp/wpa_supplicant/config delete mode 100644 temp/wpa_supplicant/eloop.patch delete mode 100644 temp/wpa_supplicant/wpa_cli.confd delete mode 100755 temp/wpa_supplicant/wpa_cli.initd delete mode 100644 temp/wpa_supplicant/wpa_cli.sh delete mode 100644 temp/wpa_supplicant/wpa_supplicant.confd delete mode 100644 temp/wpa_supplicant/wpa_supplicant.initd diff --git a/temp/networkmanager/APKBUILD b/temp/networkmanager/APKBUILD deleted file mode 100644 index 3d1d0fde8..000000000 --- a/temp/networkmanager/APKBUILD +++ /dev/null @@ -1,120 +0,0 @@ -# Forked from Alpine until this is merged: -# https://github.com/alpinelinux/aports/pull/9894 -pkgname=networkmanager -pkgver=1.18.2 -pkgrel=3 -pkgdesc="Network Management daemon" -url="https://wiki.gnome.org/Projects/NetworkManager" -arch="all !s390x" # Limited by iwd -license="GPL-2.0-or-later" -depends="dhcpcd iptables dbus" -install="$pkgname.pre-install $pkgname.pre-upgrade" -makedepends="$depends_dev - curl-dev - dbus-glib-dev - eudev-dev - libgudev-dev - gobject-introspection-dev - intltool - libndp-dev - libnl3-dev - libsoup-dev - libteam-dev - linux-headers - modemmanager-dev - newt-dev - nss-dev - polkit-dev - ppp-dev - readline-dev - util-linux-dev - jansson-dev - vala - meson - py-gobject3 - libpsl-dev - python2 - " -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc" -source="https://download.gnome.org/sources/NetworkManager/${pkgver:0:4}/NetworkManager-$pkgver.tar.xz - $pkgname.conf - $pkgname.initd - $pkgname.rules - musl-basic.patch - musl-network-support.patch - musl-fix-includes.patch - musl-process-util.patch - musl-has-not-secure-getenv.patch - musl-compar.patch - fix-ppc64le-build.patch - " -options="!check" # fail to compile on musl - -builddir="$srcdir"/NetworkManager-$pkgver - -build() { - meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - -Dsystemdsystemunitdir=no \ - -Dudev_dir=/lib/udev \ - -Diptables=/sbin/iptables \ - -Ddnsmasq=/usr/sbin/dnsmasq \ - -Dmodify_system=true \ - -Dselinux=false \ - -Dsystemd_journal=false \ - -Dlibaudit=no \ - -Diwd=true \ - -Dpppd=/usr/sbin/pppd \ - -Dconfig_plugins_default=ifupdown \ - -Difupdown=true \ - -Ddhcpcd=true \ - -Dconfig_dhcp_default=dhcpcd \ - -Dvapi=true \ - -Dtests=no \ - -Dlibnm_glib=true \ - -Dpolkit_agent=true \ - -Dsession_tracking=no \ - -Dqt=false \ - . output - ninja -C output introspection/libnmdbus.a - ninja -C output -} - -check() { - ninja -C output test -} - -package() { - DESTDIR="$pkgdir" ninja -C output install - - install -m755 -D "$srcdir"/networkmanager.initd "$pkgdir"/etc/init.d/networkmanager - install -m644 -D "$srcdir/$pkgname.conf" "$pkgdir"/etc/NetworkManager/NetworkManager.conf - # allow plugdev users to modify connections - install -m644 -D "$srcdir/$pkgname.rules" \ - "$pkgdir/usr/share/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - mkdir -p "$pkgdir/usr/share/apk-tools/$pkgname" - # post-install message - mv "$pkgdir/usr/share/doc/NetworkManager" "$pkgdir/usr/share/doc/$pkgname" - cat > "$pkgdir"/usr/share/doc/$pkgname/README.alpine < - -+#ifndef RTLD_DEEPBIND -+#define RTLD_DEEPBIND 0 -+#endif -+ - void *_nm_jansson_json_object_iter_value; - void *_nm_jansson_json_object_key_to_iter; - void *_nm_jansson_json_integer; -diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h -index c3b9448..e80a938 100644 ---- a/shared/systemd/src/basic/stdio-util.h -+++ b/shared/systemd/src/basic/stdio-util.h -@@ -1,7 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - #pragma once - -+#if defined(__GLIBC__) - #include -+#endif - #include - #include - #include -diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h -index 25e6ab8..7967e8a 100644 ---- a/shared/systemd/src/basic/util.h -+++ b/shared/systemd/src/basic/util.h -@@ -46,6 +46,12 @@ static inline unsigned u64log2(uint64_t n) { - #endif - } - -+#if !defined(__GLIBC__) -+typedef int (*__compar_fn_t) (const void*, const void*); -+typedef __compar_fn_t comparison_fn_t; -+typedef int (*__compar_d_fn_t) (const void *, const void *, void *); -+#endif -+ - static inline unsigned u32ctz(uint32_t n) { - #if __SIZEOF_INT__ == 4 - return n != 0 ? __builtin_ctz(n) : 32; diff --git a/temp/networkmanager/musl-compar.patch b/temp/networkmanager/musl-compar.patch deleted file mode 100644 index 1b1de2f28..000000000 --- a/temp/networkmanager/musl-compar.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h -index e029f86..935f136 100644 ---- a/shared/systemd/src/basic/sort-util.h -+++ b/shared/systemd/src/basic/sort-util.h -@@ -5,6 +5,13 @@ - - #include "macro.h" - -+#ifndef __COMPAR_FN_T -+# define __COMPAR_FN_T -+typedef int (*__compar_fn_t) (const void *, const void *); -+typedef __compar_fn_t comparison_fn_t; -+typedef int (*__compar_d_fn_t) (const void *, const void *, void *); -+#endif -+ - void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, - __compar_d_fn_t compar, void *arg); - diff --git a/temp/networkmanager/musl-fix-includes.patch b/temp/networkmanager/musl-fix-includes.patch deleted file mode 100644 index e68925372..000000000 --- a/temp/networkmanager/musl-fix-includes.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index bd4fbcc..cb5436f 100644 ---- a/src/devices/nm-device.c -+++ b/src/devices/nm-device.c -@@ -32,7 +32,11 @@ - #include - #include - #include -+#if defined(__GLIBC__) - #include -+#else -+#include -+#endif - #include - #include - -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 40e068a..aa57ce8 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include "nm-glib-aux/nm-c-list.h" - -diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index d4b0115..c934f10 100644 ---- a/src/platform/nm-linux-platform.c -+++ b/src/platform/nm-linux-platform.c -@@ -20,6 +20,7 @@ - #include "nm-default.h" - - #include "nm-linux-platform.h" -+#include "wpan/nm-wpan-utils.h" - - #include - #include -@@ -28,7 +29,11 @@ - #include - #include - #include -+#if defined(__GLIBC__) - #include -+#else -+#include -+#endif - #include - #include - #include diff --git a/temp/networkmanager/musl-has-not-secure-getenv.patch b/temp/networkmanager/musl-has-not-secure-getenv.patch deleted file mode 100644 index 37883e272..000000000 --- a/temp/networkmanager/musl-has-not-secure-getenv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h -index 8c07c53..d043afc 100644 ---- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h -+++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h -@@ -65,7 +65,7 @@ - # ifdef HAVE___SECURE_GETENV - # define secure_getenv __secure_getenv - # else --# error neither secure_getenv nor __secure_getenv is available -+# define secure_getenv getenv - # endif - #endif - diff --git a/temp/networkmanager/musl-network-support.patch b/temp/networkmanager/musl-network-support.patch deleted file mode 100644 index 36536df67..000000000 --- a/temp/networkmanager/musl-network-support.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/libnm-core/nm-utils.h -+++ b/libnm-core/nm-utils.h -@@ -30,7 +30,11 @@ - #include - - /* For ETH_ALEN and INFINIBAND_ALEN */ -+#if defined(__GLIBC__) - #include -+#else -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif - #include - - #include "nm-core-enum-types.h" ---- a/src/platform/wifi/nm-wifi-utils.h -+++ b/src/platform/wifi/nm-wifi-utils.h -@@ -22,7 +22,11 @@ - #ifndef __WIFI_UTILS_H__ - #define __WIFI_UTILS_H__ - -+#if defined(__GLIBC__) - #include -+#else /* musl libc */ -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif - - #include "nm-dbus-interface.h" - ---- a/shared/systemd/src/basic/socket-util.h 2019-03-16 15:41:33.287235649 +0100 -+++ b/shared/systemd/src/basic/socket-util.h 2019-03-16 15:42:24.273912106 +0100 -@@ -12,6 +12,11 @@ - #include - #include - #include -+#if !defined(__GLIBC__) -+/* SIOCGSTAMPNS from linux/asm-generic.h -+ * for src/systemd/src/libsystemd-network/sd-lldp.c */ -+#include -+#endif - - #include "macro.h" - #include "missing_socket.h" diff --git a/temp/networkmanager/musl-process-util.patch b/temp/networkmanager/musl-process-util.patch deleted file mode 100644 index 0eb0057fd..000000000 --- a/temp/networkmanager/musl-process-util.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/shared/systemd/src/basic/process-util.c -+++ b/shared/systemd/src/basic/process-util.c -@@ -21,6 +21,9 @@ - #include - #include - #include -+#ifndef __GLIBC__ -+#include -+#endif - #if 0 /* NM_IGNORED */ - #if HAVE_VALGRIND_VALGRIND_H - #include -@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) { - cached_pid = CACHED_PID_UNSET; - } - -+#ifdef __GLIBC__ - /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc - * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against - * libpthread, as it is part of glibc anyway. */ - extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); - extern void* __dso_handle _weak_; -+#endif - - pid_t getpid_cached(void) { - static bool installed = false; -@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) { - * only half-documented (glibc doesn't document it but LSB does — though only superficially) - * we'll check for errors only in the most generic fashion possible. */ - -- if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { -+ #ifdef __GLIBC__ -+ if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { -+ #else -+ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { -+ #endif -+ - /* OOM? Let's try again later */ - cached_pid = CACHED_PID_UNSET; - return new_pid; diff --git a/temp/networkmanager/networkmanager.conf b/temp/networkmanager/networkmanager.conf deleted file mode 100644 index 8da4fe048..000000000 --- a/temp/networkmanager/networkmanager.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -dhcp=dhcpcd diff --git a/temp/networkmanager/networkmanager.initd b/temp/networkmanager/networkmanager.initd deleted file mode 100644 index 4ca6a0d54..000000000 --- a/temp/networkmanager/networkmanager.initd +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2008 Saleem Abdulrasool -# Distributed under the terms of the GNU General Purpose License v2 -# $Header: $ - -supervisor=supervise-daemon -command=/usr/sbin/NetworkManager -command_args_foreground="-n" - -description="Network Manager Daemon" - -depend() { - need dbus - provide net -} - -# vim: set ft=gentoo-init-d ts=3 sw=3 et: diff --git a/temp/networkmanager/networkmanager.pre-install b/temp/networkmanager/networkmanager.pre-install deleted file mode 100644 index 26811dfb0..000000000 --- a/temp/networkmanager/networkmanager.pre-install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -addgroup -S plugdev 2>/dev/null - -printf " *\n * To setup system connections, regular users must be member of 'plugdev' group.\n *\n" -printf " *\n * To control WiFi devices, enable wpa_supplicant service: 'rc-update add wpa_supplicant default'\n" -printf " * then reboot the system or restart 'wpa_supplicant' and 'networkmanager' services respectively.\n *\n" - -exit 0 diff --git a/temp/networkmanager/networkmanager.pre-upgrade b/temp/networkmanager/networkmanager.pre-upgrade deleted file mode 120000 index a349c8889..000000000 --- a/temp/networkmanager/networkmanager.pre-upgrade +++ /dev/null @@ -1 +0,0 @@ -networkmanager.pre-install \ No newline at end of file diff --git a/temp/networkmanager/networkmanager.rules b/temp/networkmanager/networkmanager.rules deleted file mode 100644 index 66d21d6bb..000000000 --- a/temp/networkmanager/networkmanager.rules +++ /dev/null @@ -1,9 +0,0 @@ -// Let users in plugdev group modify NetworkManager -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" && - subject.isInGroup("plugdev") && subject.active) { - return "yes"; - } -}); - - diff --git a/temp/wpa_supplicant/APKBUILD b/temp/wpa_supplicant/APKBUILD deleted file mode 100644 index 38b7c2626..000000000 --- a/temp/wpa_supplicant/APKBUILD +++ /dev/null @@ -1,119 +0,0 @@ -# Forked from Alpine until this is merged: -# https://github.com/alpinelinux/aports/pull/9894 -pkgname=wpa_supplicant -pkgver=2.8 -pkgrel=2 -pkgdesc="A utility providing key negotiation for WPA wireless networks" -url="https://w1.fi/wpa_supplicant/" -arch="all" -license="BSD-3-Clause" -subpackages="$pkgname-doc $pkgname-openrc" -makedepends="linux-headers openssl-dev dbus-dev libnl3-dev pcsc-lite-dev" -source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz - - wpa_supplicant.initd - wpa_supplicant.confd - wpa_cli.confd - wpa_cli.initd - - eloop.patch - - config - wpa_cli.sh" - -# secfixes: -# 2.8-r0: -# - CVE-2019-11555 -# 2.7-r3: -# - CVE-2019-11555 -# 2.7-r2: -# - CVE-2019-9494 -# - CVE-2019-9495 -# - CVE-2019-9497 -# - CVE-2019-9498 -# - CVE-2019-9499 -# 2.7-r0: -# - CVE-2017-13077 -# - CVE-2017-13078 -# - CVE-2017-13079 -# - CVE-2017-13080 -# - CVE-2017-13081 -# - CVE-2017-13082 -# - CVE-2017-13086 -# - CVE-2017-13087 -# - CVE-2017-13088 -# 2.6-r14: -# - CVE-2018-14526 -# 2.6-r7: -# - CVE-2017-13077 -# - CVE-2017-13078 -# - CVE-2017-13079 -# - CVE-2017-13080 -# - CVE-2017-13081 -# - CVE-2017-13082 -# - CVE-2017-13086 -# - CVE-2017-13087 -# - CVE-2017-13088 - -prepare() { - cd "$builddir" - default_prepare - - # Copy our configuration file to the build directory - cp "$srcdir"/config "$builddir"/wpa_supplicant/.config -} - -build() { - cd "$builddir"/wpa_supplicant - make LIBDIR=/lib BINDIR=/sbin -} - -check() { - cd "$builddir"/wpa_supplicant - make eapol_test -} - -package() { - cd "$builddir"/wpa_supplicant - make DESTDIR="$pkgdir" LIBDIR=/lib BINDIR=/sbin install - install -Dm644 wpa_supplicant.conf \ - "$pkgdir"/usr/share/doc/wpa_supplicant/examples/wpa_supplicant.conf - install -Dm755 "$srcdir"/wpa_cli.sh \ - "$pkgdir"/etc/wpa_supplicant/wpa_cli.sh - - local man= - for man in doc/docbook/*.?; do - install -Dm644 "$man" \ - "$pkgdir"/usr/share/man/man${man##*.}/${man##*/} - done - install -Dm755 eapol_test "$pkgdir"/sbin/eapol_test - - # dbus - cd dbus - install -d "$pkgdir"/etc/dbus-1/system.d - install -m644 dbus-wpa_supplicant.conf \ - "$pkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf - install -d "$pkgdir"/usr/share/dbus-1/system-services - install fi.w1.wpa_supplicant1.service \ - "$pkgdir"/usr/share/dbus-1/system-services - install -d "$pkgdir"/var/run/wpa_supplicant - - # openrc runscripts - install -Dm755 "$srcdir"/wpa_supplicant.initd \ - "$pkgdir"/etc/init.d/wpa_supplicant - install -Dm644 "$srcdir"/wpa_supplicant.confd \ - "$pkgdir"/etc/conf.d/wpa_supplicant - install -Dm755 "$srcdir"/wpa_cli.initd \ - "$pkgdir"/etc/init.d/wpa_cli - install -Dm644 "$srcdir"/wpa_cli.confd \ - "$pkgdir"/etc/conf.d/wpa_cli -} - -sha512sums="b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b wpa_supplicant-2.8.tar.gz -4d2d3e34bc21305eab08880552c5ffe3548a1459549ec2393f5d417ec1240fab7731b028e7fa7de5d7b3804b91952ff7d209a42c1091efadf43c0724bc3469b0 wpa_supplicant.initd -cbfc6b80cb47d4e33415018054a0d8ba39acbadbc3e44776afa918cc4c1e4d36ed3dd809b3448332575ac4fa0b82ad77d7530563f0b9f5e1374a5deea73a3b93 wpa_supplicant.confd -c3db077fa78dd296d90d07626cb4e684f87618a77ffd51c1ae04b47be7bc0db1e9a3e0f7442acef21c081f6bb782f150cbbd3d0bf245d6ab43f19da3899b53b9 wpa_cli.confd -a0ac905ef23af18f1899a797e18157a54fa509c7cc3c59583de768a493d750876bbc0a89237373b67171e7c84259d2350d2c0e33d8e1ea56db9a2e5f27b64128 wpa_cli.initd -2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch -6707991f9a071f2fcb09d164d31d12b1f52b91fbb5574b70b8d6f9727f72bbe42b03dd66d10fcc2126f5b7e49ac785657dec90e88b4bf54a9aa5638582f6e505 config -212c4265afce2e72b95a32cd785612d6c3e821b47101ead154136d184ac4add01434ada6c87edbb9a98496552e76e1a4d79c6b5840e3a5cfe5e6d602fceae576 wpa_cli.sh" diff --git a/temp/wpa_supplicant/config b/temp/wpa_supplicant/config deleted file mode 100644 index f35daa0d1..000000000 --- a/temp/wpa_supplicant/config +++ /dev/null @@ -1,550 +0,0 @@ -# Example wpa_supplicant build time configuration -# -# This file lists the configuration options that are used when building the -# hostapd binary. All lines starting with # are ignored. Configuration option -# lines must be commented out complete, if they are not to be included, i.e., -# just setting VARIABLE=n is not disabling that variable. -# -# This file is included in Makefile, so variables like CFLAGS and LIBS can also -# be modified from here. In most cases, these lines should use += in order not -# to override previous values of the variables. - - -# Uncomment following two lines and fix the paths if you have installed OpenSSL -# or GnuTLS in non-default location -#CFLAGS += -I/usr/local/openssl/include -#LIBS += -L/usr/local/openssl/lib - -# Some Red Hat versions seem to include kerberos header files from OpenSSL, but -# the kerberos files are not in the default include path. Following line can be -# used to fix build issues on such systems (krb5.h not found). -#CFLAGS += -I/usr/include/kerberos - -# Driver interface for generic Linux wireless extensions -# Note: WEXT is deprecated in the current Linux kernel version and no new -# functionality is added to it. nl80211-based interface is the new -# replacement for WEXT and its use allows wpa_supplicant to properly control -# the driver to improve existing functionality like roaming and to support new -# functionality. -CONFIG_DRIVER_WEXT=y - -# Driver interface for Linux drivers using the nl80211 kernel interface -CONFIG_DRIVER_NL80211=y - -# QCA vendor extensions to nl80211 -#CONFIG_DRIVER_NL80211_QCA=y - -# driver_nl80211.c requires libnl. If you are compiling it yourself -# you may need to point hostapd to your version of libnl. -# -#CFLAGS += -I$ -#LIBS += -L$ - -# Use libnl v2.0 (or 3.0) libraries. -#CONFIG_LIBNL20=y - -# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) -CONFIG_LIBNL32=y - - -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) -#CONFIG_DRIVER_BSD=y -#CFLAGS += -I/usr/local/include -#LIBS += -L/usr/local/lib -#LIBS_p += -L/usr/local/lib -#LIBS_c += -L/usr/local/lib - -# Driver interface for Windows NDIS -#CONFIG_DRIVER_NDIS=y -#CFLAGS += -I/usr/include/w32api/ddk -#LIBS += -L/usr/local/lib -# For native build using mingw -#CONFIG_NATIVE_WINDOWS=y -# Additional directories for cross-compilation on Linux host for mingw target -#CFLAGS += -I/opt/mingw/mingw32/include/ddk -#LIBS += -L/opt/mingw/mingw32/lib -#CC=mingw32-gcc -# By default, driver_ndis uses WinPcap for low-level operations. This can be -# replaced with the following option which replaces WinPcap calls with NDISUIO. -# However, this requires that WZC is disabled (net stop wzcsvc) before starting -# wpa_supplicant. -# CONFIG_USE_NDISUIO=y - -# Driver interface for wired Ethernet drivers -CONFIG_DRIVER_WIRED=y - -# Driver interface for the Broadcom RoboSwitch family -#CONFIG_DRIVER_ROBOSWITCH=y - -# Driver interface for no driver (e.g., WPS ER only) -#CONFIG_DRIVER_NONE=y - -# Solaris libraries -#LIBS += -lsocket -ldlpi -lnsl -#LIBS_c += -lsocket - -# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is -# included) -CONFIG_IEEE8021X_EAPOL=y - -# EAP-MD5 -CONFIG_EAP_MD5=y - -# EAP-MSCHAPv2 -CONFIG_EAP_MSCHAPV2=y - -# EAP-TLS -CONFIG_EAP_TLS=y - -# EAL-PEAP -CONFIG_EAP_PEAP=y - -# EAP-TTLS -CONFIG_EAP_TTLS=y - -# EAP-FAST -# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed -# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g., -# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. -CONFIG_EAP_FAST=y - -# EAP-GTC -CONFIG_EAP_GTC=y - -# EAP-OTP -CONFIG_EAP_OTP=y - -# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) -CONFIG_EAP_SIM=y - -# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) -CONFIG_EAP_PSK=y - -# EAP-pwd (secure authentication using only a password) -#CONFIG_EAP_PWD=y - -# EAP-PAX -CONFIG_EAP_PAX=y - -# LEAP -CONFIG_EAP_LEAP=y - -# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) -CONFIG_EAP_AKA=y - -# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). -# This requires CONFIG_EAP_AKA to be enabled, too. -CONFIG_EAP_AKA_PRIME=y - -# Enable USIM simulator (Milenage) for EAP-AKA -#CONFIG_USIM_SIMULATOR=y - -# EAP-SAKE -#CONFIG_EAP_SAKE=y - -# EAP-GPSK -#CONFIG_EAP_GPSK=y -# Include support for optional SHA256 cipher suite in EAP-GPSK -#CONFIG_EAP_GPSK_SHA256=y - -# EAP-TNC and related Trusted Network Connect support (experimental) -#CONFIG_EAP_TNC=y - -# Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y -# Enable WPS external registrar functionality -#CONFIG_WPS_ER=y -# Disable credentials for an open network by default when acting as a WPS -# registrar. -#CONFIG_WPS_REG_DISABLE_OPEN=y -# Enable WPS support with NFC config method -#CONFIG_WPS_NFC=y - -# EAP-IKEv2 -#CONFIG_EAP_IKEV2=y - -# EAP-EKE -#CONFIG_EAP_EKE=y - -# PKCS#12 (PFX) support (used to read private key and certificate file from -# a file that usually has extension .p12 or .pfx) -CONFIG_PKCS12=y - -# Smartcard support (i.e., private key on a smartcard), e.g., with openssl -# engine. -CONFIG_SMARTCARD=y - -# PC/SC interface for smartcards (USIM, GSM SIM) -# Enable this if EAP-SIM or EAP-AKA is included -CONFIG_PCSC=y - -# Support HT overrides (disable HT/HT40, mask MCS rates, etc.) -#CONFIG_HT_OVERRIDES=y - -# Support VHT overrides (disable VHT, mask MCS rates, etc.) -#CONFIG_VHT_OVERRIDES=y - -# Development testing -#CONFIG_EAPOL_TEST=y - -# Select control interface backend for external programs, e.g, wpa_cli: -# unix = UNIX domain sockets (default for Linux/*BSD) -# udp = UDP sockets using localhost (127.0.0.1) -# udp6 = UDP IPv6 sockets using localhost (::1) -# named_pipe = Windows Named Pipe (default for Windows) -# udp-remote = UDP sockets with remote access (only for tests systems/purpose) -# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose) -# y = use default (backwards compatibility) -# If this option is commented out, control interface is not included in the -# build. -CONFIG_CTRL_IFACE=y - -# Include support for GNU Readline and History Libraries in wpa_cli. -# When building a wpa_cli binary for distribution, please note that these -# libraries are licensed under GPL and as such, BSD license may not apply for -# the resulting binary. -#CONFIG_READLINE=y - -# Include internal line edit mode in wpa_cli. This can be used as a replacement -# for GNU Readline to provide limited command line editing and history support. -CONFIG_WPA_CLI_EDIT=y - -# Remove debugging code that is printing out debug message to stdout. -# This can be used to reduce the size of the wpa_supplicant considerably -# if debugging code is not needed. The size reduction can be around 35% -# (e.g., 90 kB). -#CONFIG_NO_STDOUT_DEBUG=y - -# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save -# 35-50 kB in code size. -#CONFIG_NO_WPA=y - -# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support -# This option can be used to reduce code size by removing support for -# converting ASCII passphrases into PSK. If this functionality is removed, the -# PSK can only be configured as the 64-octet hexstring (e.g., from -# wpa_passphrase). This saves about 0.5 kB in code size. -#CONFIG_NO_WPA_PASSPHRASE=y - -# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. -# This can be used if ap_scan=1 mode is never enabled. -#CONFIG_NO_SCAN_PROCESSING=y - -# Select configuration backend: -# file = text file (e.g., wpa_supplicant.conf; note: the configuration file -# path is given on command line, not here; this option is just used to -# select the backend that allows configuration files to be used) -# winreg = Windows registry (see win_example.reg for an example) -CONFIG_BACKEND=file - -# Remove configuration write functionality (i.e., to allow the configuration -# file to be updated based on runtime configuration changes). The runtime -# configuration can still be changed, the changes are just not going to be -# persistent over restarts. This option can be used to reduce code size by -# about 3.5 kB. -#CONFIG_NO_CONFIG_WRITE=y - -# Remove support for configuration blobs to reduce code size by about 1.5 kB. -#CONFIG_NO_CONFIG_BLOBS=y - -# Select program entry point implementation: -# main = UNIX/POSIX like main() function (default) -# main_winsvc = Windows service (read parameters from registry) -# main_none = Very basic example (development use only) -#CONFIG_MAIN=main - -# Select wrapper for operating system and C library specific functions -# unix = UNIX/POSIX like systems (default) -# win32 = Windows systems -# none = Empty template -#CONFIG_OS=unix - -# Select event loop implementation -# eloop = select() loop (default) -# eloop_win = Windows events and WaitForMultipleObject() loop -#CONFIG_ELOOP=eloop - -# Should we use poll instead of select? Select is used by default. -#CONFIG_ELOOP_POLL=y - -# Should we use epoll instead of select? Select is used by default. -#CONFIG_ELOOP_EPOLL=y - -# Should we use kqueue instead of select? Select is used by default. -#CONFIG_ELOOP_KQUEUE=y - -# Select layer 2 packet implementation -# linux = Linux packet socket (default) -# pcap = libpcap/libdnet/WinPcap -# freebsd = FreeBSD libpcap -# winpcap = WinPcap with receive thread -# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) -# none = Empty template -#CONFIG_L2_PACKET=linux - -# Disable Linux packet socket workaround applicable for station interface -# in a bridge for EAPOL frames. This should be uncommented only if the kernel -# is known to not have the regression issue in packet socket behavior with -# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). -#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y - -# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) -CONFIG_PEERKEY=y - -# IEEE 802.11w (management frame protection), also known as PMF -# Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y - -# Select TLS implementation -# openssl = OpenSSL (default) -# gnutls = GnuTLS -# internal = Internal TLSv1 implementation (experimental) -# none = Empty template -CONFIG_TLS=openssl - -# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) -# can be enabled to get a stronger construction of messages when block ciphers -# are used. It should be noted that some existing TLS v1.0 -based -# implementation may not be compatible with TLS v1.1 message (ClientHello is -# sent prior to negotiating which version will be used) -#CONFIG_TLSV11=y - -# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) -# can be enabled to enable use of stronger crypto algorithms. It should be -# noted that some existing TLS v1.0 -based implementation may not be compatible -# with TLS v1.2 message (ClientHello is sent prior to negotiating which version -# will be used) -#CONFIG_TLSV12=y - -# If CONFIG_TLS=internal is used, additional library and include paths are -# needed for LibTomMath. Alternatively, an integrated, minimal version of -# LibTomMath can be used. See beginning of libtommath.c for details on benefits -# and drawbacks of this option. -#CONFIG_INTERNAL_LIBTOMMATH=y -#ifndef CONFIG_INTERNAL_LIBTOMMATH -#LTM_PATH=/usr/src/libtommath-0.39 -#CFLAGS += -I$(LTM_PATH) -#LIBS += -L$(LTM_PATH) -#LIBS_p += -L$(LTM_PATH) -#endif -# At the cost of about 4 kB of additional binary size, the internal LibTomMath -# can be configured to include faster routines for exptmod, sqr, and div to -# speed up DH and RSA calculation considerably -#CONFIG_INTERNAL_LIBTOMMATH_FAST=y - -# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. -# This is only for Windows builds and requires WMI-related header files and -# WbemUuid.Lib from Platform SDK even when building with MinGW. -#CONFIG_NDIS_EVENTS_INTEGRATED=y -#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" - -# Add support for old DBus control interface -# (fi.epitest.hostap.WPASupplicant) -#CONFIG_CTRL_IFACE_DBUS=y - -# Add support for new DBus control interface -# (fi.w1.hostap.wpa_supplicant1) -CONFIG_CTRL_IFACE_DBUS_NEW=y - -# Add introspection support for new DBus control interface -CONFIG_CTRL_IFACE_DBUS_INTRO=y - -# Add support for loading EAP methods dynamically as shared libraries. -# When this option is enabled, each EAP method can be either included -# statically (CONFIG_EAP_=y) or dynamically (CONFIG_EAP_=dyn). -# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to -# be loaded in the beginning of the wpa_supplicant configuration file -# (see load_dynamic_eap parameter in the example file) before being used in -# the network blocks. -# -# Note that some shared parts of EAP methods are included in the main program -# and in order to be able to use dynamic EAP methods using these parts, the -# main program must have been build with the EAP method enabled (=y or =dyn). -# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries -# unless at least one of them was included in the main build to force inclusion -# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included -# in the main build to be able to load these methods dynamically. -# -# Please also note that using dynamic libraries will increase the total binary -# size. Thus, it may not be the best option for targets that have limited -# amount of memory/flash. -#CONFIG_DYNAMIC_EAP_METHODS=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) -#CONFIG_IEEE80211R=y - -# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) -#CONFIG_DEBUG_FILE=y - -# Send debug messages to syslog instead of stdout -#CONFIG_DEBUG_SYSLOG=y -# Set syslog facility for debug messages -#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON - -# Add support for sending all debug messages (regardless of debug verbosity) -# to the Linux kernel tracing facility. This helps debug the entire stack by -# making it easy to record everything happening from the driver up into the -# same file, e.g., using trace-cmd. -#CONFIG_DEBUG_LINUX_TRACING=y - -# Add support for writing debug log to Android logcat instead of standard -# output -#CONFIG_ANDROID_LOG=y - -# Enable privilege separation (see README 'Privilege separation' for details) -#CONFIG_PRIVSEP=y - -# Enable mitigation against certain attacks against TKIP by delaying Michael -# MIC error reports by a random amount of time between 0 and 60 seconds -CONFIG_DELAYED_MIC_ERROR_REPORT=y - -# Enable tracing code for developer debugging -# This tracks use of memory allocations and other registrations and reports -# incorrect use with a backtrace of call (or allocation) location. -#CONFIG_WPA_TRACE=y -# For BSD, uncomment these. -#LIBS += -lexecinfo -#LIBS_p += -lexecinfo -#LIBS_c += -lexecinfo - -# Use libbfd to get more details for developer debugging -# This enables use of libbfd to get more detailed symbols for the backtraces -# generated by CONFIG_WPA_TRACE=y. -#CONFIG_WPA_TRACE_BFD=y -# For BSD, uncomment these. -#LIBS += -lbfd -liberty -lz -#LIBS_p += -lbfd -liberty -lz -#LIBS_c += -lbfd -liberty -lz - -# wpa_supplicant depends on strong random number generation being available -# from the operating system. os_get_random() function is used to fetch random -# data when needed, e.g., for key generation. On Linux and BSD systems, this -# works by reading /dev/urandom. It should be noted that the OS entropy pool -# needs to be properly initialized before wpa_supplicant is started. This is -# important especially on embedded devices that do not have a hardware random -# number generator and may by default start up with minimal entropy available -# for random number generation. -# -# As a safety net, wpa_supplicant is by default trying to internally collect -# additional entropy for generating random data to mix in with the data fetched -# from the OS. This by itself is not considered to be very strong, but it may -# help in cases where the system pool is not initialized properly. However, it -# is very strongly recommended that the system pool is initialized with enough -# entropy either by using hardware assisted random number generator or by -# storing state over device reboots. -# -# wpa_supplicant can be configured to maintain its own entropy store over -# restarts to enhance random number generation. This is not perfect, but it is -# much more secure than using the same sequence of random numbers after every -# reboot. This can be enabled with -e command line option. The -# specified file needs to be readable and writable by wpa_supplicant. -# -# If the os_get_random() is known to provide strong random data (e.g., on -# Linux/BSD, the board in question is known to have reliable source of random -# data from /dev/urandom), the internal wpa_supplicant random pool can be -# disabled. This will save some in binary size and CPU use. However, this -# should only be considered for builds that are known to be used on devices -# that meet the requirements described above. -#CONFIG_NO_RANDOM_POOL=y - -# IEEE 802.11n (High Throughput) support (mainly for AP mode) -#CONFIG_IEEE80211N=y - -# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) -# (depends on CONFIG_IEEE80211N) -#CONFIG_IEEE80211AC=y - -# Wireless Network Management (IEEE Std 802.11v-2011) -# Note: This is experimental and not complete implementation. -#CONFIG_WNM=y - -# Interworking (IEEE 802.11u) -# This can be used to enable functionality to improve interworking with -# external networks (GAS/ANQP to learn more about the networks and network -# selection based on available credentials). -#CONFIG_INTERWORKING=y - -# Hotspot 2.0 -#CONFIG_HS20=y - -# Enable interface matching in wpa_supplicant -#CONFIG_MATCH_IFACE=y - -# Disable roaming in wpa_supplicant -#CONFIG_NO_ROAMING=y - -# AP mode operations with wpa_supplicant -# This can be used for controlling AP mode operations with wpa_supplicant. It -# should be noted that this is mainly aimed at simple cases like -# WPA2-Personal while more complex configurations like WPA2-Enterprise with an -# external RADIUS server can be supported with hostapd. -CONFIG_AP=y - -# P2P (Wi-Fi Direct) -# This can be used to enable P2P support in wpa_supplicant. See README-P2P for -# more information on P2P operations. -CONFIG_P2P=y - -# Enable TDLS support -#CONFIG_TDLS=y - -# Wi-Fi Direct -# This can be used to enable Wi-Fi Direct extensions for P2P using an external -# program to control the additional information exchanges in the messages. -#CONFIG_WIFI_DISPLAY=y - -# Autoscan -# This can be used to enable automatic scan support in wpa_supplicant. -# See wpa_supplicant.conf for more information on autoscan usage. -# -# Enabling directly a module will enable autoscan support. -# For exponential module: -#CONFIG_AUTOSCAN_EXPONENTIAL=y -# For periodic module: -#CONFIG_AUTOSCAN_PERIODIC=y - -# Password (and passphrase, etc.) backend for external storage -# These optional mechanisms can be used to add support for storing passwords -# and other secrets in external (to wpa_supplicant) location. This allows, for -# example, operating system specific key storage to be used -# -# External password backend for testing purposes (developer use) -#CONFIG_EXT_PASSWORD_TEST=y - -# Enable Fast Session Transfer (FST) -#CONFIG_FST=y - -# Enable CLI commands for FST testing -#CONFIG_FST_TEST=y - -# OS X builds. This is only for building eapol_test. -#CONFIG_OSX=y - -# Automatic Channel Selection -# This will allow wpa_supplicant to pick the channel automatically when channel -# is set to "0". -# -# TODO: Extend parser to be able to parse "channel=acs_survey" as an alternative -# to "channel=0". This would enable us to eventually add other ACS algorithms in -# similar way. -# -# Automatic selection is currently only done through initialization, later on -# we hope to do background checks to keep us moving to more ideal channels as -# time goes by. ACS is currently only supported through the nl80211 driver and -# your driver must have survey dump capability that is filled by the driver -# during scanning. -# -# TODO: In analogy to hostapd be able to customize the ACS survey algorithm with -# a newly to create wpa_supplicant.conf variable acs_num_scans. -# -# Supported ACS drivers: -# * ath9k -# * ath5k -# * ath10k -# -# For more details refer to: -# http://wireless.kernel.org/en/users/Documentation/acs -#CONFIG_ACS=y - -# Support Multi Band Operation -#CONFIG_MBO=y diff --git a/temp/wpa_supplicant/eloop.patch b/temp/wpa_supplicant/eloop.patch deleted file mode 100644 index bab2cee4e..000000000 --- a/temp/wpa_supplicant/eloop.patch +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_utils_eloop_c,v 1.5 2015/09/29 11:57:54 dcoppa Exp $ - -don't try to access list members to free them unless already initialised - ---- a/src/utils/eloop.c.orig Sun Sep 27 21:02:05 2015 -+++ b/src/utils/eloop.c Mon Sep 28 09:35:05 2015 -@@ -1064,6 +1064,9 @@ void eloop_destroy(void) - struct eloop_timeout *timeout, *prev; - struct os_reltime now; - -+ if (eloop.timeout.prev == NULL) -+ return; -+ - os_get_reltime(&now); - dl_list_for_each_safe(timeout, prev, &eloop.timeout, - struct eloop_timeout, list) { diff --git a/temp/wpa_supplicant/wpa_cli.confd b/temp/wpa_supplicant/wpa_cli.confd deleted file mode 100644 index aa481ac27..000000000 --- a/temp/wpa_supplicant/wpa_cli.confd +++ /dev/null @@ -1 +0,0 @@ -WPACLI_OPTS="-a /etc/wpa_supplicant/wpa_cli.sh" diff --git a/temp/wpa_supplicant/wpa_cli.initd b/temp/wpa_supplicant/wpa_cli.initd deleted file mode 100755 index e9139c02b..000000000 --- a/temp/wpa_supplicant/wpa_cli.initd +++ /dev/null @@ -1,9 +0,0 @@ -#!/sbin/openrc-run - -command="/sbin/wpa_cli" -pidfile="/var/run/${SVCNAME}.pid" -command_args="${WPACLI_OPTS} -B -P ${pidfile} >/dev/null" - -depend() { - need wpa_supplicant -} diff --git a/temp/wpa_supplicant/wpa_cli.sh b/temp/wpa_supplicant/wpa_cli.sh deleted file mode 100644 index dd9bc2ca4..000000000 --- a/temp/wpa_supplicant/wpa_cli.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Script for using udhcpc (started by ifup) with wpa_supplicant. -# -# Distributed under the same license as wpa_supplicant itself. -# Copyright (c) 2015,2018 Sören Tempel - -if [ $# -ne 2 ]; then - logger -t wpa_cli "this script should be called from wpa_cli(8)" - exit 1 -fi - -IFNAME="${1}" -ACTION="${2}" -SIGNAL="" -DHCPID="" - -# PID file created by the busybox ifup applet for udhcpc. -DHCPIDFILE="/var/run/udhcpc.${IFNAME}.pid" - -if [ ! -e "${DHCPIDFILE}" ]; then - logger -t wpa_cli "udhcpc isn't running for interface '${IFNAME}'" - exit 1 -fi - -logger -t wpa_cli "interface ${IFNAME} ${ACTION}" -case "${ACTION}" in - CONNECTED) - SIGNAL="USR1" - ;; - DISCONNECTED) - SIGNAL="USR2" - ;; - *) - logger -t wpa_cli "unknown action '${ACTION}'" - exit 1 -esac - -read -r DHCPID < "${DHCPIDFILE}" -kill -${SIGNAL} "${DHCPID}" || logger -t wpa_cli \ - "Couldn't send '${SIGNAL}' to '${DHCPID}'" diff --git a/temp/wpa_supplicant/wpa_supplicant.confd b/temp/wpa_supplicant/wpa_supplicant.confd deleted file mode 100644 index aac6d3628..000000000 --- a/temp/wpa_supplicant/wpa_supplicant.confd +++ /dev/null @@ -1,7 +0,0 @@ -# conf.d file for wpa_supplicant -# -# Please check man 8 wpa_supplicant for more information about the options -# wpa_supplicant accepts. Add "-u" (enable dbus) option for controling this -# service with other apps/services like NetworkManager over dbus. -# -wpa_supplicant_args="" diff --git a/temp/wpa_supplicant/wpa_supplicant.initd b/temp/wpa_supplicant/wpa_supplicant.initd deleted file mode 100644 index 895bf1c9d..000000000 --- a/temp/wpa_supplicant/wpa_supplicant.initd +++ /dev/null @@ -1,60 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2009 Roy Marples -# All rights reserved. Released under the 2-clause BSD license. - -command=/sbin/wpa_supplicant -: ${wpa_supplicant_conf:=/etc/wpa_supplicant/wpa_supplicant.conf} -wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if - -# Run in dbus mode if no config file is found -if [ -f "${wpa_supplicant_conf}" ]; then - command_args="$wpa_supplicant_args -B -c$wpa_supplicant_conf $wpa_supplicant_if" -else - command_args="$wpa_supplicant_args -B -u" -fi - -name="WPA Supplicant Daemon" - -depend() -{ - need localmount - use logger dbus - after bootmisc modules entropy - before dns dhcpcd net - keyword -shutdown -} - -find_wireless() -{ - local iface= - for iface in /sys/class/net/*; do - if [ -e "$iface"/wireless -o -e "$iface"/phy80211 ]; then - echo "${iface##*/}" - return 0 - fi - done - - return 1 -} - -append_wireless() -{ - local iface= i= - - iface=$(find_wireless) - if [ -n "$iface" ]; then - for i in $iface; do - command_args="$command_args -i$i" - done - else - eerror "Could not find a wireless interface" - fi -} - -start_pre() -{ - case " $command_args" in - *" -i"*) ;; - *) append_wireless;; - esac -}