dev-db/pgpool2: Cleanup

Package-Manager: Portage-2.3.13, Repoman-2.3.3

2 files changed, 0 insertions, 439 deletions

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 b2c5d554e561..000000000000
--- 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 d6943d7502e2..000000000000
--- 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)
- 
-