Package: guix-patches;
Reported by: Rodion Goritskov <rodion <at> goritskov.com>
Date: Fri, 25 Apr 2025 20:14:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 78066 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [bug#78066] [PATCH v2 3/5] gnu: fail2ban: Improve style. Date: Sun, 27 Apr 2025 11:08:10 +0200
* gnu/packages/admin.scm (fail2ban): Improve style (through guix-style).
[arguments]<phases>: Rewrite using gexps. Rewrite phases
'set-action-dependencies and copy-man-pages for readability.
---
gnu/packages/admin.scm | 321 +++++++++++++++++++----------------------
1 file changed, 148 insertions(+), 173 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 689e9bcd4a..1f48eb264d 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -6232,181 +6232,156 @@ (define-public fail2ban
(package
(name "fail2ban")
(version "1.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fail2ban/fail2ban")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0lfakna6ad2xwz95sjxzkavipcsxiy7ybavkdkf9zzmspf2ws4yk"))
- (modules '((guix build utils) (srfi srfi-26)))
- (snippet
- '(begin
- ;; deleting things that are not feasible to fix
- ;; or won't be used any way
- (with-directory-excursion "config"
- (for-each delete-file
- '("paths-arch.conf"
- "paths-debian.conf"
- "paths-fedora.conf"
- "paths-freebsd.conf"
- "paths-opensuse.conf"
- "paths-osx.conf")))
- (with-directory-excursion "config/action.d"
- (for-each delete-file
- '("apf.conf"
- "bsd-ipfw.conf"
- "dshield.conf"
- "ipfilter.conf"
- "ipfw.conf"
- "firewallcmd-allports.conf"
- "firewallcmd-common.conf"
- "firewallcmd-ipset.conf"
- "firewallcmd-multiport.conf"
- "firewallcmd-new.conf"
- "firewallcmd-rich-logging.conf"
- "firewallcmd-rich-rules.conf"
- "osx-afctl.conf"
- "osx-ipfw.conf"
- "pf.conf"
- "nginx-block-map.conf"
- "npf.conf"
- "shorewall.conf"
- "shorewall-ipset-proto6.conf"
- "ufw.conf")))
- ;; Get rid of absolute file names.
- (substitute* "setup.py"
- (("/etc/fail2ban")
- "etc/fail2ban")
- (("/var/lib/fail2ban")
- "var/lib/fail2ban")
- (("\"/usr/bin/\"")
- "\"usr/bin/\"")
- (("\"/usr/lib/fail2ban/\"")
- "\"usr/lib/fail2ban/\"")
- (("'/usr/share/doc/fail2ban'")
- "'usr/share/doc/fail2ban'"))
- ;; disable tests performing unacceptable side-effects
- (let ((make-suite (cut string-append
- "tests.addTest\\(loadTests\\("
- <> "\\)\\)")))
- (substitute* "fail2ban/tests/utils.py"
- (((make-suite "actiontestcase.CommandActionTest"))
- "")
- (((make-suite "misctestcase.SetupTest"))
- "")
- (((make-suite
- "filtertestcase.DNSUtilsNetworkTests"))
- "")
- (((make-suite "filtertestcase.IgnoreIPDNS"))
- "")
- (((make-suite "filtertestcase.GetFailures"))
- "")
- (((make-suite
- "fail2banclienttestcase.Fail2banServerTest"))
- "")
- (((make-suite
- "servertestcase.ServerConfigReaderTests"))
- "")))))
- (patches (search-patches "fail2ban-paths-guix-conf.patch"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fail2ban/fail2ban")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0lfakna6ad2xwz95sjxzkavipcsxiy7ybavkdkf9zzmspf2ws4yk"))
+ (modules '((guix build utils)
+ (srfi srfi-26)))
+ (snippet '(begin
+ ;; deleting things that are not feasible to fix
+ ;; or won't be used any way
+ (with-directory-excursion "config"
+ (for-each delete-file
+ '("paths-arch.conf" "paths-debian.conf"
+ "paths-fedora.conf" "paths-freebsd.conf"
+ "paths-opensuse.conf" "paths-osx.conf")))
+ (with-directory-excursion "config/action.d"
+ (for-each delete-file
+ '("apf.conf" "bsd-ipfw.conf"
+ "dshield.conf"
+ "ipfilter.conf"
+ "ipfw.conf"
+ "firewallcmd-allports.conf"
+ "firewallcmd-common.conf"
+ "firewallcmd-ipset.conf"
+ "firewallcmd-multiport.conf"
+ "firewallcmd-new.conf"
+ "firewallcmd-rich-logging.conf"
+ "firewallcmd-rich-rules.conf"
+ "osx-afctl.conf"
+ "osx-ipfw.conf"
+ "pf.conf"
+ "nginx-block-map.conf"
+ "npf.conf"
+ "shorewall.conf"
+ "shorewall-ipset-proto6.conf"
+ "ufw.conf")))
+ ;; Get rid of absolute file names.
+ (substitute* "setup.py"
+ (("/etc/fail2ban")
+ "etc/fail2ban")
+ (("/var/lib/fail2ban")
+ "var/lib/fail2ban")
+ (("\"/usr/bin/\"")
+ "\"usr/bin/\"")
+ (("\"/usr/lib/fail2ban/\"")
+ "\"usr/lib/fail2ban/\"")
+ (("'/usr/share/doc/fail2ban'")
+ "'usr/share/doc/fail2ban'"))
+ ;; disable tests performing unacceptable side-effects
+ (let ((make-suite (cut string-append
+ "tests.addTest\\(loadTests\\(" <>
+ "\\)\\)")))
+ (substitute* "fail2ban/tests/utils.py"
+ (((make-suite "actiontestcase.CommandActionTest"))
+ "")
+ (((make-suite "misctestcase.SetupTest"))
+ "")
+ (((make-suite "filtertestcase.DNSUtilsNetworkTests"))
+ "")
+ (((make-suite "filtertestcase.IgnoreIPDNS"))
+ "")
+ (((make-suite "filtertestcase.GetFailures"))
+ "")
+ (((make-suite
+ "fail2banclienttestcase.Fail2banServerTest"))
+ "")
+ (((make-suite "servertestcase.ServerConfigReaderTests"))
+ "")))))
+ (patches (search-patches "fail2ban-paths-guix-conf.patch"))))
(build-system pyproject-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'avoid-external-binary-in-/bin
- (lambda _
- (delete-file "fail2ban/setup.py")
- (substitute* '("bin/fail2ban-testcases"
- "setup.py")
- ((".*updatePyExec.*") ""))))
- (add-before 'install 'fix-default-config
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("config/paths-common.conf"
- "fail2ban/tests/utils.py"
- "fail2ban/client/configreader.py"
- "fail2ban/client/fail2bancmdline.py"
- "fail2ban/client/fail2banregex.py")
- (("/etc/fail2ban")
- (string-append (assoc-ref outputs "out")
- "/etc/fail2ban")))))
- (add-after 'fix-default-config 'set-action-dependencies
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((lookup-cmd (lambda (i)
- (search-input-file inputs i)))
- (bin (lambda (i)
- (lookup-cmd (string-append "/bin/" i))))
- (sbin (lambda (i)
- (lookup-cmd (string-append "/sbin/" i))))
- (ip (sbin "ip"))
- (sendmail (sbin "sendmail")))
- (substitute* (find-files "config/action.d" "\\.conf$")
- ;; TODO: deal with geoiplookup ..
- (("(awk|curl|dig|jq)" all cmd)
- (bin cmd))
- (("(cat|echo|grep|head|printf|wc) " all
- cmd)
- (string-append (bin cmd) " "))
- ((" (date|rm|sed|tail|touch|tr) " all
- cmd)
- (string-append " "
- (bin cmd) " "))
- (("cut -d")
- (string-append (bin "cut") " -d"))
- (("`date`")
- (string-append "`"
- (bin "date") "`"))
- (("id -")
- (string-append (bin "id") " -"))
- (("ip -([46]) addr" all ver)
- (string-append ip " -" ver " addr"))
- (("ip route")
- (string-append ip " route"))
- (("ipset ")
- (string-append (sbin "ipset") " "))
- (("(iptables|ip6tables) <" all cmd)
- (string-append (sbin cmd) " <"))
- (("/usr/bin/nsupdate")
- (bin "nsupdate"))
- (("mail -E")
- (string-append sendmail " -E"))
- (("nftables = nft")
- (string-append "nftables = " (sbin "nft")))
- (("perl -e")
- (string-append (bin "perl") " -e"))
- (("/usr/sbin/sendmail")
- sendmail)
- (("test -e")
- (string-append (bin "test") " -e"))
- (("_whois = whois")
- (string-append "_whois = " (bin "whois")))))
- (substitute* "config/jail.conf"
- (("before = paths-debian.conf")
- "before = paths-guix.conf"))))
- (add-after 'install 'copy-man-pages
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((man (string-append (assoc-ref outputs "out")
- "/man"))
- (install-man (lambda (m)
- (lambda (f)
- (install-file (string-append f
- "." m)
- (string-append man
- "/man" m)))))
- (install-man1 (install-man "1"))
- (install-man5 (install-man "5")))
- (with-directory-excursion "man"
- (for-each install-man1
- '("fail2ban"
- "fail2ban-client"
- "fail2ban-python"
- "fail2ban-regex"
- "fail2ban-server"
- "fail2ban-testcases"))
- (for-each install-man5
- '("jail.conf")))))))))
- (native-inputs
- (list python-setuptools python-wheel))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'avoid-external-binary-in-/bin
+ (lambda _
+ (delete-file "fail2ban/setup.py")
+ (substitute* '("bin/fail2ban-testcases" "setup.py")
+ ((".*updatePyExec.*")
+ ""))))
+ (add-before 'install 'fix-default-config
+ (lambda _
+ (substitute* '("config/paths-common.conf"
+ "fail2ban/tests/utils.py"
+ "fail2ban/client/configreader.py"
+ "fail2ban/client/fail2bancmdline.py"
+ "fail2ban/client/fail2banregex.py")
+ (("/etc/fail2ban")
+ (string-append #$output "/etc/fail2ban")))))
+ (add-after 'fix-default-config 'set-action-dependencies
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (lookup dir file)
+ (search-input-file inputs (string-append "/" dir "/" file)))
+
+ (substitute* (find-files "config/action.d" "\\.conf$")
+ ;; TODO: deal with geoiplookup ..
+ (("(awk|curl|dig|jq)" all cmd)
+ (lookup "bin" cmd))
+ (("(cat|echo|grep|head|printf|wc) " all cmd)
+ (string-append (lookup "bin" cmd) " "))
+ ((" (date|rm|sed|tail|touch|tr) " all cmd)
+ (string-append " " (lookup "bin" cmd) " "))
+ (("cut -d")
+ (string-append (lookup "bin" "cut") " -d"))
+ (("`date`")
+ (string-append "`" (lookup "bin" "date") "`"))
+ (("id -")
+ (string-append (lookup "bin" "id") " -"))
+ (("ip (route|-[46] addr)" all rest)
+ (string-append (lookup "sbin" "ip") rest))
+ (("ipset ")
+ (string-append (lookup "sbin" "ipset") " "))
+ (("(iptables|ip6tables) <" all cmd)
+ (string-append (lookup "sbin" cmd) " <"))
+ (("/usr/bin/nsupdate")
+ (lookup "bin" "nsupdate"))
+ (("mail -E")
+ (string-append (lookup "sbin" "sendmail") " -E"))
+ (("nftables = nft")
+ (string-append "nftables = " (lookup "sbin" "nft")))
+ (("perl -e")
+ (string-append (lookup "bin" "perl") " -e"))
+ (("/usr/sbin/sendmail")
+ (lookup "sbin" "sendmail"))
+ (("test -e")
+ (string-append (lookup "bin" "test") " -e"))
+ (("_whois = whois")
+ (string-append "_whois = " (lookup "bin" "whois"))))
+
+ (substitute* "config/jail.conf"
+ (("before = paths-debian.conf")
+ "before = paths-guix.conf"))))
+ (add-after 'install 'copy-man-pages
+ (lambda _
+ (define (install-man m)
+ (lambda (f)
+ (install-file (string-append f "." m)
+ (string-append #$output "man/man" m))))
+
+ (with-directory-excursion "man"
+ (for-each (install-man "1")
+ '("fail2ban" "fail2ban-client" "fail2ban-python"
+ "fail2ban-regex" "fail2ban-server"
+ "fail2ban-testcases"))
+ ((install-man "5") "jail.conf")))))))
+ (native-inputs (list python-setuptools python-wheel))
(inputs (list gawk
coreutils-minimal
curl
--
2.49.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.