From fba9367a9d84b12e6bc278ea4d56be11cc3ea48d Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Fri, 1 Dec 2017 09:13:37 +0300
Subject: [PATCH] postgesql: Update to 10.1

---
 mingw-w64-postgresql/PKGBUILD                         | 10 +++++-----
 mingw-w64-postgresql/postgresql-9.4.1-pl-tcl.patch    |  8 +++++---
 mingw-w64-postgresql/postgresql-9.5.1-pl-python.patch | 11 +++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/mingw-w64-postgresql/PKGBUILD b/mingw-w64-postgresql/PKGBUILD
index c079f10c85..4259daab9c 100644
--- a/mingw-w64-postgresql/PKGBUILD
+++ b/mingw-w64-postgresql/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=postgresql
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=9.6.3
+pkgver=10.1
 pkgrel=1
 pkgdesc="Libraries for use with PostgreSQL (mingw-w64)"
 arch=('any')
@@ -30,11 +30,11 @@ source=("https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.t
         postgresql-9.5.1-pl-python.patch
         postgresql-9.4.1-pl-tcl.patch
         postgresql-9.4.1-mingw-enable-readline.patch)
-sha256sums=('1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6'
+sha256sums=('3ccb4e25fe7a7ea6308dea103cac202963e6b746697366d72ec2900449a5e713'
             '0f2b5c7edb48dd106900854c9323ca2d483054595c4cf8a5b796a1d536d22aad'
             '57c1e9b75c042af591b05b9dda60e6327b5c364bb5adc2675da8a48b47e11b81'
-            'f219a21a9a3376d04594fb03098d521745c909089204e9a806f23294e0a3c8be'
-            'a57b6e7500d2d3daa89162ef98f5e5cb9a082a2123b53f31b4060e774fd1a0c0'
+            '6e2db558f0b85da2847c109fd7b7e1681bb97dccd805e8e03c1a7dba5e0a1af4'
+            'ab9c42374b4e8a01b598810b19b583d9ee7bf5c43c39c019f66b62aacac38926'
             '51c72fbd380d23cf944165405221912a277b9be99e285479772b39cacbbf384f')
 
 prepare() {
@@ -119,7 +119,7 @@ package() {
 
   # Use winpty-git script to invoke utilities. Please don't move this into a patch as
   # hopefully one day we won't need this hack.
-  for f in clusterdb createdb createlang createuser dropdb droplang dropuser initdb pg_basebackup pg_dump pg_dumpall pg_receivexlog pg_restore psql reindexdb vacuumdb; do
+  for f in clusterdb createdb createuser dropdb dropuser initdb pg_basebackup pg_dump pg_dumpall pg_receivewal pg_restore psql reindexdb vacuumdb; do
     mv "${pkgdir}"${MINGW_PREFIX}/bin/${f}.exe "${pkgdir}"${MINGW_PREFIX}/bin/${f}_exe
     _exename="${f}"
     echo "#!/usr/bin/env bash" > "${pkgdir}${MINGW_PREFIX}/bin/${_exename}"
diff --git a/mingw-w64-postgresql/postgresql-9.4.1-pl-tcl.patch b/mingw-w64-postgresql/postgresql-9.4.1-pl-tcl.patch
index 99e62633a9..b543d62f13 100644
--- a/mingw-w64-postgresql/postgresql-9.4.1-pl-tcl.patch
+++ b/mingw-w64-postgresql/postgresql-9.4.1-pl-tcl.patch
@@ -38,11 +38,13 @@
  include $(top_srcdir)/src/Makefile.shlib
  
  ifeq ($(TCL_SHARED_BUILD), 1)
-@@ -116,7 +98,4 @@
- clean distclean maintainer-clean: clean-lib
+@@ -93,9 +93,6 @@
+ clean distclean: clean-lib
  	rm -f $(OBJS)
  	rm -rf $(pg_regress_clean_files)
 -ifeq ($(PORTNAME), win32)
 -	rm -f $(tclwithver).def
 -endif
- 	$(MAKE) -C modules $@
+ 
+ maintainer-clean: distclean
+ 	rm -f pltclerrcodes.h
diff --git a/mingw-w64-postgresql/postgresql-9.5.1-pl-python.patch b/mingw-w64-postgresql/postgresql-9.5.1-pl-python.patch
index f7953b12c6..f399285382 100644
--- a/mingw-w64-postgresql/postgresql-9.5.1-pl-python.patch
+++ b/mingw-w64-postgresql/postgresql-9.5.1-pl-python.patch
@@ -49,3 +49,14 @@
  
  else # can't build
  
+--- postgresql-10.1/config/python.m4.orig	2017-12-01 08:18:11.189297000 +0300
++++ postgresql-10.1/config/python.m4	2017-12-01 08:18:22.161116600 +0300
+@@ -88,7 +88,7 @@
+ python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
+ 
+ # If LDLIBRARY exists and has a shlib extension, use it verbatim.
+-ldlibrary=`echo "${python_ldlibrary}" | sed -e 's/\.so$//' -e 's/\.dll$//' -e 's/\.dylib$//' -e 's/\.sl$//'`
++ldlibrary=`echo "${python_ldlibrary}" | sed -e 's/\.so$//' -e 's/\.dll$//' -e 's/\.dll.a$//' -e 's/\.dylib$//' -e 's/\.sl$//'`
+ if test -e "${python_libdir}/${python_ldlibrary}" -a x"${python_ldlibrary}" != x"${ldlibrary}"
+ then
+ 	ldlibrary=`echo "${ldlibrary}" | sed "s/^lib//"`