From 58927996d9171aa7054d20de7dbd393ebd7a3efa Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 22 Aug 2018 15:39:14 -0400
Subject: gnu: perl-dbd-mysql: Update to 4.046.

* gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.046.
[source]: Update URL. Remove 'perl-dbd-mysql-CVE-2017-10788.patch'.
* gnu/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/packages/databases.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/databases.scm')

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9dca5f4e62..4e64fb78b4 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1472,16 +1472,15 @@ columns, primary keys, unique constraints and relationships.")
 (define-public perl-dbd-mysql
   (package
     (name "perl-dbd-mysql")
-    (version "4.043")
+    (version "4.046")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/"
+       (uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/"
                            "DBD-mysql-" version ".tar.gz"))
        (sha256
         (base32
-         "16bg7l28n65ngi1abjxvwk906a80i2vd5vzjn812dx8phdg8d7v2"))
-       (patches (search-patches "perl-dbd-mysql-CVE-2017-10788.patch"))))
+         "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1"))))
     (build-system perl-build-system)
     ;; Tests require running MySQL server
     (arguments `(#:tests? #f))
-- 
cgit 1.4.1


From 444488fc1b0d12190bf751b58191daea90ab243c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 24 Aug 2018 00:33:34 +0200
Subject: gnu: boost: Move 1.59.0 definition to boost.scm.

Fixes a regression introduced in commit
7cbf06d8c2935abfc6c688cf3f9b99e0e5393960 where the top-level code of
these two modules would depend on each other, leading to "boost: unbound
variable" kind of errors in some circumstances.

* gnu/packages/databases.scm (boost-for-mysql): Move to...
* gnu/packages/boost.scm (boost-for-mysql): ... here.  Make public and
add 'properties' field.
---
 gnu/packages/boost.scm     | 16 ++++++++++++++++
 gnu/packages/databases.scm | 14 --------------
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/databases.scm')

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index d00f96de64..cf70a29775 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -110,6 +110,22 @@ across a broad spectrum of applications.")
     (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
                                 "Some components have other similar licences."))))
 
+(define-public boost-for-mysql
+  ;; Older version for MySQL 5.7.23.
+  (package
+    (inherit boost)
+    (version "1.59.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/boost/boost/" version "/boost_"
+                    (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
+                    ".tar.bz2"))
+              (sha256
+               (base32
+                "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"))))
+    (properties '((hidden? . #t)))))
+
 (define-public boost-sync
   (let ((commit "c72891d9b90e2ceb466ec859f640cd012b2d8709")
         (version "1.55")
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 4e64fb78b4..ecc14c259a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -549,20 +549,6 @@ RDBMS systems (which are deep in functionality).")
                    ;; Some parts are licensed under the Apache License
                    license:asl2.0))))
 
-(define boost-for-mysql
-  (package
-    (inherit boost)
-    (version "1.59.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://sourceforge/boost/boost/" version "/boost_"
-                    (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
-                    ".tar.bz2"))
-              (sha256
-               (base32
-                "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"))))))
-
 ;; XXX When updating, check whether boost-for-mysql is still needed.
 ;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past.
 (define-public mysql
-- 
cgit 1.4.1