gentoo resync : 18.08.2019

2 files changed, 0 insertions, 542 deletions

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)
- 
-