From 07efa9df3e2ba45a410898f2baca01121d5fa6f8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jan 2022 01:01:18 +0100
Subject: gnu: hostapd: Update to 2.10.

* gnu/packages/admin.scm (hostapd): Update to 2.10.
[arguments]: Don't explicitly return #t from phases.
[source]: Remove patches.
---
 gnu/packages/admin.scm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'gnu/packages/admin.scm')

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index bdc52101db..a9ef4a073f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2013,17 +2013,14 @@ command.")
 (define-public hostapd
   (package
     (name "hostapd")
-    (version "2.9")
+    (version "2.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://w1.fi/releases/hostapd-" version
                                   ".tar.gz"))
               (sha256
                (base32
-                "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8"))
-              (patches
-               (search-patches "wpa-supplicant-CVE-2021-27803.patch"
-                               "wpa-supplicant-CVE-2021-30004.patch"))))
+                "0pcik0a6yin9nib02frjhaglmg44hwik086iwg1751b7kdwpqvi0"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -2039,16 +2036,14 @@ command.")
       CONFIG_IEEE80211R=y
       CONFIG_IEEE80211N=y
       CONFIG_IEEE80211AC=y\n" port)
-               (close-port port))
-             #t))
+               (close-port port))))
          (add-after 'unpack 'patch-pkg-config
            (lambda _
              (substitute* "src/drivers/drivers.mak"
                (("pkg-config")
                 (or (which "pkg-config")
                     (string-append ,(%current-target-system)
-                                   "-pkg-config"))))
-             #t))
+                                   "-pkg-config"))))))
          (add-after 'install 'install-man-pages
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out  (assoc-ref outputs "out"))
@@ -2062,8 +2057,7 @@ command.")
                (for-each (copy-man-page man1)
                          (find-files "." "\\.1"))
                (for-each (copy-man-page man8)
-                         (find-files "." "\\.8"))
-               #t))))
+                         (find-files "." "\\.8"))))))
 
       #:make-flags (list (string-append "CC=" ,(cc-for-target))
                          (string-append "BINDIR=" (assoc-ref %outputs "out")
-- 
cgit v1.2.3