postgresql 10.18

3 files changed, 11 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a143144ca91..cf6c525b2031 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = postgresql-10
 	pkgdesc = Sophisticated object-relational DBMS
-	pkgver = 10.17
+	pkgver = 10.18
 	pkgrel = 1
 	url = https://www.postgresql.org/
 	arch = x86_64
@@ -19,8 +19,7 @@ pkgbase = postgresql-10
 	makedepends = libldap
 	makedepends = llvm
 	makedepends = clang
-	source = https://ftp.postgresql.org/pub/source/v10.17/postgresql-10.17.tar.bz2
-	source = icu68.patch
+	source = https://ftp.postgresql.org/pub/source/v10.18/postgresql-10.18.tar.bz2
 	source = postgresql-run-socket.patch
 	source = postgresql-perl-rpath.patch
 	source = postgresql.pam
@@ -29,8 +28,7 @@ pkgbase = postgresql-10
 	source = postgresql-check-db-dir
 	source = postgresql.sysusers
 	source = postgresql.tmpfiles
-	sha256sums = 5af28071606c9cd82212c19ba584657a9d240e1c4c2da28fc1f3998a2754b26c
-	sha256sums = d8e2e89215c049d27cbdbc6eed1b805028aa0169f3f244399b44180251036f12
+	sha256sums = 57477c2edc82c3f86a74747707b3babc1f301f389315ae14e819e025c0ba3801
 	sha256sums = 8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9
 	sha256sums = 5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
@@ -39,8 +37,7 @@ pkgbase = postgresql-10
 	sha256sums = 888a1d44f03fccfa4bf344ee45824fefb846ae3c1c0c40113ad6020b4be3b0cf
 	sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
 	sha256sums = 4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57
-	sha512sums = 4989abe56cf631b367252c62f15c9f4a22a864a75d607fa29c2116c95e29f95bc3855df6b2fc88dbedcfc7b238d6732d13629fc967f09bbd3ea4d5c328cb925f
-	sha512sums = 1f80bc7f4d726b3985b5b8d694d052e0d1e84e0515f855c17892c3141fe97385abe8c10cef17f1e89435dddddaeb679ec1cf1521eb2b62c91958bdb6b4186e87
+	sha512sums = 8a564256b0a5f6375a817cc5db14e56f7f7ee831881a2dc78759e7f2cf708d95fb61ad75a01f13fb05517ab165c991794d837bbb93f60d54f4fb33ca0ac45729
 	sha512sums = 031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7
 	sha512sums = 38302242b30c01c7981574ed28d9cbd9dc73bf6b56ba3a032afb5d0885ae83e5aa72ce578bf2422214dfa6c46f09d0bdd7cccaeb3c25d58754eb1a34f8bf5615
 	sha512sums = 1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67
@@ -58,20 +55,20 @@ pkgname = postgresql-libs-10
 	depends = zlib
 	depends = libldap
 	provides = postgresql-client
-	provides = postgresql-libs=10.17
+	provides = postgresql-libs=10.18
 	conflicts = postgresql-client
 	conflicts = postgresql-libs
 
 pkgname = postgresql-docs-10
 	pkgdesc = HTML documentation for PostgreSQL
-	provides = postgresql-docs=10.17
+	provides = postgresql-docs=10.18
 	conflicts = postgresql-docs
 	options = docs
 
 pkgname = postgresql-10
 	pkgdesc = Sophisticated object-relational DBMS
 	install = postgresql.install
-	depends = postgresql-libs>=10.17
+	depends = postgresql-libs>=10.18
 	depends = krb5
 	depends = libxml2
 	depends = readline>=6.0
@@ -86,7 +83,7 @@ pkgname = postgresql-10
 	optdepends = perl: for PL/Perl support
 	optdepends = tcl: for PL/Tcl support
 	optdepends = postgresql-old-upgrade: upgrade from previous major version using pg_upgrade
-	provides = postgresql=10.17
+	provides = postgresql=10.18
 	conflicts = postgresql
 	options = staticlibs
 	backup = etc/pam.d/postgresql
diff --git a/PKGBUILD b/PKGBUILD
index 3227bc6f65a8..d02cb3e72403 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=postgresql-10
 pkgname=('postgresql-libs-10' 'postgresql-docs-10' 'postgresql-10')
-pkgver=10.17
+pkgver=10.18
 _majorver=${pkgver%.*}
 pkgrel=1
 pkgdesc='Sophisticated object-relational DBMS'
@@ -15,7 +15,6 @@ license=('custom:PostgreSQL')
 makedepends=('krb5' 'libxml2' 'python' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0'
              'pam' 'zlib' 'icu' 'systemd' 'libldap' 'llvm' 'clang')
 source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-        icu68.patch
         postgresql-run-socket.patch
         postgresql-perl-rpath.patch
         postgresql.pam
@@ -24,8 +23,7 @@ source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.ta
         postgresql-check-db-dir
         postgresql.sysusers
         postgresql.tmpfiles)
-sha256sums=('5af28071606c9cd82212c19ba584657a9d240e1c4c2da28fc1f3998a2754b26c'
-            'd8e2e89215c049d27cbdbc6eed1b805028aa0169f3f244399b44180251036f12'
+sha256sums=('57477c2edc82c3f86a74747707b3babc1f301f389315ae14e819e025c0ba3801'
             '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
             '5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -34,8 +32,7 @@ sha256sums=('5af28071606c9cd82212c19ba584657a9d240e1c4c2da28fc1f3998a2754b26c'
             '888a1d44f03fccfa4bf344ee45824fefb846ae3c1c0c40113ad6020b4be3b0cf'
             '7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
             '4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57')
-sha512sums=('4989abe56cf631b367252c62f15c9f4a22a864a75d607fa29c2116c95e29f95bc3855df6b2fc88dbedcfc7b238d6732d13629fc967f09bbd3ea4d5c328cb925f'
-            '1f80bc7f4d726b3985b5b8d694d052e0d1e84e0515f855c17892c3141fe97385abe8c10cef17f1e89435dddddaeb679ec1cf1521eb2b62c91958bdb6b4186e87'
+sha512sums=('8a564256b0a5f6375a817cc5db14e56f7f7ee831881a2dc78759e7f2cf708d95fb61ad75a01f13fb05517ab165c991794d837bbb93f60d54f4fb33ca0ac45729'
             '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7'
             '38302242b30c01c7981574ed28d9cbd9dc73bf6b56ba3a032afb5d0885ae83e5aa72ce578bf2422214dfa6c46f09d0bdd7cccaeb3c25d58754eb1a34f8bf5615'
             '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
@@ -49,7 +46,6 @@ prepare() {
   cd postgresql-${pkgver}
   patch -p1 < ../postgresql-run-socket.patch
   patch -p1 < ../postgresql-perl-rpath.patch
-  patch -p1 < ../icu68.patch
 }
 
 build() {
diff --git a/icu68.patch b/icu68.patch
deleted file mode 100644
index 89b0f8362f33..000000000000
--- a/icu68.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur postgresql-10.13.orig/src/include/utils/pg_locale.h postgresql-10.13/src/include/utils/pg_locale.h
---- postgresql-10.13.orig/src/include/utils/pg_locale.h	2020-05-11 23:12:38.000000000 +0200
-+++ postgresql-10.13/src/include/utils/pg_locale.h	2021-04-23 23:05:22.732461418 +0200
-@@ -17,6 +17,7 @@
- #endif
- #ifdef USE_ICU
- #include <unicode/ucol.h>
-+#undef bool
- #endif
- 
- #include "utils/guc.h"