pgpool2: update to 4.2.2.

Based on a diff provided by Mustafa Dogan.

4.2.1 and 4.2.2 are bugfix releases.

4.2 contains new features and enhancements, including:

    Some items in the configuration file pgpool.conf are vastly
    enhanced for easier configuration and administration.

    Implement logging_collector for easier log management.

    Implement log_disconnections to collect disconnection logs.

    Implement pg_enc and pg_md5 to allow to register multiple
    passwords at once.

    Allow to show statistics of health check by using SHOW
    POOL_HEALTH_CHECK_STATS command, and also allow to show statistics
    of issued SQL by using SHOW POOL_BACKEND_STATS command.

    New PCP command pcp_reload_config is added.

    Now it is possible to omit write_function_list and
    read_only_function_list by looking at system catalog information.

    Add new clustering mode snapshot_isolation_mode which guarantees
    not only data modifications to multiple PostgreSQL but read
    consistency.

    Support LDAP authentication between clients and Pgpool-II.

    Add ssl_crl_file and ssl_passphrase_command to SSL configuration.

    Import PostgreSQL 13's SQL parser.

11 files changed, 130 insertions, 43 deletions

diff --git a/databases/pgpool2/Makefile b/databases/pgpool2/Makefile
index a9ad6b46a09..40c88d96383 100644
--- a/databases/pgpool2/Makefile
+++ b/databases/pgpool2/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2020/05/27 19:37:38 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.8 2021/04/28 09:18:55 wiz Exp $
 
-DISTNAME=	pgpool-II-3.6.5
+DISTNAME=	pgpool-II-4.2.2
 PKGNAME=	postgresql${PGSQL_VERSION}-${DISTNAME:S/pgpool-II/pgpool2/}
-PKGREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
+MASTER_SITES=	https://www.pgpool.net/mediawiki/images/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.pgpool.net/mediawiki/
+HOMEPAGE=	https://www.pgpool.net/mediawiki/
 COMMENT=	Middleware between PostgreSQL servers and a PostgreSQL database client
 LICENSE=	modified-bsd
 
@@ -49,7 +47,11 @@ SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	src/sample/pgpool.conf.sample src/include/pool.h
 SUBST_VARS.path=	PGPOOL_LOGDIR PGPOOL_PIDDIR
 
-REPLACE_BASH+=		src/tools/pgpool_setup src/tools/watchdog_setup
+SUBST_CLASSES+=		bash
+SUBST_MESSAGE.bash=	Fixing bash path
+SUBST_STAGE.bash=	pre-configure
+SUBST_FILES.bash=	src/test/pgpool_setup.in src/test/watchdog_setup.in
+SUBST_SED.bash=		-e 's|/usr/bin/env bash|${PREFIX}/bin/bash|'
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
diff --git a/databases/pgpool2/PLIST b/databases/pgpool2/PLIST
index 62baa172ed6..e508fe16483 100644
--- a/databases/pgpool2/PLIST
+++ b/databases/pgpool2/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2016/11/24 12:52:47 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/04/28 09:18:55 wiz Exp $
 bin/pcp_attach_node
 bin/pcp_detach_node
+bin/pcp_health_check_stats
 bin/pcp_node_count
 bin/pcp_node_info
 bin/pcp_pool_status
@@ -8,12 +9,16 @@ bin/pcp_proc_count
 bin/pcp_proc_info
 bin/pcp_promote_node
 bin/pcp_recovery_node
+bin/pcp_reload_config
 bin/pcp_stop_pgpool
 bin/pcp_watchdog_info
+bin/pg_enc
 bin/pg_md5
 bin/pgpool
 bin/pgpool_setup
+bin/pgproto
 bin/watchdog_setup
+bin/wd_cli
 include/libpcp_ext.h
 include/pcp.h
 include/pool_process_reporting.h
@@ -22,20 +27,39 @@ lib/libpcp.la
 lib/postgresql/pgpool-recovery.so
 lib/postgresql/pgpool-regclass.so
 lib/postgresql/pgpool_adm.so
+share/examples/pgpool2/escalation.sh.sample
+share/examples/pgpool2/failover.sh.sample
+share/examples/pgpool2/follow_primary.sh.sample
 share/examples/pgpool2/pcp.conf.sample
 share/examples/pgpool2/pgpool.conf.sample
-share/examples/pgpool2/pgpool.conf.sample-master-slave
+share/examples/pgpool2/pgpool.conf.sample-logical
+share/examples/pgpool2/pgpool.conf.sample-raw
 share/examples/pgpool2/pgpool.conf.sample-replication
