summaryrefslogtreecommitdiff
path: root/dev-db/pgpool2
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
commit1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch)
treee48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-db/pgpool2
parentd87262dd706fec50cd150aab3e93883b6337466d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-db/pgpool2')
-rw-r--r--dev-db/pgpool2/Manifest12
-rw-r--r--dev-db/pgpool2/files/pgpool2.confd17
-rw-r--r--dev-db/pgpool2/files/pgpool2.initd82
-rw-r--r--dev-db/pgpool2/files/pgpool_run_paths-3.6.5.patch268
-rw-r--r--dev-db/pgpool2/files/pgpool_run_paths-9999.patch274
-rw-r--r--dev-db/pgpool2/metadata.xml11
-rw-r--r--dev-db/pgpool2/pgpool2-3.7.0.ebuild98
-rw-r--r--dev-db/pgpool2/pgpool2-3.7.1.ebuild98
-rw-r--r--dev-db/pgpool2/pgpool2-3.7.3.ebuild98
-rw-r--r--dev-db/pgpool2/pgpool2-9999.ebuild97
10 files changed, 0 insertions, 1055 deletions
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
deleted file mode 100644
index c5b930da7a98..000000000000
--- a/dev-db/pgpool2/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910
-AUX pgpool2.initd 2174 BLAKE2B 153fa1d756067fd381e599447fb71d780b90bc4c187d0146b1e2806fcc1c19a85d215b59b1931373a3a95fa7e719b9cebd93756276fbeeab087f2a5ba5a1f27b SHA512 3123d2c5e7178fc4b970592fe6908df2860ca3cd5ec54d4609c28145ffc934edf6ddb11f9d2208d89d43bc4252e326b3bc0eed36a28fd2fadbaeb2d635935e40
-AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
-AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
-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
-EBUILD pgpool2-3.7.0.ebuild 2489 BLAKE2B 79706764ecb54cd2e682bb200640f6635f9a2f6ff8d26f9129a290ea68cb43adef5ba6f6622c591bd9cd5e996456f396d2f936ed8d4d303367fef0032bf2cd56 SHA512 7f74ded58782b8657b3c3f1de92a7a268a806019978e73ed3f4ed93c160d75d9e251acc2bbc39ee266dbc23f662fad8678b98f31b9a476d1b9f0c6b6719377c6
-EBUILD pgpool2-3.7.1.ebuild 2491 BLAKE2B f31a347236dacc779b0c019663205b5472a994da5be4136919a4fc3c86cf730a48abbb2741224855a3fd284a937ad97b1b1a7f0b8e6741ea6570974841d5d6e6 SHA512 42026cf2f0d76578b8324b14af12b0fb53c21a75b33d04ef997589878943fb29887488219f175d4481833854dfdf3f6d91c804b54f73157b72d6f786173d6950
-EBUILD pgpool2-3.7.3.ebuild 2491 BLAKE2B f31a347236dacc779b0c019663205b5472a994da5be4136919a4fc3c86cf730a48abbb2741224855a3fd284a937ad97b1b1a7f0b8e6741ea6570974841d5d6e6 SHA512 42026cf2f0d76578b8324b14af12b0fb53c21a75b33d04ef997589878943fb29887488219f175d4481833854dfdf3f6d91c804b54f73157b72d6f786173d6950
-EBUILD pgpool2-9999.ebuild 2443 BLAKE2B f6c59d5334c199bff687e8dfa494d26593ebe5b60fb86b5b052a9e9003393ec1116ee39f8a66bf45c01bf986064390ed675320e818c66e8058c0f117cac4d325 SHA512 cc484a69fa7b25330b9bf5a64017bf2df6cc0b11e44c6f0f347ddbfca7ec6046cc5115a678ab691951734e4c6c463ac4307e8efc7908b1d0646d5ce6c839226e
-MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/files/pgpool2.confd b/dev-db/pgpool2/files/pgpool2.confd
deleted file mode 100644
index b2dd2a69e02e..000000000000
--- a/dev-db/pgpool2/files/pgpool2.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# NICE_QUIT ignores new connections and wait for clients to disconnect from
-# server before shutting down. NICE_TIMEOUT in seconds determines how long to
-# wait for this to succeed.
-NICE_TIMEOUT=60
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminated client connections have their open transactions
-# rolled back.
-# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
-RUDE_QUIT="YES"
-RUDE_TIMEOUT=30
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to YES.
-# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
-FORCE_QUIT="NO"
-FORCE_TIMEOUT=2 \ No newline at end of file
diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd
deleted file mode 100644
index c9ffb0cf1611..000000000000
--- a/dev-db/pgpool2/files/pgpool2.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-CONFIGFILE="/etc/pgpool2/pgpool.conf"
-LOGFILE="/var/log/pgpool2.log"
-
-depend() {
- use net
- use postgresql
- after logger
-}
-
-get_config() {
- [ -f ${CONFIGFILE} ] || return 1
-
- eval echo $(sed -e 's:#.*::' ${CONFIGFILE} | \
- awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-PIDFILE="$(get_config pid_file_name)"
-: ${PIDFILE:='/run/pgpool/pgpool.pid'}
-
-prep() {
- # $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 0660 -f ${LOGFILE} || return 1
- checkpath -o postgres:postgres -m 0770 \
- -d ${socket_dir:-'/run/postgresql'} || return 1
- checkpath -o postgres:postgres -m 0770 \
- -d ${pcp_socket_dir:-'/run/postgresql'} || return 1
-}
-
-start() {
- prep || return 1
-
- ebegin "Starting pgpool2"
-
- start-stop-daemon --start \
- --user pgpool:postgres \
- --pidfile ${PIDFILE} \
- --exec /usr/bin/pgpool
-
- eend
-}
-
-stop() {
- local seconds=$(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} ))
- ebegin "Stopping pgpool (this can take up to ${seconds} seconds)"
-
- local retval
- local retries=SIGTERM/${NICE_TIMEOUT}
-
- if [ "${RUDE_QUIT}" != "NO" ] ; then
- einfo "RUDE_QUIT enabled."
- retries="${retries}/SIGINT/${RUDE_TIMEOUT}"
- fi
- if [ "${FORCE_QUIT}" = "YES" ] ; then
- einfo "FORCE_QUIT enabled."
- ewarn "A recover-run might be executed on next startup."
- retries="${retries}/SIGQUIT/${FORCE_TIMEOUT}"
- fi
-
- # Loops through nice, rude, and force quit in one go.
- start-stop-daemon --stop \
- --pidfile ${PIDFILE} \
- --retry ${retries}
-
- eend
-}
-
-reload() {
- start-stop-daemon --signal HUP \
- --pidfile ${PIDFILE}
-}
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.6.5.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.6.5.patch
deleted file mode 100644
index 06c1b3711bd4..000000000000
--- a/dev-db/pgpool2/files/pgpool_run_paths-3.6.5.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff -ur 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-07-10 04:56:18.000000000 -0400
-+++ b/src/include/parser/pg_config_manual.h 2017-07-11 09:38:46.612907898 -0400
-@@ -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.
-Only in b/src/include/parser: pg_config_manual.h.orig
-diff -ur a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
---- a/src/include/pcp/pcp_stream.h 2017-07-10 04:39:14.000000000 -0400
-+++ b/src/include/pcp/pcp_stream.h 2017-07-11 09:38:46.612907898 -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 -ur a/src/include/pool.h b/src/include/pool.h
---- a/src/include/pool.h 2017-07-10 04:56:18.000000000 -0400
-+++ b/src/include/pool.h 2017-07-11 09:38:46.612907898 -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 -ur a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
---- a/src/sample/pgpool.conf.sample 2017-07-10 04:56:18.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample 2017-07-11 11:05:00.174030914 -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,13 +206,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)
-
-@@ -493,10 +489,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 -ur 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-07-10 04:56:18.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-master-slave 2017-07-11 11:13:57.700698647 -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,13 +206,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)
-
-@@ -492,10 +488,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 -ur a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
---- a/src/sample/pgpool.conf.sample-replication 2017-07-10 04:56:18.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-replication 2017-07-11 11:15:10.613588243 -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,13 +206,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)
-
-@@ -492,10 +488,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 -ur a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
---- a/src/sample/pgpool.conf.sample-stream 2017-07-10 04:56:18.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-stream 2017-07-11 11:15:50.996675811 -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,13 +207,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)
-
-@@ -492,10 +488,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
deleted file mode 100644
index 691d6e867ef5..000000000000
--- a/dev-db/pgpool2/files/pgpool_run_paths-9999.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-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/metadata.xml b/dev-db/pgpool2/metadata.xml
deleted file mode 100644
index 7414c47471c7..000000000000
--- a/dev-db/pgpool2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>pgsql-bugs@gentoo.org</email>
- <name>PostgreSQL and Related Package Development</name>
- </maintainer>
- <use>
- <flag name="memcached">Use memcached for query caching.</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-db/pgpool2/pgpool2-3.7.0.ebuild b/dev-db/pgpool2/pgpool2-3.7.0.ebuild
deleted file mode 100644
index 9ffbb68c699e..000000000000
--- a/dev-db/pgpool2/pgpool2-3.7.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-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.7.1.ebuild b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
deleted file mode 100644
index fe57ae924343..000000000000
--- a/dev-db/pgpool2/pgpool2-3.7.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-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.7.3.ebuild b/dev-db/pgpool2/pgpool2-3.7.3.ebuild
deleted file mode 100644
index fe57ae924343..000000000000
--- a/dev-db/pgpool2/pgpool2-3.7.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-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-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
deleted file mode 100644
index b0b43a07e37c..000000000000
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-inherit git-r3 postgres-multi
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI=""
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS=""
-
-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
-"
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-9999.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 {} +
-}