[gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/

2023-10-05 Thread 罗百科
commit: 51adfed1b62178fcc8b3edaefaf40e60549b1694
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Oct  5 09:57:03 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Thu Oct  5 09:57:03 2023 +
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  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 ..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 intpcp_write(PCP_CONNECTION * pc, void *buf, int len);
+ extern intpcp_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'
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/

2022-03-15 Thread Aaron W. Swenson
commit: 5c2d66607521b5c6cb22f91c9df1227f6381516f
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Wed Mar 16 03:43:54 2022 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Wed Mar 16 03:46:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2d6660

dev-db/pgpool2: Bump to 4.3.1

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pgpool2/Manifest   |   1 +
 dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch | 100 ++
 dev-db/pgpool2/pgpool2-4.3.1.ebuild   |  91 
 3 files changed, 192 insertions(+)

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 2d63ff7e8e99..870e3b0f5fa9 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,2 +1,3 @@
 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.3.1.tar.gz 6034811 BLAKE2B 
6ca2a27eefc2b20186d0e5cbdfd838f429d9996e299ab177e655ed69aa214e676029db728b16020dbdc49d9036fe7aad71d6abb12b486a4cf8fb8348bb201c6c
 SHA512 
a5417d9f5baa1b39e3645f7d44accf0a2f04d5fc5cb4d28089169aaebbd15c20b4cd280d09f15fa764c3b793117086fc03f5d7be584c0c5ff9c5f8e11ddb9ef8

diff --git a/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch 
b/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch
new file mode 100644
index ..2b9090fb2dce
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch
@@ -0,0 +1,100 @@
+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 intpcp_write(PCP_CONNECTION * pc, void *buf, int len);
+ extern intpcp_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 = 
+# 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
+@@ -292,13 +288,13 @@
+ # FILE LOCATIONS
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/

2021-02-18 Thread David Seifert
commit: 6e4c5974c66059a2b312f5edc6ed767f8f4f3cd7
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Feb 18 18:55:24 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Feb 18 18:55:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4c5974

dev-db/pgpool2: Remove old

Bug: https://bugs.gentoo.org/762952
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-db/pgpool2/Manifest|   3 -
 dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch | 322 -
 dev-db/pgpool2/pgpool2-3.7.10.ebuild   | 104 ---
 dev-db/pgpool2/pgpool2-4.0.5.ebuild| 104 ---
 dev-db/pgpool2/pgpool2-4.2.0.ebuild|  98 ---
 5 files changed, 631 deletions(-)

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 62a75f59451..73364f57dec 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,4 +1 @@
-DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 
96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789
 SHA512 
a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
-DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 
2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af
 SHA512 
897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
-DIST pgpool-II-4.2.0.tar.gz 4707623 BLAKE2B 
9aa54fe0230d5dab303e9b20f35c242f9fe7f09c4c506c72be3a5d789f4e5c23b6e6fdf529ddafd5b1a0c0697a1e1b0f0106f965a8409f8e012633b8be0a58a9
 SHA512 
73179c3968441b592503512c5e0dfcc95ef778ecfd077024df0485fe831c9af12e708b51607c96c7bebf26f3cc81aefc53f50c7ad0a670d304cbbcf852170abf
 DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 
207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2
 SHA512 
b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8

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 2374054b0f5..000
--- 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.h2019-05-15 03:04:59.0 
-0400
-+++ b/src/include/parser/pg_config_manual.h2019-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.0 -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.sample2019-05-15 03:04:59.0 -0400
-+++ b/src/sample/pgpool.conf.sample2019-05-23 06:17:33.641244614 -0400
-@@ -31,10 +31,8 @@
- port = 
-# Port number
-# (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-# Unix domain socket path
--   # The Debian package defaults to
--   # 

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/

2020-12-16 Thread Aaron W. Swenson
commit: 55cb29cdcea2e22381b97ddac899d44bd4e9e673
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Thu Dec 17 04:02:34 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Thu Dec 17 04:02:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55cb29cd

dev-db/pgpool2: Bump to 4.2.0

Now supports Pg 12 and 13.

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pgpool2/Manifest|   1 +
 .../files/pgpool-4.2.0-configure-memcached.patch   |  60 +++
 .../files/pgpool-4.2.0-configure-pthread.patch |  14 +
 dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch  | 432 +
 dev-db/pgpool2/pgpool2-4.2.0.ebuild|  98 +
 5 files changed, 605 insertions(+)

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 6ab46044a51..e8e714bd215 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,2 +1,3 @@
 DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 
96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789
 SHA512 
a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
 DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 
2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af
 SHA512 
897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
+DIST pgpool-II-4.2.0.tar.gz 4707623 BLAKE2B 
9aa54fe0230d5dab303e9b20f35c242f9fe7f09c4c506c72be3a5d789f4e5c23b6e6fdf529ddafd5b1a0c0697a1e1b0f0106f965a8409f8e012633b8be0a58a9
 SHA512 
73179c3968441b592503512c5e0dfcc95ef778ecfd077024df0485fe831c9af12e708b51607c96c7bebf26f3cc81aefc53f50c7ad0a670d304cbbcf852170abf

diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch 
b/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch
new file mode 100644
index 000..9854e45e3a2
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch
@@ -0,0 +1,60 @@
+diff -Naruw pgpool-II-4.2.0.orig/configure.ac pgpool-II-4.2.0/configure.ac
+--- pgpool-II-4.2.0.orig/configure.ac  2020-11-25 20:25:42.0 -0500
 pgpool-II-4.2.0/configure.ac   2020-12-16 06:36:26.051076452 -0500
+@@ -392,37 +392,24 @@
+ 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_ARG_WITH([memcached],
++AS_HELP_STRING([--with-memcached], [Build with memcached support]))
++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([header file  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_MSG_ERROR([Couldn't find ])])
++
++   AC_SEARCH_LIBS(memcached_create, [], [],
++   [AC_MSG_ERROR(libmemcached is not installed)])
+   ])
+ 
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
+ 
+-AC_SUBST(MEMCACHED_INCLUDE_OPT)
+-AC_SUBST(MEMCACHED_LINK_OPT)
+-AC_SUBST(MEMCACHED_RPATH_OPT)
+ 
+ OLD_LDFLAGS="$LDFLAGS"
+ LDFLAGS="-L$PGSQL_LIB_DIR $LDFLAGS"
+@@ -435,7 +422,6 @@
+ AC_SUBST(PGSQL_INCLUDE_DIR)
+ AC_SUBST(PGSQL_LIB_DIR)
+ AC_SUBST(PGSQL_BIN_DIR)
+-AC_SUBST(MEMCACHED_DIR)
+ 
+ # --enable(disable)-rpath option
+ AC_ARG_ENABLE(rpath,

diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch 
b/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch
new file mode 100644
index 000..842fd5fbad7
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch
@@ -0,0 +1,14 @@
+diff -Naruw pgpool-II-4.2.0.orig/configure.ac pgpool-II-4.2.0/configure.ac
+--- pgpool-II-4.2.0.orig/configure.ac  2020-11-25 20:25:42.0 -0500
 pgpool-II-4.2.0/configure.ac   2020-12-16 06:40:11.150611861 -0500
+@@ -4,6 +4,10 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CC_C99()
++AX_PTHREAD
++LIBS="$PTHREAD_LIBS $LIBS"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++CC="$PTHREAD_CC"
+ 
+ # Error out if the compiler does not support C99, as the codebase
+ # relies on that.

diff --git 

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/

2020-12-16 Thread Aaron W. Swenson
commit: d55b2687cb772e77556ac0f29d2230f2c79e228a
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Thu Dec 17 04:08:38 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Thu Dec 17 04:08:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55b2687

dev-db/pgpool2: Fix QA notices by pkgcheck

Unnecessary slash strip, and nonexistent blocker.

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch | 60 +++
 dev-db/pgpool2/pgpool2-4.2.0.ebuild   |  6 +--
 dev-db/pgpool2/pgpool2-.ebuild| 20 +++-
 3 files changed, 40 insertions(+), 46 deletions(-)

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
index fd5dd863d7b..2eca0fd5918 100644
--- a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
@@ -1,6 +1,6 @@
-diff -Naruw pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h 
pgpool-II-4.2.0/src/include/parser/pg_config_manual.h
 pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h 2020-11-25 
20:25:31.0 -0500
-+++ pgpool-II-4.2.0/src/include/parser/pg_config_manual.h  2020-12-16 
21:39:27.178596628 -0500
+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.
   */
@@ -10,9 +10,9 @@ diff -Naruw 
pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h pgpool-II
  #else
  #define DEFAULT_PGSOCKET_DIR ""
  #endif
-diff -Naruw pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h 
pgpool-II-4.2.0/src/include/pcp/pcp_stream.h
 pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h  2020-11-25 
20:25:31.0 -0500
-+++ pgpool-II-4.2.0/src/include/pcp/pcp_stream.h   2020-12-16 
21:40:46.051752707 -0500
+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 intpcp_write(PCP_CONNECTION * pc, void *buf, int len);
  extern intpcp_flush(PCP_CONNECTION * pc);
@@ -21,9 +21,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h 
pgpool-II-4.2.0/sr
 +#define UNIX_DOMAIN_PATH "/run/pgpool"
  
  #endif/* PCP_STREAM_H 
*/
-diff -Naruw pgpool-II-4.2.0.orig/src/include/pool.h 
pgpool-II-4.2.0/src/include/pool.h
 pgpool-II-4.2.0.orig/src/include/pool.h2020-11-25 20:25:31.0 
-0500
-+++ pgpool-II-4.2.0/src/include/pool.h 2020-12-16 21:42:50.054807364 -0500
+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"
  
@@ -45,9 +45,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/include/pool.h 
pgpool-II-4.2.0/src/include/
  
  /* status file name */
  #define STATUS_FILE_NAME "pgpool_status"
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample 
pgpool-II-4.2.0/src/sample/pgpool.conf.sample
 pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample 2020-11-25 
20:25:31.0 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample  2020-12-16 
21:57:56.776102951 -0500
+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 = 
 # Port number
@@ -100,9 +100,9 @@ diff -Naruw 
pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample pgpool-II-4.2.0/s
  # (change requires restart)
  
  
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical 
pgpool-II-4.2.0/src/sample/pgpool.conf.sample-logical
 pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical 2020-11-25 
20:25:31.0 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-logical  2020-12-16 
21:57:56.776102951 -0500
+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 = 
 # Port number
@@ -155,9 +155,9 @@ diff -Naruw 
pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical pgpool-II
  # (change requires restart)
  
  
-diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw 
pgpool-II-4.2.0/src/sample/pgpool.conf.sample-raw
 pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw 2020-11-25 
20:25:31.0 -0500
-+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-raw  2020-12-16 
21:57:56.776102951 -0500
+diff -Naruw a/src/sample/pgpool.conf.sample-raw 
b/src/sample/pgpool.conf.sample-raw
+--- 

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/

2018-08-03 Thread Aaron Swenson
commit: 079ff486c23fdb326e5d58df1433b854ca900e94
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Fri Aug  3 13:26:51 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Fri Aug  3 13:26:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079ff486

dev-db/pgpool2: Bump to 3.7.5

Add a couple patches to fix a few options in
configure.ac. --without-pam no longer acts as if --with-pam was
given. Now uses pkg-config to get any special settings for
libmemcached rather than using fixed sub-directories
(${user_provided_path}/{include,lib,…}). Lastly, introduced AX_PTHREAD
to link in the appropriate threading library to fix bug 616302.

If libmemcached was built with USE=sasl which builds against
cyrus-sasl. cyrus-sasl builds against a threading library which
necessitates including the same threading in pgpool2 despite pgpool2
not being a threaded program.

pgpool2 is now able to build against LibreSSL as well as OpenSSL. The
ebuild now reflects this fact

Bug: https://bugs.gentoo.org/616302
Bug: https://bugs.gentoo.org/646888
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-db/pgpool2/Manifest|  1 +
 .../pgpool2/files/pgpool-configure-memcached.patch | 64 ++
 dev-db/pgpool2/files/pgpool-configure-pam.patch| 25 +
 .../pgpool2/files/pgpool-configure-pthread.patch   | 13 +
 dev-db/pgpool2/files/pgpool2.initd | 14 ++---
 .../{pgpool2-.ebuild => pgpool2-3.7.5.ebuild}  | 45 ---
 dev-db/pgpool2/pgpool2-.ebuild | 42 --
 ...gpool2-.ebuild => pgpool2-.ebuild.orig} | 35 +++-
 8 files changed, 182 insertions(+), 57 deletions(-)

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index e81a23c8628..120a39ebe5b 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,3 +1,4 @@
 DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B 
f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8
 SHA512 
cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
 DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B 
ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac
 SHA512 
2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
 DIST pgpool-II-3.7.3.tar.gz 3259752 BLAKE2B 
398257b2a647039a634d52b0e23ab1584aaa67f58d6f234f03bf2e99380b346b4ff51647f876d0789c484e88fc149a2af5a5b1b8fd3aa48323aada064ea3421d
 SHA512 
c7fea570f11dfc348b0099fde074f61a15e6979b6f16526d24d73b26d723edfdbadbcf10e90c2111aeb72599970718d3cda4abed3e99e8a711cf03b715c29624
+DIST pgpool-II-3.7.5.tar.gz 3276279 BLAKE2B 
d9c52684985e0a74ef115792f79a71305fbcc5f44663971e5fee41d543c7c290999091c387f5da6c73c88466880a24b21d469046de7981983d9984a606ae357e
 SHA512 
4840047f11b5e176803c03073d1ef6ef54f9d0be3d9bd622fedc9fd0ad4f835090fbf671bfd71cda0d994af6ea9a1658b0d5e5d09ec317b345c41fb0fa4b7b70

diff --git a/dev-db/pgpool2/files/pgpool-configure-memcached.patch 
b/dev-db/pgpool2/files/pgpool-configure-memcached.patch
new file mode 100644
index 000..7b983dba02e
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-configure-memcached.patch
@@ -0,0 +1,64 @@
+--- a/configure.ac
 b/configure.ac
+@@ -338,37 +338,24 @@
+   [AC_MSG_ERROR([header file 
 or  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  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 

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/

2018-01-11 Thread Aaron Swenson
commit: 278fe78f2fe0ce2f62f63235f1b4a316f4086e25
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Thu Jan 11 10:38:10 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Thu Jan 11 10:38:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278fe78f

dev-db/pgpool2: Cleanup

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-db/pgpool2/Manifest   |   7 -
 dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch | 184 
 dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch | 255 --
 dev-db/pgpool2/pgpool2-3.5.2.ebuild   | 101 -
 dev-db/pgpool2/pgpool2-3.5.5.ebuild   | 101 -
 dev-db/pgpool2/pgpool2-3.6.1.ebuild   |  99 -
 dev-db/pgpool2/pgpool2-3.6.4.ebuild   |  99 -
 dev-db/pgpool2/pgpool2-3.6.5.ebuild   |  98 -
 dev-db/pgpool2/pgpool2-3.6.6.ebuild   |  98 -
 dev-db/pgpool2/pgpool2-3.6.7.ebuild   |  98 -
 10 files changed, 1140 deletions(-)

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 7be846d3630..664bfb2820b 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,8 +1 @@
-DIST pgpool-II-3.5.2.tar.gz 2227075 BLAKE2B 
4f40044dc37353a811b2f4ddd4bb6d41604e1fc5c64064603fcee704a92a4e4d3b1baa83314f476dfe32ecbd851208996139a55ffaffb3f1bb9f8ac72685a02f
 SHA512 
dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a
-DIST pgpool-II-3.5.5.tar.gz 2243184 BLAKE2B 
4267991fdf45ddd0e2bf3e253508b9b18ad669d0184bcb13143dddcfe6233e4aa223ba275f9471b2645262e43341fb4c8e5ac9e154ee2fd3de49aa5420de070e
 SHA512 
f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed
-DIST pgpool-II-3.6.1.tar.gz 2539510 BLAKE2B 
844f54a2f74251af8af1348c374807e1dce2028eb64d2974c7fb1b904c6518012764c16fdd7fdeea8b9039fcfa13d8c139a9b2e020fffc87e6b90f3d6a489e5c
 SHA512 
9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a
-DIST pgpool-II-3.6.4.tar.gz 2623625 BLAKE2B 
d8ba2a02c0b7e4d4b259dcf87a85d0b3b7dd11d5121907039cb3baad52f2c40bd0ff2457e844922d04c300068f1638d26b0efdc60d828e05a735d3866365ca8c
 SHA512 
a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f
-DIST pgpool-II-3.6.5.tar.gz 2651330 BLAKE2B 
d0ad069b17e1e0fb46590e7dd0dd29feb499a6703056d5ff5d4f218227158f4bca44f8d52209f378d08879a97c7930f85a61dfc22fce0bafa1313ad3c7649d5b
 SHA512 
12247730f202859c76b0a11ccc485de786e53df7b8e08ffd76d7653c25633d79387f027e7c9d804bf19cd89b9db047b7ca0cf1cf5e914ee74c6efc0b6660eb1d
-DIST pgpool-II-3.6.6.tar.gz 3171264 BLAKE2B 
b519d097366f190c4b6136643ccd839d1854ced0287ec1dc9f058dad1f7ebc18448d97d48338d03a8a7eafee49391381a8aa802fc14b84b757b133d6c97ec94e
 SHA512 
02cfceed761cf6338ce0a33e9afe05194acdf4d5577cf0d920176cb3bacffce6e9c2c1e8a8b89c5b062bc53d54cd012a4ad9582b42df7bc36ee666dcd0ee3e10
-DIST pgpool-II-3.6.7.tar.gz 3188186 BLAKE2B 
b58561418e4027716614d6a70f5d844b8043312cb2a2b18882e0fdcd466e1f0624e43db7c67685227d808368388c6ee9dd0d5f3ea956d0585444b1e30bc49643
 SHA512 
4bc80f4b47f4b37e4efe1af137c2af076dc98c438bf094236223bba0facfaea91546a86d7604e67453b67e82a24ac5ee6e4325d81f90358a3a0d7a6c34acd7fc
 DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B 
f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8
 SHA512 
cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2

diff --git a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch 
b/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
deleted file mode 100644
index b2c5d554e56..000
--- a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -aruw pgpool-II-3.5.0.orig/src/include/pool.h 
pgpool-II-3.5.0/src/include/pool.h
 pgpool-II-3.5.0.orig/src/include/pool.h2016-02-10 03:53:31.0 
-0500
-+++ pgpool-II-3.5.0/src/include/pool.h 2016-03-12 06:47:15.297966248 -0500
-@@ -72,16 +72,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
- 
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@"
- 
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
- 
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
- 
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid"
- 
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -aruw 

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/

2017-07-09 Thread Aaron Swenson
commit: ba7463bc581fa454f1803b4b828b746d25a4d639
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Mon Jul 10 02:24:33 2017 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Mon Jul 10 02:24:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7463bc

dev-db/pgpool2: Bump, new repo, postgres-multi

Now installs to all selected slots via use flags.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-db/pgpool2/Manifest   |   1 +
 dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch | 255 
 dev-db/pgpool2/files/pgpool_run_paths-.patch  | 274 ++
 dev-db/pgpool2/pgpool2-3.6.4.ebuild   |  98 
 dev-db/pgpool2/pgpool2-.ebuild|  98 +++-
 5 files changed, 667 insertions(+), 59 deletions(-)

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index f3281d182e8..88999227ef2 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,3 +1,4 @@
 DIST pgpool-II-3.5.2.tar.gz 2227075 SHA256 
5d29fd9c30141bfdaf15b51c7878766178e5df42fa5e160d0f7df2824d26104f SHA512 
dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a
 WHIRLPOOL 
22939c855919b8399c1129ff4622eae159141e9bf05cc36aca456bfd582c7ab0dc7ec87df5ea96d7101f438e89bf4e06f46a5f63cfde22e505d0a3965c0496fc
 DIST pgpool-II-3.5.5.tar.gz 2243184 SHA256 
8fa1ccf13ff4f7c1ab0f6d523090444f65d78923de11061b5027eb5d58318491 SHA512 
f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed
 WHIRLPOOL 
5f4d4d9c3f6478b9b3ecda311c571e1f54805a07aa505acd32fbfb8fb2790183b732d6f86843a2b6614c74565efad7f9b3d962281cd2b1d23b54515448a1c84a
 DIST pgpool-II-3.6.1.tar.gz 2539510 SHA256 
244f99a70198b5861a63b2fe3e44ac39d2819f6aa6497f62958c6afa2750d94c SHA512 
9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a
 WHIRLPOOL 
9a307a63e9179ecfc7a52d1f056d47f09543bf4e378fa0090cdaf90d141c70e89323b4cfcbc9bbd9fa2422ff76bea592f189bea78915445fb1779ce9089ef6e1
+DIST pgpool-II-3.6.4.tar.gz 2623625 SHA256 
6ad78b9878d126e8da1e03e8edf3c8d56bb0754fe6432f633e81f6faaf8e6dbf SHA512 
a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f
 WHIRLPOOL 
410136d359baa369f3d19136da54ba202c8b250bf364fc2f9b91a66190266ae523647cc89313211b63effbedd97168d026a2574be059dd0da7c8768b2d9714e7

diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch 
b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
new file mode 100644
index 000..d6943d7502e
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
@@ -0,0 +1,255 @@
+diff -ru a/src/include/parser/pg_config_manual.h 
b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h2017-05-11 05:53:04.0 
-0400
 b/src/include/parser/pg_config_manual.h2017-07-08 20:28:47.733745889 
-0400
+@@ -184,7 +184,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 -ru a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h 2017-05-11 05:36:01.0 -0400
 b/src/include/pcp/pcp_stream.h 2017-07-08 20:29:28.613506800 -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 -ru a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h   2017-05-11 05:53:04.0 -0400
 b/src/include/pool.h   2017-07-08 20:27:09.330984074 -0400
+@@ -73,16 +73,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 -ru a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample2017-05-11 05:53:04.0 -0400
 b/src/sample/pgpool.conf.sample2017-07-08 20:36:28.477717849 -0400
+@@ -31,10 +31,8 @@
+ port = 
+# Port