From 145ac95c683ecda55a9b2cafc84dced2e9c29e03 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Oct 2022 15:52:10 +0100 Subject: gentoo auto-resync : 24:10:2022 - 15:52:09 --- dev-db/Manifest.gz | Bin 15756 -> 15754 bytes dev-db/pgpool2/Manifest | 12 +- dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch | 432 ---------------------- dev-db/pgpool2/files/pgpool-9999-run_paths.patch | 98 +++++ dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild | 97 ----- dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild | 96 ----- dev-db/pgpool2/pgpool2-4.2.9.ebuild | 98 ----- dev-db/pgpool2/pgpool2-4.3.1.ebuild | 91 ----- dev-db/pgpool2/pgpool2-9999.ebuild | 6 +- 9 files changed, 103 insertions(+), 827 deletions(-) delete mode 100644 dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch create mode 100644 dev-db/pgpool2/files/pgpool-9999-run_paths.patch delete mode 100644 dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild delete mode 100644 dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild delete mode 100644 dev-db/pgpool2/pgpool2-4.2.9.ebuild delete mode 100644 dev-db/pgpool2/pgpool2-4.3.1.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 6dc56a3725a9..05d5ba9f9717 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest index 8bb737a514f6..2b0db417eba0 100644 --- a/dev-db/pgpool2/Manifest +++ b/dev-db/pgpool2/Manifest @@ -1,19 +1,11 @@ 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.2.0-run_paths.patch 19114 BLAKE2B 1a3f545774b9389cdb16a09741e39d6b470580aa7e26d17ed32bcaf0d83e83e6772a3e6bbfbb4ec894088347d05d06f59a8ebacea6a1fe9ded4bd0d0ac184359 SHA512 65a4c32d2061608dea10f0a38dd6043a3f95ad087aea3867c3501bc56babb739c9f71ed3d9138fd7343a4d27049224eb4828ebb2aa79c8205bab3052be117ada AUX pgpool-4.3.1-run_paths.patch 4009 BLAKE2B bb9f4ce01af465b826559312d73c0bdb60fb1433a7e5bfc1db9bc5608a4408866e657a9e35c2b19ffb5ffebd7e1fa0b813c4da1754fd3e2449fd7d57fdeed54b SHA512 426da4fd0904fab31ebedbddab226d50b7fe173dd76524c7c515f92c8a348c186f1285c8e164f72aa2023499b993087b2c1b4f5c79cbfc1ed1e537de00be44b8 +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.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8 -DIST pgpool-II-4.2.2.tar.gz 4734840 BLAKE2B 2b4d26991732293e1411d1219f85a8c9ad1dca72c63069381ae1377a02ae215e813356172f3b89b42b9140549c92c76d443b125bb65cbc6abf03d2b99cf18dab SHA512 a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8 -DIST pgpool-II-4.2.9.tar.gz 4642836 BLAKE2B 75cfaf86d2e7a4f9677b7d5a98b783e25458e282b682979d31023372dd827dd0b52bf684949e9c97e404c383ab8b2f526e40b00e643d3d6566c702b111a13e34 SHA512 b0256095298e1c1ee50133b4bdc5716aea52f2ab6dc4dc4152ca0415f9b5ccfc14f97d6af1167e69fa1e2b0fd37468a5a10a1cffd8dfcea8e93b11616a66cf42 -DIST pgpool-II-4.3.1.tar.gz 6034811 BLAKE2B 6ca2a27eefc2b20186d0e5cbdfd838f429d9996e299ab177e655ed69aa214e676029db728b16020dbdc49d9036fe7aad71d6abb12b486a4cf8fb8348bb201c6c SHA512 a5417d9f5baa1b39e3645f7d44accf0a2f04d5fc5cb4d28089169aaebbd15c20b4cd280d09f15fa764c3b793117086fc03f5d7be584c0c5ff9c5f8e11ddb9ef8 DIST pgpool-II-4.3.2.tar.gz 5846769 BLAKE2B 82cfe7095ad303ac3a910c533d6e57edb4e3d5b28a9a9bffb2df473dd3087ec329d3a77f9490d9bb738d5d1a443020d96d0e9a1b1d6adecc04cce5d1caa04e7d SHA512 771426257eddb5c48504c80a2c8cccf44a18f7ea50df55654b7e9e017bda561a73a3e1f0db79785785ff6893d6df26f73b55310d0184ef3301838d12290d3d4c -EBUILD pgpool2-4.2.1-r2.ebuild 2385 BLAKE2B 02e2a2b25faf32d0cac4ded29ef6be7751e3fb02e6887ca0449375055c82711b095813890250cc7a3cffc1dd76392010a7bfb35a6f19809d0d1715afc7a9d19d SHA512 2c657926d9a44b369e424111def6d72ba7bf3979f33b516ff071d55d382b3bb89b0adc2c0bf60d1abbf2f94d077cac05b1ea14207fc249247a3e46bbb60b30dd -EBUILD pgpool2-4.2.2-r2.ebuild 2386 BLAKE2B 877085b5eeceb6fcbfbaf097c85bf4090d855ed8adff5ac52f83efb613432899bb6b03ace5f7523ea248409e11c88b22aa956b837dca617b2b90071de086ef6e SHA512 b7136a85a7e6a4a696d7a3baf8cd97c9762a6e0cbfbbecd33da4ef583f98e65905c4fe49cdfbf961feb6435e1b90992a784013a65c36289acf5214ff474a9f18 -EBUILD pgpool2-4.2.9.ebuild 2370 BLAKE2B 2d5ac6f8983a3ae52ee1c0e4f95af7b8ba0d9c603fb99950b73fd66519b1ad4d0feab014b192d506c7d8adb6201a1470463e907804a6c5214112cf277f8266c7 SHA512 773356a22f55b2cb485d388013f681778b8955c2966c41de12c74c014f8e12a9cff6e311fad84cc4167f0b51cbde88ff2932d00f7c5f6d4fc145ce483189859e -EBUILD pgpool2-4.3.1.ebuild 2319 BLAKE2B 3c5663663db3a4e5dc87ea1c522ae79ee07bb217fd6720f9eed2bcc53c22f99e69c0eb5e2361b1b37e54c9013c2d10ac5f258a2507607f430d5ec1f98397f593 SHA512 d62c1383ac31af5db62e72415de448e464471f4b133c8de26c12b03f2ebc72090fe241113d3dc84faafb416c97b45a1ac1642aaa73bb3a3aae8a9108ec2d4585 EBUILD pgpool2-4.3.2.ebuild 2317 BLAKE2B 5a932d7b01e5e3b2ee8811fb68de3caf131ecb589851aa808fff055701fb2627d033b7483bde12d0f5f74ab64b51485d07b7d830b343bb2e085635eb5643634a SHA512 dbde38f5939a008e3940b2237f4230f7342f38da031e7a84b935232a7f72b77cbd4764a13c6cbe4ef6a7742b443e6bd16088a9ca96770f81b26f82d35b2a92ae -EBUILD pgpool2-9999.ebuild 2429 BLAKE2B 6e153bb0a6369f55918b043f201ab9e3077098a6e638abbcd2a187014899ac516e1210d2f99c0d9a95e2740ea8533e8d4de67c7febb406fb8837d99785c98625 SHA512 97863b967c82901f19ad8ee64b22fd12b150225e2b8946a7209cd04ff6f92bd72c4619679c55fe22dd77c9b4e21657a4a2eb36ab996bb5bdd64553c046ccb2b4 +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.2.0-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch deleted file mode 100644 index 2eca0fd59185..000000000000 --- a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch +++ /dev/null @@ -1,432 +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 -+++ b/src/include/parser/pg_config_manual.h -@@ -228,7 +228,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 -@@ -39,10 +39,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) - reserved_connections = 0 - # Number of reserved connections. -@@ -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 -@@ -286,13 +282,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) - -@@ -659,10 +655,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 -+++ b/src/sample/pgpool.conf.sample-logical -@@ -38,10 +38,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) - reserved_connections = 0 - # Number of reserved connections. -@@ -58,10 +56,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 -@@ -286,13 +282,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) - -@@ -621,10 +617,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-raw b/src/sample/pgpool.conf.sample-raw ---- a/src/sample/pgpool.conf.sample-raw -+++ b/src/sample/pgpool.conf.sample-raw -@@ -39,10 +39,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) - reserved_connections = 0 - # Number of reserved connections. -@@ -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 -@@ -287,13 +283,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) - -@@ -660,10 +656,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 -+++ b/src/sample/pgpool.conf.sample-replication -@@ -39,10 +39,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 -@@ -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) - - # - Backend Connection Settings - -@@ -282,13 +278,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) - -@@ -657,10 +653,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-slony b/src/sample/pgpool.conf.sample-slony ---- a/src/sample/pgpool.conf.sample-slony -+++ b/src/sample/pgpool.conf.sample-slony -@@ -39,10 +39,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 -@@ -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) - - # - Backend Connection Settings - -@@ -283,13 +279,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) - -@@ -658,10 +654,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-snapshot b/src/sample/pgpool.conf.sample-snapshot ---- a/src/sample/pgpool.conf.sample-snapshot -+++ b/src/sample/pgpool.conf.sample-snapshot -@@ -39,10 +39,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 -@@ -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) - - # - Backend Connection Settings - -@@ -280,13 +276,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) - -@@ -655,10 +651,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 -+++ b/src/sample/pgpool.conf.sample-stream -@@ -39,10 +39,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) - reserved_connections = 0 - # Number of reserved connections. -@@ -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 -@@ -286,13 +282,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) - -@@ -659,10 +655,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-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-4.2.1-r2.ebuild b/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild deleted file mode 100644 index d3efaa96ffff..000000000000 --- a/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -POSTGRES_COMPAT=( 9.6 {10..13} ) - -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" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc memcached pam ssl static-libs" - -RDEPEND=" - ${POSTGRES_DEP} - acct-group/postgres - 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 -" - -pkg_setup() { - postgres-multi_pkg_setup -} - -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.2.0-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.2.2-r2.ebuild b/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild deleted file mode 100644 index c8b5484a0cdb..000000000000 --- a/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -POSTGRES_COMPAT=( 9.6 {10..13} ) - -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" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc memcached pam ssl static-libs" - -RDEPEND=" - ${POSTGRES_DEP} - acct-group/postgres - 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 -" - -pkg_setup() { - postgres-multi_pkg_setup -} - -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.2.0-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.2.9.ebuild b/dev-db/pgpool2/pgpool2-4.2.9.ebuild deleted file mode 100644 index c2ce05764ea6..000000000000 --- a/dev-db/pgpool2/pgpool2-4.2.9.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -POSTGRES_COMPAT=( {10..14} ) - -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} - 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} - -pkg_setup() { - postgres_new_user pgpool - - postgres-multi_pkg_setup -} - -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.2.0-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.3.1.ebuild b/dev-db/pgpool2/pgpool2-4.3.1.ebuild deleted file mode 100644 index f78d11206305..000000000000 --- a/dev-db/pgpool2/pgpool2-4.3.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -POSTGRES_COMPAT=( 9.6 {10..14} ) - -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-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() { -- cgit v1.2.3