pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases/pgpool2
Module Name: pkgsrc
Committed By: adam
Date: Wed May 18 11:20:35 UTC 2022
Modified Files:
pkgsrc/databases/pgpool2: Makefile PLIST distinfo
pkgsrc/databases/pgpool2/patches: patch-configure
patch-src_auth_pool__hba.c patch-src_sample_pgpool.conf.sample
Added Files:
pkgsrc/databases/pgpool2/patches: patch-src_Makefile.in
Log Message:
pgpool2: updated to 4.3.1
4.3.1
Suppress message length log for in_hot_standby.
Change the default value for log_line_prefix.
Add validations of wd_lifecheck_password and recovery_password format.
Enhance parameter status handling.
Bug fixes
4.3.0
Many enhancements are added to this version for easier configuration and administration. A new cluster membership mechanism is introduced to dynamically adjust the Watchdog cluster size. This allows
the leader Watchdog node to retain the quorum/VIP even when some of watchdog nodes get Shutdown or disconnected. New PostgreSQL 14 SQL parser is imported. The Snapshot Isolation Mode is now ready for
production. New sample configuration for the mode is provided in the configuration example section.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/pgpool2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/pgpool2/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/pgpool2/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/pgpool2/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/pgpool2/patches/patch-src_Makefile.in
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/databases/pgpool2/patches/patch-src_auth_pool__hba.c
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/databases/pgpool2/Makefile
diff -u pkgsrc/databases/pgpool2/Makefile:1.8 pkgsrc/databases/pgpool2/Makefile:1.9
--- pkgsrc/databases/pgpool2/Makefile:1.8 Wed Apr 28 09:18:55 2021
+++ pkgsrc/databases/pgpool2/Makefile Wed May 18 11:20:35 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2021/04/28 09:18:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/18 11:20:35 adam Exp $
-DISTNAME= pgpool-II-4.2.2
-PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME:S/pgpool-II/pgpool2/}
+DISTNAME= pgpool-II-4.3.1
+PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME:S/-II/2/}
CATEGORIES= databases
MASTER_SITES= https://www.pgpool.net/mediawiki/images/
@@ -12,9 +12,10 @@ LICENSE= modified-bsd
DEPENDS+= postgresql${PGSQL_VERSION}-server>=0:../../databases/postgresql${PGSQL_VERSION}-server
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= bash:run gmake
+USE_LIBTOOL= yes
+USE_TOOLS+= bash:run gmake
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+GNU_CONFIGURE= yes
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
@@ -25,8 +26,6 @@ EGDIR= share/examples/pgpool2
PGPOOL_USER?= pgpool
PGPOOL_GROUP?= ${PGGROUP}
-PGGROUP?= pgsql
-PGHOME?= ${PREFIX}/${PGGROUP}
PKG_GROUPS= ${PGPOOL_GROUP}
PKG_USERS= ${PGPOOL_USER}:${PGPOOL_GROUP}
@@ -47,16 +46,10 @@ SUBST_STAGE.path= pre-configure
SUBST_FILES.path= src/sample/pgpool.conf.sample src/include/pool.h
SUBST_VARS.path= PGPOOL_LOGDIR PGPOOL_PIDDIR
-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}
+REPLACE_BASH+= src/test/pgpool_setup.in
+REPLACE_BASH+= src/test/watchdog_setup.in
BUILD_DIRS= . src/sql
-
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/${EGDIR}
RCD_SCRIPTS+= pgpool2
Index: pkgsrc/databases/pgpool2/PLIST
diff -u pkgsrc/databases/pgpool2/PLIST:1.3 pkgsrc/databases/pgpool2/PLIST:1.4
--- pkgsrc/databases/pgpool2/PLIST:1.3 Wed Apr 28 09:18:55 2021
+++ pkgsrc/databases/pgpool2/PLIST Wed May 18 11:20:35 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/04/28 09:18:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/05/18 11:20:35 adam Exp $
bin/pcp_attach_node
bin/pcp_detach_node
bin/pcp_health_check_stats
@@ -24,6 +24,12 @@ include/pcp.h
include/pool_process_reporting.h
include/pool_type.h
lib/libpcp.la
+lib/postgresql/bitcode/pgpool-recovery.index.bc
+lib/postgresql/bitcode/pgpool-recovery/pgpool-recovery.bc
+lib/postgresql/bitcode/pgpool-regclass.index.bc
+lib/postgresql/bitcode/pgpool-regclass/pgpool-regclass.bc
+lib/postgresql/bitcode/pgpool_adm.index.bc
+lib/postgresql/bitcode/pgpool_adm/pgpool_adm.bc
lib/postgresql/pgpool-recovery.so
lib/postgresql/pgpool-regclass.so
lib/postgresql/pgpool_adm.so
@@ -32,17 +38,12 @@ share/examples/pgpool2/failover.sh.sampl
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-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/examples/pgpool2/replication_mode_recovery_1st_stage.sample
+share/examples/pgpool2/replication_mode_recovery_2nd_stage.sample
share/pgpool2/insert_lock.sql
share/pgpool2/pgpool.pam
share/postgresql/extension/pgpool-recovery.sql
@@ -53,13 +54,17 @@ share/postgresql/extension/pgpool_adm--1
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--1.4.sql
share/postgresql/extension/pgpool_adm--1.3.sql
+share/postgresql/extension/pgpool_adm--1.4.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--1.4.sql
share/postgresql/extension/pgpool_recovery--1.3.sql
+share/postgresql/extension/pgpool_recovery--1.4.sql
share/postgresql/extension/pgpool_recovery.control
share/postgresql/extension/pgpool_regclass--1.0.sql
share/postgresql/extension/pgpool_regclass.control
Index: pkgsrc/databases/pgpool2/distinfo
diff -u pkgsrc/databases/pgpool2/distinfo:1.6 pkgsrc/databases/pgpool2/distinfo:1.7
--- pkgsrc/databases/pgpool2/distinfo:1.6 Tue Oct 26 10:09:44 2021
+++ pkgsrc/databases/pgpool2/distinfo Wed May 18 11:20:35 2022
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:09:44 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/05/18 11:20:35 adam Exp $
-BLAKE2s (pgpool-II-4.2.2.tar.gz) = 7cc3938469f8fac05b61f32d662f34c702dda88a0421b25729a6a820536f4cb9
-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
+BLAKE2s (pgpool-II-4.3.1.tar.gz) = 780229c8c2adcf38a136641f849e0ef18bbf46a15dedf9bc2990cf85dcb48027
+SHA512 (pgpool-II-4.3.1.tar.gz) = a5417d9f5baa1b39e3645f7d44accf0a2f04d5fc5cb4d28089169aaebbd15c20b4cd280d09f15fa764c3b793117086fc03f5d7be584c0c5ff9c5f8e11ddb9ef8
+Size (pgpool-II-4.3.1.tar.gz) = 6034811 bytes
+SHA1 (patch-configure) = dc15a41b8f5d6572426514a155dc671ca2faa95c
+SHA1 (patch-src_Makefile.in) = 467e7b9a2acf5459b29141812dc0e1ad6d01f72f
+SHA1 (patch-src_auth_pool__hba.c) = e677effdc067273342adedfd0611661fc03ca059
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_sample_pgpool.conf.sample) = 3a12aa1a9107a77b536912ab46d98888c3640ef6
SHA1 (patch-src_tools_pgproto_read.c) = a533898b74eb2c43a8aa24285f8cdd3d1e9ac2e2
SHA1 (patch-src_watchdog_wd__escalation.c) = ef3e4c8715003d9c1031c923fc55179d7c53631a
Index: pkgsrc/databases/pgpool2/patches/patch-configure
diff -u pkgsrc/databases/pgpool2/patches/patch-configure:1.4 pkgsrc/databases/pgpool2/patches/patch-configure:1.5
--- pkgsrc/databases/pgpool2/patches/patch-configure:1.4 Wed Apr 28 09:18:55 2021
+++ pkgsrc/databases/pgpool2/patches/patch-configure Wed May 18 11:20:35 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.4 2021/04/28 09:18:55 wiz Exp $
+$NetBSD: patch-configure,v 1.5 2022/05/18 11:20:35 adam Exp $
Pick a better name for the package.
---- configure.orig 2021-04-24 00:31:03.163784259 +0300
-+++ configure 2021-04-24 00:31:38.257972283 +0300
-@@ -4053,7 +4053,7 @@ fi
+--- configure.orig 2022-02-17 01:50:05.000000000 +0000
++++ configure
+@@ -4054,7 +4054,7 @@ fi
# Define the identity of the package.
- PACKAGE='pgpool-II'
+ PACKAGE='pgpool2'
- VERSION='4.2.2'
+ VERSION='4.3.1'
Index: pkgsrc/databases/pgpool2/patches/patch-src_auth_pool__hba.c
diff -u pkgsrc/databases/pgpool2/patches/patch-src_auth_pool__hba.c:1.1 pkgsrc/databases/pgpool2/patches/patch-src_auth_pool__hba.c:1.2
--- pkgsrc/databases/pgpool2/patches/patch-src_auth_pool__hba.c:1.1 Wed Apr 28 09:18:55 2021
+++ pkgsrc/databases/pgpool2/patches/patch-src_auth_pool__hba.c Wed May 18 11:20:35 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_auth_pool__hba.c,v 1.1 2021/04/28 09:18:55 wiz Exp $
+$NetBSD: patch-src_auth_pool__hba.c,v 1.2 2022/05/18 11:20:35 adam 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 @@
+--- src/auth/pool_hba.c.orig 2022-02-17 01:45:01.000000000 +0000
++++ src/auth/pool_hba.c
+@@ -30,9 +30,8 @@
#include <errno.h>
#include <netdb.h>
@@ -10,7 +10,6 @@ $NetBSD: patch-src_auth_pool__hba.c,v 1.
+#include <sys/types.h>
#include <netinet/in.h>
-#endif
-+#include <netinet6/in6.h>
#include "pool.h"
#include "auth/pool_hba.h"
Index: pkgsrc/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample
diff -u pkgsrc/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample:1.3 pkgsrc/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample:1.4
--- pkgsrc/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample:1.3 Wed Apr 28 09:18:55 2021
+++ pkgsrc/databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample Wed May 18 11:20:35 2022
@@ -1,31 +1,31 @@
-$NetBSD: patch-src_sample_pgpool.conf.sample,v 1.3 2021/04/28 09:18:55 wiz Exp $
+$NetBSD: patch-src_sample_pgpool.conf.sample,v 1.4 2022/05/18 11:20:35 adam Exp $
Default pid file location.
---- 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'
+--- src/sample/pgpool.conf.sample.orig 2022-02-17 01:50:05.000000000 +0000
++++ src/sample/pgpool.conf.sample
+@@ -292,13 +292,13 @@ backend_clustering_mode = 'streaming_rep
# FILE LOCATIONS
#------------------------------------------------------------------------------
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_PIDDIR@/pgpool.pid'
+-#pid_file_name = '/var/run/pgpool/pgpool.pid'
++#pid_file_name = '@PGPOOL_PIDDIR@/pgpool.pid'
# PID file name
# Can be specified as relative to the"
# location of pgpool.conf file or
# as an absolute path
# (change requires restart)
--logdir = '/tmp'
-+logdir = '@PGPOOL_LOGDIR@'
+-#logdir = '/tmp'
++#logdir = '@PGPOOL_LOGDIR@'
# Directory of pgPool status file
# (change requires restart)
-@@ -894,7 +894,7 @@ memqcache_cache_block_size = 1MB
+@@ -936,7 +936,7 @@ hostname0 = ''
# 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'
+-#memqcache_oiddir = '/var/log/pgpool/oiddir'
++#memqcache_oiddir = '@PGPOOL_LOGDIR@/oiddir'
# Temporary work directory to record table oids
# (change requires restart)
- cache_safe_memqcache_table_list = ''
+ #cache_safe_memqcache_table_list = ''
Added files:
Index: pkgsrc/databases/pgpool2/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/databases/pgpool2/patches/patch-src_Makefile.in:1.1
--- /dev/null Wed May 18 11:20:35 2022
+++ pkgsrc/databases/pgpool2/patches/patch-src_Makefile.in Wed May 18 11:20:35 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2022/05/18 11:20:35 adam Exp $
+
+PGPOOL_CONFIG_DIR is where pgpool_setup copies sample config files from.
+
+--- src/Makefile.in.orig 2022-05-18 10:42:40.000000000 +0000
++++ src/Makefile.in
+@@ -1205,7 +1205,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+
+ %: %.in
+ sed -e 's#[@][@]PGPOOL_INSTALL_DIR[@][@]#$(prefix)#g' \
+- -e 's#[@][@]PGPOOL_CONFIG_DIR[@][@]#$(sysconfdir)#g' \
++ -e 's#[@][@]PGPOOL_CONFIG_DIR[@][@]#$(prefix)/share/examples/pgpool2#g' \
+ -e 's#[@][@]PGSQL_BIN_DIR[@][@]#$(PGSQL_BIN_DIR)#g' \
+ -e 's#[@][@]PGSQL_LIB_DIR[@][@]#$(PGSQL_LIB_DIR)#g' $^ > $@
+ chmod +x $@
Home |
Main Index |
Thread Index |
Old Index