commit: 296d9686a4cb50f7d6d19da621140623ab03b422 Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 12:41:53 2022 +0000 Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 12:41:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=296d9686
dev-db/pgpool2: Fix run paths patch Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org> dev-db/pgpool2/files/pgpool-9999-run_paths.patch | 98 ++++++++++++++++++++++++ dev-db/pgpool2/pgpool2-9999.ebuild | 6 +- 2 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dev-db/pgpool2/files/pgpool-9999-run_paths.patch b/dev-db/pgpool2/files/pgpool-9999-run_paths.patch new file mode 100644 index 000000000000..bca3b213edb9 --- /dev/null +++ b/dev-db/pgpool2/files/pgpool-9999-run_paths.patch @@ -0,0 +1,98 @@ +--- a/src/include/parser/pg_config_manual.h ++++ b/src/include/parser/pg_config_manual.h +@@ -244,7 +244,7 @@ + * support them yet. + */ + #ifndef WIN32 +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" + #else + #define DEFAULT_PGSOCKET_DIR "" + #endif +--- a/src/include/pcp/pcp_stream.h ++++ b/src/include/pcp/pcp_stream.h +@@ -49,6 +49,6 @@ + extern int pcp_write(PCP_CONNECTION * pc, void *buf, int len); + extern int pcp_flush(PCP_CONNECTION * pc); + +-#define UNIX_DOMAIN_PATH "/tmp" ++#define UNIX_DOMAIN_PATH "/run/pgpool" + + #endif /* PCP_STREAM_H */ +--- a/src/include/pool.h ++++ b/src/include/pool.h +@@ -69,16 +69,16 @@ + #define HBA_CONF_FILE_NAME "pool_hba.conf" + + /* pid file directory */ +-#define DEFAULT_LOGDIR "/tmp" ++#define DEFAULT_LOGDIR "/run/pgpool" + + /* Unix domain socket directory */ +-#define DEFAULT_SOCKET_DIR "/tmp" ++#define DEFAULT_SOCKET_DIR "/run/postgresql" + + /* Unix domain socket directory for watchdog IPC */ +-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp" ++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool" + + /* pid file name */ +-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid" ++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid" + + /* status file name */ + #define STATUS_FILE_NAME "pgpool_status" +--- a/src/sample/pgpool.conf.sample-stream ++++ b/src/sample/pgpool.conf.sample-stream +@@ -39,10 +39,8 @@ + #port = 9999 + # Port number + # (change requires restart) +-#unix_socket_directories = '/tmp' ++unix_socket_directories = '/run/postgresql' + # Unix domain socket path(s) +- # The Debian package defaults to +- # /var/run/postgresql + # (change requires restart) + #unix_socket_group = '' + # The Owner group of Unix domain socket(s) +@@ -65,10 +63,8 @@ + #pcp_port = 9898 + # Port number for pcp + # (change requires restart) +-#pcp_socket_dir = '/tmp' ++pcp_socket_dir = '/run/pgpool' + # Unix domain socket path for pcp +- # The Debian package defaults to +- # /var/run/postgresql + # (change requires restart) + #listen_backlog_multiplier = 2 + # Set the backlog parameter of listen(2) to +@@ -298,13 +294,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) + +@@ -687,10 +683,8 @@ + # Authentication key for watchdog communication + # (change requires restart) + +-#wd_ipc_socket_dir = '/tmp' ++wd_ipc_socket_dir = '/run/postgresql' + # Unix domain socket path for watchdog IPC socket +- # The Debian package defaults to +- # /var/run/postgresql + # (change requires restart) + + diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild index d14481554c21..0de82e93599a 100644 --- a/dev-db/pgpool2/pgpool2-9999.ebuild +++ b/dev-db/pgpool2/pgpool2-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"; -POSTGRES_COMPAT=( 9.6 {10..13} ) +POSTGRES_COMPAT=( 9.6 {10..15} ) inherit autotools git-r3 postgres-multi @@ -45,7 +45,7 @@ src_prepare() { "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \ "${FILESDIR}/pgpool-configure-pam.patch" \ "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \ - "${FILESDIR}/pgpool-4.2.0-run_paths.patch" + "${FILESDIR}/pgpool-9999-run_paths.patch" eautoreconf @@ -70,7 +70,7 @@ src_compile() { # of that directory built, too. postgres-multi_foreach emake postgres-multi_foreach emake -C src/sql - use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc + use doc && postgres-multi_forbest emake -C doc } src_install() {
