cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to wpa_supplicant-2.4

Browse Source 
Tested by pascal@ and Fabian Raetz

OK pascal@
This commit is contained in:
dcoppa 2015-03-18 15:35:43 +00:00
parent a2903b7dbc
commit fa31b7d6b0
4 changed files with 16 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/wpa_supplicant/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.23 2014/10/11 17:55:49 dcoppa Exp $
# $OpenBSD: Makefile,v 1.24 2015/03/18 15:35:43 dcoppa Exp $
COMMENT= IEEE 802.1X supplicant
DISTNAME= wpa_supplicant-2.3
DISTNAME= wpa_supplicant-2.4
CATEGORIES= security net
HOMEPAGE= http://hostap.epitest.fi/wpa_supplicant/

4
security/wpa_supplicant/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (wpa_supplicant-2.3.tar.gz) = 6qpb8wVScOUhst/2Ty0gPsgED3GVi4WIJpqCwAyde2o=
SIZE (wpa_supplicant-2.3.tar.gz) = 2398722
SHA256 (wpa_supplicant-2.4.tar.gz) = BY3IMsCWE5oFnm34FAgPUCUajTE8IbEzZMVKHnAQkSI=
SIZE (wpa_supplicant-2.4.tar.gz) = 2525648

8
security/wpa_supplicant/patches/patch-src_utils_eloop_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_utils_eloop_c,v 1.3 2014/09/02 13:04:34 dcoppa Exp $
$OpenBSD: patch-src_utils_eloop_c,v 1.4 2015/03/18 15:35:44 dcoppa Exp $
don't try to access list members to free them unless already initialised
--- src/utils/eloop.c.orig Wed Jun 4 15:26:14 2014
+++ src/utils/eloop.c Tue Sep 2 13:00:23 2014
@@ -1033,6 +1033,9 @@ void eloop_destroy(void)
--- src/utils/eloop.c.orig Sun Mar 15 12:30:39 2015
+++ src/utils/eloop.c Wed Mar 18 04:20:32 2015
@@ -1035,6 +1035,9 @@ void eloop_destroy(void)
struct eloop_timeout *timeout, *prev;
struct os_reltime now;

79
security/wpa_supplicant/patches/patch-wpa_supplicant_Makefile
View File

@ -1,23 +1,7 @@
$OpenBSD: patch-wpa_supplicant_Makefile,v 1.5 2014/10/13 07:32:11 dcoppa Exp $
commit 2d4e9c2eb811978a4097b7d249eca3c7e9c510e5
Author: Jouni Malinen <j@w1.fi>
Date: Sun Oct 12 17:03:25 2014 +0300
Include ieee802_11_common.c in wpa_supplicant build unconditionally
This is needed for number of items and it was possible to make a build
configuration that did not include ieee802_11_common.c while still
trying to use functions from there. While it would be possible to add
NEED_80211_COMMON=y to all the cases where this file is needed, the
extra complexity from this is not really justifiable anymore, so include
the file unconditionally.
Signed-off-by: Jouni Malinen <j@w1.fi>
--- wpa_supplicant/Makefile.orig Thu Oct 9 16:41:31 2014
+++ wpa_supplicant/Makefile Mon Oct 13 09:23:16 2014
@@ -56,7 +56,7 @@ mkconfig:
$OpenBSD: patch-wpa_supplicant_Makefile,v 1.6 2015/03/18 15:35:44 dcoppa Exp $
--- wpa_supplicant/Makefile.orig Sun Mar 15 12:30:39 2015
+++ wpa_supplicant/Makefile Wed Mar 18 04:20:32 2015
@@ -57,7 +57,7 @@ mkconfig:
echo CONFIG_DRIVER_WEXT=y >> .config
$(DESTDIR)$(BINDIR)/%: %
@ -26,64 +10,17 @@ Signed-off-by: Jouni Malinen <j@w1.fi>
install: $(addprefix $(DESTDIR)$(BINDIR)/,$(BINALL))
$(MAKE) -C ../src install
@@ -119,13 +119,6 @@ endif
@@ -121,13 +121,6 @@ CONFIG_ELOOP=eloop
endif
OBJS += ../src/utils/$(CONFIG_ELOOP).o
OBJS_c += ../src/utils/$(CONFIG_ELOOP).o
-
-ifeq ($(CONFIG_ELOOP), eloop)
-# Using glibc < 2.17 requires -lrt for clock_gettime()
-LIBS += -lrt
-LIBS_c += -lrt
-LIBS_p += -lrt
-endif
-
ifdef CONFIG_ELOOP_POLL
CFLAGS += -DCONFIG_ELOOP_POLL
endif
@@ -194,7 +187,6 @@ endif
ifdef CONFIG_IEEE80211R
CFLAGS += -DCONFIG_IEEE80211R
OBJS += ../src/rsn_supp/wpa_ft.o
-NEED_80211_COMMON=y
NEED_SHA256=y
NEED_AES_OMAC1=y
endif
@@ -264,7 +256,6 @@ OBJS += ../src/utils/bitfield.o
CFLAGS += -DCONFIG_P2P
NEED_GAS=y
NEED_OFFCHANNEL=y
-NEED_80211_COMMON=y
CONFIG_WPS=y
CONFIG_AP=y
ifdef CONFIG_P2P_STRICT
@@ -635,7 +626,6 @@ CONFIG_IEEE8021X_EAPOL=y
NEED_DH_GROUPS=y
NEED_SHA256=y
NEED_BASE64=y
-NEED_80211_COMMON=y
NEED_AES_CBC=y
NEED_MODEXP=y
@@ -757,7 +747,6 @@ OBJS += ../src/pae/ieee802_1x_secy_ops.o
endif
ifdef CONFIG_AP
-NEED_80211_COMMON=y
NEED_EAP_COMMON=y
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
@@ -1386,14 +1375,11 @@ OBJS += ../src/utils/base64.o
endif
ifdef NEED_SME
-NEED_80211_COMMON=y
OBJS += sme.o
CFLAGS += -DCONFIG_SME
endif
-ifdef NEED_80211_COMMON
OBJS += ../src/common/ieee802_11_common.o
-endif
ifdef NEED_EAP_COMMON
OBJS += ../src/eap_common/eap_common.o