svn commit: r399108 - in head/security/wpa_supplicant: . files
John Marino
marino at FreeBSD.org
Sun Oct 11 22:53:01 UTC 2015
Author: marino
Date: Sun Oct 11 22:52:59 2015
New Revision: 399108
URL: https://svnweb.freebsd.org/changeset/ports/399108
Log:
security/wpa_supplicant: Upgrade version 2.4 => 2.5
Deleted:
head/security/wpa_supplicant/files/patch-src_ap_wmm.c
head/security/wpa_supplicant/files/patch-src_eap__peer_eap__pwd.c
head/security/wpa_supplicant/files/patch-src_eap__server_eap__server__pwd.c
head/security/wpa_supplicant/files/patch-src_p2p_p2p.c
head/security/wpa_supplicant/files/patch-src_wps_httpread.c
head/security/wpa_supplicant/files/patch-src_wps_ndef.c
Modified:
head/security/wpa_supplicant/Makefile
head/security/wpa_supplicant/distinfo
head/security/wpa_supplicant/files/patch-src_utils_os__unix.c
head/security/wpa_supplicant/files/patch-wpa__supplicant_scan.c
Modified: head/security/wpa_supplicant/Makefile
==============================================================================
--- head/security/wpa_supplicant/Makefile Sun Oct 11 22:11:52 2015 (r399107)
+++ head/security/wpa_supplicant/Makefile Sun Oct 11 22:52:59 2015 (r399108)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wpa_supplicant
-PORTVERSION= 2.4
-PORTREVISION= 4
+PORTVERSION= 2.5
CATEGORIES= security net
MASTER_SITES= http://w1.fi/releases/
@@ -14,7 +13,7 @@ USE_OPENSSL= yes
BUILD_WRKSRC= ${WRKSRC}/wpa_supplicant
INSTALL_WRKSRC= ${WRKSRC}/src
CFLAGS+= ${CPPFLAGS} # USES=readline only augments CPPFLAGS and LDFLAGS
-LDFLAGS= -lutil
+LDFLAGS+= -lutil
SUB_FILES= pkg-message
PORTDOCS= README ChangeLog
Modified: head/security/wpa_supplicant/distinfo
==============================================================================
--- head/security/wpa_supplicant/distinfo Sun Oct 11 22:11:52 2015 (r399107)
+++ head/security/wpa_supplicant/distinfo Sun Oct 11 22:52:59 2015 (r399108)
@@ -1,2 +1,2 @@
-SHA256 (wpa_supplicant-2.4.tar.gz) = 058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122
-SIZE (wpa_supplicant-2.4.tar.gz) = 2525648
+SHA256 (wpa_supplicant-2.5.tar.gz) = cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316
+SIZE (wpa_supplicant-2.5.tar.gz) = 2607336
Modified: head/security/wpa_supplicant/files/patch-src_utils_os__unix.c
==============================================================================
--- head/security/wpa_supplicant/files/patch-src_utils_os__unix.c Sun Oct 11 22:11:52 2015 (r399107)
+++ head/security/wpa_supplicant/files/patch-src_utils_os__unix.c Sun Oct 11 22:52:59 2015 (r399108)
@@ -1,6 +1,6 @@
---- src/utils/os_unix.c.orig 2015-03-15 17:30:39 UTC
+--- src/utils/os_unix.c.orig 2015-09-27 19:02:05 UTC
+++ src/utils/os_unix.c
-@@ -190,17 +190,42 @@ static int os_daemon(int nochdir, int no
+@@ -214,17 +214,42 @@ static int os_daemon(int nochdir, int no
#define os_daemon daemon
#endif /* __APPLE__ */
@@ -43,7 +43,7 @@
if (pid_file) {
FILE *f = fopen(pid_file, "w");
if (f) {
-@@ -208,6 +233,7 @@ int os_daemonize(const char *pid_file)
+@@ -232,6 +257,7 @@ int os_daemonize(const char *pid_file)
fclose(f);
}
}
@@ -51,7 +51,7 @@
return -0;
#endif /* defined(__uClinux__) || defined(__sun__) */
-@@ -357,7 +383,7 @@ int os_setenv(const char *name, const ch
+@@ -384,7 +410,7 @@ int os_setenv(const char *name, const ch
int os_unsetenv(const char *name)
{
@@ -60,3 +60,14 @@
defined(__OpenBSD__)
unsetenv(name);
return 0;
+@@ -445,7 +471,9 @@ int os_file_exists(const char *fname)
+ int os_fdatasync(FILE *stream)
+ {
+ if (!fflush(stream)) {
+-#ifndef __MACH__
++#ifdef FREE_DRAGON
++ return fsync(fileno(stream));
++#elif !defined __MACH__
+ return fdatasync(fileno(stream));
+ #else /* __MACH__ */
+ #ifdef F_FULLFSYNC
Modified: head/security/wpa_supplicant/files/patch-wpa__supplicant_scan.c
==============================================================================
--- head/security/wpa_supplicant/files/patch-wpa__supplicant_scan.c Sun Oct 11 22:11:52 2015 (r399107)
+++ head/security/wpa_supplicant/files/patch-wpa__supplicant_scan.c Sun Oct 11 22:52:59 2015 (r399108)
@@ -1,6 +1,6 @@
---- wpa_supplicant/scan.c.orig 2015-03-15 17:30:39 UTC
+--- wpa_supplicant/scan.c.orig 2015-09-27 19:02:05 UTC
+++ wpa_supplicant/scan.c
-@@ -1621,7 +1621,7 @@ struct wpabuf * wpa_scan_get_vendor_ie_m
+@@ -1657,7 +1657,7 @@ struct wpabuf * wpa_scan_get_vendor_ie_m
* better. */
static int wpa_scan_result_compar(const void *a, const void *b)
{
@@ -9,19 +9,19 @@
struct wpa_scan_res **_wa = (void *) a;
struct wpa_scan_res **_wb = (void *) b;
struct wpa_scan_res *wa = *_wa;
-@@ -1650,9 +1650,9 @@ static int wpa_scan_result_compar(const
+@@ -1686,9 +1686,9 @@ static int wpa_scan_result_compar(const
if (wa->flags & wb->flags & WPA_SCAN_LEVEL_DBM) {
snr_a_full = wa->snr;
- snr_a = MIN(wa->snr, GREAT_SNR);
+ snr_a = MINAB(wa->snr, GREAT_SNR);
snr_b_full = wb->snr;
-- snr_b = MIN(wa->snr, GREAT_SNR);
-+ snr_b = MINAB(wa->snr, GREAT_SNR);
+- snr_b = MIN(wb->snr, GREAT_SNR);
++ snr_b = MINAB(wb->snr, GREAT_SNR);
} else {
/* Level is not in dBm, so we can't calculate
* SNR. Just use raw level (units unknown). */
-@@ -1675,7 +1675,7 @@ static int wpa_scan_result_compar(const
+@@ -1711,7 +1711,7 @@ static int wpa_scan_result_compar(const
if (snr_b_full == snr_a_full)
return wb->qual - wa->qual;
return snr_b_full - snr_a_full;
More information about the svn-ports-all
mailing list