summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD16
-rw-r--r--postgresql-perl-rpath.patch8
-rw-r--r--postgresql-run-socket.patch12
4 files changed, 27 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c36a885c4d87..b0a0ecbc2e4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = postgresql-git
pkgdesc = Sophisticated object-relational DBMS (Git version)
- pkgver = 12.2
+ pkgver = 49068.d9a4cce29d
pkgrel = 1
url = https://www.postgresql.org/
arch = x86_64
@@ -29,8 +29,8 @@ pkgbase = postgresql-git
source = postgresql.sysusers
source = postgresql.tmpfiles
sha256sums = SKIP
- sha256sums = 8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9
- sha256sums = 5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31
+ sha256sums = 719d24c09c5ea17701cbd49b77f40c58bde52b603c3c8b85a708d277175d27b8
+ sha256sums = 5bcc0bcedfa0271afaa05c35e7f651416a2a818c28069c51c2d0de0aa7d0dfdb
sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
sha256sums = 6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e
sha256sums = 25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57
@@ -38,8 +38,8 @@ pkgbase = postgresql-git
sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
sha256sums = 4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57
sha512sums = SKIP
- sha512sums = 031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7
- sha512sums = 38302242b30c01c7981574ed28d9cbd9dc73bf6b56ba3a032afb5d0885ae83e5aa72ce578bf2422214dfa6c46f09d0bdd7cccaeb3c25d58754eb1a34f8bf5615
+ sha512sums = caa2f44f00dff4ca8942a742c973f2d1b0ca4c7688c140858f61394aa74785dd5645c0301a04a1956c1e8a605487b640244497c845982f76bb0fea478e3b53f6
+ sha512sums = b6b5407b79f414618c72a7bb2cf259f6b99abcc3a6d7f55b62bb6933662fdad6d1e6663a47108912ac99779a3f4d1e1907cc45219af7cc28850211475a7f3f3e
sha512sums = 1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67
sha512sums = 9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8
sha512sums = ee0c010be07e8b5396cfd89c1d077b7c5573753d0210ea4e330e314c2759e25fbee9071e663f871855d65cc8ac75162af9e793dd10892f50f515e7a89cc8d6a0
@@ -63,7 +63,7 @@ pkgname = postgresql-docs-git
pkgname = postgresql-git
pkgdesc = Sophisticated object-relational DBMS
- depends = postgresql-libs>=12.2
+ depends = postgresql-libs>=49068.d9a4cce29d
depends = krb5
depends = libxml2
depends = readline>=6.0
diff --git a/PKGBUILD b/PKGBUILD
index 190736bc8f9a..a0e258ed35b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=postgresql-git
pkgname=('postgresql-libs-git' 'postgresql-docs-git' 'postgresql-git')
-pkgver=12.2
+pkgver=49068.d9a4cce29d
_majorver=${pkgver%.*}
pkgrel=1
pkgdesc='Sophisticated object-relational DBMS (Git version)'
@@ -26,8 +26,8 @@ source=(git://git.postgresql.org/git/postgresql.git
postgresql.sysusers
postgresql.tmpfiles)
sha256sums=('SKIP'
- '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
- '5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31'
+ '719d24c09c5ea17701cbd49b77f40c58bde52b603c3c8b85a708d277175d27b8'
+ '5bcc0bcedfa0271afaa05c35e7f651416a2a818c28069c51c2d0de0aa7d0dfdb'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
'25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57'
@@ -35,8 +35,8 @@ sha256sums=('SKIP'
'7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
'4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57')
sha512sums=('SKIP'
- '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7'
- '38302242b30c01c7981574ed28d9cbd9dc73bf6b56ba3a032afb5d0885ae83e5aa72ce578bf2422214dfa6c46f09d0bdd7cccaeb3c25d58754eb1a34f8bf5615'
+ 'caa2f44f00dff4ca8942a742c973f2d1b0ca4c7688c140858f61394aa74785dd5645c0301a04a1956c1e8a605487b640244497c845982f76bb0fea478e3b53f6'
+ 'b6b5407b79f414618c72a7bb2cf259f6b99abcc3a6d7f55b62bb6933662fdad6d1e6663a47108912ac99779a3f4d1e1907cc45219af7cc28850211475a7f3f3e'
'1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
'9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8'
'ee0c010be07e8b5396cfd89c1d077b7c5573753d0210ea4e330e314c2759e25fbee9071e663f871855d65cc8ac75162af9e793dd10892f50f515e7a89cc8d6a0'
@@ -44,6 +44,12 @@ sha512sums=('SKIP'
'36f7a5d38370fdc4d4267fd5a8a8330f152a1077bf0f065b89d4a7b8112ccd42be2c46c863791b77de02013f28275a42219f4236e7cb837c3f8cfd5fcc7d3373'
'5fe81d716d56d515ee4ae1aac56652b7bf20346ea8413482fd9fdb79f0485d8c5ed099f4d2cc460cbe37686488f1354dec433905ce005da8fec772e783addc70')
+pkgver() {
+ cd postgresql
+ printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+
prepare() {
cd postgresql
patch -p1 < ../postgresql-run-socket.patch
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index c4c4fdad2898..1865b012afd8 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -1,13 +1,13 @@
diff -Naur postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile postgresql-9.1.5/src/pl/plperl/GNUmakefile
--- postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile 2012-08-14 18:41:04.000000000 -0400
+++ postgresql-9.1.5/src/pl/plperl/GNUmakefile 2012-08-17 11:15:09.457116708 -0400
-@@ -43,6 +43,9 @@
+@@ -55,6 +55,9 @@
SHLIB_LINK = $(perl_embed_ldflags)
+# Force rpath to be used even though we disable it everywhere else
+SHLIB_LINK += $(rpath)
+
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl --load-extension=plperlu
- REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
- # if Perl can support two interpreters in one backend,
+ REGRESS_OPTS = --dbname=$(PL_TESTDB)
+ REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \
+ plperl_elog plperl_util plperl_init plperlu plperl_array \
diff --git a/postgresql-run-socket.patch b/postgresql-run-socket.patch
index b558c7b74961..de5045b330f7 100644
--- a/postgresql-run-socket.patch
+++ b/postgresql-run-socket.patch
@@ -1,12 +1,12 @@
diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
--- postgresql-9.2.0.sockets/src/include/pg_config_manual.h 2012-09-06 17:26:17.000000000 -0400
+++ postgresql-9.2.0/src/include/pg_config_manual.h 2012-09-06 18:13:18.183092471 -0400
-@@ -144,7 +144,7 @@
- * here's where to twiddle it. You can also override this at runtime
- * with the postmaster's -k switch.
+@@ -201,7 +201,7 @@
+ * support them yet.
*/
+ #ifndef WIN32
-#define DEFAULT_PGSOCKET_DIR "/tmp"
+#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
-
- /*
- * The random() function is expected to yield values between 0 and
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif