[arch-commits] Commit in wpa_supplicant/trunk (PKGBUILD wpa_supplicant_config)

[Jan Steffens]

    Date: Wednesday, February 23, 2022 @ 03:37:16
  Author: heftig
Revision: 437984

2.10-3: FS#65470 enable WNM again

Modified:
  wpa_supplicant/trunk/PKGBUILD
  wpa_supplicant/trunk/wpa_supplicant_config

-----------------------+
 PKGBUILD              |   34 +++++++++++++++-------------------
 wpa_supplicant_config |    2 +-
 2 files changed, 16 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-23 03:34:53 UTC (rev 437983)
+++ PKGBUILD	2022-02-23 03:37:16 UTC (rev 437984)
@@ -1,11 +1,11 @@
 # Maintainer:
-# Contributor:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Contributor: Thomas Bächler <thomas at archlinux.org>
 # Contributor: loqs
 
 pkgname=wpa_supplicant
 pkgver=2.10
-pkgrel=2
+pkgrel=3
 epoch=2
 pkgdesc='A utility providing key negotiation for WPA wireless networks'
 url='https://w1.fi/wpa_supplicant/'
@@ -27,7 +27,7 @@
             '08915b040d03a3e07cdc8ea6c76b497e00059e01ce85b67413dfe41d4fc68992'
             '60f6a1cf2e124813dfce1da78ee1818e2ff5236aafa4113c7ae3b3f2a0b84006'
             'd42bdbf3d4980b9f0a819612df0c39843c7e96c8afcb103aa656c824f93790b0'
-            '385c956607d9a4966b13458db60a29b7556ff0c9928d7fef59381678ce79f13b'
+            'd99c48843bb413d7eb63e87e0bab255736712f901b515b9a625f40c8eb8e99db'
             'aaedf87f1530d4e6cb00bf7981d1f868409ed892cc41b83c5613019e7b51f380')
 
 prepare() {
@@ -47,27 +47,23 @@
 
 package() {
   cd $pkgname-$pkgver/$pkgname
+
   make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="$pkgdir" install
+
   install -Dm755 eapol_test "$pkgdir/usr/bin/eapol_test"
 
-  install -d -m755 "$pkgdir/etc/wpa_supplicant"
-  install -Dm644 wpa_supplicant.conf \
-    "$pkgdir/usr/share/doc/wpa_supplicant/wpa_supplicant.conf"
+  install -dm755 "$pkgdir/etc/wpa_supplicant"
+  install -Dm644 wpa_supplicant.conf -t "$pkgdir/usr/share/doc/wpa_supplicant"
 
+  install -Dm644 dbus/fi.w1.wpa_supplicant1.service \
+    -t "$pkgdir/usr/share/dbus-1/system-services"
 
-install -d -m755 "$pkgdir"/usr/share/dbus-1/{system.d,system-services}
-install -m644 \
-dbus/fi.w1.wpa_supplicant1.service \
-"$pkgdir/usr/share/dbus-1/system-services/"
+  install -Dm644 dbus/dbus-wpa_supplicant.conf \
+    "$pkgdir/usr/share/dbus-1/system.d/wpa_supplicant.conf"
 
- install -Dm644 dbus/dbus-wpa_supplicant.conf \
-"$pkgdir/usr/share/dbus-1/system.d/wpa_supplicant.conf"
+  install -Dm644 doc/docbook/*.5 -t "$pkgdir/usr/share/man/man5"
+  install -Dm644 doc/docbook/*.8 -t "$pkgdir/usr/share/man/man8"
+  rm "$pkgdir"/usr/share/man/man8/wpa_{priv,gui}.8
 
-  install -d -m755 "$pkgdir/usr/share/man/man"{5,8}
-  install -m644 doc/docbook/*.5 "$pkgdir/usr/share/man/man5/"
-  install -m644 doc/docbook/*.8 "$pkgdir/usr/share/man/man8/"
-  rm -f "$pkgdir/usr/share/man/man8/wpa_"{priv,gui}.8
-
-  install -d -m755 "$pkgdir/usr/lib/systemd/system"
-  install -m644 systemd/*.service "$pkgdir/usr/lib/systemd/system/"
+  install -Dm644 systemd/*.service -t "$pkgdir/usr/lib/systemd/system"
 }

Modified: wpa_supplicant_config
===================================================================
--- wpa_supplicant_config	2022-02-23 03:34:53 UTC (rev 437983)
+++ wpa_supplicant_config	2022-02-23 03:37:16 UTC (rev 437984)
@@ -477,7 +477,7 @@
 
 # Wireless Network Management (IEEE Std 802.11v-2011)
 # Note: This is experimental and not complete implementation.
-#CONFIG_WNM=y
+CONFIG_WNM=y
 
 # Interworking (IEEE 802.11u)
 # This can be used to enable functionality to improve interworking with