+share/examples/pgpool2/pgpool.conf.sample-slony
+share/examples/pgpool2/pgpool.conf.sample-snapshot
 share/examples/pgpool2/pgpool.conf.sample-stream
+share/examples/pgpool2/pgpool_remote_start.sample
 share/examples/pgpool2/pool_hba.conf.sample
 share/examples/pgpool2/pool_passwd
+share/examples/pgpool2/recovery_1st_stage.sample
+share/examples/pgpool2/recovery_2nd_stage.sample
 share/pgpool2/insert_lock.sql
 share/pgpool2/pgpool.pam
 share/postgresql/extension/pgpool-recovery.sql
 share/postgresql/extension/pgpool-regclass.sql
+share/postgresql/extension/pgpool_adm--1.0--1.1.sql
 share/postgresql/extension/pgpool_adm--1.0.sql
+share/postgresql/extension/pgpool_adm--1.1--1.2.sql
+share/postgresql/extension/pgpool_adm--1.1.sql
+share/postgresql/extension/pgpool_adm--1.2--1.3.sql
+share/postgresql/extension/pgpool_adm--1.2.sql
+share/postgresql/extension/pgpool_adm--1.3.sql
 share/postgresql/extension/pgpool_adm.control
+share/postgresql/extension/pgpool_recovery--1.1--1.2.sql
 share/postgresql/extension/pgpool_recovery--1.1.sql
+share/postgresql/extension/pgpool_recovery--1.2--1.3.sql
+share/postgresql/extension/pgpool_recovery--1.2.sql
+share/postgresql/extension/pgpool_recovery--1.3.sql
 share/postgresql/extension/pgpool_recovery.control
 share/postgresql/extension/pgpool_regclass--1.0.sql
 share/postgresql/extension/pgpool_regclass.control
diff --git a/databases/pgpool2/distinfo b/databases/pgpool2/distinfo
index 95ef27fb5aa..dc2b05ae62a 100644
--- a/databases/pgpool2/distinfo
+++ b/databases/pgpool2/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.3 2017/08/17 07:46:05 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2021/04/28 09:18:55 wiz Exp $
 
-SHA1 (pgpool-II-3.6.5.tar.gz) = 573e5f80691330632ed23648a24c502221175a31
-RMD160 (pgpool-II-3.6.5.tar.gz) = 83b2e8f86bcb7b3fceb57ed6ef485181b43325f9
-SHA512 (pgpool-II-3.6.5.tar.gz) = 12247730f202859c76b0a11ccc485de786e53df7b8e08ffd76d7653c25633d79387f027e7c9d804bf19cd89b9db047b7ca0cf1cf5e914ee74c6efc0b6660eb1d
-Size (pgpool-II-3.6.5.tar.gz) = 2651330 bytes
-SHA1 (patch-configure) = ed04280cf2c02f5491aa20d3478f026a92885f19
-SHA1 (patch-src_include_pool.h) = 74409384d735695d44466468833088959753d9d2
-SHA1 (patch-src_sample_pgpool.conf.sample) = 43f9e481ba3630984c165c609d2aac3d4bbf7c18
-SHA1 (patch-src_watchdog_wd__escalation.c) = 63ac5ea3f8853eb953707e79f351ae1eea3a8b25
+SHA1 (pgpool-II-4.2.2.tar.gz) = 87f917320f4cf790a44a235e2a8854b6fa79d7b3
+RMD160 (pgpool-II-4.2.2.tar.gz) = cc87f747fdf74b5e6628fabab808a474766f8288
+SHA512 (pgpool-II-4.2.2.tar.gz) = a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8
+Size (pgpool-II-4.2.2.tar.gz) = 4734840 bytes
+SHA1 (patch-configure) = 134f5e55499f762e84e458f59132b0e3d5ce1019
+SHA1 (patch-src_auth_pool__hba.c) = a15a9da84419e44fb9d6dc8eb7b8d2769ecaed4a
+SHA1 (patch-src_include_pool.h) = eae2f78a996e3204d75d23378ad6e95333282926
+SHA1 (patch-src_include_utils_fe__ports.h) = 7aea07d78cf2295844286935a330a90e0e411825
+SHA1 (patch-src_main_pgpool__main.c) = 1e680d9143bc745618ecdc61cb4791a90719a5ff
+SHA1 (patch-src_sample_pgpool.conf.sample) = 477cac9cb29a4b6aeb6fd69df80302c69c8a4a03
+SHA1 (patch-src_tools_pgproto_read.c) = a533898b74eb2c43a8aa24285f8cdd3d1e9ac2e2
+SHA1 (patch-src_watchdog_wd__escalation.c) = ef3e4c8715003d9c1031c923fc55179d7c53631a
diff --git a/databases/pgpool2/patches/patch-configure b/databases/pgpool2/patches/patch-configure
index 23e9c836d3c..d065697ab12 100644
--- a/databases/pgpool2/patches/patch-configure
+++ b/databases/pgpool2/patches/patch-configure
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.3 2017/08/17 07:46:05 fhajny Exp $
+$NetBSD: patch-configure,v 1.4 2021/04/28 09:18:55 wiz Exp $
 
 Pick a better name for the package.
 
