summaryrefslogtreecommitdiff
path: root/dev-db/pgpool2/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/pgpool2/files')
-rw-r--r--dev-db/pgpool2/files/pgpool-configure-memcached.patch64
-rw-r--r--dev-db/pgpool2/files/pgpool-configure-pthread.patch13
-rw-r--r--dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch322
3 files changed, 0 insertions, 399 deletions
diff --git a/dev-db/pgpool2/files/pgpool-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-configure-memcached.patch
deleted file mode 100644
index 7b983dba02e2..000000000000
--- a/dev-db/pgpool2/files/pgpool-configure-memcached.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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-pthread.patch b/dev-db/pgpool2/files/pgpool-configure-pthread.patch
deleted file mode 100644
index 50b18fab6fc4..000000000000
--- a/dev-db/pgpool2/files/pgpool-configure-pthread.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/pgpool_run_paths-3.7.10.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch
deleted file mode 100644
index 2374054b0f5c..000000000000
--- 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)
-
-
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-02 13:28:23 +0000