From 9761aca95cf01d225a673573f981ef324ef82479 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Apr 2018 02:11:04 +0200 Subject: gnu: unixodbc: Update to 2.3.6. * gnu/packages/databases.scm (unixodbc): Update to 2.3.6. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c2005144b4..b9ae9ee152 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1440,7 +1440,7 @@ valid SQL query.") (define-public unixodbc (package (name "unixodbc") - (version "2.3.4") + (version "2.3.6") (source (origin (method url-fetch) (uri @@ -1448,7 +1448,7 @@ valid SQL query.") "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-" version ".tar.gz")) (sha256 - (base32 "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f")))) + (base32 "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8")))) (build-system gnu-build-system) (synopsis "Data source abstraction library") (description "Unixodbc is a library providing an API with which to access -- cgit v1.2.3 From 4c27ea06d4f294613b267bdbec7c2896608c4189 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Jul 2018 14:34:27 +0200 Subject: gnu: mariadb: Install pkg-config file to a standard location. * gnu/packages/databases.scm (mariadb)[#:configure-flags]: Set INSTALL_SHAREDIR to "share". --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b9ae9ee152..0e30815d40 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -662,7 +662,7 @@ Language.") "-DINSTALL_SUPPORTFILESDIR=share/mysql/support-files" "-DINSTALL_MYSQLSHAREDIR=share/mysql" "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql") + "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases (add-before -- cgit v1.2.3 From 5b4d2e40f1b2097c1f1ea6d1a0e701a1908011d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Jul 2018 00:50:20 +0200 Subject: gnu: mariadb: Disable plugin that fails on armhf. * gnu/packages/databases.scm (mariadb)[arguments]: Add 'disable-plugins' phase. --- gnu/packages/databases.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0e30815d40..61b4268e9d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -665,6 +665,19 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases + (add-before 'configure 'disable-plugins + (lambda _ + (let ((disable-plugin (lambda (name) + (call-with-output-file + (string-append "plugin/" name + "/CMakeLists.txt") + (lambda (port) + (format port "\n"))))) + (disabled-plugins '(;; FIXME: On armhf-linux, this plugin + ;; triggers a GCC ICE. Disable for now. + "semisync"))) + (for-each disable-plugin disabled-plugins) + #t))) (add-before 'configure 'pre-configure (lambda _ -- cgit v1.2.3 From 3869f39e6d36cc66907ac0f6f2cf9463c5adff6f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 00:49:08 +0200 Subject: gnu: mariadb: Run the full test suite. * gnu/packages/databases.scm (mariadb)[arguments]: Override 'check' phase. Add phase 'adjust-tests'. Disable one more plugin. [properties]: New field. --- gnu/packages/databases.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 61b4268e9d..115ebe37f8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -665,6 +665,29 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-tests + (lambda _ + (let ((disabled-tests + '(;; These fail because root@hostname == root@localhost in + ;; the build environment, causing a user count mismatch. + ;; See . + "main.join_cache" + "main.explain_non_select" + "roles.acl_statistics")) + + ;; This file contains a list of known-flaky tests for this + ;; release. Append our own items. + (unstable-tests (open-file "mysql-test/unstable-tests" "a"))) + (for-each (lambda (test) + (format unstable-tests "~a : ~a\n" + test "Disabled in Guix")) + disabled-tests) + (close-port unstable-tests) + + (substitute* "mysql-test/mysql-test-run.pl" + (("/bin/ls") (which "ls")) + (("/bin/sh") (which "sh"))) + #t))) (add-before 'configure 'disable-plugins (lambda _ (let ((disable-plugin (lambda (name) @@ -675,7 +698,9 @@ Language.") (format port "\n"))))) (disabled-plugins '(;; FIXME: On armhf-linux, this plugin ;; triggers a GCC ICE. Disable for now. - "semisync"))) + "semisync" + ;; XXX: Causes a test failure. + "disks"))) (for-each disable-plugin disabled-plugins) #t))) (add-before @@ -683,6 +708,15 @@ Language.") (lambda _ (setenv "CONFIG_SHELL" (which "sh")) #t)) + (replace 'check + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (with-directory-excursion "mysql-test" + (invoke "./mtr" "--verbose" + "--parallel" (number->string (parallel-job-count)) + "--skip-test-list=unstable-tests")) + (format #t "test suite not run~%")) + #t)) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) @@ -708,6 +742,9 @@ Language.") ("openssl" ,openssl) ("pcre" ,pcre) ("zlib" ,zlib))) + ;; The test suite is very resource intensive and can take more than three + ;; hours on a x86_64 system. Give slow and busy machines some leeway. + (properties '((timeout . 64800))) ;18 hours (home-page "https://mariadb.org/") (synopsis "SQL database server") (description -- cgit v1.2.3 From 03aed90b86549e7f9197ea11c360c5efd08327bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Jul 2018 21:12:22 +0200 Subject: gnu: mariadb: Update to 10.1.34. * gnu/packages/databases.scm (mariadb): Update to 10.1.34. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 115ebe37f8..78e514ae7f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -627,7 +627,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.33") + (version "10.1.34") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -635,7 +635,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0bax748j4srsyhw5cs5jvwigndh0zwmf4r2cjvhja31ckx8jqccl")))) + "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 2001d2dac45f658acc7abf367dafda49012e2b79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Jul 2018 21:31:42 +0200 Subject: gnu: mariadb: Remove some bundled libraries. * gnu/packages/databases.scm (mariadb)[source](snippet, modules): New fields. [arguments]: Add explicit #:configure-flags for system libraries. Add 'unbundle' phase. Remove 'pre-configure' phase. [inputs]: Add SNAPPY and XZ. --- gnu/packages/databases.scm | 48 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 78e514ae7f..752b400866 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -635,7 +635,20 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")))) + "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled snappy and xz. + (delete-file-recursively "storage/tokudb/PerconaFT/third_party") + + ;; Preserve CMakeLists.txt for these. + (for-each (lambda (file) + (unless (string-suffix? "CMakeLists.txt" file) + (delete-file file))) + (append (find-files "extra/yassl") + (find-files "pcre") (find-files "zlib"))) + #t)))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -649,6 +662,12 @@ Language.") ;; For now, disable the features that that use libarchive (xtrabackup). "-DWITH_LIBARCHIVE=OFF" + ;; Ensure the system libraries are used. + "-DWITH_JEMALLOC=yes" + "-DWITH_PCRE=system" + "-DWITH_SSL=system" + "-DWITH_ZLIB=system" + "-DDEFAULT_CHARSET=utf8" "-DDEFAULT_COLLATION=utf8_general_ci" "-DMYSQL_DATADIR=/var/lib/mysql" @@ -665,6 +684,26 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle + (lambda _ + ;; The bundled PCRE in MariaDB has a patch that was upstreamed + ;; in version 8.34. Unfortunately the upstream patch behaves + ;; slightly differently and the build system fails to detect it. + ;; See . + ;; XXX: Consider patching PCRE instead. + (substitute* "cmake/pcre.cmake" + ((" OR NOT PCRE_STACK_SIZE_OK") "")) + + (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" + ;; Remove dependency on these CMake targets. + ((" build_lzma build_snappy") "")) + + (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" + ;; This file checks that the bundled sources are present and + ;; declares build procedures for them. We don't need that. + (("^include\\(TokuThirdParty\\)") "")) + + #t)) (add-after 'unpack 'adjust-tests (lambda _ (let ((disabled-tests @@ -703,11 +742,6 @@ Language.") "disks"))) (for-each disable-plugin disabled-plugins) #t))) - (add-before - 'configure 'pre-configure - (lambda _ - (setenv "CONFIG_SHELL" (which "sh")) - #t)) (replace 'check (lambda* (#:key (tests? #t) #:allow-other-keys) (if tests? @@ -741,6 +775,8 @@ Language.") ("ncurses" ,ncurses) ("openssl" ,openssl) ("pcre" ,pcre) + ("snappy" ,snappy) + ("xz" ,xz) ("zlib" ,zlib))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. -- cgit v1.2.3 From 963157f1cc421dba0623964dcdfd124e1cc64540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Jul 2018 02:50:58 +0200 Subject: gnu: mariadb: Delete test files and static libraries. * gnu/packages/databases.scm (mariadb)[arguments]: Adapt 'post-install' phase to purge static archives and test executables. --- gnu/packages/databases.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 752b400866..c285d2f53b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -763,7 +763,11 @@ Language.") (with-directory-excursion out (for-each delete-file-recursively '("data" "mysql-test" "sql-bench" - "share/man/man1/mysql-test-run.pl.1"))) + "share/man/man1/mysql-test-run.pl.1")) + ;; Delete huge mysqltest executables. + (for-each delete-file (find-files "bin" "test")) + ;; And static libraries. + (for-each delete-file (find-files "lib" "\\.a$"))) #t)))))) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 0333582477bfd1160a640bd35d08f59feaada607 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 18:37:37 +0200 Subject: gnu: mariadb: Move GCC ICE patch to the usual location. * gnu/packages/databases.scm (mariadb)[source](patches): New field. [arguments]: Don't disable semisync plugin. [inputs]: Remove 'mariadb-gcc-ice.patch'. --- gnu/packages/databases.scm | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cbc5ffc2c6..bd5102e027 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,6 +636,7 @@ Language.") (sha256 (base32 "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) + (patches (search-patches "mariadb-gcc-ice.patch")) (modules '((guix build utils))) (snippet '(begin @@ -684,17 +685,6 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases - ;; Apply this patch that's only needed on ARM. - ,@(if (and (not (%current-target-system)) - (string=? "armhf-linux" (%current-system))) - `((add-after 'unpack 'apply-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "gcc-ice-patch"))) - (invoke "patch" "-p1" "--force" - "--input" patch) - #t)))) - '()) - (add-after 'unpack 'unbundle (lambda _ ;; The bundled PCRE in MariaDB has a patch that was upstreamed @@ -746,10 +736,7 @@ Language.") "/CMakeLists.txt") (lambda (port) (format port "\n"))))) - (disabled-plugins '(;; FIXME: On armhf-linux, this plugin - ;; triggers a GCC ICE. Disable for now. - "semisync" - ;; XXX: Causes a test failure. + (disabled-plugins '(;; XXX: Causes a test failure. "disks"))) (for-each disable-plugin disabled-plugins) #t))) @@ -782,10 +769,7 @@ Language.") #t)))))) (native-inputs `(("bison" ,bison) - ("perl" ,perl) - ,@(if (string=? "armhf-linux" (%current-system)) - `(("gcc-ice-patch" ,(search-patch "mariadb-gcc-ice.patch"))) - '()))) + ("perl" ,perl))) (inputs `(("jemalloc" ,jemalloc) ("libaio" ,libaio) -- cgit v1.2.3 From 3418e43bf55033c15b997a46a56c9efd69c0624e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Aug 2018 00:51:48 +0200 Subject: gnu: mariadb: Adjust to test failures on Hydra. * gnu/packages/patches/mariadb-client-test-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/databases.scm (mariadb)[source](patches): Add it. [arguments]: Increase retry count and test timeout. Disable test main.myisampack. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 19 +++++++++-- .../patches/mariadb-client-test-32bit.patch | 37 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/mariadb-client-test-32bit.patch (limited to 'gnu/packages/databases.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 4ed341df8f..adae0f3d23 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -930,6 +930,7 @@ dist_patch_DATA = \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-gcc-ice.patch \ + %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4c9382ce6d..48c75bbba8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,7 +636,8 @@ Language.") (sha256 (base32 "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) - (patches (search-patches "mariadb-gcc-ice.patch")) + (patches (search-patches "mariadb-gcc-ice.patch" + "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet '(begin @@ -713,7 +714,18 @@ Language.") ;; See . "main.join_cache" "main.explain_non_select" - "roles.acl_statistics")) + "roles.acl_statistics" + + ;; FIXME: This test fails on i686: + ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") + ;; +myisampack: Can't create/write to file (Errcode: 17 "File exists) + ;; When running "myisampack --join=foo/t3 foo/t1 foo/t2" + ;; (all three tables must exist and be identical) + ;; in a loop it produces the same error around 1/240 times. + ;; montywi on #maria suggested removing the real_end check in + ;; "strings/my_vsnprintf.c" on line 503, yet it still does not + ;; reach the ending quote occasionally. Disable it for now. + "main.myisampack")) ;; This file contains a list of known-flaky tests for this ;; release. Append our own items. @@ -745,6 +757,9 @@ Language.") (if tests? (with-directory-excursion "mysql-test" (invoke "./mtr" "--verbose" + "--retry=3" + "--testcase-timeout=30" + "--suite-timeout=540" "--parallel" (number->string (parallel-job-count)) "--skip-test-list=unstable-tests")) (format #t "test suite not run~%")) diff --git a/gnu/packages/patches/mariadb-client-test-32bit.patch b/gnu/packages/patches/mariadb-client-test-32bit.patch new file mode 100644 index 0000000000..02017e324d --- /dev/null +++ b/gnu/packages/patches/mariadb-client-test-32bit.patch @@ -0,0 +1,37 @@ +From 93efa48a7b972fc463406603574a4d508eefe792 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik +Date: Sun, 13 May 2018 18:50:21 +0200 +Subject: [PATCH] fix failing main.mysql_client_test test on 32bit + +in `ulonglong=ulong*uint` multiplication +is done in ulong, wrapping around on 32bit. + +This became visible after C/C changed the +default charset to utf8, thus changing +mbmaxlem from 1 to 3. +--- + tests/mysql_client_fw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c +index f69eb28a2871..4d036887629a 100644 +--- a/tests/mysql_client_fw.c ++++ b/tests/mysql_client_fw.c +@@ -768,7 +768,7 @@ static void do_verify_prepare_field(MYSQL_RES *result, + { + MYSQL_FIELD *field; + CHARSET_INFO *cs; +- ulonglong expected_field_length; ++ ulonglong expected_field_length= length; + + if (!(field= mysql_fetch_field_direct(result, no))) + { +@@ -777,7 +777,7 @@ static void do_verify_prepare_field(MYSQL_RES *result, + } + cs= get_charset(field->charsetnr, 0); + DIE_UNLESS(cs); +- if ((expected_field_length= length * cs->mbmaxlen) > UINT_MAX32) ++ if ((expected_field_length*= cs->mbmaxlen) > UINT_MAX32) + expected_field_length= UINT_MAX32; + if (!opt_silent) + { -- cgit v1.2.3 From 71179b35b820e71b51fd503c5ee0c58369c2705e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Aug 2018 13:41:08 +0200 Subject: gnu: mariadb: Further increase test timeouts. * gnu/packages/databases.scm (mariadb)[arguments]: Allow 40 minutes for single tests, and 600 in total. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 48c75bbba8..2c27c5fcd1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -758,8 +758,8 @@ Language.") (with-directory-excursion "mysql-test" (invoke "./mtr" "--verbose" "--retry=3" - "--testcase-timeout=30" - "--suite-timeout=540" + "--testcase-timeout=40" + "--suite-timeout=600" "--parallel" (number->string (parallel-job-count)) "--skip-test-list=unstable-tests")) (format #t "test suite not run~%")) -- cgit v1.2.3 From 62694caa440579d48e5bb4ba13016c0d4a88051f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Aug 2018 19:55:19 +0300 Subject: gnu: mariadb: Remove test which fails on armhf-linux. * gnu/packages/databases.scm (mariadb)[arguments]: Disable test 'mroonga/storage.index_read_multiple_double'. --- gnu/packages/databases.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2c27c5fcd1..dffc2c1553 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -725,7 +725,9 @@ Language.") ;; montywi on #maria suggested removing the real_end check in ;; "strings/my_vsnprintf.c" on line 503, yet it still does not ;; reach the ending quote occasionally. Disable it for now. - "main.myisampack")) + "main.myisampack" + ;; FIXME: This test fails on armhf-linux: + "mroonga/storage.index_read_multiple_double")) ;; This file contains a list of known-flaky tests for this ;; release. Append our own items. -- cgit v1.2.3 From 516fe8deb5a645bf86e9db66fccd4403a64206d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Aug 2018 15:12:53 +0200 Subject: gnu: postgresql: Update to 10.5 [fixes CVE-2018-10915, CVE-2018-10925]. * gnu/packages/databases.scm (postgresql): Update to 10.5. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dffc2c1553..eca10556f8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -811,14 +811,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.4") + (version "10.5") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v")))) + "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-uuid=e2fs") -- cgit v1.2.3 From 369d15674c8bb251c45a45466031a2da1640df9f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Aug 2018 15:16:11 +0200 Subject: gnu: mariadb: Update to 10.1.35 [security fixes]. This release fixes CVE-2018-3058, CVE-2018-3063, CVE-2018-3064 and CVE-2018-3066. See for details. * gnu/packages/databases.scm (mariadb): Update to 10.1.35. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index eca10556f8..ceeb4052f3 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -627,7 +627,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.34") + (version "10.1.35") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -635,7 +635,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) + "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) (patches (search-patches "mariadb-gcc-ice.patch" "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) -- cgit v1.2.3 From 0a1f520d4028fcc806cca789e0406eba229bfe16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Aug 2018 17:39:10 +0200 Subject: gnu: r-rmysql: Add missing dependency on OpenSSL. * gnu/packages/databases.scm (r-rmysql)[inputs]: Add OPENSSL. --- gnu/packages/databases.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ceeb4052f3..59dc5e58cc 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2181,6 +2181,9 @@ and web services platform functionality.") `(("pkg-config" ,pkg-config))) (inputs `(("mariadb" ,mariadb) + ;; FIXME: This should be propagated from MariaDB, but add it here + ;; for now to prevent a large rebuild. + ("openssl" ,openssl) ("zlib" ,zlib))) (propagated-inputs `(("r-dbi" ,r-dbi))) -- cgit v1.2.3