---- configure.orig	2017-07-10 08:56:18.000000000 +0000
-+++ configure
-@@ -3999,7 +3999,7 @@ fi
+--- configure.orig	2021-04-24 00:31:03.163784259 +0300
++++ configure	2021-04-24 00:31:38.257972283 +0300
+@@ -4053,7 +4053,7 @@ fi
  
  
  # Define the identity of the package.
 - PACKAGE='pgpool-II'
 + PACKAGE='pgpool2'
-  VERSION='3.6.5'
+  VERSION='4.2.2'
  
  
diff --git a/databases/pgpool2/patches/patch-src_auth_pool__hba.c b/databases/pgpool2/patches/patch-src_auth_pool__hba.c
new file mode 100644
index 00000000000..f8e887e5625
--- /dev/null
+++ b/databases/pgpool2/patches/patch-src_auth_pool__hba.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_auth_pool__hba.c,v 1.1 2021/04/28 09:18:55 wiz Exp $
+
+--- src/auth/pool_hba.c.orig	2021-04-24 00:32:29.786972517 +0300
++++ src/auth/pool_hba.c	2021-04-24 00:33:47.296429745 +0300
+@@ -30,9 +30,9 @@
+ #include <errno.h>
+ #include <netdb.h>
+ 
+-#ifdef __FreeBSD__
++#include <sys/types.h>
+ #include <netinet/in.h>
+-#endif
++#include <netinet6/in6.h>
+ 
+ #include "pool.h"
+ #include "auth/pool_hba.h"
diff --git a/databases/pgpool2/patches/patch-src_include_pool.h b/databases/pgpool2/patches/patch-src_include_pool.h
index 59f1f06c35e..87ab8abfa67 100644
--- a/databases/pgpool2/patches/patch-src_include_pool.h
+++ b/databases/pgpool2/patches/patch-src_include_pool.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_include_pool.h,v 1.1 2016/03/11 21:30:55 fhajny Exp $
+$NetBSD: patch-src_include_pool.h,v 1.2 2021/04/28 09:18:55 wiz Exp $
 
 Default pid file location.
 
---- src/include/pool.h.orig	2016-02-20 00:28:07.000000000 +0200
-+++ src/include/pool.h		2016-02-20 00:29:09.000000000 +0200
-@@ -81,7 +81,7 @@
+--- src/include/pool.h.orig	2021-04-24 00:34:31.131959515 +0300
++++ src/include/pool.h	2021-04-24 00:35:57.462247644 +0300
+@@ -78,7 +78,7 @@
  #define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
  
  /* pid file name */
diff --git a/databases/pgpool2/patches/patch-src_include_utils_fe__ports.h b/databases/pgpool2/patches/patch-src_include_utils_fe__ports.h
new file mode 100644
index 00000000000..5fc20d12a67
--- /dev/null
+++ b/databases/pgpool2/patches/patch-src_include_utils_fe__ports.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_include_utils_fe__ports.h,v 1.1 2021/04/28 09:18:55 wiz Exp $
+
+--- src/include/utils/fe_ports.h.orig	2021-04-24 00:38:17.082783710 +0300
++++ src/include/utils/fe_ports.h	2021-04-24 00:38:58.811176898 +0300
+@@ -29,6 +29,7 @@
+ #endif
+ 
+ #include <stdlib.h>
++#include <stdarg.h>
+ #ifndef FE_PORTS
+ #define FE_PORTS
+ #include "parser/pg_config_manual.h"
diff --git a/databases/pgpool2/patches/patch-src_main_pgpool__main.c b/databases/pgpool2/patches/patch-src_main_pgpool__main.c
new file mode 100644
index 00000000000..868929afa5d
--- /dev/null
+++ b/databases/pgpool2/patches/patch-src_main_pgpool__main.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_main_pgpool__main.c,v 1.1 2021/04/28 09:18:55 wiz Exp $
+
+--- src/main/pgpool_main.c.orig	2021-04-24 00:39:53.017132316 +0300
++++ src/main/pgpool_main.c	2021-04-24 00:40:56.172455323 +0300
+@@ -33,10 +33,8 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/wait.h>
+-
+-#ifdef  __FreeBSD__
++#include <sys/syslog.h>
+ #include <netinet/in.h>
+-#endif
+ 
+ #include "pool.h"
+ #include "version.h"
diff --git a/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample b/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample
index ccfa323b088..b5eaa95a7cb 100644
--- a/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample
+++ b/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_sample_pgpool.conf.sample,v 1.2 2017/08/17 07:46:05 fhajny Exp $
+$NetBSD: patch-src_sample_pgpool.conf.sample,v 1.3 2021/04/28 09:18:55 wiz Exp $
 
 Default pid file location.
 
