| developer | 93607dd | 2023-08-30 04:53:00 +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 |
| developer | 2468486 | 2023-08-02 08:10:38 +0800 | [diff] [blame] | 18 | diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile |
| developer | 93607dd | 2023-08-30 04:53:00 +0800 | [diff] [blame] | 19 | index 4bc1b94..348c94d 100644 |
| developer | 2468486 | 2023-08-02 08:10:38 +0800 | [diff] [blame] | 20 | --- a/package/network/services/hostapd/Makefile |
| 21 | +++ b/package/network/services/hostapd/Makefile |
| developer | 93607dd | 2023-08-30 04:53:00 +0800 | [diff] [blame] | 22 | @@ -80,7 +80,7 @@ ifneq ($(CONFIG_DRIVER_11AX_SUPPORT),) |
| 23 | endif |
| 24 | |
| 25 | CORE_DEPENDS = +ucode +libubus +libucode +ucode-mod-fs +ucode-mod-nl80211 +ucode-mod-rtnl +ucode-mod-ubus +ucode-mod-uloop +libblobmsg-json |
| 26 | -OPENSSL_DEPENDS = +PACKAGE_$(1):libopenssl +PACKAGE_$(1):libopenssl-legacy |
| 27 | +OPENSSL_DEPENDS = +PACKAGE_$(1):libopenssl |
| 28 | |
| 29 | DRIVER_MAKEOPTS= \ |
| 30 | CONFIG_ACS=y CONFIG_DRIVER_NL80211=y \ |
| 31 | @@ -498,7 +498,6 @@ define Package/hostapd-utils |
| developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 32 | TITLE:=IEEE 802.1x Authenticator (utils) |
| 33 | URL:=http://hostap.epitest.fi/ |
| 34 | DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg))) |
| 35 | - VARIANT:=* |
| 36 | endef |
| 37 | |
| 38 | define Package/hostapd-utils/description |
| developer | 93607dd | 2023-08-30 04:53:00 +0800 | [diff] [blame] | 39 | @@ -512,7 +511,6 @@ define Package/wpa-cli |
| developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 40 | SUBMENU:=WirelessAPD |
| 41 | DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg))) |
| 42 | TITLE:=WPA Supplicant command line control utility |
| 43 | - VARIANT:=* |
| 44 | endef |
| 45 | |
| 46 | define Package/eapol-test/Default |
| developer | 93607dd | 2023-08-30 04:53:00 +0800 | [diff] [blame] | 47 | @@ -719,6 +717,9 @@ define Package/hostapd-common/install |
| developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 48 | $(INSTALL_DATA) ./files/wpad.json $(1)/etc/capabilities |
| developer | 2468486 | 2023-08-02 08:10:38 +0800 | [diff] [blame] | 49 | $(INSTALL_DATA) ./files/common.uc $(1)/usr/share/hostap/ |
| 50 | $(INSTALL_DATA) ./files/wdev.uc $(1)/usr/share/hostap/ |
| developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 51 | + [ ! -d $(STAGING_DIR)/usr/include/wpa_ctrl.h ] && $(CP) -f $(PKG_BUILD_DIR)/src/common/wpa_ctrl.h $(STAGING_DIR)/usr/include |
| 52 | + [ ! -d $(STAGING_DIR)/usr/lib/wpa_ctrl.o ] && $(CP) -f $(PKG_BUILD_DIR)/build/hostapd/src/common/wpa_ctrl.o $(STAGING_DIR)/usr/lib |
| 53 | + [ ! -d $(STAGING_DIR)/usr/lib/os_unix.o ] && $(CP) -f $(PKG_BUILD_DIR)/build/hostapd/src/utils/os_unix.o $(STAGING_DIR)/usr/lib |
| 54 | endef |
| 55 | |
| 56 | define Package/hostapd/install |