me/guix
Archived
1
0
Fork 0
Code Activity

gnu: lynis: Update to 3.0.6.

Browse source 
* gnu/packages/admin.scm (lynis): Update to 3.0.6.
[arguments]: Don't explicitly return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-05 16:18:03 +02:00
parent a9075d332d
commit d84420d494
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/admin.scm
View file

@ -4218,7 +4218,7 @@ Logitech Unifying Receiver.")
(package (package
(name "lynis") (name "lynis")
;; Also update the ‘lynis-sdk’ input to the commit matching this release. ;; Also update the ‘lynis-sdk’ input to the commit matching this release.
(version "3.0.5") (version "3.0.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4227,15 +4227,14 @@ Logitech Unifying Receiver.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "11kl54hbvjl7q2i1jz8a726vlkdmknvbp4zac3j4fgljg27qp410")) (base32 "1a1n8alcq6zil1rwk9940cg3x2nz3igcxfad99505pdh7ccz9324"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Remove proprietary plugins. As of now, all plugins supplied with ;; Remove proprietary plugins. As of now, all plugins supplied with
;; lynis are proprietary. In the future, if free plugins are ;; lynis are proprietary. In the future, if free plugins are
;; provided, whitelist them from deletion. ;; provided, whitelist them from deletion.
(for-each delete-file (find-files "plugins")) (for-each delete-file (find-files "plugins"))))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(;; For tests `(;; For tests
@ -4244,10 +4243,10 @@ Logitech Unifying Receiver.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/CISOfy/lynis-sdk") (url "https://github.com/CISOfy/lynis-sdk")
(commit "99f79c4deb4cb2221d7fccfe82baf58c0a55b9e7"))) (commit "1c4e5f60a03e29a1525ca9ec17c793461058253d")))
(file-name (git-file-name "lynis-sdk" version)) (file-name (git-file-name "lynis-sdk" version))
(sha256 (sha256
(base32 "1nc2rhzj6l08d2mnjrzkm4mxla1mjkddcxl8n05c1kdz9ycn6cpl")))))) (base32 "060k8k1q4c7nvrv3cwscxq8md2v75q3nrwwim1hgfw20divw3npy"))))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -4258,8 +4257,7 @@ Logitech Unifying Receiver.")
(string-append (assoc-ref outputs "out") "/share/lynis"))) (string-append (assoc-ref outputs "out") "/share/lynis")))
(substitute* "include/functions" (substitute* "include/functions"
(("/usr/local/etc/lynis") (("/usr/local/etc/lynis")
(string-append (assoc-ref outputs "out") "/etc/lynis"))) (string-append (assoc-ref outputs "out") "/etc/lynis")))))
#t))
(delete 'build) (delete 'build)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -4270,8 +4268,7 @@ Logitech Unifying Receiver.")
(lambda (dir) (lambda (dir)
(copy-recursively dir (string-append out "/share/lynis/" dir))) (copy-recursively dir (string-append out "/share/lynis/" dir)))
(list "db" "include" "plugins")) (list "db" "include" "plugins"))
(install-file "lynis.8" (string-append out "/share/man/man8")) (install-file "lynis.8" (string-append out "/share/man/man8")))))
#t)))
(replace 'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "lynis-sdk") "../lynis-sdk") (copy-recursively (assoc-ref inputs "lynis-sdk") "../lynis-sdk")