---- src/sample/pgpool.conf.sample.orig	2017-07-10 08:56:18.000000000 +0000
-+++ src/sample/pgpool.conf.sample
-@@ -210,13 +210,13 @@ syslog_ident = 'pgpool'
+--- src/sample/pgpool.conf.sample.orig	2021-04-24 00:45:34.156306546 +0300
++++ src/sample/pgpool.conf.sample	2021-04-24 00:47:55.421086015 +0300
+@@ -286,13 +286,13 @@ syslog_ident = 'pgpool'
  # FILE LOCATIONS
  #------------------------------------------------------------------------------
  
@@ -15,17 +15,17 @@ Default pid file location.
                                     # location of pgpool.conf file or
                                     # as an absolute path
                                     # (change requires restart)
--logdir = '/var/log/pgpool'
+-logdir = '/tmp'
 +logdir = '@PGPOOL_LOGDIR@'
                                     # Directory of pgPool status file
                                     # (change requires restart)
  
-@@ -709,7 +709,7 @@ memqcache_cache_block_size = 1048576
- 								   # Cache block size in bytes. Mandatory if memqcache_method = 'shmem'.
- 								   # Defaults to 1MB.
+@@ -894,7 +894,7 @@ memqcache_cache_block_size = 1MB
+                                    # Cache block size in bytes. Mandatory if memqcache_method = 'shmem'.
+                                    # Defaults to 1MB.
                                     # (change requires restart)
 -memqcache_oiddir = '/var/log/pgpool/oiddir'
 +memqcache_oiddir = '@PGPOOL_LOGDIR@/oiddir'
- 				   				   # Temporary work directory to record table oids
+                                    # Temporary work directory to record table oids
                                     # (change requires restart)
- white_memqcache_table_list = ''
+ cache_safe_memqcache_table_list = ''
diff --git a/databases/pgpool2/patches/patch-src_tools_pgproto_read.c b/databases/pgpool2/patches/patch-src_tools_pgproto_read.c
new file mode 100644
index 00000000000..3df1bf7a2d5
--- /dev/null
+++ b/databases/pgpool2/patches/patch-src_tools_pgproto_read.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_tools_pgproto_read.c,v 1.1 2021/04/28 09:18:55 wiz Exp $
+
+--- src/tools/pgproto/read.c.orig	2021-04-24 00:48:42.306544222 +0300
++++ src/tools/pgproto/read.c	2021-04-24 00:49:09.010194923 +0300
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <arpa/inet.h>
++#include <sys/time.h>
+ #include "pgproto/fe_memutils.h"
+ #include <libpq-fe.h>
+ #include "pgproto/read.h"
diff --git a/databases/pgpool2/patches/patch-src_watchdog_wd__escalation.c b/databases/pgpool2/patches/patch-src_watchdog_wd__escalation.c
index 4316fb687d8..fb6a9298383 100644
--- a/databases/pgpool2/patches/patch-src_watchdog_wd__escalation.c
+++ b/databases/pgpool2/patches/patch-src_watchdog_wd__escalation.c
@@ -1,16 +1,17 @@
-$NetBSD: patch-src_watchdog_wd__escalation.c,v 1.1 2016/03/11 21:30:55 fhajny Exp $
+$NetBSD: patch-src_watchdog_wd__escalation.c,v 1.2 2021/04/28 09:18:55 wiz Exp $
 
 Add sys/wait.h unconditionally, same as other source files.
 
---- src/watchdog/wd_escalation.c.orig	2016-02-10 08:53:31.000000000 +0000
-+++ src/watchdog/wd_escalation.c
-@@ -27,9 +27,7 @@
+--- src/watchdog/wd_escalation.c.orig	2021-04-24 00:49:41.737572235 +0300
++++ src/watchdog/wd_escalation.c	2021-04-24 00:49:56.140555487 +0300
+@@ -26,10 +26,7 @@
+ #include <stdlib.h>
  #include <unistd.h>
  #include <errno.h>
- 
+-
 -#ifdef __FreeBSD__
  #include <sys/wait.h>
 -#endif
  
- #include "pool.h"
+ #include "utils/pool_signal.h"
  #include "utils/elog.h"