commit: 51adfed1b62178fcc8b3edaefaf40e60549b1694 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> AuthorDate: Thu Oct 5 09:57:03 2023 +0000 Commit: 罗百科 <patrick <AT> gentoo <DOT> org> CommitDate: Thu Oct 5 09:57:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51adfed1
dev-db/pgpool2: add 4.4.4 Closes: https://bugs.gentoo.org/913009 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org> dev-db/pgpool2/Manifest | 1 + dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch | 88 ++++++++++++++++++++++ dev-db/pgpool2/pgpool2-4.4.4.ebuild | 91 +++++++++++++++++++++++ 3 files changed, 180 insertions(+) diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest index 61be66b815aa..c07b7ba70f51 100644 --- a/dev-db/pgpool2/Manifest +++ b/dev-db/pgpool2/Manifest @@ -1,2 +1,3 @@ DIST pgpool-II-4.3.2.tar.gz 5846769 BLAKE2B 82cfe7095ad303ac3a910c533d6e57edb4e3d5b28a9a9bffb2df473dd3087ec329d3a77f9490d9bb738d5d1a443020d96d0e9a1b1d6adecc04cce5d1caa04e7d SHA512 771426257eddb5c48504c80a2c8cccf44a18f7ea50df55654b7e9e017bda561a73a3e1f0db79785785ff6893d6df26f73b55310d0184ef3301838d12290d3d4c DIST pgpool-II-4.3.7.tar.gz 4901679 BLAKE2B 40c280a9d399246da77661a856d64691c213361193ba6af46a70c03c9193021a9f44dd9bfdfc7335c269675d04e9469d033ce55757799a7009d35d1493c50d6e SHA512 dd84b94a60fb1e75de2c14f83b3637491a4673b15dc7c23dbb8e26e69d32f617a85159f7c276a88a62d741b7758d84e94949ea6aa8f505be0960d8fffdaa10b6 +DIST pgpool-II-4.4.4.tar.gz 4973024 BLAKE2B 2fa41442bc9bf677a17d98388f9977b97fb609cdd6f1494d9f4de2356b04de5a3725478381d67cc04a01f3ff964bd3dfe159d9c41c13980e477a5f0c4c198413 SHA512 fb80df3df2894e7f2cf820a2b32e04ef6447a8137341db65c3a141679ea0fcbae7d5824c1904cb19aae7b05ef9fe641ac294dbc58cdbc6231444f0c4e508e7dc diff --git a/dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch new file mode 100644 index 000000000000..41d80030df4c --- /dev/null +++ b/dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch @@ -0,0 +1,88 @@ +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 ++++ b/src/include/parser/pg_config_manual.h +@@ -227,7 +227,7 @@ + * support them yet. + */ + #ifndef WIN32 +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" + #else + #define DEFAULT_PGSOCKET_DIR "" + #endif +diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h +--- 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 */ +diff -Naruw a/src/include/pool.h b/src/include/pool.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" +diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample +--- a/src/sample/pgpool.conf.sample ++++ b/src/sample/pgpool.conf.sample +@@ -59,10 +57,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 +@@ -292,13 +288,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) + +@@ -676,8 +672,6 @@ + # 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/pgpool2-4.4.4.ebuild b/dev-db/pgpool2/pgpool2-4.4.4.ebuild new file mode 100644 index 000000000000..7c58c30c4de0 --- /dev/null +++ b/dev-db/pgpool2/pgpool2-4.4.4.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +POSTGRES_COMPAT=( {10..16} ) + +inherit autotools postgres-multi + +MY_P="${PN/2/-II}-${PV}" + +DESCRIPTION="Connection pool server for PostgreSQL" +HOMEPAGE="https://www.pgpool.net/"; +SRC_URI="https://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} + acct-user/pgpool + net-libs/libnsl:0= + virtual/libcrypt:= + memcached? ( dev-libs/libmemcached ) + pam? ( sys-auth/pambase ) + ssl? ( dev-libs/openssl:0= ) +" +DEPEND="${RDEPEND} + sys-devel/bison + virtual/pkgconfig +" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + eapply \ + "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \ + "${FILESDIR}/pgpool-configure-pam.patch" \ + "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \ + "${FILESDIR}/pgpool-4.4.4-run_paths.patch" + + eautoreconf + + postgres-multi_src_prepare +} + +src_configure() { + postgres-multi_foreach econf \ + --disable-rpath \ + --sysconfdir="${EPREFIX}/etc/${PN}" \ + --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \ + --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \ + $(use_enable static-libs static) \ + $(use_with memcached) \ + $(use_with pam) \ + $(use_with ssl openssl) +} + +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 + + # 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 + + # One more thing: Evil la files! + find "${ED}" -name '*.la' -exec rm -f {} + +}
