commit: 2b50d018e25c81b930855f763162fb8df89b1d37
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 13:52:06 2019 +0000
Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Thu May 23 13:52:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b50d018
dev-db/pgpool2: Bump to 3.7.10, 4.0.5
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>
dev-db/pgpool2/Manifest | 2 +
dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch | 322 +++++++++++++++++++++
.../{pgpool2-9999.ebuild => pgpool2-3.7.10.ebuild} | 23 +-
.../{pgpool2-9999.ebuild => pgpool2-4.0.5.ebuild} | 23 +-
dev-db/pgpool2/pgpool2-9999.ebuild | 4 +-
5 files changed, 346 insertions(+), 28 deletions(-)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 35cafa49579..065666b9229 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,2 +1,4 @@
+DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B
96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789
SHA512
a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
DIST pgpool-II-3.7.8.tar.gz 3337039 BLAKE2B
bce75be04d3c37dffecbc0a1f029d6e97f316cc2497de032ccd4862acc6e7ae64f12ffffdb42a99141e548a2cc616ed02d7eef6ca2f63e222fb400cbad72828c
SHA512
0f4e337c2307368cfd38f29c63b9267dd3171dc4b9cd2c59cff564295908e2f561230156a5b690e4d87ce4c8b3174d01b081147e7f5d8ff403d3adc8e7cea7e7
DIST pgpool-II-4.0.3.tar.gz 3715976 BLAKE2B
c5ecfebc44ee4d6ab8fda5ae0854bb51423252ba518b356a37d3b125bc8f4fac048f6f944fdf9b1ee785aae5ac3eca4c4196adf218bc071dd90b93da5c6e6c08
SHA512
76ffbc8df120d4ef68b761684a1805c0349665375f549cd3a194f7d09b9bbdf70d0824da0cbe975e6d15f850704c4fc7c1a2218f551f88f2ce56f542bdfee9b8
+DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B
2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af
SHA512
897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
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
new file mode 100644
index 00000000000..2374054b0f5
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch
@@ -0,0 +1,322 @@
+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 2019-05-15 03:04:59.000000000
-0400
++++ b/src/include/parser/pg_config_manual.h 2019-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.000000000 -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.sample 2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample 2019-05-23 06:17:33.641244614 -0400
+@@ -31,10 +31,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
+@@ -53,10 +51,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 -
+@@ -217,13 +213,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 = '/var/log/pgpool'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -512,10 +508,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 2019-05-15 03:04:59.000000000
-0400
++++ b/src/sample/pgpool.conf.sample-logical 2019-05-23 06:24:39.766884345
-0400
+@@ -31,10 +31,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)
+
+
+@@ -47,10 +45,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
+@@ -218,13 +214,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)
+
+@@ -511,10 +507,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-master-slave
b/src/sample/pgpool.conf.sample-master-slave
+--- a/src/sample/pgpool.conf.sample-master-slave 2019-05-15
03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-master-slave 2019-05-23
06:27:27.259814032 -0400
+@@ -31,10 +31,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
+@@ -53,10 +51,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 -
+@@ -217,13 +213,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)
+
+@@ -511,10 +507,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 2019-05-15
03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-replication 2019-05-23
06:28:29.479664086 -0400
+@@ -31,10 +31,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
+@@ -53,10 +51,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 -
+@@ -216,13 +212,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)
+
+@@ -510,10 +506,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 2019-05-15 03:04:59.000000000
-0400
++++ b/src/sample/pgpool.conf.sample-stream 2019-05-23 06:29:16.582883904
-0400
+@@ -31,10 +31,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)
+
+
+@@ -47,10 +45,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
+@@ -218,13 +214,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)
+
+@@ -511,10 +507,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/pgpool2-9999.ebuild
b/dev-db/pgpool2/pgpool2-3.7.10.ebuild
similarity index 84%
copy from dev-db/pgpool2/pgpool2-9999.ebuild
copy to dev-db/pgpool2/pgpool2-3.7.10.ebuild
index ad9b675997d..8c538b17082 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.10.ebuild
@@ -3,19 +3,19 @@
EAPI=6
-EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git";
+POSTGRES_COMPAT=( 9.{4..6} 10 )
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+inherit autotools postgres-multi
-inherit autotools git-r3 postgres-multi
+MY_P="${PN/2/-II}-${PV}"
DESCRIPTION="Connection pool server for PostgreSQL"
HOMEPAGE="https://www.pgpool.net/";
-SRC_URI=""
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz ->
${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="doc libressl memcached pam ssl static-libs"
@@ -33,13 +33,10 @@ DEPEND="${RDEPEND}
!!dev-db/pgpool
sys-devel/bison
virtual/pkgconfig
- doc? (
- app-text/openjade
- dev-libs/libxml2
- dev-libs/libxslt
- )
"
+S=${WORKDIR}/${MY_P}
+
pkg_setup() {
postgres_new_user pgpool
@@ -51,7 +48,7 @@ src_prepare() {
"${FILESDIR}/pgpool-configure-memcached.patch" \
"${FILESDIR}/pgpool-configure-pam.patch" \
"${FILESDIR}/pgpool-configure-pthread.patch" \
- "${FILESDIR}/pgpool_run_paths-9999.patch"
+ "${FILESDIR}/pgpool_run_paths-3.7.10.patch"
eautoreconf
@@ -76,7 +73,6 @@ 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
}
src_install() {
@@ -91,7 +87,8 @@ src_install() {
# Documentation!
dodoc NEWS TODO
- use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
+ doman doc/src/sgml/man{1,8}/*
+ use doc && dodoc -r doc/src/sgml/html
# Examples and extras
# mv some files that get installed to /usr/share/pgpool-II so that
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild
b/dev-db/pgpool2/pgpool2-4.0.5.ebuild
similarity index 84%
copy from dev-db/pgpool2/pgpool2-9999.ebuild
copy to dev-db/pgpool2/pgpool2-4.0.5.ebuild
index ad9b675997d..a217a62435c 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.0.5.ebuild
@@ -3,19 +3,19 @@
EAPI=6
-EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git";
+POSTGRES_COMPAT=( 9.{4..6} {10..11} )
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+inherit autotools postgres-multi
-inherit autotools git-r3 postgres-multi
+MY_P="${PN/2/-II}-${PV}"
DESCRIPTION="Connection pool server for PostgreSQL"
HOMEPAGE="https://www.pgpool.net/";
-SRC_URI=""
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz ->
${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="doc libressl memcached pam ssl static-libs"
@@ -33,13 +33,10 @@ DEPEND="${RDEPEND}
!!dev-db/pgpool
sys-devel/bison
virtual/pkgconfig
- doc? (
- app-text/openjade
- dev-libs/libxml2
- dev-libs/libxslt
- )
"
+S=${WORKDIR}/${MY_P}
+
pkg_setup() {
postgres_new_user pgpool
@@ -51,7 +48,7 @@ src_prepare() {
"${FILESDIR}/pgpool-configure-memcached.patch" \
"${FILESDIR}/pgpool-configure-pam.patch" \
"${FILESDIR}/pgpool-configure-pthread.patch" \
- "${FILESDIR}/pgpool_run_paths-9999.patch"
+ "${FILESDIR}/pgpool_run_paths-3.7.10.patch"
eautoreconf
@@ -76,7 +73,6 @@ 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
}
src_install() {
@@ -91,7 +87,8 @@ src_install() {
# Documentation!
dodoc NEWS TODO
- use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
+ doman doc/src/sgml/man{1,8}/*
+ use doc && dodoc -r doc/src/sgml/html
# Examples and extras
# mv some files that get installed to /usr/share/pgpool-II so that
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild
b/dev-db/pgpool2/pgpool2-9999.ebuild
index ad9b675997d..1e3475f6c7e 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git";
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+POSTGRES_COMPAT=( 9.{4..6} {10..11} )
inherit autotools git-r3 postgres-multi
@@ -51,7 +51,7 @@ src_prepare() {
"${FILESDIR}/pgpool-configure-memcached.patch" \
"${FILESDIR}/pgpool-configure-pam.patch" \
"${FILESDIR}/pgpool-configure-pthread.patch" \
- "${FILESDIR}/pgpool_run_paths-9999.patch"
+ "${FILESDIR}/pgpool_run_paths-3.7.10.patch"
eautoreconf
