developer | 55aca75 | 2023-09-07 02:46:06 +0800 | [diff] [blame] | 1 | diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile |
| 2 | index 8084327..8fd4c85 100644 |
| 3 | --- a/package/network/config/netifd/Makefile |
| 4 | +++ b/package/network/config/netifd/Makefile |
| 5 | @@ -5,9 +5,9 @@ PKG_RELEASE:=3 |
| 6 | |
| 7 | PKG_SOURCE_PROTO:=git |
| 8 | PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git |
| 9 | -PKG_SOURCE_DATE:=2023-08-31 |
| 10 | -PKG_SOURCE_VERSION:=1a07f1dff32b3af49e39533e33e8964b59535662 |
| 11 | -PKG_MIRROR_HASH:=dc621dd04c3c9631002f929cf10a4620f57af8b0baf614c590bda17957fa6201 |
| 12 | +PKG_SOURCE_DATE:=2023-07-17 |
| 13 | +PKG_SOURCE_VERSION:=0ff22a6a68ce942d4c9e7d58355d128dd3793b06 |
| 14 | +PKG_MIRROR_HASH:=4cc81829fa6eb571d67f6879c78d2f514b757a34cc963b7627d55a7a8deffb75 |
| 15 | PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> |
| 16 | |
| 17 | PKG_LICENSE:=GPL-2.0 |
| 18 | diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile |
| 19 | index f184830..3af18c6 100644 |
| 20 | --- a/package/network/services/hostapd/Makefile |
| 21 | +++ b/package/network/services/hostapd/Makefile |
| 22 | @@ -500,7 +500,6 @@ define Package/hostapd-utils |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 23 | TITLE:=IEEE 802.1x Authenticator (utils) |
| 24 | URL:=http://hostap.epitest.fi/ |
| 25 | DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg))) |
| 26 | - VARIANT:=* |
| 27 | endef |
| 28 | |
| 29 | define Package/hostapd-utils/description |
developer | 55aca75 | 2023-09-07 02:46:06 +0800 | [diff] [blame] | 30 | @@ -514,7 +513,6 @@ define Package/wpa-cli |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 31 | SUBMENU:=WirelessAPD |
| 32 | DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg))) |
| 33 | TITLE:=WPA Supplicant command line control utility |
| 34 | - VARIANT:=* |
| 35 | endef |
| 36 | |
| 37 | define Package/eapol-test/Default |
developer | 55aca75 | 2023-09-07 02:46:06 +0800 | [diff] [blame] | 38 | @@ -692,6 +690,9 @@ define Package/hostapd-common/install |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 39 | $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps |
| 40 | $(INSTALL_DATA) ./files/wpad_acl.json $(1)/usr/share/acl.d |
| 41 | $(INSTALL_DATA) ./files/wpad.json $(1)/etc/capabilities |
| 42 | + [ ! -d $(STAGING_DIR)/usr/include/wpa_ctrl.h ] && $(CP) -f $(PKG_BUILD_DIR)/src/common/wpa_ctrl.h $(STAGING_DIR)/usr/include |
| 43 | + [ ! -d $(STAGING_DIR)/usr/lib/wpa_ctrl.o ] && $(CP) -f $(PKG_BUILD_DIR)/build/hostapd/src/common/wpa_ctrl.o $(STAGING_DIR)/usr/lib |
| 44 | + [ ! -d $(STAGING_DIR)/usr/lib/os_unix.o ] && $(CP) -f $(PKG_BUILD_DIR)/build/hostapd/src/utils/os_unix.o $(STAGING_DIR)/usr/lib |
| 45 | endef |
| 46 | |
| 47 | define Package/hostapd/install |