Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=47056c078f10bc1012eb818fb22dcd53caa1570a
commit 47056c078f10bc1012eb818fb22dcd53caa1570a Author: DeX77 <[email protected]> Date: Sun May 28 17:05:03 2017 +0200 hostapd-2.6-1-x86_64 * version bump diff --git a/source/network-extra/hostapd/CVE-2014-3686-1.patch b/source/network-extra/hostapd/CVE-2014-3686-1.patch deleted file mode 100644 index 6ca7726..0000000 --- a/source/network-extra/hostapd/CVE-2014-3686-1.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 89de07a9442072f88d49869d8ecd8d42bae050a0 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <[email protected]> -Date: Mon, 6 Oct 2014 16:27:44 +0300 -Subject: [PATCH 1/3] Add os_exec() helper to run external programs - -Signed-off-by: Jouni Malinen <[email protected]> ---- - src/utils/os.h | 9 +++++++++ - src/utils/os_unix.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/utils/os_win32.c | 6 ++++++ - 3 files changed, 70 insertions(+) - ---- a/src/utils/os.h -+++ b/src/utils/os.h -@@ -485,6 +485,15 @@ char * os_strdup(const char *s); - */ - size_t os_strlcpy(char *dest, const char *src, size_t siz); - -+/** -+ * os_exec - Execute an external program -+ * @program: Path to the program -+ * @arg: Command line argument string -+ * @wait_completion: Whether to wait until the program execution completes -+ * Returns: 0 on success, -1 on error -+ */ -+int os_exec(const char *program, const char *arg, int wait_completion); -+ - - #ifdef OS_REJECT_C_LIB_FUNCTIONS - #define malloc OS_DO_NOT_USE_malloc ---- a/src/utils/os_unix.c -+++ b/src/utils/os_unix.c -@@ -15,6 +15,7 @@ - #include "includes.h" - - #include <time.h> -+#include <sys/wait.h> - - #ifdef ANDROID - #include <linux/capability.h> -@@ -492,3 +493,57 @@ char * os_strdup(const char *s) - } - - #endif /* WPA_TRACE */ -+ -+ -+int os_exec(const char *program, const char *arg, int wait_completion) -+{ -+ pid_t pid; -+ int pid_status; -+ -+ pid = fork(); -+ if (pid < 0) { -+ perror("fork"); -+ return -1; -+ } -+ -+ if (pid == 0) { -+ /* run the external command in the child process */ -+ const int MAX_ARG = 30; -+ char *_program, *_arg, *pos; -+ char *argv[MAX_ARG + 1]; -+ int i; -+ -+ _program = os_strdup(program); -+ _arg = os_strdup(arg); -+ -+ argv[0] = _program; -+ -+ i = 1; -+ pos = _arg; -+ while (i < MAX_ARG && pos && *pos) { -+ while (*pos == ' ') -+ pos++; -+ if (*pos == '\0') -+ break; -+ argv[i++] = pos; -+ pos = os_strchr(pos, ' '); -+ if (pos) -+ *pos++ = '\0'; -+ } -+ argv[i] = NULL; -+ -+ execv(program, argv); -+ perror("execv"); -+ os_free(_program); -+ os_free(_arg); -+ exit(0); -+ return -1; -+ } -+ -+ if (wait_completion) { -+ /* wait for the child process to complete in the parent */ -+ waitpid(pid, &pid_status, 0); -+ } -+ -+ return 0; -+} ---- a/src/utils/os_win32.c -+++ b/src/utils/os_win32.c -@@ -239,3 +239,9 @@ size_t os_strlcpy(char *dest, const char - - return s - src - 1; - } -+ -+ -+int os_exec(const char *program, const char *arg, int wait_completion) -+{ -+ return -1; -+} diff --git a/source/network-extra/hostapd/CVE-2014-3686.patch b/source/network-extra/hostapd/CVE-2014-3686.patch deleted file mode 100644 index d35b289..0000000 --- a/source/network-extra/hostapd/CVE-2014-3686.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5d4fa2a29bef013e61185beb21a3ec110885eb9a Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <[email protected]> -Date: Mon, 6 Oct 2014 18:49:01 +0300 -Subject: [PATCH 3/3] hostapd_cli: Use os_exec() for action script execution - -Use os_exec() to run the action script operations to avoid undesired -command line processing for control interface event strings. Previously, -it could have been possible for some of the event strings to include -unsanitized data which is not suitable for system() use. (CVE-2014-3686) - -Signed-off-by: Jouni Malinen <[email protected]> ---- - hostapd/hostapd_cli.c | 25 ++++++++----------------- - 1 file changed, 8 insertions(+), 17 deletions(-) - ---- a/hostapd/hostapd_cli.c -+++ b/hostapd/hostapd_cli.c -@@ -239,28 +239,19 @@ static int hostapd_cli_cmd_mib(struct wp - static int hostapd_cli_exec(const char *program, const char *arg1, - const char *arg2) - { -- char *cmd; -+ char *arg; - size_t len; - int res; -- int ret = 0; - -- len = os_strlen(program) + os_strlen(arg1) + os_strlen(arg2) + 3; -- cmd = os_malloc(len); -- if (cmd == NULL) -+ len = os_strlen(arg1) + os_strlen(arg2) + 2; -+ arg = os_malloc(len); -+ if (arg == NULL) - return -1; -- res = os_snprintf(cmd, len, "%s %s %s", program, arg1, arg2); -- if (res < 0 || (size_t) res >= len) { -- os_free(cmd); -- return -1; -- } -- cmd[len - 1] = '\0'; --#ifndef _WIN32_WCE -- if (system(cmd) < 0) -- ret = -1; --#endif /* _WIN32_WCE */ -- os_free(cmd); -+ os_snprintf(arg, len, "%s %s", arg1, arg2); -+ res = os_exec(program, arg, 1); -+ os_free(arg); - -- return ret; -+ return res; - } - - diff --git a/source/network-extra/hostapd/FrugalBuild b/source/network-extra/hostapd/FrugalBuild index ca77a21..e8b017e 100644 --- a/source/network-extra/hostapd/FrugalBuild +++ b/source/network-extra/hostapd/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: James Buren <[email protected]> pkgname=hostapd -pkgver=1.1 -pkgrel=3 +pkgver=2.6 +pkgrel=1 pkgdesc="A daemon for managing software wireless access points." url="http://hostap.epitest.fi/hostapd"; depends=('openssl>=1.0.0' 'libnl>=3.2.9') groups=('network-extra') -archs=('i686' 'x86_64') +archs=('x86_64') up2date="Flasttar $url" source=(${url/hostapd/releases}/$pkgname-$pkgver.tar.gz http://ftp.frugalware.org/pub/other/sources/madwifi/madwifi-0.9.4.4180.tar.xz config $pkgname.service README.Frugalware libnl3.patch) backup=(etc/$pkgname/$pkgname.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} etc/$pkgname/wired.conf) -sha1sums=('247ab472d501ef3e10b271446842527143976708' \ +sha1sums=('ef9f03ba3477e8abc189b24c70c51ddb3e45f2a0' \ '4776f3ae8e2f9a6a2d77edf95b41abb1ad04892d' \ 'e853a9095319e9d3e0c94b5051c8ae9da3eb44ba' \ '3979a30543dd4be3af91d6b71624f7793f7ef576' \ @@ -21,12 +21,6 @@ sha1sums=('247ab472d501ef3e10b271446842527143976708' \ _F_systemd_units=($pkgname=) Finclude systemd -# FSA fix *** -source=(${source[@]} CVE-2014-3686.patch CVE-2014-3686-1.patch) -sha1sums=(${sha1sums[@]} '776164a788254d46f2ce0f46b3f090de4fe8905c' \ - 'bfef0dc799312e97bd65f6e6c9011f51c2766ff7') -# *********** - build() { Fcd $pkgname-$pkgver _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
