From e8c80f80fd116cc679f261d8bc6ee6c9bfc3f0a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Oct 2023 11:54:04 +0100 Subject: gentoo auto-resync : 05:10:2023 - 11:54:04 --- dev-db/pgpool2/Manifest | 7 +- dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch | 88 ++++++++++++++++++++++ dev-db/pgpool2/pgpool2-4.3.2.ebuild | 4 +- dev-db/pgpool2/pgpool2-4.3.7.ebuild | 91 +++++++++++++++++++++++ dev-db/pgpool2/pgpool2-4.4.4.ebuild | 91 +++++++++++++++++++++++ 5 files changed, 278 insertions(+), 3 deletions(-) create mode 100644 dev-db/pgpool2/files/pgpool-4.4.4-run_paths.patch create mode 100644 dev-db/pgpool2/pgpool2-4.3.7.ebuild create mode 100644 dev-db/pgpool2/pgpool2-4.4.4.ebuild (limited to 'dev-db/pgpool2') diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest index 2b0db417eba0..ef716b026422 100644 --- a/dev-db/pgpool2/Manifest +++ b/dev-db/pgpool2/Manifest @@ -1,11 +1,16 @@ AUX pgpool-4.2.0-configure-memcached.patch 2023 BLAKE2B 6216bb0e83f2e66ab3b46d6fca08ec151ad18821b2ca3dba1f5444c553874ded5d839c11efe5031979c3f4d11aa8c2db0e68c35b77c415daf2b622fe332821dd SHA512 34de23f441a8b0ad4cc727ac450132c43b91d015ac4488f243b86305749a8cf1df967c19ddf9e6a5e3beb6dafff7680c7273dac316ee2d10b97b6c340b5cd5eb AUX pgpool-4.2.0-configure-pthread.patch 471 BLAKE2B 789cbcb435d64ef87d12379dc4d4e66b38e253286321d4994480c04635713bc272f0e70b25493189cea891f8a33be86a882c682cf7394c75cadf6c5ab5919e10 SHA512 3ba36eec9c2d22c4abc18aaa5a60a7713ed807f5d7d69c129ba16875082553875ab0ee9f03f59b490ac1973a1cf7c7adafabac8d2e3788c356a84eb399532fb6 AUX pgpool-4.3.1-run_paths.patch 4009 BLAKE2B bb9f4ce01af465b826559312d73c0bdb60fb1433a7e5bfc1db9bc5608a4408866e657a9e35c2b19ffb5ffebd7e1fa0b813c4da1754fd3e2449fd7d57fdeed54b SHA512 426da4fd0904fab31ebedbddab226d50b7fe173dd76524c7c515f92c8a348c186f1285c8e164f72aa2023499b993087b2c1b4f5c79cbfc1ed1e537de00be44b8 +AUX pgpool-4.4.4-run_paths.patch 3458 BLAKE2B a0ecaf1b1b83dcb5ab9606207d1cc8e890af37cdcf357a2f12746b59578256063ad343cf3c32f10d1d63a32476168be45dbdb38bdd3d175d7a40aa9e48527909 SHA512 6a1df0eb664c31c6483fd687782bbec6e56e23bc93e10dfe13f929ca70ddf2afd630089411f04c1bd779f1a7a87cc8c24ac838996db96bc4137469d3b9da8083 AUX pgpool-9999-run_paths.patch 3772 BLAKE2B 37f98d76a06ac74ad1af4a917d795ee85e1890119361f0f8de92ef64a17ceafa7cb84f38fa795e569d35d6b3261e279a1f0caaa4e200cea610334339b6f81b1a SHA512 1a155c5e9c84d3b77adf0dbf93f4571ad0c4f91076a18aaafe45e84f5664442c8bc8ca5d11ceb6793ef4944b2b468980b38c67de307c676a451f5b0f44831108 AUX pgpool-configure-pam.patch 1077 BLAKE2B 4dad8c20faf2ecb1c65e95b87d394d1c17c363d0337e830ea25efb88b1cb07d1a19fc1169ed9fbf69807347eba59296c276b33e0f786d32300e6c518b7a8c4ea SHA512 7c3b3f02977c7d9b1dbf7fb8905cca3a405ab856b8884bb9016dccb70650ed074af76ee81ee6cf2c1d4c366283af07ddb5c473960d81f7528d9d7afe762f9d4e AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53 DIST pgpool-II-4.3.2.tar.gz 5846769 BLAKE2B 82cfe7095ad303ac3a910c533d6e57edb4e3d5b28a9a9bffb2df473dd3087ec329d3a77f9490d9bb738d5d1a443020d96d0e9a1b1d6adecc04cce5d1caa04e7d SHA512 771426257eddb5c48504c80a2c8cccf44a18f7ea50df55654b7e9e017bda561a73a3e1f0db79785785ff6893d6df26f73b55310d0184ef3301838d12290d3d4c -EBUILD pgpool2-4.3.2.ebuild 2317 BLAKE2B 5a932d7b01e5e3b2ee8811fb68de3caf131ecb589851aa808fff055701fb2627d033b7483bde12d0f5f74ab64b51485d07b7d830b343bb2e085635eb5643634a SHA512 dbde38f5939a008e3940b2237f4230f7342f38da031e7a84b935232a7f72b77cbd4764a13c6cbe4ef6a7742b443e6bd16088a9ca96770f81b26f82d35b2a92ae +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 +EBUILD pgpool2-4.3.2.ebuild 2317 BLAKE2B 7a7d9f27eb872253a87b5af29efc8d14eb6fa6cb34730e7c70b54a8c887d08167b11732bfd95f850fbab707c39b0659100b3b211d5655719dd09988fbfc68858 SHA512 b6d8d0dc77f30fc94404e7b3a5af2339a16a564999a8666815c5553e922cca0988bf214cacd61c465cef4c43b885450064492252ddd9b371b15370c19c58d9f0 +EBUILD pgpool2-4.3.7.ebuild 2317 BLAKE2B 7a7d9f27eb872253a87b5af29efc8d14eb6fa6cb34730e7c70b54a8c887d08167b11732bfd95f850fbab707c39b0659100b3b211d5655719dd09988fbfc68858 SHA512 b6d8d0dc77f30fc94404e7b3a5af2339a16a564999a8666815c5553e922cca0988bf214cacd61c465cef4c43b885450064492252ddd9b371b15370c19c58d9f0 +EBUILD pgpool2-4.4.4.ebuild 2315 BLAKE2B 1f3ac9c6b77476b644fcab2bd7f2bbb208f625bf8190bd157cfd1e116d6ebeb47b55ce8cd38de802e80d2cc21c35743b5afbbf8dc40e31957703fa2937a60a38 SHA512 84c3b7fd245366ceba4c69a6dc993d6539dcea1016e923996819ec0cec3c5abd0fc1e7ca59a5549df26de31a06268c2467d8442f9f9bc3b1cf2738325da22171 EBUILD pgpool2-9999.ebuild 2413 BLAKE2B fc0e0c1fb7b13f81eec53c1d878e4fc455a4112e9ff1b96e0a5c38dbf3fdd3e3563b0c6b62387fda876bc9cb76b19c880506f93412aeb14680c9f875ba062477 SHA512 f343781e12622108647be5e06f4eb735e6fd9cb0137be548a5f30076f01c35f710062a0b56c9eadbedb4df8fac8bb890456b485bbe34848994629a8928d1d684 MISC metadata.xml 391 BLAKE2B c5855fde95e138709d778b50b897ea0dd75267547e89faf60988d1dfe78740c313291a226c30fdd618ef2893ad3dc11000b33026e04369fe294ca9ed1e18efb1 SHA512 374bd70841f1f13e2f8265f972e2debc7fb79a3f463efb897a75fd8ddc3163edf82c888d3d8d5bfede6c509fc27f67e74592599b8da8640035a5d4241cad98c1 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.3.2.ebuild b/dev-db/pgpool2/pgpool2-4.3.2.ebuild index d6b6abf1f001..d46c7c75826a 100644 --- a/dev-db/pgpool2/pgpool2-4.3.2.ebuild +++ b/dev-db/pgpool2/pgpool2-4.3.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -POSTGRES_COMPAT=( 9.6 {10..14} ) +POSTGRES_COMPAT=( 9.6 {10..15} ) inherit autotools postgres-multi diff --git a/dev-db/pgpool2/pgpool2-4.3.7.ebuild b/dev-db/pgpool2/pgpool2-4.3.7.ebuild new file mode 100644 index 000000000000..d46c7c75826a --- /dev/null +++ b/dev-db/pgpool2/pgpool2-4.3.7.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=( 9.6 {10..15} ) + +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.3.1-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 {} + +} 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 {} + +} -- cgit v1.2.3