me
/
guix
Archived
1
0
Fork 0
Code

gnu: redis: Update to 7.0.9 [security fixes]. 

Fixes CVE-2023-25155, CVE-2022-36021 and more; see
https://raw.githubusercontent.com/redis/redis/7.0/00-RELEASENOTES.

* gnu/packages/databases.scm (redis): Update to 7.0.9.
[native-inputs]: Add pkg-config and which.
[arguments]: Add a patch-paths phase.  Skip the AOF-related tests.
[properties]: Add a lint-hidden-cve property.
master
Maxim Cournoyer 2023-03-05 14:55:38 -05:00
parent 3a2200e1ad
commit 458b791f35
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/databases.scm
View File

@ -2442,22 +2442,21 @@ similar to BerkeleyDB, LevelDB, etc.")
(define-public redis (define-public redis
(package (package
(name "redis") (name "redis")
(version "6.2.6") (version "7.0.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.redis.io/releases/redis-" (uri (string-append "http://download.redis.io/releases/redis-"
version".tar.gz")) version".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ariw5x33hmmm3d5al0j3307l5kf3vhmn78wpyaz67hia1x8nasv")) "0rczzcy2mwy6hjdgg10l9lr4vavh8jrs7zlb0ba534bwlk13awgp"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete bundled jemalloc, as the package will use the libc one ;; Delete bundled jemalloc, as the package will use the libc one
'(begin (delete-file-recursively "deps/jemalloc"))))) '(begin (delete-file-recursively "deps/jemalloc")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list procps ; for tests (list pkg-config procps tcl which))
tcl)) ; for tests
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -2469,10 +2468,20 @@ similar to BerkeleyDB, LevelDB, etc.")
(string-append "TCLSH=" (string-append "TCLSH="
(assoc-ref inputs "tcl") (assoc-ref inputs "tcl")
"/bin/tclsh"))))) "/bin/tclsh")))))
(add-after 'unpack 'patch-paths
(lambda _
(substitute* "tests/support/server.tcl"
(("/usr/bin/env")
(which "env")))))
(add-after 'unpack 'adjust-tests (add-after 'unpack 'adjust-tests
(lambda _ (lambda _
;; Disable failing tests ;; Disable failing tests
(substitute* "tests/test_helper.tcl" (substitute* "tests/test_helper.tcl"
;; The AOF tests cause the test suite to hang waiting for a
;; "background AOF rewrite to finish", perhaps because dead
;; processes persist as zombies in the build environment.
(("unit/aofrw") "")
(("integration/aof(-multi-part)?") "")
(("integration/failover") "") (("integration/failover") "")
(("integration/replication-4") "") (("integration/replication-4") "")
(("integration/replication-psync") "") (("integration/replication-psync") "")
@ -2487,6 +2496,8 @@ similar to BerkeleyDB, LevelDB, etc.")
supports many data structures including strings, hashes, lists, sets, sorted supports many data structures including strings, hashes, lists, sets, sorted
sets, bitmaps and hyperloglogs.") sets, bitmaps and hyperloglogs.")
(home-page "https://redis.io/") (home-page "https://redis.io/")
;; These two CVEs have long been fixed.
(properties `((lint-hidden-cve . ("CVE-2022-3647" "CVE-2022-33105"))))
(license license:bsd-3))) (license license:bsd-3)))
(define-public hiredis (define-public hiredis