* [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
@ 2017-07-10 2:27 Aaron Swenson
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Swenson @ 2017-07-10 2:27 UTC (permalink / raw
To: gentoo-commits
commit: ba7463bc581fa454f1803b4b828b746d25a4d639
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 02:24:33 2017 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 02:24:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7463bc
dev-db/pgpool2: Bump, new repo, postgres-multi
Now installs to all selected slots via use flags.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-db/pgpool2/Manifest | 1 +
dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch | 255 ++++++++++++++++++++
dev-db/pgpool2/files/pgpool_run_paths-9999.patch | 274 ++++++++++++++++++++++
dev-db/pgpool2/pgpool2-3.6.4.ebuild | 98 ++++++++
dev-db/pgpool2/pgpool2-9999.ebuild | 98 +++-----
5 files changed, 667 insertions(+), 59 deletions(-)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index f3281d182e8..88999227ef2 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,3 +1,4 @@
DIST pgpool-II-3.5.2.tar.gz 2227075 SHA256 5d29fd9c30141bfdaf15b51c7878766178e5df42fa5e160d0f7df2824d26104f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a WHIRLPOOL 22939c855919b8399c1129ff4622eae159141e9bf05cc36aca456bfd582c7ab0dc7ec87df5ea96d7101f438e89bf4e06f46a5f63cfde22e505d0a3965c0496fc
DIST pgpool-II-3.5.5.tar.gz 2243184 SHA256 8fa1ccf13ff4f7c1ab0f6d523090444f65d78923de11061b5027eb5d58318491 SHA512 f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed WHIRLPOOL 5f4d4d9c3f6478b9b3ecda311c571e1f54805a07aa505acd32fbfb8fb2790183b732d6f86843a2b6614c74565efad7f9b3d962281cd2b1d23b54515448a1c84a
DIST pgpool-II-3.6.1.tar.gz 2539510 SHA256 244f99a70198b5861a63b2fe3e44ac39d2819f6aa6497f62958c6afa2750d94c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a WHIRLPOOL 9a307a63e9179ecfc7a52d1f056d47f09543bf4e378fa0090cdaf90d141c70e89323b4cfcbc9bbd9fa2422ff76bea592f189bea78915445fb1779ce9089ef6e1
+DIST pgpool-II-3.6.4.tar.gz 2623625 SHA256 6ad78b9878d126e8da1e03e8edf3c8d56bb0754fe6432f633e81f6faaf8e6dbf SHA512 a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f WHIRLPOOL 410136d359baa369f3d19136da54ba202c8b250bf364fc2f9b91a66190266ae523647cc89313211b63effbedd97168d026a2574be059dd0da7c8768b2d9714e7
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
new file mode 100644
index 00000000000..d6943d7502e
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
@@ -0,0 +1,255 @@
+diff -ru a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h 2017-05-11 05:53:04.000000000 -0400
++++ b/src/include/parser/pg_config_manual.h 2017-07-08 20:28:47.733745889 -0400
+@@ -184,7 +184,7 @@
+ * here's where to twiddle it. You can also override this at runtime
+ * with the postmaster's -k switch.
+ */
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+
+ /*
+ * This is the default event source for Windows event log.
+diff -ru a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h 2017-05-11 05:36:01.000000000 -0400
++++ b/src/include/pcp/pcp_stream.h 2017-07-08 20:29:28.613506800 -0400
+@@ -48,6 +48,6 @@
+ extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION *pc);
+
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+
+ #endif /* PCP_STREAM_H */
+diff -ru a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h 2017-05-11 05:53:04.000000000 -0400
++++ b/src/include/pool.h 2017-07-08 20:27:09.330984074 -0400
+@@ -73,16 +73,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff -ru a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample 2017-05-11 05:53:04.000000000 -0400
++++ b/src/sample/pgpool.conf.sample 2017-07-08 20:36:28.477717849 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -210,10 +206,10 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # (change requires restart)
+-logdir = '/var/log/pgpool'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -490,10 +486,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -ru a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
+--- a/src/sample/pgpool.conf.sample-master-slave 2017-05-11 05:53:04.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-master-slave 2017-07-08 20:37:17.914095382 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -210,10 +206,10 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -489,10 +485,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Virtual IP control Setting -
+diff -ru a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
+--- a/src/sample/pgpool.conf.sample-replication 2017-05-11 05:53:04.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-replication 2017-07-08 20:37:30.384022450 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -210,10 +206,10 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -489,10 +485,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -ru a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
+--- a/src/sample/pgpool.conf.sample-stream 2017-05-11 05:53:04.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-stream 2017-07-08 20:37:44.060609128 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+@@ -47,10 +45,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -211,10 +207,10 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -489,10 +485,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-9999.patch b/dev-db/pgpool2/files/pgpool_run_paths-9999.patch
new file mode 100644
index 00000000000..691d6e867ef
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool_run_paths-9999.patch
@@ -0,0 +1,274 @@
+diff --git a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+index d7e153b2..a4c9e87a 100644
+--- a/src/include/parser/pg_config_manual.h
++++ b/src/include/parser/pg_config_manual.h
+@@ -193,7 +193,7 @@
+ * here's where to twiddle it. You can also override this at runtime
+ * with the postmaster's -k switch.
+ */
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+
+ /*
+ * This is the default event source for Windows event log.
+diff --git a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+index 254b98cb..5883ad31 100644
+--- a/src/include/pcp/pcp_stream.h
++++ b/src/include/pcp/pcp_stream.h
+@@ -48,6 +48,6 @@ extern int pcp_read(PCP_CONNECTION *pc, void *buf, int len);
+ extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION *pc);
+
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+
+ #endif /* PCP_STREAM_H */
+diff --git a/src/include/pool.h b/src/include/pool.h
+index d5dd63aa..a3ae197f 100644
+--- a/src/include/pool.h
++++ b/src/include/pool.h
+@@ -73,16 +73,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+index d73c9bca..e95815ba 100644
+--- a/src/sample/pgpool.conf.sample
++++ b/src/sample/pgpool.conf.sample
+@@ -31,10 +31,8 @@ listen_addresses = 'localhost'
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@ pcp_listen_addresses = '*'
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -210,13 +206,13 @@ syslog_ident = 'pgpool'
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/var/log/pgpool'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -505,10 +501,8 @@ wd_authkey = ''
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
+index 612c10a7..ad385ba6 100644
+--- a/src/sample/pgpool.conf.sample-master-slave
++++ b/src/sample/pgpool.conf.sample-master-slave
+@@ -31,10 +31,8 @@ listen_addresses = 'localhost'
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@ pcp_listen_addresses = '*'
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -210,13 +206,13 @@ syslog_ident = 'pgpool'
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -504,10 +500,8 @@ wd_authkey = ''
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Virtual IP control Setting -
+diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
+index f47a7957..bd7ce73e 100644
+--- a/src/sample/pgpool.conf.sample-replication
++++ b/src/sample/pgpool.conf.sample-replication
+@@ -31,10 +31,8 @@ listen_addresses = 'localhost'
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@ pcp_listen_addresses = '*'
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -210,13 +206,13 @@ syslog_ident = 'pgpool'
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -504,10 +500,8 @@ wd_authkey = ''
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
+index d57226b0..669a31d4 100644
+--- a/src/sample/pgpool.conf.sample-stream
++++ b/src/sample/pgpool.conf.sample-stream
+@@ -31,10 +31,8 @@ listen_addresses = 'localhost'
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+@@ -47,10 +45,8 @@ pcp_listen_addresses = '*'
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -211,13 +207,13 @@ syslog_ident = 'pgpool'
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -504,10 +500,8 @@ wd_authkey = ''
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
diff --git a/dev-db/pgpool2/pgpool2-3.6.4.ebuild b/dev-db/pgpool2/pgpool2-3.6.4.ebuild
new file mode 100644
index 00000000000..cf9cd0abf25
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.6.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{2..6} )
+
+inherit postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc memcached pam ssl static-libs"
+
+RDEPEND="
+ ${POSTGRES_DEP}
+ memcached? ( dev-libs/libmemcached )
+ pam? ( sys-auth/pambase )
+ ssl? ( dev-libs/openssl:* )
+"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ !!dev-db/pgpool
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ postgres_new_user pgpool
+
+ postgres-multi_pkg_setup
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/pgpool_run_paths-3.6.4.patch"
+
+ postgres-multi_src_prepare
+}
+
+src_configure() {
+ local myconf
+ use memcached && \
+ myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+ use pam && myconf+=' --with-pam'
+
+ postgres-multi_foreach econf \
+ --disable-rpath \
+ --sysconfdir="${EROOT%/}/etc/${PN}" \
+ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+ $(use_with ssl openssl) \
+ $(use_enable static-libs static) \
+ ${myconf}
+}
+
+src_compile() {
+ # Even though we're only going to do an install for the best slot
+ # available, the extension bits in src/sql need some things outside
+ # of that directory built, too.
+ postgres-multi_foreach emake
+ postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+ # We only need the best stuff installed
+ postgres-multi_forbest emake DESTDIR="${D}" install
+
+ # Except for the extension and .so files that each PostgreSQL slot needs
+ postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ # Documentation!
+ dodoc NEWS TODO
+ if use doc ; then
+ postgres-multi_forbest emake DESTDIR="${D}" -C doc install
+ fi
+
+ # Examples and extras
+ # mv some files that get installed to /usr/share/pgpool-II so that
+ # they all wind up in the same place
+ mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+ into "/usr/share/${PN}"
+ dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+ insinto "/usr/share/${PN}"
+ doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+
+ # One more thing: Evil la files!
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index b351db267e3..031166c54b9 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,66 +1,45 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=6
-[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}"
+EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
-ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool"
-ECVS_MODULE="pgpool-II"
-[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs"
-inherit base user ${SCM_ECLASS}
-unset SCM_ECLASS
+POSTGRES_COMPAT=( 9.{2..6} )
+
+inherit git-r3 postgres-multi
DESCRIPTION="Connection pool server for PostgreSQL"
HOMEPAGE="http://www.pgpool.net/"
-[[ ${PV} == 9999 ]] || SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI=""
LICENSE="BSD"
SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
-IUSE="memcached pam ssl static-libs"
+IUSE="doc memcached pam ssl static-libs"
RDEPEND="
- dev-db/postgresql
+ ${POSTGRES_DEP}
memcached? ( dev-libs/libmemcached )
pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl:* )
"
DEPEND="${RDEPEND}
sys-devel/bison
!!dev-db/pgpool
"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-S=${WORKDIR}/${MY_P}
-
pkg_setup() {
- enewgroup postgres 70
- enewuser pgpool -1 -1 -1 postgres
+ postgres_new_user pgpool
- # We need the postgres user as well so we can set the proper
- # permissions on the sockets without getting into fights with
- # PostgreSQL's initialization scripts.
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+ postgres-multi_pkg_setup
}
src_prepare() {
- epatch "${FILESDIR}/pgpool_run_paths.patch"
+ eapply "${FILESDIR}/pgpool_run_paths-9999.patch"
- local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
- local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
- sed 's|.*\"\(.*\)\"|\1|g')
- local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
- sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
- -i *.conf.sample* pool.h || die
-
- sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
- -i *.conf.sample* pool.h || die
+ postgres-multi_src_prepare
}
src_configure() {
@@ -69,47 +48,48 @@ src_configure() {
myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
use pam && myconf+=' --with-pam'
- econf \
+ postgres-multi_foreach econf \
--disable-rpath \
--sysconfdir="${EROOT%/}/etc/${PN}" \
+ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
$(use_with ssl openssl) \
$(use_enable static-libs static) \
${myconf}
}
src_compile() {
- emake
-
- cd sql
- emake
+ # Even though we're only going to do an install for the best slot
+ # available, the extension bits in src/sql need some things outside
+ # of that directory built, too.
+ postgres-multi_foreach emake
+ postgres-multi_foreach emake -C src/sql
}
src_install() {
- emake DESTDIR="${D}" install
-
- cd sql
- emake DESTDIR="${D}" install
- cd "${S}"
-
- # `contrib' moved to `extension' with PostgreSQL 9.1
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} > 90 ]] ; then
- cd "${ED%/}$(pg_config --sharedir)"
- mv contrib extension || die
- cd "${S}"
- fi
+ # We only need the best stuff installed
+ postgres-multi_forbest emake DESTDIR="${D}" install
+
+ # Except for the extension and .so files that each PostgreSQL slot needs
+ postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
newinitd "${FILESDIR}/${PN}.initd" ${PN}
newconfd "${FILESDIR}/${PN}.confd" ${PN}
- # Documentation
- dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
- dohtml -r doc
+ # Documentation!
+ dodoc NEWS TODO
+ if use doc ; then
+ postgres-multi_forbest emake DESTDIR="${D}" -C doc install
+ fi
# Examples and extras
- insinto "/usr/share/${PN}"
- doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
+ # mv some files that get installed to /usr/share/pgpool-II so that
+ # they all wind up in the same place
mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+ into "/usr/share/${PN}"
+ dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+ insinto "/usr/share/${PN}"
+ doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
# One more thing: Evil la files!
find "${ED}" -name '*.la' -exec rm -f {} +
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
@ 2018-01-11 10:38 Aaron Swenson
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Swenson @ 2018-01-11 10:38 UTC (permalink / raw
To: gentoo-commits
commit: 278fe78f2fe0ce2f62f63235f1b4a316f4086e25
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 10:38:10 2018 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 10:38:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278fe78f
dev-db/pgpool2: Cleanup
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-db/pgpool2/Manifest | 7 -
dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch | 184 ----------------
dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch | 255 ----------------------
dev-db/pgpool2/pgpool2-3.5.2.ebuild | 101 ---------
dev-db/pgpool2/pgpool2-3.5.5.ebuild | 101 ---------
dev-db/pgpool2/pgpool2-3.6.1.ebuild | 99 ---------
dev-db/pgpool2/pgpool2-3.6.4.ebuild | 99 ---------
dev-db/pgpool2/pgpool2-3.6.5.ebuild | 98 ---------
dev-db/pgpool2/pgpool2-3.6.6.ebuild | 98 ---------
dev-db/pgpool2/pgpool2-3.6.7.ebuild | 98 ---------
10 files changed, 1140 deletions(-)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 7be846d3630..664bfb2820b 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,8 +1 @@
-DIST pgpool-II-3.5.2.tar.gz 2227075 BLAKE2B 4f40044dc37353a811b2f4ddd4bb6d41604e1fc5c64064603fcee704a92a4e4d3b1baa83314f476dfe32ecbd851208996139a55ffaffb3f1bb9f8ac72685a02f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a
-DIST pgpool-II-3.5.5.tar.gz 2243184 BLAKE2B 4267991fdf45ddd0e2bf3e253508b9b18ad669d0184bcb13143dddcfe6233e4aa223ba275f9471b2645262e43341fb4c8e5ac9e154ee2fd3de49aa5420de070e SHA512 f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed
-DIST pgpool-II-3.6.1.tar.gz 2539510 BLAKE2B 844f54a2f74251af8af1348c374807e1dce2028eb64d2974c7fb1b904c6518012764c16fdd7fdeea8b9039fcfa13d8c139a9b2e020fffc87e6b90f3d6a489e5c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a
-DIST pgpool-II-3.6.4.tar.gz 2623625 BLAKE2B d8ba2a02c0b7e4d4b259dcf87a85d0b3b7dd11d5121907039cb3baad52f2c40bd0ff2457e844922d04c300068f1638d26b0efdc60d828e05a735d3866365ca8c SHA512 a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f
-DIST pgpool-II-3.6.5.tar.gz 2651330 BLAKE2B d0ad069b17e1e0fb46590e7dd0dd29feb499a6703056d5ff5d4f218227158f4bca44f8d52209f378d08879a97c7930f85a61dfc22fce0bafa1313ad3c7649d5b SHA512 12247730f202859c76b0a11ccc485de786e53df7b8e08ffd76d7653c25633d79387f027e7c9d804bf19cd89b9db047b7ca0cf1cf5e914ee74c6efc0b6660eb1d
-DIST pgpool-II-3.6.6.tar.gz 3171264 BLAKE2B b519d097366f190c4b6136643ccd839d1854ced0287ec1dc9f058dad1f7ebc18448d97d48338d03a8a7eafee49391381a8aa802fc14b84b757b133d6c97ec94e SHA512 02cfceed761cf6338ce0a33e9afe05194acdf4d5577cf0d920176cb3bacffce6e9c2c1e8a8b89c5b062bc53d54cd012a4ad9582b42df7bc36ee666dcd0ee3e10
-DIST pgpool-II-3.6.7.tar.gz 3188186 BLAKE2B b58561418e4027716614d6a70f5d844b8043312cb2a2b18882e0fdcd466e1f0624e43db7c67685227d808368388c6ee9dd0d5f3ea956d0585444b1e30bc49643 SHA512 4bc80f4b47f4b37e4efe1af137c2af076dc98c438bf094236223bba0facfaea91546a86d7604e67453b67e82a24ac5ee6e4325d81f90358a3a0d7a6c34acd7fc
DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
diff --git a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch b/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
deleted file mode 100644
index b2c5d554e56..00000000000
--- a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -aruw pgpool-II-3.5.0.orig/src/include/pool.h pgpool-II-3.5.0/src/include/pool.h
---- pgpool-II-3.5.0.orig/src/include/pool.h 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/include/pool.h 2016-03-12 06:47:15.297966248 -0500
-@@ -72,16 +72,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
-
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@"
-
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
-
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
-
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid"
-
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample pgpool-II-3.5.0/src/sample/pgpool.conf.sample
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample 2016-03-12 08:55:22.318087007 -0500
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/var/log/pgpool'
-+logdir = '/var/lib/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave 2016-03-12 08:55:45.284665542 -0500
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication 2016-03-12 08:56:55.004397999 -0500
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream 2016-03-12 08:58:23.820723842 -0500
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-@@ -47,10 +45,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -215,10 +211,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
deleted file mode 100644
index d6943d7502e..00000000000
--- a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -ru a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
---- a/src/include/parser/pg_config_manual.h 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/include/parser/pg_config_manual.h 2017-07-08 20:28:47.733745889 -0400
-@@ -184,7 +184,7 @@
- * here's where to twiddle it. You can also override this at runtime
- * with the postmaster's -k switch.
- */
--#define DEFAULT_PGSOCKET_DIR "/tmp"
-+#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
-
- /*
- * This is the default event source for Windows event log.
-diff -ru a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
---- a/src/include/pcp/pcp_stream.h 2017-05-11 05:36:01.000000000 -0400
-+++ b/src/include/pcp/pcp_stream.h 2017-07-08 20:29:28.613506800 -0400
-@@ -48,6 +48,6 @@
- extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
- extern int pcp_flush(PCP_CONNECTION *pc);
-
--#define UNIX_DOMAIN_PATH "/tmp"
-+#define UNIX_DOMAIN_PATH "/run/pgpool"
-
- #endif /* PCP_STREAM_H */
-diff -ru a/src/include/pool.h b/src/include/pool.h
---- a/src/include/pool.h 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/include/pool.h 2017-07-08 20:27:09.330984074 -0400
-@@ -73,16 +73,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
-
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "/run/pgpool"
-
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "/run/postgresql"
-
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
-
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
-
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -ru a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
---- a/src/sample/pgpool.conf.sample 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample 2017-07-08 20:36:28.477717849 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/var/log/pgpool'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -490,10 +486,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-diff -ru a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
---- a/src/sample/pgpool.conf.sample-master-slave 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-master-slave 2017-07-08 20:37:17.914095382 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -489,10 +485,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Virtual IP control Setting -
-diff -ru a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
---- a/src/sample/pgpool.conf.sample-replication 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-replication 2017-07-08 20:37:30.384022450 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -489,10 +485,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-diff -ru a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
---- a/src/sample/pgpool.conf.sample-stream 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-stream 2017-07-08 20:37:44.060609128 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-@@ -47,10 +45,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -211,10 +207,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -489,10 +485,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
diff --git a/dev-db/pgpool2/pgpool2-3.5.2.ebuild b/dev-db/pgpool2/pgpool2-3.5.2.ebuild
deleted file mode 100644
index f5c656a3a1a..00000000000
--- a/dev-db/pgpool2/pgpool2-3.5.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- dev-db/postgresql:=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup postgres 70
- enewuser pgpool -1 -1 -1 postgres
-
- # We need the postgres user as well so we can set the proper
- # permissions on the sockets without getting into fights with
- # PostgreSQL's initialization scripts.
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
- epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
- local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
- local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
- sed 's|.*\"\(.*\)\"|\1|g')
- local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
- sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
- sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- emake -C src/sql
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation
- dodoc NEWS TODO
- use doc && dohtml -r doc/*
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin doc/{pgpool_remote_start,basebackup.sh}
- insinto "/usr/share/${PN}"
- doins doc/recovery.conf.sample
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.5.5.ebuild b/dev-db/pgpool2/pgpool2-3.5.5.ebuild
deleted file mode 100644
index 206325ee553..00000000000
--- a/dev-db/pgpool2/pgpool2-3.5.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- dev-db/postgresql:=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup postgres 70
- enewuser pgpool -1 -1 -1 postgres
-
- # We need the postgres user as well so we can set the proper
- # permissions on the sockets without getting into fights with
- # PostgreSQL's initialization scripts.
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
- epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
- local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
- local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
- sed 's|.*\"\(.*\)\"|\1|g')
- local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
- sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
- sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- emake -C src/sql
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation
- dodoc NEWS TODO
- use doc && dohtml -r doc/*
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin doc/{pgpool_remote_start,basebackup.sh}
- insinto "/usr/share/${PN}"
- doins doc/recovery.conf.sample
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.1.ebuild b/dev-db/pgpool2/pgpool2-3.6.1.ebuild
deleted file mode 100644
index 644dc65245e..00000000000
--- a/dev-db/pgpool2/pgpool2-3.6.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- dev-db/postgresql:=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup postgres 70
- enewuser pgpool -1 -1 -1 postgres
-
- # We need the postgres user as well so we can set the proper
- # permissions on the sockets without getting into fights with
- # PostgreSQL's initialization scripts.
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
- epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
- local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
- local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
- sed 's|.*\"\(.*\)\"|\1|g')
- local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
- sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
- sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- emake -C src/sql
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation
- dodoc NEWS TODO
- use doc && dohtml -r doc/*
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/pgpool_remote_start
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.4.ebuild b/dev-db/pgpool2/pgpool2-3.6.4.ebuild
deleted file mode 100644
index e3a92f81d55..00000000000
--- a/dev-db/pgpool2/pgpool2-3.6.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-3.6.4.patch"
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- if use doc ; then
- postgres-multi_forbest emake DESTDIR="${D}" -C doc install
- fi
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.5.ebuild b/dev-db/pgpool2/pgpool2-3.6.5.ebuild
deleted file mode 100644
index 830743a0c78..00000000000
--- a/dev-db/pgpool2/pgpool2-3.6.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- doman doc/src/sgml/man{1,8}/*
- use doc && dodoc -r doc/src/sgml/html
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.6.ebuild b/dev-db/pgpool2/pgpool2-3.6.6.ebuild
deleted file mode 100644
index 830743a0c78..00000000000
--- a/dev-db/pgpool2/pgpool2-3.6.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- doman doc/src/sgml/man{1,8}/*
- use doc && dodoc -r doc/src/sgml/html
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.7.ebuild b/dev-db/pgpool2/pgpool2-3.6.7.ebuild
deleted file mode 100644
index 830743a0c78..00000000000
--- a/dev-db/pgpool2/pgpool2-3.6.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- doman doc/src/sgml/man{1,8}/*
- use doc && dodoc -r doc/src/sgml/html
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
@ 2018-08-03 13:27 Aaron Swenson
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Swenson @ 2018-08-03 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 079ff486c23fdb326e5d58df1433b854ca900e94
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 3 13:26:51 2018 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Fri Aug 3 13:26:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079ff486
dev-db/pgpool2: Bump to 3.7.5
Add a couple patches to fix a few options in
configure.ac. --without-pam no longer acts as if --with-pam was
given. Now uses pkg-config to get any special settings for
libmemcached rather than using fixed sub-directories
(${user_provided_path}/{include,lib,…}). Lastly, introduced AX_PTHREAD
to link in the appropriate threading library to fix bug 616302.
If libmemcached was built with USE=sasl which builds against
cyrus-sasl. cyrus-sasl builds against a threading library which
necessitates including the same threading in pgpool2 despite pgpool2
not being a threaded program.
pgpool2 is now able to build against LibreSSL as well as OpenSSL. The
ebuild now reflects this fact
Bug: https://bugs.gentoo.org/616302
Bug: https://bugs.gentoo.org/646888
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-db/pgpool2/Manifest | 1 +
.../pgpool2/files/pgpool-configure-memcached.patch | 64 ++++++++++++++++++++++
dev-db/pgpool2/files/pgpool-configure-pam.patch | 25 +++++++++
.../pgpool2/files/pgpool-configure-pthread.patch | 13 +++++
dev-db/pgpool2/files/pgpool2.initd | 14 ++---
.../{pgpool2-9999.ebuild => pgpool2-3.7.5.ebuild} | 45 ++++++++-------
dev-db/pgpool2/pgpool2-9999.ebuild | 42 ++++++++------
...gpool2-9999.ebuild => pgpool2-9999.ebuild.orig} | 35 +++++++-----
8 files changed, 182 insertions(+), 57 deletions(-)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index e81a23c8628..120a39ebe5b 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,3 +1,4 @@
DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
DIST pgpool-II-3.7.3.tar.gz 3259752 BLAKE2B 398257b2a647039a634d52b0e23ab1584aaa67f58d6f234f03bf2e99380b346b4ff51647f876d0789c484e88fc149a2af5a5b1b8fd3aa48323aada064ea3421d SHA512 c7fea570f11dfc348b0099fde074f61a15e6979b6f16526d24d73b26d723edfdbadbcf10e90c2111aeb72599970718d3cda4abed3e99e8a711cf03b715c29624
+DIST pgpool-II-3.7.5.tar.gz 3276279 BLAKE2B d9c52684985e0a74ef115792f79a71305fbcc5f44663971e5fee41d543c7c290999091c387f5da6c73c88466880a24b21d469046de7981983d9984a606ae357e SHA512 4840047f11b5e176803c03073d1ef6ef54f9d0be3d9bd622fedc9fd0ad4f835090fbf671bfd71cda0d994af6ea9a1658b0d5e5d09ec317b345c41fb0fa4b7b70
diff --git a/dev-db/pgpool2/files/pgpool-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-configure-memcached.patch
new file mode 100644
index 00000000000..7b983dba02e
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-configure-memcached.patch
@@ -0,0 +1,64 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -338,37 +338,24 @@
+ [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
+ fi
+
+-AC_ARG_WITH(memcached,
+- [ --with-memcached=DIR site header files for libmemcached in DIR],
+- [
+- case "$withval" in
+- "" | y | ye | yes | n | no)
+- AC_MSG_ERROR([*** You must supply an argument to the --with-memcached option.])
+- ;;
+- *)
+-
+- MEMCACHED_INCLUDE_DIR="$withval"/include
+- MEMCACHED_LIB_DIR="$withval"/lib
+- OLD_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I$MEMCACHED_INCLUDE_DIR"
+- AC_CHECK_HEADERS(
+- [libmemcached/memcached.h],
+- [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])],
+- [AC_MSG_ERROR([header file <libmemcached/memcached.h> is required for memcached support])])
+- CFLAGS=$OLD_CFLAGS
+- AC_CHECK_LIB(memcached, memcached_create, [], [AC_MSG_ERROR(libmemcached is not installed)])
+- MEMCACHED_INCLUDE_OPT="-I $MEMCACHED_INCLUDE_DIR"
+- MEMCACHED_LINK_OPT="-L$MEMCACHED_LIB_DIR"
+- MEMCACHED_RPATH_OPT="-rpath $MEMCACHED_LIB_DIR"
+- ;;
+- esac
+- ])
++AC_ARG_WITH([memcached],
++ AS_HELP_STRING([--with-memcached], [Build with memcached support]))
+
+-CFLAGS="$CFLAGS -fno-strict-aliasing"
++AS_IF([test "x$with_memcached" = "xyes"], [
++ PKG_CHECK_MODULES([MEMCACHED], [libmemcached])
++ CFLAGS="$CFLAGS $MEMCACHED_CFLAGS"
++ LIBS="$LIBS $MEMCACHED_LIBS"
++
++ AC_CHECK_HEADERS(
++ [libmemcached/memcached.h],
++ [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])],
++ [AC_MSG_ERROR([Couldn't find <libmemcached/memcached.h>])])
++
++ AC_SEARCH_LIBS(memcached_create, [], [],
++ [AC_MSG_ERROR(libmemcached is not installed)])
++])
+
+-AC_SUBST(MEMCACHED_INCLUDE_OPT)
+-AC_SUBST(MEMCACHED_LINK_OPT)
+-AC_SUBST(MEMCACHED_RPATH_OPT)
++CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+ OLD_LDFLAGS="$LDFLAGS"
+ LDFLAGS="-L$PGSQL_LIB_DIR"
+@@ -380,7 +367,6 @@
+
+ AC_SUBST(PGSQL_INCLUDE_DIR)
+ AC_SUBST(PGSQL_LIB_DIR)
+-AC_SUBST(MEMCACHED_DIR)
+
+ # --enable(disable)-rpath option
+ AC_ARG_ENABLE(rpath,
diff --git a/dev-db/pgpool2/files/pgpool-configure-pam.patch b/dev-db/pgpool2/files/pgpool-configure-pam.patch
new file mode 100644
index 00000000000..3a8e89dde30
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-configure-pam.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -330,11 +330,13 @@
+
+-AC_ARG_WITH(pam,
+- [ --with-pam build with PAM support],
+- [AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support. (--with-pam)])])
+-if test "$with_pam" = yes ; then
+- AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
+- AC_CHECK_HEADERS(security/pam_appl.h, [],
+- [AC_CHECK_HEADERS(pam/pam_appl.h, [],
+- [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
+-fi
++AC_ARG_WITH([pam], AS_HELP_STRING([--with-pam], [Build with PAM support]))
++
++AS_IF([test "x$with_pam" = "xyes"], [
++ AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support])
++ AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
++ AC_CHECK_HEADERS(security/pam_appl.h,
++ [],
++ [AC_CHECK_HEADERS(pam/pam_appl.h, [],
++ [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
++
++])
+
diff --git a/dev-db/pgpool2/files/pgpool-configure-pthread.patch b/dev-db/pgpool2/files/pgpool-configure-pthread.patch
new file mode 100644
index 00000000000..50b18fab6fc
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-configure-pthread.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,6 +3,10 @@
+
+ dnl Checks for programs.
+ AC_PROG_CC
++AX_PTHREAD
++LIBS="$PTHREAD_LIBS $LIBS"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++CC="$PTHREAD_CC"
+
+ AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects])
+
diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd
index c9ffb0cf161..73db4dd8b3c 100644
--- a/dev-db/pgpool2/files/pgpool2.initd
+++ b/dev-db/pgpool2/files/pgpool2.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
extra_started_commands="reload"
@@ -23,24 +23,22 @@ get_config() {
PIDFILE="$(get_config pid_file_name)"
: ${PIDFILE:='/run/pgpool/pgpool.pid'}
-prep() {
+start_pre() {
# $logdir contains status file(s), not log files.
local logdir=$(get_config logdir)
local socket_dir=$(get_config socket_dir)
local pcp_socket_dir=$(get_config pcp_socket_dir)
checkpath -o pgpool:postgres -m 0770 -d $(dirname ${PIDFILE}) || return 1
- checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/run/pgpool'} || return 1
+ checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/var/lib/pgpool'} || return 1
checkpath -o pgpool:postgres -m 0660 -f ${LOGFILE} || return 1
- checkpath -o postgres:postgres -m 0770 \
+ checkpath -o root:postgres -m 1775 \
-d ${socket_dir:-'/run/postgresql'} || return 1
- checkpath -o postgres:postgres -m 0770 \
- -d ${pcp_socket_dir:-'/run/postgresql'} || return 1
+ checkpath -o pgpool:postgres -m 0770 \
+ -d ${pcp_socket_dir:-'/run/postgresql/pgpool'} || return 1
}
start() {
- prep || return 1
-
ebegin "Starting pgpool2"
start-stop-daemon --start \
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-3.7.5.ebuild
similarity index 72%
copy from dev-db/pgpool2/pgpool2-9999.ebuild
copy to dev-db/pgpool2/pgpool2-3.7.5.ebuild
index b0b43a07e37..adab103e02f 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.5.ebuild
@@ -3,34 +3,40 @@
EAPI=6
-EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
+POSTGRES_COMPAT=( 9.{3..6} {10..11} )
-POSTGRES_COMPAT=( 9.{3..6} 10 )
+inherit autotools postgres-multi
-inherit git-r3 postgres-multi
+MY_P="${PN/2/-II}-${PV}"
DESCRIPTION="Connection pool server for PostgreSQL"
HOMEPAGE="http://www.pgpool.net/"
-SRC_URI=""
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
-IUSE="doc memcached pam ssl static-libs"
+IUSE="doc libressl memcached pam ssl static-libs"
RDEPEND="
${POSTGRES_DEP}
net-libs/libnsl:0=
memcached? ( dev-libs/libmemcached )
pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:* )
+ libressl? ( dev-libs/libressl:= )
+ )
"
DEPEND="${RDEPEND}
- sys-devel/bison
!!dev-db/pgpool
+ sys-devel/bison
+ virtual/pkgconfig
"
+S=${WORKDIR}/${MY_P}
+
pkg_setup() {
postgres_new_user pgpool
@@ -38,25 +44,27 @@ pkg_setup() {
}
src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-9999.patch"
+ eapply \
+ "${FILESDIR}/pgpool-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-configure-pam.patch" \
+ "${FILESDIR}/pgpool-configure-pthread.patch" \
+ "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
+
+ eautoreconf
postgres-multi_src_prepare
}
src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
postgres-multi_foreach econf \
--disable-rpath \
--sysconfdir="${EROOT%/}/etc/${PN}" \
--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
$(use_enable static-libs static) \
- ${myconf}
+ $(use_with memcached) \
+ $(use_with pam) \
+ $(use_with ssl openssl)
}
src_compile() {
@@ -79,9 +87,8 @@ src_install() {
# Documentation!
dodoc NEWS TODO
- if use doc ; then
- postgres-multi_forbest emake DESTDIR="${D}" -C doc install
- fi
+ doman doc/src/sgml/man{1,8}/*
+ use doc && dodoc -r doc/src/sgml/html
# Examples and extras
# mv some files that get installed to /usr/share/pgpool-II so that
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index b0b43a07e37..b565c24cfbe 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=6
EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
-POSTGRES_COMPAT=( 9.{3..6} 10 )
+POSTGRES_COMPAT=( 9.{3..6} {10..11} )
-inherit git-r3 postgres-multi
+inherit autotools git-r3 postgres-multi
DESCRIPTION="Connection pool server for PostgreSQL"
HOMEPAGE="http://www.pgpool.net/"
@@ -17,18 +17,27 @@ SLOT="0"
KEYWORDS=""
-IUSE="doc memcached pam ssl static-libs"
+IUSE="doc libressl memcached pam ssl static-libs"
RDEPEND="
${POSTGRES_DEP}
net-libs/libnsl:0=
memcached? ( dev-libs/libmemcached )
pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:* )
+ libressl? ( dev-libs/libressl:= )
+ )
"
DEPEND="${RDEPEND}
- sys-devel/bison
!!dev-db/pgpool
+ sys-devel/bison
+ virtual/pkgconfig
+ doc? (
+ app-text/openjade
+ dev-libs/libxml2
+ dev-libs/libxslt
+ )
"
pkg_setup() {
@@ -38,25 +47,27 @@ pkg_setup() {
}
src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-9999.patch"
+ eapply \
+ "${FILESDIR}/pgpool-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-configure-pam.patch" \
+ "${FILESDIR}/pgpool-configure-pthread.patch" \
+ "${FILESDIR}/pgpool_run_paths-9999.patch"
+
+ eautoreconf
postgres-multi_src_prepare
}
src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
postgres-multi_foreach econf \
--disable-rpath \
--sysconfdir="${EROOT%/}/etc/${PN}" \
--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
$(use_enable static-libs static) \
- ${myconf}
+ $(use_with memcached) \
+ $(use_with pam) \
+ $(use_with ssl openssl)
}
src_compile() {
@@ -65,6 +76,7 @@ src_compile() {
# of that directory built, too.
postgres-multi_foreach emake
postgres-multi_foreach emake -C src/sql
+ use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc
}
src_install() {
@@ -79,9 +91,7 @@ src_install() {
# Documentation!
dodoc NEWS TODO
- if use doc ; then
- postgres-multi_forbest emake DESTDIR="${D}" -C doc install
- fi
+ use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
# Examples and extras
# mv some files that get installed to /usr/share/pgpool-II so that
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild.orig
similarity index 77%
copy from dev-db/pgpool2/pgpool2-9999.ebuild
copy to dev-db/pgpool2/pgpool2-9999.ebuild.orig
index b0b43a07e37..5881c059c51 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild.orig
@@ -5,9 +5,9 @@ EAPI=6
EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
-POSTGRES_COMPAT=( 9.{3..6} 10 )
+POSTGRES_COMPAT=( 9.{3..6} {10..11} )
-inherit git-r3 postgres-multi
+inherit autotools git-r3 postgres-multi
DESCRIPTION="Connection pool server for PostgreSQL"
HOMEPAGE="http://www.pgpool.net/"
@@ -27,8 +27,14 @@ RDEPEND="
ssl? ( dev-libs/openssl:* )
"
DEPEND="${RDEPEND}
- sys-devel/bison
!!dev-db/pgpool
+ sys-devel/bison
+ virtual/pkgconfig
+ doc? (
+ app-text/openjade
+ dev-libs/libxml2
+ dev-libs/libxslt
+ )
"
pkg_setup() {
@@ -38,25 +44,27 @@ pkg_setup() {
}
src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-9999.patch"
+ eapply \
+ "${FILESDIR}/pgpool-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-configure-pam.patch" \
+ "${FILESDIR}/pgpool-configure-pthread.patch" \
+ "${FILESDIR}/pgpool_run_paths-9999.patch"
+
+ eautoreconf
postgres-multi_src_prepare
}
src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
postgres-multi_foreach econf \
--disable-rpath \
--sysconfdir="${EROOT%/}/etc/${PN}" \
--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
$(use_enable static-libs static) \
- ${myconf}
+ $(use_with memcached) \
+ $(use_with pam) \
+ $(use_with ssl openssl)
}
src_compile() {
@@ -65,6 +73,7 @@ src_compile() {
# of that directory built, too.
postgres-multi_foreach emake
postgres-multi_foreach emake -C src/sql
+ use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc
}
src_install() {
@@ -79,9 +88,7 @@ src_install() {
# Documentation!
dodoc NEWS TODO
- if use doc ; then
- postgres-multi_forbest emake DESTDIR="${D}" -C doc install
- fi
+ use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
# Examples and extras
# mv some files that get installed to /usr/share/pgpool-II so that
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
@ 2020-12-17 4:09 Aaron W. Swenson
0 siblings, 0 replies; 8+ messages in thread
From: Aaron W. Swenson @ 2020-12-17 4:09 UTC (permalink / raw
To: gentoo-commits
commit: 55cb29cdcea2e22381b97ddac899d44bd4e9e673
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 04:02:34 2020 +0000
Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 04:02:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55cb29cd
dev-db/pgpool2: Bump to 4.2.0
Now supports Pg 12 and 13.
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>
dev-db/pgpool2/Manifest | 1 +
.../files/pgpool-4.2.0-configure-memcached.patch | 60 +++
.../files/pgpool-4.2.0-configure-pthread.patch | 14 +
dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch | 432 +++++++++++++++++++++
dev-db/pgpool2/pgpool2-4.2.0.ebuild | 98 +++++
5 files changed, 605 insertions(+)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 6ab46044a51..e8e714bd215 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,2 +1,3 @@
DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789 SHA512 a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af SHA512 897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
+DIST pgpool-II-4.2.0.tar.gz 4707623 BLAKE2B 9aa54fe0230d5dab303e9b20f35c242f9fe7f09c4c506c72be3a5d789f4e5c23b6e6fdf529ddafd5b1a0c0697a1e1b0f0106f965a8409f8e012633b8be0a58a9 SHA512 73179c3968441b592503512c5e0dfcc95ef778ecfd077024df0485fe831c9af12e708b51607c96c7bebf26f3cc81aefc53f50c7ad0a670d304cbbcf852170abf
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch
new file mode 100644
index 00000000000..9854e45e3a2
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch
@@ -0,0 +1,60 @@
+diff -Naruw pgpool-II-4.2.0.orig/configure.ac pgpool-II-4.2.0/configure.ac
+--- pgpool-II-4.2.0.orig/configure.ac 2020-11-25 20:25:42.000000000 -0500
++++ pgpool-II-4.2.0/configure.ac 2020-12-16 06:36:26.051076452 -0500
+@@ -392,37 +392,24 @@
+ fi
+
+
+-AC_ARG_WITH(memcached,
+- [ --with-memcached=DIR site header files for libmemcached in DIR],
+- [
+- case "$withval" in
+- "" | y | ye | yes | n | no)
+- AC_MSG_ERROR([*** You must supply an argument to the --with-memcached option.])
+- ;;
+- *)
+-
+- MEMCACHED_INCLUDE_DIR="$withval"/include
+- MEMCACHED_LIB_DIR="$withval"/lib
+- OLD_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I$MEMCACHED_INCLUDE_DIR"
++AC_ARG_WITH([memcached],
++ AS_HELP_STRING([--with-memcached], [Build with memcached support]))
++AS_IF([test "x$with_memcached" = "xyes"], [
++ PKG_CHECK_MODULES([MEMCACHED], [libmemcached])
++ CFLAGS="$CFLAGS $MEMCACHED_CFLAGS"
++ LIBS="$LIBS $MEMCACHED_LIBS"
++
+ AC_CHECK_HEADERS(
+ [libmemcached/memcached.h],
+ [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])],
+- [AC_MSG_ERROR([header file <libmemcached/memcached.h> is required for memcached support])])
+- CFLAGS=$OLD_CFLAGS
+- AC_CHECK_LIB(memcached, memcached_create, [], [AC_MSG_ERROR(libmemcached is not installed)])
+- MEMCACHED_INCLUDE_OPT="-I $MEMCACHED_INCLUDE_DIR"
+- MEMCACHED_LINK_OPT="-L$MEMCACHED_LIB_DIR"
+- MEMCACHED_RPATH_OPT="-rpath $MEMCACHED_LIB_DIR"
+- ;;
+- esac
++ [AC_MSG_ERROR([Couldn't find <libmemcached/memcached.h>])])
++
++ AC_SEARCH_LIBS(memcached_create, [], [],
++ [AC_MSG_ERROR(libmemcached is not installed)])
+ ])
+
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+-AC_SUBST(MEMCACHED_INCLUDE_OPT)
+-AC_SUBST(MEMCACHED_LINK_OPT)
+-AC_SUBST(MEMCACHED_RPATH_OPT)
+
+ OLD_LDFLAGS="$LDFLAGS"
+ LDFLAGS="-L$PGSQL_LIB_DIR $LDFLAGS"
+@@ -435,7 +422,6 @@
+ AC_SUBST(PGSQL_INCLUDE_DIR)
+ AC_SUBST(PGSQL_LIB_DIR)
+ AC_SUBST(PGSQL_BIN_DIR)
+-AC_SUBST(MEMCACHED_DIR)
+
+ # --enable(disable)-rpath option
+ AC_ARG_ENABLE(rpath,
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch b/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch
new file mode 100644
index 00000000000..842fd5fbad7
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch
@@ -0,0 +1,14 @@
+diff -Naruw pgpool-II-4.2.0.orig/configure.ac pgpool-II-4.2.0/configure.ac
+--- pgpool-II-4.2.0.orig/configure.ac 2020-11-25 20:25:42.000000000 -0500
++++ pgpool-II-4.2.0/configure.ac 2020-12-16 06:40:11.150611861 -0500
+@@ -4,6 +4,10 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CC_C99()
++AX_PTHREAD
++LIBS="$PTHREAD_LIBS $LIBS"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++CC="$PTHREAD_CC"
+
+ # Error out if the compiler does not support C99, as the codebase
+ # relies on that.
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
new file mode 100644
index 00000000000..fd5dd863d7b
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
@@ -0,0 +1,432 @@
+diff -Naruw pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h pgpool-II-4.2.0/src/include/parser/pg_config_manual.h
+--- pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/include/parser/pg_config_manual.h 2020-12-16 21:39:27.178596628 -0500
+@@ -228,7 +228,7 @@
+ * support them yet.
+ */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
+diff -Naruw pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h pgpool-II-4.2.0/src/include/pcp/pcp_stream.h
+--- pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/include/pcp/pcp_stream.h 2020-12-16 21:40:46.051752707 -0500
+@@ -49,6 +49,6 @@
+ extern int pcp_write(PCP_CONNECTION * pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION * pc);
+
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+
+ #endif /* PCP_STREAM_H */
+diff -Naruw pgpool-II-4.2.0.orig/src/include/pool.h pgpool-II-4.2.0/src/include/pool.h
+--- pgpool-II-4.2.0.orig/src/include/pool.h 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/include/pool.h 2020-12-16 21:42:50.054807364 -0500
+@@ -69,16 +69,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample pgpool-II-4.2.0/src/sample/pgpool.conf.sample
+--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample 2020-12-16 21:57:56.776102951 -0500
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ reserved_connections = 0
+ # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -659,10 +655,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical pgpool-II-4.2.0/src/sample/pgpool.conf.sample-logical
+--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-logical 2020-12-16 21:57:56.776102951 -0500
+@@ -38,10 +38,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ reserved_connections = 0
+ # Number of reserved connections.
+@@ -58,10 +56,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -621,10 +617,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw pgpool-II-4.2.0/src/sample/pgpool.conf.sample-raw
+--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-raw 2020-12-16 21:57:56.776102951 -0500
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ reserved_connections = 0
+ # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -287,13 +283,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -660,10 +656,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Virtual IP control Setting -
+diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-replication pgpool-II-4.2.0/src/sample/pgpool.conf.sample-replication
+--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-replication 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-replication 2020-12-16 21:57:56.776102951 -0500
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -282,13 +278,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -657,10 +653,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-slony pgpool-II-4.2.0/src/sample/pgpool.conf.sample-slony
+--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-slony 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-slony 2020-12-16 21:57:56.776102951 -0500
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -283,13 +279,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -658,10 +654,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Virtual IP control Setting -
+diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-snapshot pgpool-II-4.2.0/src/sample/pgpool.conf.sample-snapshot
+--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-snapshot 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-snapshot 2020-12-16 21:57:56.779436277 -0500
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -280,13 +276,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -655,10 +651,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-stream pgpool-II-4.2.0/src/sample/pgpool.conf.sample-stream
+--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-stream 2020-11-25 20:25:31.000000000 -0500
++++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-stream 2020-12-16 21:57:56.779436277 -0500
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ reserved_connections = 0
+ # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -659,10 +655,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
diff --git a/dev-db/pgpool2/pgpool2-4.2.0.ebuild b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
new file mode 100644
index 00000000000..9e4cb8b8837
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+
+IUSE="doc libressl memcached pam ssl static-libs"
+
+RDEPEND="
+ ${POSTGRES_DEP}
+ net-libs/libnsl:0=
+ memcached? ( dev-libs/libmemcached )
+ pam? ( sys-auth/pambase )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ postgres_new_user pgpool
+
+ postgres-multi_pkg_setup
+}
+
+src_prepare() {
+ eapply \
+ "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-configure-pam.patch" \
+ "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+ "${FILESDIR}/pgpool-4.2.0-run_paths.patch"
+
+ eautoreconf
+
+ postgres-multi_src_prepare
+}
+
+src_configure() {
+ postgres-multi_foreach econf \
+ --disable-rpath \
+ --sysconfdir="${EROOT%/}/etc/${PN}" \
+ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+ $(use_enable static-libs static) \
+ $(use_with memcached) \
+ $(use_with pam) \
+ $(use_with ssl openssl)
+}
+
+src_compile() {
+ # Even though we're only going to do an install for the best slot
+ # available, the extension bits in src/sql need some things outside
+ # of that directory built, too.
+ postgres-multi_foreach emake
+ postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+ # We only need the best stuff installed
+ postgres-multi_forbest emake DESTDIR="${D}" install
+
+ # Except for the extension and .so files that each PostgreSQL slot needs
+ postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ # Documentation!
+ dodoc NEWS TODO
+ doman doc/src/sgml/man{1,8}/*
+ use doc && dodoc -r doc/src/sgml/html
+
+ # mv some files that get installed to /usr/share/pgpool-II so that
+ # they all wind up in the same place
+ mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+
+ # One more thing: Evil la files!
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
@ 2020-12-17 4:09 Aaron W. Swenson
0 siblings, 0 replies; 8+ messages in thread
From: Aaron W. Swenson @ 2020-12-17 4:09 UTC (permalink / raw
To: gentoo-commits
commit: d55b2687cb772e77556ac0f29d2230f2c79e228a
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 04:08:38 2020 +0000
Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 04:08:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55b2687
dev-db/pgpool2: Fix QA notices by pkgcheck
Unnecessary slash strip, and nonexistent blocker.
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>
dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch | 60 +++++++++++------------
dev-db/pgpool2/pgpool2-4.2.0.ebuild | 6 +--
dev-db/pgpool2/pgpool2-9999.ebuild | 20 +++-----
3 files changed, 40 insertions(+), 46 deletions(-)
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
index fd5dd863d7b..2eca0fd5918 100644
--- a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
@@ -1,6 +1,6 @@
-diff -Naruw pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h pgpool-II-4.2.0/src/include/parser/pg_config_manual.h
---- pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/include/parser/pg_config_manual.h 2020-12-16 21:39:27.178596628 -0500
+diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h
++++ b/src/include/parser/pg_config_manual.h
@@ -228,7 +228,7 @@
* support them yet.
*/
@@ -10,9 +10,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h pgpool-II
#else
#define DEFAULT_PGSOCKET_DIR ""
#endif
-diff -Naruw pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h pgpool-II-4.2.0/src/include/pcp/pcp_stream.h
---- pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/include/pcp/pcp_stream.h 2020-12-16 21:40:46.051752707 -0500
+diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h
++++ b/src/include/pcp/pcp_stream.h
@@ -49,6 +49,6 @@
extern int pcp_write(PCP_CONNECTION * pc, void *buf, int len);
extern int pcp_flush(PCP_CONNECTION * pc);
@@ -21,9 +21,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h pgpool-II-4.2.0/sr
+#define UNIX_DOMAIN_PATH "/run/pgpool"
#endif /* PCP_STREAM_H */
-diff -Naruw pgpool-II-4.2.0.orig/src/include/pool.h pgpool-II-4.2.0/src/include/pool.h
---- pgpool-II-4.2.0.orig/src/include/pool.h 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/include/pool.h 2020-12-16 21:42:50.054807364 -0500
+diff -Naruw a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h
++++ b/src/include/pool.h
@@ -69,16 +69,16 @@
#define HBA_CONF_FILE_NAME "pool_hba.conf"
@@ -45,9 +45,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/include/pool.h pgpool-II-4.2.0/src/include/
/* status file name */
#define STATUS_FILE_NAME "pgpool_status"
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample pgpool-II-4.2.0/src/sample/pgpool.conf.sample
---- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample 2020-12-16 21:57:56.776102951 -0500
+diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample
++++ b/src/sample/pgpool.conf.sample
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -100,9 +100,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample pgpool-II-4.2.0/s
# (change requires restart)
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical pgpool-II-4.2.0/src/sample/pgpool.conf.sample-logical
---- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-logical 2020-12-16 21:57:56.776102951 -0500
+diff -Naruw a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
+--- a/src/sample/pgpool.conf.sample-logical
++++ b/src/sample/pgpool.conf.sample-logical
@@ -38,10 +38,8 @@
port = 9999
# Port number
@@ -155,9 +155,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical pgpool-II
# (change requires restart)
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw pgpool-II-4.2.0/src/sample/pgpool.conf.sample-raw
---- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-raw 2020-12-16 21:57:56.776102951 -0500
+diff -Naruw a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw
+--- a/src/sample/pgpool.conf.sample-raw
++++ b/src/sample/pgpool.conf.sample-raw
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -210,9 +210,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw pgpool-II-4.2
# (change requires restart)
# - Virtual IP control Setting -
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-replication pgpool-II-4.2.0/src/sample/pgpool.conf.sample-replication
---- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-replication 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-replication 2020-12-16 21:57:56.776102951 -0500
+diff -Naruw a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
+--- a/src/sample/pgpool.conf.sample-replication
++++ b/src/sample/pgpool.conf.sample-replication
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -265,9 +265,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-replication pgpoo
# (change requires restart)
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-slony pgpool-II-4.2.0/src/sample/pgpool.conf.sample-slony
---- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-slony 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-slony 2020-12-16 21:57:56.776102951 -0500
+diff -Naruw a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony
+--- a/src/sample/pgpool.conf.sample-slony
++++ b/src/sample/pgpool.conf.sample-slony
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -320,9 +320,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-slony pgpool-II-4
# (change requires restart)
# - Virtual IP control Setting -
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-snapshot pgpool-II-4.2.0/src/sample/pgpool.conf.sample-snapshot
---- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-snapshot 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-snapshot 2020-12-16 21:57:56.779436277 -0500
+diff -Naruw a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot
+--- a/src/sample/pgpool.conf.sample-snapshot
++++ b/src/sample/pgpool.conf.sample-snapshot
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -375,9 +375,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-snapshot pgpool-I
# (change requires restart)
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-stream pgpool-II-4.2.0/src/sample/pgpool.conf.sample-stream
---- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-stream 2020-11-25 20:25:31.000000000 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-stream 2020-12-16 21:57:56.779436277 -0500
+diff -Naruw a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
+--- a/src/sample/pgpool.conf.sample-stream
++++ b/src/sample/pgpool.conf.sample-stream
@@ -39,10 +39,8 @@
port = 9999
# Port number
diff --git a/dev-db/pgpool2/pgpool2-4.2.0.ebuild b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
index 9e4cb8b8837..4c93ba916e0 100644
--- a/dev-db/pgpool2/pgpool2-4.2.0.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc libressl memcached pam ssl static-libs"
@@ -57,7 +57,7 @@ src_prepare() {
src_configure() {
postgres-multi_foreach econf \
--disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
+ --sysconfdir="${EROOT}/etc/${PN}" \
--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
$(use_enable static-libs static) \
@@ -91,7 +91,7 @@ src_install() {
# mv some files that get installed to /usr/share/pgpool-II so that
# they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+ mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
# One more thing: Evil la files!
find "${ED}" -name '*.la' -exec rm -f {} +
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 042e87ed4a9..2b63038d42f 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
-POSTGRES_COMPAT=( 9.{5..6} {10..11} )
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
inherit autotools git-r3 postgres-multi
@@ -30,7 +30,6 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- !!dev-db/pgpool
sys-devel/bison
virtual/pkgconfig
doc? (
@@ -48,10 +47,10 @@ pkg_setup() {
src_prepare() {
eapply \
- "${FILESDIR}/pgpool-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
"${FILESDIR}/pgpool-configure-pam.patch" \
- "${FILESDIR}/pgpool-configure-pthread.patch" \
- "${FILESDIR}/pgpool_run_paths-3.7.10.patch"
+ "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+ "${FILESDIR}/pgpool-4.2.0-run_paths.patch"
eautoreconf
@@ -61,7 +60,7 @@ src_prepare() {
src_configure() {
postgres-multi_foreach econf \
--disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
+ --sysconfdir="${EROOT}/etc/${PN}" \
--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
$(use_enable static-libs static) \
@@ -93,14 +92,9 @@ src_install() {
dodoc NEWS TODO
use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
- # Examples and extras
# mv some files that get installed to /usr/share/pgpool-II so that
# they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+ mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
# One more thing: Evil la files!
find "${ED}" -name '*.la' -exec rm -f {} +
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
@ 2021-02-18 18:57 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2021-02-18 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 6e4c5974c66059a2b312f5edc6ed767f8f4f3cd7
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 18 18:55:24 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 18:55:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4c5974
dev-db/pgpool2: Remove old
Bug: https://bugs.gentoo.org/762952
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-db/pgpool2/Manifest | 3 -
dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch | 322 ---------------------
dev-db/pgpool2/pgpool2-3.7.10.ebuild | 104 -------
dev-db/pgpool2/pgpool2-4.0.5.ebuild | 104 -------
dev-db/pgpool2/pgpool2-4.2.0.ebuild | 98 -------
5 files changed, 631 deletions(-)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 62a75f59451..73364f57dec 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,4 +1 @@
-DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789 SHA512 a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
-DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af SHA512 897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
-DIST pgpool-II-4.2.0.tar.gz 4707623 BLAKE2B 9aa54fe0230d5dab303e9b20f35c242f9fe7f09c4c506c72be3a5d789f4e5c23b6e6fdf529ddafd5b1a0c0697a1e1b0f0106f965a8409f8e012633b8be0a58a9 SHA512 73179c3968441b592503512c5e0dfcc95ef778ecfd077024df0485fe831c9af12e708b51607c96c7bebf26f3cc81aefc53f50c7ad0a670d304cbbcf852170abf
DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch
deleted file mode 100644
index 2374054b0f5..00000000000
--- a/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
---- a/src/include/parser/pg_config_manual.h 2019-05-15 03:04:59.000000000 -0400
-+++ b/src/include/parser/pg_config_manual.h 2019-05-22 17:33:26.657307088 -0400
-@@ -208,7 +208,7 @@
- * here's where to twiddle it. You can also override this at runtime
- * with the postmaster's -k switch.
- */
--#define DEFAULT_PGSOCKET_DIR "/tmp"
-+#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
-
- /*
- * This is the default event source for Windows event log.
-diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
---- a/src/include/pcp/pcp_stream.h 2019-05-22 17:34:22.377167537 -0400
-+++ b/src/include/pcp/pcp_stream.h 2019-05-22 17:34:45.263776883 -0400
-@@ -48,6 +48,6 @@
- extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
- extern int pcp_flush(PCP_CONNECTION *pc);
-
--#define UNIX_DOMAIN_PATH "/tmp"
-+#define UNIX_DOMAIN_PATH "/run/pgpool"
-
- #endif /* PCP_STREAM_H */
-diff -Naruw a/src/include/pool.h b/src/include/pool.h
---- a/src/include/pool.h 2019-05-15 03:04:59.000000000 -0400
-+++ b/src/include/pool.h 2019-05-22 17:37:07.220088017 -0400
-@@ -72,16 +72,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
-
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "/run/pgpool"
-
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "/run/postgresql"
-
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
-
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
-
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
---- a/src/sample/pgpool.conf.sample 2019-05-15 03:04:59.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample 2019-05-23 06:17:33.641244614 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -217,13 +213,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/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 = '/var/log/pgpool'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -512,10 +508,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-diff -Naruw a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
---- a/src/sample/pgpool.conf.sample-logical 2019-05-15 03:04:59.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-logical 2019-05-23 06:24:39.766884345 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-@@ -47,10 +45,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -218,13 +214,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/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 = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -511,10 +507,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-diff -Naruw a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
---- a/src/sample/pgpool.conf.sample-master-slave 2019-05-15 03:04:59.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-master-slave 2019-05-23 06:27:27.259814032 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -217,13 +213,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/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 = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -511,10 +507,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Virtual IP control Setting -
-diff -Naruw a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
---- a/src/sample/pgpool.conf.sample-replication 2019-05-15 03:04:59.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-replication 2019-05-23 06:28:29.479664086 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -216,13 +212,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/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 = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -510,10 +506,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-diff -Naruw a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
---- a/src/sample/pgpool.conf.sample-stream 2019-05-15 03:04:59.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-stream 2019-05-23 06:29:16.582883904 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-@@ -47,10 +45,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -218,13 +214,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/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 = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -511,10 +507,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
diff --git a/dev-db/pgpool2/pgpool2-3.7.10.ebuild b/dev-db/pgpool2/pgpool2-3.7.10.ebuild
deleted file mode 100644
index 888fe8b89df..00000000000
--- a/dev-db/pgpool2/pgpool2-3.7.10.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{5..6} 10 )
-
-inherit autotools postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="https://www.pgpool.net/"
-SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-IUSE="doc libressl memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- !!dev-db/pgpool
- sys-devel/bison
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply \
- "${FILESDIR}/pgpool-configure-memcached.patch" \
- "${FILESDIR}/pgpool-configure-pam.patch" \
- "${FILESDIR}/pgpool-configure-pthread.patch" \
- "${FILESDIR}/pgpool_run_paths-3.7.10.patch"
-
- eautoreconf
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_enable static-libs static) \
- $(use_with memcached) \
- $(use_with pam) \
- $(use_with ssl openssl)
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- doman doc/src/sgml/man{1,8}/*
- use doc && dodoc -r doc/src/sgml/html
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-4.0.5.ebuild b/dev-db/pgpool2/pgpool2-4.0.5.ebuild
deleted file mode 100644
index fa0a7f04569..00000000000
--- a/dev-db/pgpool2/pgpool2-4.0.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{5..6} {10..11} )
-
-inherit autotools postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="https://www.pgpool.net/"
-SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-IUSE="doc libressl memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- !!dev-db/pgpool
- sys-devel/bison
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply \
- "${FILESDIR}/pgpool-configure-memcached.patch" \
- "${FILESDIR}/pgpool-configure-pam.patch" \
- "${FILESDIR}/pgpool-configure-pthread.patch" \
- "${FILESDIR}/pgpool_run_paths-3.7.10.patch"
-
- eautoreconf
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_enable static-libs static) \
- $(use_with memcached) \
- $(use_with pam) \
- $(use_with ssl openssl)
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- doman doc/src/sgml/man{1,8}/*
- use doc && dodoc -r doc/src/sgml/html
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-4.2.0.ebuild b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
deleted file mode 100644
index 4c93ba916e0..00000000000
--- a/dev-db/pgpool2/pgpool2-4.2.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
-
-inherit autotools postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="https://www.pgpool.net/"
-SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc libressl memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply \
- "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
- "${FILESDIR}/pgpool-configure-pam.patch" \
- "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
- "${FILESDIR}/pgpool-4.2.0-run_paths.patch"
-
- eautoreconf
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_enable static-libs static) \
- $(use_with memcached) \
- $(use_with pam) \
- $(use_with ssl openssl)
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- doman doc/src/sgml/man{1,8}/*
- use doc && dodoc -r doc/src/sgml/html
-
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
@ 2022-03-16 3:47 Aaron W. Swenson
0 siblings, 0 replies; 8+ messages in thread
From: Aaron W. Swenson @ 2022-03-16 3:47 UTC (permalink / raw
To: gentoo-commits
commit: 5c2d66607521b5c6cb22f91c9df1227f6381516f
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 03:43:54 2022 +0000
Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 03:46:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2d6660
dev-db/pgpool2: Bump to 4.3.1
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>
dev-db/pgpool2/Manifest | 1 +
dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch | 100 ++++++++++++++++++++++
dev-db/pgpool2/pgpool2-4.3.1.ebuild | 91 ++++++++++++++++++++
3 files changed, 192 insertions(+)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 2d63ff7e8e99..870e3b0f5fa9 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,2 +1,3 @@
DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8
DIST pgpool-II-4.2.2.tar.gz 4734840 BLAKE2B 2b4d26991732293e1411d1219f85a8c9ad1dca72c63069381ae1377a02ae215e813356172f3b89b42b9140549c92c76d443b125bb65cbc6abf03d2b99cf18dab SHA512 a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8
+DIST pgpool-II-4.3.1.tar.gz 6034811 BLAKE2B 6ca2a27eefc2b20186d0e5cbdfd838f429d9996e299ab177e655ed69aa214e676029db728b16020dbdc49d9036fe7aad71d6abb12b486a4cf8fb8348bb201c6c SHA512 a5417d9f5baa1b39e3645f7d44accf0a2f04d5fc5cb4d28089169aaebbd15c20b4cd280d09f15fa764c3b793117086fc03f5d7be584c0c5ff9c5f8e11ddb9ef8
diff --git a/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch
new file mode 100644
index 000000000000..2b9090fb2dce
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch
@@ -0,0 +1,100 @@
+diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h
++++ b/src/include/parser/pg_config_manual.h
+@@ -227,7 +227,7 @@
+ * support them yet.
+ */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
+diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h
++++ b/src/include/pcp/pcp_stream.h
+@@ -49,6 +49,6 @@
+ extern int pcp_write(PCP_CONNECTION * pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION * pc);
+
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+
+ #endif /* PCP_STREAM_H */
+diff -Naruw a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h
++++ b/src/include/pool.h
+@@ -69,16 +69,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample
++++ b/src/sample/pgpool.conf.sample
+@@ -39,10 +39,8 @@
+ #port = 9999
+ # Port number
+ # (change requires restart)
+-#socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ #reserved_connections = 0
+ # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ #pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-#pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ #listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -292,13 +288,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-#pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -676,8 +672,6 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-#wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
diff --git a/dev-db/pgpool2/pgpool2-4.3.1.ebuild b/dev-db/pgpool2/pgpool2-4.3.1.ebuild
new file mode 100644
index 000000000000..f78d11206305
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.3.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc memcached pam ssl static-libs"
+
+RDEPEND="
+ ${POSTGRES_DEP}
+ acct-user/pgpool
+ net-libs/libnsl:0=
+ virtual/libcrypt:=
+ memcached? ( dev-libs/libmemcached )
+ pam? ( sys-auth/pambase )
+ ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ eapply \
+ "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-configure-pam.patch" \
+ "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+ "${FILESDIR}/pgpool-4.3.1-run_paths.patch"
+
+ eautoreconf
+
+ postgres-multi_src_prepare
+}
+
+src_configure() {
+ postgres-multi_foreach econf \
+ --disable-rpath \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+ $(use_enable static-libs static) \
+ $(use_with memcached) \
+ $(use_with pam) \
+ $(use_with ssl openssl)
+}
+
+src_compile() {
+ # Even though we're only going to do an install for the best slot
+ # available, the extension bits in src/sql need some things outside
+ # of that directory built, too.
+ postgres-multi_foreach emake
+ postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+ # We only need the best stuff installed
+ postgres-multi_forbest emake DESTDIR="${D}" install
+
+ # Except for the extension and .so files that each PostgreSQL slot needs
+ postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ # Documentation!
+ dodoc NEWS TODO
+ doman doc/src/sgml/man{1,8}/*
+ use doc && dodoc -r doc/src/sgml/html
+
+ # mv some files that get installed to /usr/share/pgpool-II so that
+ # they all wind up in the same place
+ mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
+
+ # One more thing: Evil la files!
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
@ 2023-10-05 9:57 罗百科
0 siblings, 0 replies; 8+ messages in thread
From: 罗百科 @ 2023-10-05 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 51adfed1b62178fcc8b3edaefaf40e60549b1694
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 5 09:57:03 2023 +0000
Commit: 罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Thu Oct 5 09:57:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51adfed1
dev-db/pgpool2: add 4.4.4
Closes: https://bugs.gentoo.org/913009
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
dev-db/pgpool2/Manifest | 1 +
dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch | 88 ++++++++++++++++++++++
dev-db/pgpool2/pgpool2-4.4.4.ebuild | 91 +++++++++++++++++++++++
3 files changed, 180 insertions(+)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 61be66b815aa..c07b7ba70f51 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,2 +1,3 @@
DIST pgpool-II-4.3.2.tar.gz 5846769 BLAKE2B 82cfe7095ad303ac3a910c533d6e57edb4e3d5b28a9a9bffb2df473dd3087ec329d3a77f9490d9bb738d5d1a443020d96d0e9a1b1d6adecc04cce5d1caa04e7d SHA512 771426257eddb5c48504c80a2c8cccf44a18f7ea50df55654b7e9e017bda561a73a3e1f0db79785785ff6893d6df26f73b55310d0184ef3301838d12290d3d4c
DIST pgpool-II-4.3.7.tar.gz 4901679 BLAKE2B 40c280a9d399246da77661a856d64691c213361193ba6af46a70c03c9193021a9f44dd9bfdfc7335c269675d04e9469d033ce55757799a7009d35d1493c50d6e SHA512 dd84b94a60fb1e75de2c14f83b3637491a4673b15dc7c23dbb8e26e69d32f617a85159f7c276a88a62d741b7758d84e94949ea6aa8f505be0960d8fffdaa10b6
+DIST pgpool-II-4.4.4.tar.gz 4973024 BLAKE2B 2fa41442bc9bf677a17d98388f9977b97fb609cdd6f1494d9f4de2356b04de5a3725478381d67cc04a01f3ff964bd3dfe159d9c41c13980e477a5f0c4c198413 SHA512 fb80df3df2894e7f2cf820a2b32e04ef6447a8137341db65c3a141679ea0fcbae7d5824c1904cb19aae7b05ef9fe641ac294dbc58cdbc6231444f0c4e508e7dc
diff --git a/dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch
new file mode 100644
index 000000000000..41d80030df4c
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch
@@ -0,0 +1,88 @@
+diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h
++++ b/src/include/parser/pg_config_manual.h
+@@ -227,7 +227,7 @@
+ * support them yet.
+ */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
+diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h
++++ b/src/include/pcp/pcp_stream.h
+@@ -49,6 +49,6 @@
+ extern int pcp_write(PCP_CONNECTION * pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION * pc);
+
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+
+ #endif /* PCP_STREAM_H */
+diff -Naruw a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h
++++ b/src/include/pool.h
+@@ -69,16 +69,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample
++++ b/src/sample/pgpool.conf.sample
+@@ -59,10 +57,8 @@
+ #pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-#pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ #listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -292,13 +288,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-#pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/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 = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -676,8 +672,6 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-#wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
diff --git a/dev-db/pgpool2/pgpool2-4.4.4.ebuild b/dev-db/pgpool2/pgpool2-4.4.4.ebuild
new file mode 100644
index 000000000000..7c58c30c4de0
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.4.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {10..16} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc memcached pam ssl static-libs"
+
+RDEPEND="
+ ${POSTGRES_DEP}
+ acct-user/pgpool
+ net-libs/libnsl:0=
+ virtual/libcrypt:=
+ memcached? ( dev-libs/libmemcached )
+ pam? ( sys-auth/pambase )
+ ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ eapply \
+ "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-configure-pam.patch" \
+ "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+ "${FILESDIR}/pgpool-4.4.4-run_paths.patch"
+
+ eautoreconf
+
+ postgres-multi_src_prepare
+}
+
+src_configure() {
+ postgres-multi_foreach econf \
+ --disable-rpath \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+ $(use_enable static-libs static) \
+ $(use_with memcached) \
+ $(use_with pam) \
+ $(use_with ssl openssl)
+}
+
+src_compile() {
+ # Even though we're only going to do an install for the best slot
+ # available, the extension bits in src/sql need some things outside
+ # of that directory built, too.
+ postgres-multi_foreach emake
+ postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+ # We only need the best stuff installed
+ postgres-multi_forbest emake DESTDIR="${D}" install
+
+ # Except for the extension and .so files that each PostgreSQL slot needs
+ postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ # Documentation!
+ dodoc NEWS TODO
+ doman doc/src/sgml/man{1,8}/*
+ use doc && dodoc -r doc/src/sgml/html
+
+ # mv some files that get installed to /usr/share/pgpool-II so that
+ # they all wind up in the same place
+ mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
+
+ # One more thing: Evil la files!
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-10-05 9:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-10 2:27 [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/ Aaron Swenson
-- strict thread matches above, loose matches on Subject: below --
2018-01-11 10:38 Aaron Swenson
2018-08-03 13:27 Aaron Swenson
2020-12-17 4:09 Aaron W. Swenson
2020-12-17 4:09 Aaron W. Swenson
2021-02-18 18:57 David Seifert
2022-03-16 3:47 Aaron W. Swenson
2023-10-05 9:57 罗百科
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox