summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2022-01-16 01:01:18 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2022-01-16 01:00:00 +0100
commit07efa9df3e2ba45a410898f2baca01121d5fa6f8 (patch)
tree107c6ea9b9fe71ca3c79e0bf694feab27d6ab6ac
parent2045852b096131a714409aa0cc4fe17938f60b15 (diff)
downloadguix-patches-07efa9df3e2ba45a410898f2baca01121d5fa6f8.tar
guix-patches-07efa9df3e2ba45a410898f2baca01121d5fa6f8.tar.gz
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.
-rw-r--r--gnu/packages/admin.scm16
1 files changed, 5 insertions, 11 deletions
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")