02/03: gnu: postgresql: Remove graft for 10.8.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 224d2e2efd1ccefaab0e3c10b0ab07451f436d27
Author: Marius Bakke <address@hidden>
Date:   Fri May 24 22:48:59 2019 +0200

    gnu: postgresql: Remove graft for 10.8.
    
    * gnu/packages/databases.scm (postgresql): Update to 10.8.
    [replacement]: Remove.
    (postgresql-10.8): Remove variable.
---
 gnu/packages/databases.scm | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 96b58b3..ea0a38b 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -800,15 +800,14 @@ as a drop-in replacement of MySQL.")
 (define-public postgresql
   (package
     (name "postgresql")
-    (version "10.7")
-    (replacement postgresql-10.8)
+    (version "10.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://ftp.postgresql.org/pub/source/v";
                                   version "/postgresql-" version ".tar.bz2"))
               (sha256
                (base32
-                "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz"))
+                "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i"))
               (patches (search-patches 
"postgresql-disable-resolve_symlinks.patch"))))
     (build-system gnu-build-system)
     (arguments
@@ -844,22 +843,6 @@ TIMESTAMP.  It also supports storage of binary large 
objects, including
 pictures, sounds, or video.")
     (license (license:x11-style "file://COPYRIGHT"))))
 
-;; This release fixes CVE-2019-10129 and CVE-2019-10130.  See
-;; <https://www.postgresql.org/about/news/1939/> for details.
-;; TODO: Remove this in the next rebuild cycle.
-(define-public postgresql-10.8
-  (package
-    (inherit postgresql)
-    (version "10.8")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://ftp.postgresql.org/pub/source/v";
-                                  version "/postgresql-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i"))
-              (patches (search-patches 
"postgresql-disable-resolve_symlinks.patch"))))))
-
 (define-public postgresql-9.6
   (package
     (inherit postgresql)