svn commit: r568766 - in head: net net/hostapd-devel net/hostapd-devel/files security security/wpa_supplicant-devel security/wpa_supplicant-devel/files
Cy Schubert
cy at FreeBSD.org
Fri Mar 19 00:18:24 UTC 2021
Author: cy
Date: Fri Mar 19 00:18:22 2021
New Revision: 568766
URL: https://svnweb.freebsd.org/changeset/ports/568766
Log:
net/hostapd-devel, security/wpa_supplicant-devel
Add two new development ports tracking the latest w1.fi development.
WPA developement is hosted at git://w1.fi/hostap.git however ports
plumbing provides API access to github. Therefore I cloned/forked
hostap, renaming "origin" to "upstream," with a brand-new "origin"
located on github. In theory this will allow me to git pull from
git://w1.fi/hostap.git and push to my github repo.
This will coincide with base tracking more recent developent at w1.fi,
supporting WPA3.
Discussed with: phillip@
Added:
head/net/hostapd-devel/
- copied from r568756, head/net/hostapd/
head/security/wpa_supplicant-devel/
- copied from r568756, head/security/wpa_supplicant/
Modified:
head/net/Makefile
head/net/hostapd-devel/Makefile
head/net/hostapd-devel/distinfo
head/net/hostapd-devel/files/patch-src_drivers_driver__bsd.c
head/net/hostapd-devel/files/patch-src_wps_wps__upnp.c
head/security/Makefile
head/security/wpa_supplicant-devel/Makefile
head/security/wpa_supplicant-devel/distinfo
head/security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c
head/security/wpa_supplicant-devel/files/patch-src_wps_wps__upnp.c
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Thu Mar 18 23:45:34 2021 (r568765)
+++ head/net/Makefile Fri Mar 19 00:18:22 2021 (r568766)
@@ -241,6 +241,7 @@
SUBDIR += hlmaster
SUBDIR += honeyd
SUBDIR += hostapd
+ SUBDIR += hostapd-devel
SUBDIR += hping
SUBDIR += hping3
SUBDIR += hsflowd
Modified: head/net/hostapd-devel/Makefile
==============================================================================
--- head/net/hostapd/Makefile Thu Mar 18 19:14:59 2021 (r568756)
+++ head/net/hostapd-devel/Makefile Fri Mar 19 00:18:22 2021 (r568766)
@@ -2,18 +2,18 @@
# $FreeBSD$
PORTNAME= hostapd
-PORTVERSION= 2.9
-PORTREVISION= 3
+PORTVERSION= ${COMMIT_DATE}
CATEGORIES= net
-MASTER_SITES= https://w1.fi/releases/
+PKGNAMESUFFIX= -devel
-PATCH_SITES= https://w1.fi/security/2020-1/
-PATCHFILES= 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch:-p1 \
- 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch:-p1 \
- 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch:-p1
-
MAINTAINER= cy at FreeBSD.org
COMMENT= IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
+
+USE_GITHUB= yes
+GH_ACCOUNT= cschuber
+GH_PROJECT= hostap
+GH_TAGNAME= 9d9b423
+COMMIT_DATE= 2021.03.16
LICENSE= BSD3CLAUSE
Modified: head/net/hostapd-devel/distinfo
==============================================================================
--- head/net/hostapd/distinfo Thu Mar 18 19:14:59 2021 (r568756)
+++ head/net/hostapd-devel/distinfo Fri Mar 19 00:18:22 2021 (r568766)
@@ -1,9 +1,3 @@
-TIMESTAMP = 1591652140
-SHA256 (hostapd-2.9.tar.gz) = 881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7
-SIZE (hostapd-2.9.tar.gz) = 2244312
-SHA256 (0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch) = 2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7
-SIZE (0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch) = 5909
-SHA256 (0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch) = 49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de
-SIZE (0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch) = 2284
-SHA256 (0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch) = a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a
-SIZE (0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch) = 1553
+TIMESTAMP = 1616098123
+SHA256 (cschuber-hostap-2021.03.16-9d9b423_GH0.tar.gz) = 835a4591ab72097b4579de0979af70d218c415ca324c10571543904fe1161325
+SIZE (cschuber-hostap-2021.03.16-9d9b423_GH0.tar.gz) = 4763342
Modified: head/net/hostapd-devel/files/patch-src_drivers_driver__bsd.c
==============================================================================
--- head/net/hostapd/files/patch-src_drivers_driver__bsd.c Thu Mar 18 19:14:59 2021 (r568756)
+++ head/net/hostapd-devel/files/patch-src_drivers_driver__bsd.c Fri Mar 19 00:18:22 2021 (r568766)
@@ -1,27 +1,6 @@
--- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700
-+++ src/drivers/driver_bsd.c 2021-01-20 08:04:07.589603000 -0800
-@@ -649,7 +649,7 @@
- len = 2048;
- }
-
-- return len;
-+ return (len == 0) ? 2048 : len;
- }
-
- #ifdef HOSTAPD
-@@ -665,7 +665,11 @@
- static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
- u16 reason_code);
-
-+#ifdef __DragonFly__
-+const char *
-+#else
- static const char *
-+#endif
- ether_sprintf(const u8 *addr)
- {
- static char buf[sizeof(MACSTR)];
-@@ -1336,14 +1340,18 @@
++++ src/drivers/driver_bsd.c 2021-01-20 08:00:59.210974000 -0800
+@@ -1336,14 +1336,18 @@
drv = bsd_get_drvindex(global, ifm->ifm_index);
if (drv == NULL)
return;
Modified: head/net/hostapd-devel/files/patch-src_wps_wps__upnp.c
==============================================================================
--- head/net/hostapd/files/patch-src_wps_wps__upnp.c Thu Mar 18 19:14:59 2021 (r568756)
+++ head/net/hostapd-devel/files/patch-src_wps_wps__upnp.c Fri Mar 19 00:18:22 2021 (r568766)
@@ -1,20 +1,12 @@
---- src/wps/wps_upnp.c.orig 2015-03-15 17:30:39 UTC
-+++ src/wps/wps_upnp.c
-@@ -837,7 +837,7 @@ fail:
- }
-
-
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- #include <sys/sysctl.h>
- #include <net/route.h>
- #include <net/if_dl.h>
-@@ -924,7 +924,7 @@ int get_netif_info(const char *net_if, u
+--- src/wps/wps_upnp.c.orig 2021-03-16 13:50:10.000000000 -0700
++++ src/wps/wps_upnp.c 2021-03-18 12:49:19.537874000 -0700
+@@ -963,7 +963,8 @@
goto fail;
}
os_memcpy(mac, req.ifr_addr.sa_data, 6);
--#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) \
++ || defined(__DragonFly__)
if (eth_get(net_if, mac) < 0) {
wpa_printf(MSG_ERROR, "WPS UPnP: Failed to get MAC address");
goto fail;
Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile Thu Mar 18 23:45:34 2021 (r568765)
+++ head/security/Makefile Fri Mar 19 00:18:22 2021 (r568766)
@@ -1297,6 +1297,7 @@
SUBDIR += wolfssh
SUBDIR += wolfssl
SUBDIR += wpa_supplicant
+ SUBDIR += wpa_supplicant-devel
SUBDIR += xca
SUBDIR += xinetd
SUBDIR += xml-security
Modified: head/security/wpa_supplicant-devel/Makefile
==============================================================================
--- head/security/wpa_supplicant/Makefile Thu Mar 18 19:14:59 2021 (r568756)
+++ head/security/wpa_supplicant-devel/Makefile Fri Mar 19 00:18:22 2021 (r568766)
@@ -1,20 +1,18 @@
# $FreeBSD$
PORTNAME= wpa_supplicant
-PORTVERSION= 2.9
-PORTREVISION= 10
+PORTVERSION= ${COMMIT_DATE}
CATEGORIES= security net
-MASTER_SITES= https://w1.fi/releases/
+PKGNAMESUFFIX= -devel
-PATCH_SITES= https://w1.fi/security/2020-1/ \
- https://w1.fi/security/2021-1/
-PATCHFILES= 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch:-p1 \
- 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch:-p1 \
- 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch:-p1 \
- 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch:-p1
-
MAINTAINER= cy at FreeBSD.org
COMMENT= Supplicant (client) for WPA/802.1x protocols
+
+USE_GITHUB= yes
+GH_ACCOUNT= cschuber
+GH_PROJECT= hostap
+GH_TAGNAME= 9d9b423
+COMMIT_DATE= 2021.03.16
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/README
Modified: head/security/wpa_supplicant-devel/distinfo
==============================================================================
--- head/security/wpa_supplicant/distinfo Thu Mar 18 19:14:59 2021 (r568756)
+++ head/security/wpa_supplicant-devel/distinfo Fri Mar 19 00:18:22 2021 (r568766)
@@ -1,11 +1,3 @@
-TIMESTAMP = 1615939959
-SHA256 (wpa_supplicant-2.9.tar.gz) = fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
-SIZE (wpa_supplicant-2.9.tar.gz) = 3231785
-SHA256 (0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch) = 2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7
-SIZE (0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch) = 5909
-SHA256 (0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch) = 49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de
-SIZE (0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch) = 2284
-SHA256 (0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch) = a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a
-SIZE (0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch) = 1553
-SHA256 (0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch) = 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611
-SIZE (0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch) = 1751
+TIMESTAMP = 1616096438
+SHA256 (cschuber-hostap-2021.03.16-9d9b423_GH0.tar.gz) = 835a4591ab72097b4579de0979af70d218c415ca324c10571543904fe1161325
+SIZE (cschuber-hostap-2021.03.16-9d9b423_GH0.tar.gz) = 4763342
Modified: head/security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c
==============================================================================
--- head/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c Thu Mar 18 19:14:59 2021 (r568756)
+++ head/security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c Fri Mar 19 00:18:22 2021 (r568766)
@@ -1,14 +1,5 @@
--- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700
+++ src/drivers/driver_bsd.c 2021-01-20 08:00:59.210974000 -0800
-@@ -649,7 +649,7 @@
- len = 2048;
- }
-
-- return len;
-+ return (len == 0) ? 2048 : len;
- }
-
- #ifdef HOSTAPD
@@ -1336,14 +1336,18 @@
drv = bsd_get_drvindex(global, ifm->ifm_index);
if (drv == NULL)
Modified: head/security/wpa_supplicant-devel/files/patch-src_wps_wps__upnp.c
==============================================================================
--- head/security/wpa_supplicant/files/patch-src_wps_wps__upnp.c Thu Mar 18 19:14:59 2021 (r568756)
+++ head/security/wpa_supplicant-devel/files/patch-src_wps_wps__upnp.c Fri Mar 19 00:18:22 2021 (r568766)
@@ -1,34 +1,12 @@
---- src/wps/wps_upnp.c.orig 2020-06-08 14:40:50.402529000 -0700
-+++ src/wps/wps_upnp.c 2020-06-08 15:48:08.294830000 -0700
-@@ -861,7 +861,8 @@
- }
-
-
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
-+ || defined(__DragonFly__)
- #include <sys/sysctl.h>
- #include <net/route.h>
- #include <net/if_dl.h>
-@@ -950,7 +951,11 @@
- errno, strerror(errno));
- goto fail;
- }
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+ addr = (struct sockaddr_in *) &req.ifr_addr;
-+#else
- addr = (struct sockaddr_in *) &req.ifr_netmask;
-+#endif
- netmask->s_addr = addr->sin_addr.s_addr;
- }
-
-@@ -962,7 +967,8 @@
+--- src/wps/wps_upnp.c.orig 2021-03-16 13:50:10.000000000 -0700
++++ src/wps/wps_upnp.c 2021-03-18 12:49:19.537874000 -0700
+@@ -963,7 +963,8 @@
goto fail;
}
os_memcpy(mac, req.ifr_addr.sa_data, 6);
--#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
-+ || defined(__DragonFly__)
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) \
++ || defined(__DragonFly__)
if (eth_get(net_if, mac) < 0) {
wpa_printf(MSG_ERROR, "WPS UPnP: Failed to get MAC address");
goto fail;
More information about the svn-ports-all
mailing list