Date: Sunday, January 16, 2022 @ 23:06:52 Author: dvzrv Revision: 1106663
upgpkg: hostapd 2.10-1: Upgrade to 2.10. Remove now included patches. Consolidate custom configuration with upstream defconfig. Simplify quoting in file. Do not break long lines. Modified: hostapd/trunk/PKGBUILD hostapd/trunk/config ----------+ PKGBUILD | 62 ++++++++++++++++++++----------------------------------------- config | 53 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 63 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-16 23:04:59 UTC (rev 1106662) +++ PKGBUILD 2022-01-16 23:06:52 UTC (rev 1106663) @@ -2,46 +2,31 @@ # Contributor: David Runge <[email protected]> pkgname=hostapd -pkgver=2.9 -pkgrel=5 +pkgver=2.10 +pkgrel=1 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" -arch=('x86_64') +arch=(x86_64) url="https://w1.fi/hostapd/"; -license=('BSD') -depends=('glibc' 'libnl' 'openssl' 'sqlite') +license=(BSD) +depends=(glibc libnl openssl sqlite) backup=("etc/${pkgname}/${pkgname}."{accept,conf,deny,eap_user,radius_clients,vlan,wpa_psk}) -source=("https://w1.fi/releases/$pkgname-$pkgver.tar.gz"{,.asc} - "https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"; - "https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"; - "https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"; - "hostapd-2.9-CVE-2021-30004.patch::https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; - config - hostapd.service) -sha512sums=('66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c' +source=( + "https://w1.fi/releases/$pkgname-$pkgver.tar.gz"{,.asc} + config + hostapd.service +) +sha512sums=('243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f' 'SKIP' - 'b76bbca282a74ef16c0303e5dbd2ccd33a62461595964d52c1481b0bfa4f41deacde56830b85409b288803b87ceb6f33cf0ccc69c5b17ec632c2d4784b872f3c' - '00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c' - '69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0' - '88608529763a6fd9e8cb1e9c9a35630dc2e311a260e023e2a69002d0db700d5f58fc7723a00433b4ea895b92c371cf1db221f38742490b4ed9b4b049892b65e1' - '6e4da7ab208174ad22700d2ccdfcff39bc6fa65750246905790582aaf414a888ea1577d58f759bb12044190d2a4b144d60d23419e9d16561eaa5403a091504ee' + 'a959eda72d1c7e77943cc44cd0a00f1853223777b4f45ed18d6077ed5866e65a8a17bac0398375d1178d529a19e6df51b2572c026a262a919c7abcd5b72ca6ff' '34e16c5d46383477bcb9e0dba5073b7f01354a6adca8e591050aeff6319255f8939926b70d76d109735496bbaf9ff2d04be9cf6e0d057c4d2f4a4140067957a3') -b2sums=('07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01' +b2sums=('dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f' 'SKIP' - '2a5e3650e9872aaed73085131f3a6f80a12bf7d353b4df927346a9f2c13e828b9c4196386ded935f0ff960eee380be49325a98541bbc23a99cfe3f00e91581fe' - '0c454ca976d2ee538a874f1a4f583434bdf3abe6c5d20517f3350d9852c0f50849ae1ad4611acecf5a754339678e4952b8c9ae1abb783e06cffa615b36464d06' - '736e51142cf4402cc8aa6858022fda23ea5f37ba256bc922349365ff4824322db31ea04add04d1b55d0d41f4cb0272de8dcf44ae4671309e808cc4f4a57fe6ac' - '943ccc90d23c60eef15a336108d14e74909ecb782f772145ee48d049806c289c42867999e489fdfc0795846bf41a756303e6da81f4624d26043c618b8485cf43' - '67068de741382f1fe812723ea47caa03e7d484ee89eafe115bfb876fe000260aa23ff4215484a44976ac9ddb3fc96b51742e222477a808788f122c3213234d11' + '944d3808054876e32e47d72883b0d32632ed916ff8f15d7bb98edef9460e36d6db90d409ce75d8d4afe819264a0274377d523911064bd546245ac868c3723608' 'dbb4d1ad4359931bd70d6ad428b509e0c40dab3a55ba7b87cf1c00a458d737c2a4ed6f06dd23286d9e4a38a481e4af9ab4ffa8e6fb27d852aa4eb7d16d046bf8') validpgpkeys=('EC4AA0A991A5F2464582D52D2B6EF432EFC895FA') # Jouni Malinen prepare() { cd "$pkgname-$pkgver" - for _patch_file in ../*.patch; do - echo "Apply patch: ${_patch_file}" - patch -Np1 -i "${_patch_file}" - done - # fix include locations in main configuration file sed -e 's|/etc/hostapd|/etc/hostapd/hostapd|g' \ -e 's|/var/run|/run|g' \ @@ -50,8 +35,10 @@ -e 's|hostapd.ap_settings|/var/lib/hostapd/hostapd.ap_settings|g' \ -e 's|hostapd_wps_pin_requests|hostapd/wps_pin_requests|g' \ -i "${pkgname}/${pkgname}.conf" + # extract license cat "${pkgname}/README" |head -n47 |tail -n5 > LICENSE + # link build configuration into place: # an up-to-date version of the build configuration can be found in # hostapd/defconfig and should be diffed with the packaged one before every @@ -60,8 +47,7 @@ } build() { - cd $pkgname-$pkgver/hostapd - make + make -C $pkgname-$pkgver/$pkgname } package() { @@ -68,22 +54,16 @@ cd "$pkgname-$pkgver" make -C "${pkgname}" install DESTDIR="${pkgdir}" BINDIR="/usr/bin" # systemd service - install -vDm 644 "../${pkgname}.service" \ - -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 "../${pkgname}.service" -t "$pkgdir/usr/lib/systemd/system/" # license install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/" # config - install -d "$pkgdir/etc/hostapd" - install -vDm 640 "${pkgname}/${pkgname}."{accept,conf,deny,eap_user,radius_clients,vlan,wpa_psk} \ - -t "${pkgdir}/etc/${pkgname}" + install -vDm 640 "${pkgname}/${pkgname}."{accept,conf,deny,eap_user,radius_clients,vlan,wpa_psk} -t "${pkgdir}/etc/${pkgname}" # docs - install -vDm 644 "${pkgname}/"{hostapd.sim_db,wired.conf,hlr_auc_gw.{txt,milenage_db}} \ - "${pkgname}/"{README*,ChangeLog} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" + install -vDm 644 "${pkgname}/"{hostapd.sim_db,wired.conf,hlr_auc_gw.{txt,milenage_db}} "${pkgname}/"{README*,ChangeLog} -t "${pkgdir}/usr/share/doc/${pkgname}" # man pages install -vDm 644 "${pkgname}/${pkgname}.8" -t "$pkgdir/usr/share/man/man8/" - install -vDm 644 "${pkgname}/${pkgname}_cli.1" \ - -t "$pkgdir/usr/share/man/man1/" + install -vDm 644 "${pkgname}/${pkgname}_cli.1" -t "$pkgdir/usr/share/man/man1/" # state dir install -vdm 750 "${pkgdir}/var/lib/${pkgname}" } Modified: config =================================================================== --- config 2022-01-16 23:04:59 UTC (rev 1106662) +++ config 2022-01-16 23:06:52 UTC (rev 1106663) @@ -44,15 +44,9 @@ # Driver interface for no driver (e.g., RADIUS server only) #CONFIG_DRIVER_NONE=y -# IEEE 802.11F/IAPP -CONFIG_IAPP=y - # WPA2/IEEE 802.11i RSN pre-authentication CONFIG_RSN_PREAUTH=y -# IEEE 802.11w (management frame protection) -CONFIG_IEEE80211W=y - # Support Operating Channel Validation #CONFIG_OCV=y @@ -154,9 +148,6 @@ # the IEEE 802.11 Management capability (e.g., FreeBSD/net80211) #CONFIG_DRIVER_RADIUS_ACL=y -# IEEE 802.11n (High Throughput) support -CONFIG_IEEE80211N=y - # Wireless Network Management (IEEE Std 802.11v-2011) # Note: This is experimental and not complete implementation. #CONFIG_WNM=y @@ -355,12 +346,12 @@ # * ath10k # # For more details refer to: -# http://wireless.kernel.org/en/users/Documentation/acs +# https://wireless.wiki.kernel.org/en/users/documentation/acs # CONFIG_ACS=y # Multiband Operation support -# These extentions facilitate efficient use of multiple frequency bands +# These extensions facilitate efficient use of multiple frequency bands # available to the AP and the devices that may associate with it. #CONFIG_MBO=y @@ -390,7 +381,47 @@ # parameter. See that parameter in hostapd.conf for more details. #CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1 +# Wired equivalent privacy (WEP) +# WEP is an obsolete cryptographic data confidentiality algorithm that is not +# considered secure. It should not be used for anything anymore. The +# functionality needed to use WEP is available in the current hostapd +# release under this optional build parameter. This functionality is subject to +# be completely removed in a future release. +#CONFIG_WEP=y + +# Remove all TKIP functionality +# TKIP is an old cryptographic data confidentiality algorithm that is not +# considered secure. It should not be used anymore. For now, the default hostapd +# build includes this to allow mixed mode WPA+WPA2 networks to be enabled, but +# that functionality is subject to be removed in the future. +#CONFIG_NO_TKIP=y + +# Pre-Association Security Negotiation (PASN) +# Experimental implementation based on IEEE P802.11z/D2.6 and the protocol +# design is still subject to change. As such, this should not yet be enabled in +# production use. +# This requires CONFIG_IEEE80211W=y to be enabled, too. +#CONFIG_PASN=y + +# Device Provisioning Protocol (DPP) (also known as Wi-Fi Easy Connect) +CONFIG_DPP=y +# DPP version 2 support +CONFIG_DPP2=y +# DPP version 3 support (experimental and still changing; do not enable for +# production use) +#CONFIG_DPP3=y + # custom configuration options + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# IEEE 802.11w (management frame protection) +CONFIG_IEEE80211W=y + +# IEEE 802.11n (High Throughput) support +CONFIG_IEEE80211N=y + CONFIG_MESH=y CONFIG_SAE=y CONFIG_WPS2=y
