me/guix
Archived
1
0
Fork 0
Code Activity

gnu: MariaDB: Incorporate grafted changes.

Browse source 
* gnu/packages/databases.scm (mariadb)[replacement]: Remove.
[source](patches): New field.
(mariadb/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2021-05-09 15:09:48 +02:00
parent b7a9258941
commit fa3043fc8c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/databases.scm
View file

@ -716,6 +716,7 @@ Language.")
(sha256 (sha256
(base32 (base32
"1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b")) "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"))
(patches (search-patches "mariadb-CVE-2021-27928.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -736,7 +737,6 @@ Language.")
(append (find-files "extra/wolfssl") (append (find-files "extra/wolfssl")
(find-files "zlib"))) (find-files "zlib")))
#t)))) #t))))
(replacement mariadb/fixed)
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "lib" "dev")) (outputs '("out" "lib" "dev"))
(arguments (arguments
@ -972,13 +972,6 @@ Language.")
as a drop-in replacement of MySQL.") as a drop-in replacement of MySQL.")
(license license:gpl2))) (license license:gpl2)))
(define mariadb/fixed
(package
(inherit mariadb)
(source (origin
(inherit (package-source mariadb))
(patches (search-patches "mariadb-CVE-2021-27928.patch"))))))
(define-public mariadb-connector-c (define-public mariadb-connector-c
(package (package
(name "mariadb-connector-c") (name "mariadb-connector-c")