Hi, this updates pgpool from 3.2.12 to 3.6.6.
Yesterdays 3.6.7 requires OpenSSL 1.1 or at least some patching, so i would like to get this commited first before taking care of openssl and postgres 10). ok? /Benno Index: Makefile =================================================================== RCS file: /cvs/ports/databases/pgpool/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 4 Apr 2016 22:57:45 -0000 1.7 +++ Makefile 10 Oct 2017 14:43:08 -0000 @@ -2,8 +2,7 @@ COMMENT= connection pool server for PostgreSQL -DISTNAME= pgpool-II-3.2.12 -REVISION= 0 +DISTNAME= pgpool-II-3.6.6 CATEGORIES= databases @@ -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 -r1.5 distinfo --- distinfo 4 Oct 2015 20:22:21 -0000 1.5 +++ distinfo 10 Oct 2017 14:43:08 -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.6.6.tar.gz) = X72sFKB7T0yr74vSJL4fuwdw2apHMdj6eQWHjcTCL7w= +SIZE (pgpool-II-3.6.6.tar.gz) = 3171264 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 10 Oct 2017 14:43:08 -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_pcp_con_pcp_worker_c =================================================================== RCS file: patches/patch-src_pcp_con_pcp_worker_c diff -N patches/patch-src_pcp_con_pcp_worker_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_pcp_con_pcp_worker_c 10 Oct 2017 14:43:08 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Index: src/pcp_con/pcp_worker.c +--- src/pcp_con/pcp_worker.c.orig ++++ src/pcp_con/pcp_worker.c +@@ -704,8 +704,8 @@ inform_process_info(PCP_CONNECTION *frontend,char *buf + if (proc_id != 0 && proc_id != pools[i].pool_pid) continue; + + snprintf(proc_pid, sizeof(proc_pid), "%d", pools[i].pool_pid); +- snprintf(proc_start_time, sizeof(proc_start_time), "%ld", pools[i].start_time); +- snprintf(proc_create_time, sizeof(proc_create_time), "%ld", pools[i].create_time); ++ snprintf(proc_start_time, sizeof(proc_start_time), "%lld", pools[i].start_time); ++ snprintf(proc_create_time, sizeof(proc_create_time), "%lld", pools[i].create_time); + snprintf(majorversion, sizeof(majorversion), "%d", pools[i].pool_majorversion); + snprintf(minorversion, sizeof(minorversion), "%d", pools[i].pool_minorversion); + snprintf(pool_counter, sizeof(pool_counter), "%d", pools[i].pool_counter); Index: patches/patch-src_protocol_pool_connection_pool_c =================================================================== RCS file: patches/patch-src_protocol_pool_connection_pool_c diff -N patches/patch-src_protocol_pool_connection_pool_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_protocol_pool_connection_pool_c 10 Oct 2017 14:43:08 -0000 @@ -0,0 +1,41 @@ +$OpenBSD$ + +Index: src/protocol/pool_connection_pool.c +--- src/protocol/pool_connection_pool.c.orig ++++ src/protocol/pool_connection_pool.c +@@ -267,7 +267,7 @@ POOL_CONNECTION_POOL *pool_create_cp(void) + { + ereport(DEBUG1, + (errmsg("creating connection pool"), +- errdetail("user: %s database: %s closetime: %ld", ++ errdetail("user: %s database: %s closetime: %lld", + MASTER_CONNECTION(p)->sp->user, + MASTER_CONNECTION(p)->sp->database, + MASTER_CONNECTION(p)->closetime))); +@@ -327,7 +327,7 @@ void pool_connection_pool_timer(POOL_CONNECTION_POOL * + + ereport(DEBUG1, + (errmsg("setting backend connection close timer"), +- errdetail("close time %ld", time(NULL)))); ++ errdetail("close time %lld", time(NULL)))); + + MASTER_CONNECTION(backend)->closetime = time(NULL); /* set connection close time */ + +@@ -379,7 +379,7 @@ void pool_backend_timer(void) + now = time(NULL); + + ereport(DEBUG1, +- (errmsg("backend timer handler called at%ld", now))); ++ (errmsg("backend timer handler called at%lld", now))); + + for (i=0;i<pool_config->max_pool;i++, p++) + { +@@ -397,7 +397,7 @@ void pool_backend_timer(void) + + ereport(DEBUG1, + (errmsg("backend timer handler called"), +- errdetail("expire time: %ld", ++ errdetail("expire time: %lld", + MASTER_CONNECTION(p)->closetime+pool_config->connection_life_time))); + + if (now >= (MASTER_CONNECTION(p)->closetime+pool_config->connection_life_time)) Index: patches/patch-src_query_cache_pool_memqcache_c =================================================================== RCS file: patches/patch-src_query_cache_pool_memqcache_c diff -N patches/patch-src_query_cache_pool_memqcache_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_query_cache_pool_memqcache_c 10 Oct 2017 14:43:08 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +Index: src/query_cache/pool_memqcache.c +--- src/query_cache/pool_memqcache.c.orig ++++ src/query_cache/pool_memqcache.c +@@ -264,7 +264,7 @@ static int pool_commit_cache(POOL_CONNECTION_POOL *bac + memqcache_expire = pool_config->memqcache_expire; + ereport(DEBUG1, + (errmsg("commiting SELECT results to cache storage"), +- errdetail("memqcache_expire = %ld", memqcache_expire))); ++ errdetail("memqcache_expire = %lld", memqcache_expire))); + + if (pool_is_shmem_cache()) + { +@@ -2398,7 +2398,7 @@ static POOL_CACHEID *pool_find_item_on_shmem_cache(POO + { + ereport(DEBUG1, + (errmsg("memcache finding item"), +- errdetail("cache expired: now: %ld timestamp: %ld", ++ errdetail("cache expired: now: %lld timestamp: %lld", + now, cih->timestamp + pool_config->memqcache_expire))); + pool_delete_item_shmem_cache(c); + return NULL; 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 10 Oct 2017 14:43:08 -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_relcache_c =================================================================== RCS file: patches/patch-src_utils_pool_relcache_c diff -N patches/patch-src_utils_pool_relcache_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_utils_pool_relcache_c 10 Oct 2017 14:43:08 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/utils/pool_relcache.c +--- src/utils/pool_relcache.c.orig ++++ src/utils/pool_relcache.c +@@ -134,7 +134,7 @@ void *pool_search_relcache(POOL_RELCACHE *relcache, PO + { + ereport(DEBUG1, + (errmsg("searching relcache"), +- errdetail("relcache for database:%s table:%s expired. now:%ld expiration time:%ld", dbname, table, now, relcache->cache[i].expire))); ++ errdetail("relcache for database:%s table:%s expired. now:%lld expiration time:%lld", dbname, table, now, relcache->cache[i].expire))); + + relcache->cache[i].refcnt = 0; + break; 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 10 Oct 2017 14:43:08 -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 10 Oct 2017 14:43:08 -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_heartbeat_c =================================================================== RCS file: patches/patch-src_watchdog_wd_heartbeat_c diff -N patches/patch-src_watchdog_wd_heartbeat_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_watchdog_wd_heartbeat_c 10 Oct 2017 14:43:08 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/watchdog/wd_heartbeat.c +--- src/watchdog/wd_heartbeat.c.orig ++++ src/watchdog/wd_heartbeat.c +@@ -645,7 +645,7 @@ static int + packet_to_string_hb(WdHbPacket *pkt, char *str, int maxlen) + { + int len; +- len = snprintf(str, maxlen, "tv_sec=%ld tv_usec=%ld from=%s", ++ len = snprintf(str, maxlen, "tv_sec=%lld tv_usec=%ld from=%s", + pkt->send_time.tv_sec, pkt->send_time.tv_usec, pkt->from); + + return len; 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 10 Oct 2017 14:43:08 -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 10 Oct 2017 14:43:08 -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-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 -r1.2 PLIST --- pkg/PLIST 4 Apr 2016 22:57:45 -0000 1.2 +++ pkg/PLIST 10 Oct 2017 14:43:08 -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/ @@ -37,9 +38,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
