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 -0000 1.7 +++ Makefile 7 Dec 2017 15:19:57 -0000 @@ -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 <p...@openbsd.org> @@ -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 <bsd.port.mk> 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 -0000 1.5 +++ distinfo 7 Dec 2017 15:19:57 -0000 @@ -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 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 <unistd.h> - #include <string.h> - #include <netinet/in.h> -+#include <stdint.h> - - #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 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 <ctype.h> - #include <arpa/inet.h> - #include <dirent.h> -+#include <stdint.h> - - #ifdef USE_MEMCACHED - #include <libmemcached/memcached.h> 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 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 <stdlib.h> - #include <string.h> - #include <unistd.h> -+#include <stdint.h> - - #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 -0000 +++ patches/patch-src_include_watchdog_wd_utils_h 7 Dec 2017 15:19:57 -0000 @@ -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 <ifaddrs.h> ++#include <pthread.h> + #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 -0000 +++ patches/patch-src_main_main_c 7 Dec 2017 15:19:57 -0000 @@ -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 >= 0x10100000L) ++#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) + OPENSSL_init_ssl(0, NULL); + #else + SSL_library_init(); Index: patches/patch-src_rewrite_pool_lobj_c =================================================================== RCS file: patches/patch-src_rewrite_pool_lobj_c diff -N patches/patch-src_rewrite_pool_lobj_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_rewrite_pool_lobj_c 7 Dec 2017 15:19:57 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: src/rewrite/pool_lobj.c +--- src/rewrite/pool_lobj.c.orig ++++ src/rewrite/pool_lobj.c +@@ -27,6 +27,7 @@ + #include <unistd.h> + #include <string.h> + #include <netinet/in.h> ++#include <stdint.h> + + #include "pool.h" + #include "rewrite/pool_lobj.h" Index: patches/patch-src_utils_pool_select_walker_c =================================================================== RCS file: patches/patch-src_utils_pool_select_walker_c diff -N patches/patch-src_utils_pool_select_walker_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_utils_pool_select_walker_c 7 Dec 2017 15:19:57 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: src/utils/pool_select_walker.c +--- src/utils/pool_select_walker.c.orig ++++ src/utils/pool_select_walker.c +@@ -22,6 +22,7 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> ++#include <stdint.h> + + #include "pool.h" + #include "utils/elog.h" Index: patches/patch-src_watchdog_wd_escalation_c =================================================================== RCS file: patches/patch-src_watchdog_wd_escalation_c diff -N patches/patch-src_watchdog_wd_escalation_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_watchdog_wd_escalation_c 7 Dec 2017 15:19:57 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/watchdog/wd_escalation.c +--- src/watchdog/wd_escalation.c.orig ++++ src/watchdog/wd_escalation.c +@@ -27,7 +27,7 @@ + #include <unistd.h> + #include <errno.h> + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__OpenBSD__) + #include <sys/wait.h> + #endif + Index: patches/patch-src_watchdog_wd_lifecheck_c =================================================================== RCS file: patches/patch-src_watchdog_wd_lifecheck_c diff -N patches/patch-src_watchdog_wd_lifecheck_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_watchdog_wd_lifecheck_c 7 Dec 2017 15:19:57 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: src/watchdog/wd_lifecheck.c +--- src/watchdog/wd_lifecheck.c.orig ++++ src/watchdog/wd_lifecheck.c +@@ -26,6 +26,7 @@ + #include <ctype.h> + #include <time.h> + #include <string.h> ++#include <stdint.h> + #include <stdlib.h> + #include <unistd.h> + #include <netdb.h> Index: patches/patch-src_watchdog_wd_ping_c =================================================================== RCS file: patches/patch-src_watchdog_wd_ping_c diff -N patches/patch-src_watchdog_wd_ping_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_watchdog_wd_ping_c 7 Dec 2017 15:19:57 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: src/watchdog/wd_ping.c +--- src/watchdog/wd_ping.c.orig ++++ src/watchdog/wd_ping.c +@@ -25,6 +25,7 @@ + #include <stdio.h> + #include <errno.h> + #include <string.h> ++#include <stdint.h> + #include <stdlib.h> + #include <unistd.h> + #include <netdb.h> Index: patches/patch-src_watchdog_wd_utils_c =================================================================== RCS file: patches/patch-src_watchdog_wd_utils_c diff -N patches/patch-src_watchdog_wd_utils_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_watchdog_wd_utils_c 7 Dec 2017 15:19:57 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +Index: src/watchdog/wd_utils.c +--- src/watchdog/wd_utils.c.orig ++++ src/watchdog/wd_utils.c +@@ -154,7 +154,7 @@ static void calculate_hmac_sha256(const char *data, in + unsigned int res_len = WD_AUTH_HASH_LEN; + HMAC_CTX *ctx = NULL; + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) + ctx = HMAC_CTX_new(); + HMAC_CTX_reset(ctx); + #else +@@ -165,7 +165,7 @@ static void calculate_hmac_sha256(const char *data, in + HMAC_Init_ex(ctx, key, strlen(key), EVP_sha256(), NULL); + HMAC_Update(ctx, (unsigned char*)data, len); + HMAC_Final(ctx, (unsigned char*)str, &res_len); +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) + HMAC_CTX_reset(ctx); + HMAC_CTX_free(ctx); + #else Index: patches/patch-watchdog_wd_lifecheck_c =================================================================== RCS file: patches/patch-watchdog_wd_lifecheck_c diff -N patches/patch-watchdog_wd_lifecheck_c --- patches/patch-watchdog_wd_lifecheck_c 4 Oct 2015 20:22:21 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-watchdog_wd_lifecheck_c,v 1.2 2015/10/04 20:22:21 benno Exp $ ---- watchdog/wd_lifecheck.c.orig Wed Apr 8 09:59:48 2015 -+++ watchdog/wd_lifecheck.c Sun Jul 5 17:23:53 2015 -@@ -29,6 +29,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <netdb.h> -+#include <stdint.h> - #include "pool.h" - #include "pool_config.h" - #include "watchdog.h" Index: patches/patch-watchdog_wd_packet_c =================================================================== RCS file: patches/patch-watchdog_wd_packet_c diff -N patches/patch-watchdog_wd_packet_c --- patches/patch-watchdog_wd_packet_c 4 Oct 2015 20:22:21 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-watchdog_wd_packet_c,v 1.2 2015/10/04 20:22:21 benno Exp $ ---- watchdog/wd_packet.c.orig Wed Apr 8 09:59:48 2015 -+++ watchdog/wd_packet.c Sun Jul 5 17:29:19 2015 -@@ -39,6 +39,7 @@ - #include <arpa/inet.h> - #include <unistd.h> - #include <fcntl.h> -+#include <stdint.h> - #include <sys/wait.h> - - #include "pool.h" Index: patches/patch-watchdog_wd_ping_c =================================================================== RCS file: patches/patch-watchdog_wd_ping_c diff -N patches/patch-watchdog_wd_ping_c --- patches/patch-watchdog_wd_ping_c 4 Oct 2015 20:22:21 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-watchdog_wd_ping_c,v 1.2 2015/10/04 20:22:21 benno Exp $ ---- watchdog/wd_ping.c.orig Wed Apr 8 09:59:48 2015 -+++ watchdog/wd_ping.c Sun Jul 5 17:27:43 2015 -@@ -24,6 +24,7 @@ - #include <pthread.h> - #include <stdio.h> - #include <errno.h> -+#include <stdint.h> - #include <string.h> - #include <stdlib.h> - #include <unistd.h> Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/pgpool/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 4 Apr 2016 22:57:45 -0000 1.2 +++ pkg/PLIST 7 Dec 2017 15:19:57 -0000 @@ -11,9 +11,11 @@ @bin bin/pcp_promote_node @bin bin/pcp_recovery_node @bin bin/pcp_stop_pgpool -@bin bin/pcp_systemdb_info +@bin bin/pcp_watchdog_info @bin bin/pg_md5 @bin bin/pgpool +bin/pgpool_setup +bin/watchdog_setup include/libpcp_ext.h include/pcp.h include/pool_process_reporting.h @@ -21,7 +23,6 @@ include/pool_type.h lib/libpcp.a lib/libpcp.la @lib lib/libpcp.so.${LIBpcp_VERSION} -lib/postgresql/ lib/postgresql/pgpool-regclass.so @man man/man8/pgpool.8 share/examples/pgpool-II/ @@ -29,6 +30,7 @@ share/examples/pgpool-II/pcp.conf.sample @sample ${SYSCONFDIR}/pcp.conf share/examples/pgpool-II/pgpool.conf.sample @sample ${SYSCONFDIR}/pgpool.conf +share/examples/pgpool-II/pgpool.conf.sample-logical share/examples/pgpool-II/pgpool.conf.sample-master-slave share/examples/pgpool-II/pgpool.conf.sample-replication share/examples/pgpool-II/pgpool.conf.sample-stream @@ -37,9 +39,8 @@ share/examples/pgpool-II/pool_hba.conf.s share/pgpool-II/ share/pgpool-II/insert_lock.sql share/pgpool-II/pgpool.pam -share/pgpool-II/system_db.sql -share/postgresql/ -share/postgresql/contrib/ -share/postgresql/contrib/pgpool-regclass.sql -share/postgresql/contrib/uninstall_pgpool-regclass.sql +share/postgresql/extension/ +share/postgresql/extension/pgpool-regclass.sql +share/postgresql/extension/pgpool_regclass--1.0.sql +share/postgresql/extension/pgpool_regclass.control @rcscript ${RCDIR}/pgpool
