Re: [Update] pgpool-II-3.7.0

[Daniel Jakots]

On Thu, 7 Dec 2017 16:23:30 +0100, Pierre-Emmanuel André
 wrote:

> This diff updates pgpool-II to it's latest version (3.7.0).
> It's a big update.
> 
> Tested on @amd64 with PostgreSQL 9.6.6 and PostgreSQL 10.1.
> 
> Comments, ok ?

Did you check if the SHARED_LIB needed a bump? If so, ok danj@

[Update] pgpool-II-3.7.0

[Pierre-Emmanuel André]

Hi,

This diff updates pgpool-II to it's latest version (3.7.0).
It's a big update.

Tested on @amd64 with PostgreSQL 9.6.6 and PostgreSQL 10.1.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile	4 Apr 2016 22:57:45 -	1.7
+++ Makefile	7 Dec 2017 15:19:57 -
@@ -2,12 +2,11 @@
 
 COMMENT= 	connection pool server for PostgreSQL
 
-DISTNAME= 	pgpool-II-3.2.12
-REVISION=	0
+DISTNAME= 	pgpool-II-3.7.0
 
 CATEGORIES= 	databases
 
-HOMEPAGE= 	http://www.pgpool.net/
+HOMEPAGE= 	https://www.pgpool.net/
 
 MAINTAINER= 	Pierre-Emmanuel Andre 
 
@@ -21,7 +20,7 @@ MASTER_SITES=		http://www.pgpool.net/med
 WANTLIB= 		c crypto m pq ssl pthread
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ARGS= 	--with-openssl 
+CONFIGURE_ARGS= 	--with-openssl
 
 USE_GMAKE=		Yes
 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/pgpool-II/
@@ -30,11 +29,12 @@ BUILD_DEPENDS = 	databases/postgresql,-s
 LIB_DEPENDS = 		databases/postgresql
 
 post-install:
-	@cd ${WRKSRC}/sql/pgpool-regclass && \
+	@cd ${WRKSRC}/src/sql/pgpool-regclass && \
 		env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
 		-f ${MAKE_FILE} ${ALL_TARGET} && \
 		env -i ${MAKE_ENV} \
 		PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST} TRUEPREFIX=${PREFIX} \
 		${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
+	${INSTALL_MAN} ${WRKDIST}/./doc/src/sgml/man8/pgpool.8 ${PREFIX}/man/man8/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo	4 Oct 2015 20:22:21 -	1.5
+++ distinfo	7 Dec 2017 15:19:57 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.2.12.tar.gz) = 2ynh2OUX9qoDTehobSpAqPtCtWJOEXrKV3DIBWysbog=
-SIZE (pgpool-II-3.2.12.tar.gz) = 1626485
+SHA256 (pgpool-II-3.7.0.tar.gz) = UtQJST/1mWR31Y0Bzjds7LMzWGmoxrhAY2BNZ27u+og=
+SIZE (pgpool-II-3.7.0.tar.gz) = 3269076
Index: patches/patch-pool_lobj_c
===
RCS file: patches/patch-pool_lobj_c
diff -N patches/patch-pool_lobj_c
--- patches/patch-pool_lobj_c	21 Dec 2011 15:51:04 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_lobj_c,v 1.1.1.1 2011/12/21 15:51:04 pea Exp $
 pool_lobj.c.orig	Thu Nov 24 15:43:49 2011
-+++ pool_lobj.c	Thu Nov 24 15:44:02 2011
-@@ -27,6 +27,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "pool.h"
- #include "pool_lobj.h"
Index: patches/patch-pool_memqcache_c
===
RCS file: patches/patch-pool_memqcache_c
diff -N patches/patch-pool_memqcache_c
--- patches/patch-pool_memqcache_c	24 Sep 2012 19:39:59 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_memqcache_c,v 1.1 2012/09/24 19:39:59 pea Exp $
 pool_memqcache.c.orig	Sun Sep 16 12:23:15 2012
-+++ pool_memqcache.c	Sun Sep 16 12:23:26 2012
-@@ -36,6 +36,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef USE_MEMCACHED
- #include 
Index: patches/patch-pool_select_walker_c
===
RCS file: patches/patch-pool_select_walker_c
diff -N patches/patch-pool_select_walker_c
--- patches/patch-pool_select_walker_c	24 Sep 2012 19:39:59 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_select_walker_c,v 1.1 2012/09/24 19:39:59 pea Exp $
 pool_select_walker.c.orig	Sun Sep 16 12:30:03 2012
-+++ pool_select_walker.c	Sun Sep 16 12:30:16 2012
-@@ -22,6 +22,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "pool.h"
- #include "pool_config.h"
Index: patches/patch-src_include_watchdog_wd_utils_h
===
RCS file: patches/patch-src_include_watchdog_wd_utils_h
diff -N patches/patch-src_include_watchdog_wd_utils_h
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_include_watchdog_wd_utils_h	7 Dec 2017 15:19:57 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/include/watchdog/wd_utils.h
+--- src/include/watchdog/wd_utils.h.orig
 src/include/watchdog/wd_utils.h
+@@ -26,6 +26,7 @@
+ #define WD_UTILS_H
+ 
+ #include 
++#include 
+ #include "parser/pg_list.h"
+ 
+ #define WD_NG (0)
Index: patches/patch-src_main_main_c
===
RCS file: patches/patch-src_main_main_c
diff -N patches/patch-src_main_main_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_main_c	7 Dec 2017 15:19:57 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/main/main.c
+--- src/main/main.c.orig
 src/main/main.c
+@@ -186,7 +186,7 @@ int main(int argc, char **argv)
+ 	}
+ #ifdef USE_SSL
+ 	/* global ssl init */
+-#if (OPENSSL_VERSION_NUMBER