From dd21308225610e7adfcbd1bfa07f72a42d7c7c35 Mon Sep 17 00:00:00 2001
From: John Darrington <jmd@gnu.org>
Date: Thu, 24 Mar 2016 14:23:55 +0100
Subject: gnu: postgresql: Substitute hard coded "/bin/sh".

* gnu/packages/databses.scm (postgresql): substitute /bin/sh
with location of bash binary.
---
 gnu/packages/databases.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 6612e37aa0..7626d3d18a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -283,6 +283,16 @@ as a drop-in replacement of MySQL.")
                (base32
                 "1ljvijaja5zy4i5b1450drbj8m3fcm3ly1zzaakp75x30s2rsc3b"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-/bin/sh
+                     (lambda _
+                       ;; Refer to the actual shell.
+                       (substitute* '("src/bin/pg_ctl/pg_ctl.c"
+                                      "src/bin/psql/command.c")
+                         (("/bin/sh") (which "sh")))
+                       #t)))))
     (inputs
      `(("readline" ,readline)
        ("zlib" ,zlib)))
-- 
cgit v1.2.3


From dbeaf8f203fe26d3bcac1fcb0bb566ea8c4523ea Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 1 Apr 2016 13:57:21 +0300
Subject: gnu: postgresql: Update to 9.5.2. [fixes CVE-2016-2193,
 CVE-2016-3065]

* gnu/packages/databases.scm (postgresql): Update to 9.5.2.
---
 gnu/packages/databases.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 7626d3d18a..10d777be22 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -274,14 +274,14 @@ as a drop-in replacement of MySQL.")
 (define-public postgresql
   (package
     (name "postgresql")
-    (version "9.5.1")
+    (version "9.5.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://ftp.postgresql.org/pub/source/v"
+              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                   version "/postgresql-" version ".tar.bz2"))
               (sha256
                (base32
-                "1ljvijaja5zy4i5b1450drbj8m3fcm3ly1zzaakp75x30s2rsc3b"))))
+                "0hbwwhh0pz0a6vf8j5bskiq7gmz9rwc9ywcqyhg5asshckj35lgq"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3