Hi,
here's an update to pgbouncer 1.13, cf
https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_1_12_0 and
https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_1_13_0 for
the relnotes:
- builds fine, not tested at runtime yet
- now uses libevent2 instead of requiring libeventextra old apis
- some work needed on the tests, but i think they could be enabled
somehow. It tries to add pf rules to a dedicated anchor so my guess is
that's to test connectivity breaks.. and there's support for 'make
check' ootb, but for some reason it doesnt find ./test.sh under test/.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile 12 Jul 2019 21:15:34 -0000 1.29
+++ Makefile 20 May 2020 06:14:33 -0000
@@ -2,7 +2,7 @@
COMMENT = lightweight connection pooler for PostgreSQL
-V = 1.9.0
+V = 1.13.0
DISTNAME = pgbouncer-${V}
CATEGORIES = databases
@@ -14,11 +14,11 @@
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB = c event crypto ssl pthread
+WANTLIB = c event_core event_extra crypto ssl
MASTER_SITES = https://pgbouncer.github.io/downloads/files/${V}/
-BUILD_DEPENDS = devel/libeventextra
+LIB_DEPENDS = devel/libevent2
CONFIGURE_STYLE = gnu
#Disable the detection of asciidoc since docs are already included
@@ -31,6 +31,6 @@
# The actual regress tests are (cd ${WRKSRC}/test; ./test.sh)
# They want to create full postgres install and also play with
# firewall (iptables)
-NO_TEST = Yes
+#NO_TEST = Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 10 Sep 2018 12:38:35 -0000 1.12
+++ distinfo 20 May 2020 06:14:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (pgbouncer-1.9.0.tar.gz) = OeypYTOYY2Mn55y8vVtBEVA1vKnKG9NyVTlkZGiCXwQ=
-SIZE (pgbouncer-1.9.0.tar.gz) = 469300
+SHA256 (pgbouncer-1.13.0.tar.gz) = TLghyV8FYlWUNVu6icE58qTgYq8iHCE1vwUmuSDInTE=
+SIZE (pgbouncer-1.13.0.tar.gz) = 574955
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 22 Jan 2018 10:57:29 -0000 1.1
+++ patches/patch-configure 20 May 2020 06:14:33 -0000
@@ -3,7 +3,7 @@
Index: configure
--- configure.orig
+++ configure
-@@ -7190,7 +7190,7 @@ $as_echo_n "checking for the pthreads library -l$flag.
+@@ -7359,7 +7359,7 @@ $as_echo_n "checking for the pthreads library -l$flag.
# We try pthread_create on general principles.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
Index: patches/patch-etc_pgbouncer_ini
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/patches/patch-etc_pgbouncer_ini,v
retrieving revision 1.5
diff -u -r1.5 patch-etc_pgbouncer_ini
--- patches/patch-etc_pgbouncer_ini 22 Jan 2018 10:57:29 -0000 1.5
+++ patches/patch-etc_pgbouncer_ini 20 May 2020 06:14:33 -0000
@@ -2,21 +2,21 @@
Index: etc/pgbouncer.ini
--- etc/pgbouncer.ini.orig
+++ etc/pgbouncer.ini
-@@ -103,7 +103,7 @@ listen_port = 6432
+@@ -112,7 +112,7 @@ listen_port = 6432
;;;
- ; any, trust, plain, crypt, md5, cert, hba, pam
+ ;; any, trust, plain, md5, cert, hba, pam
-auth_type = trust
+auth_type = md5
- ;auth_file = /8.0/main/global/pg_auth
auth_file = /etc/pgbouncer/userlist.txt
-@@ -119,7 +119,7 @@ auth_file = /etc/pgbouncer/userlist.txt
+ ;; Path to HBA-style auth config
+@@ -127,7 +127,7 @@ auth_file = /etc/pgbouncer/userlist.txt
;;;
- ; comma-separated list of users, who are allowed to change settings
+ ;; comma-separated list of users who are allowed to change settings
-;admin_users = user2, someadmin, otheradmin
+admin_users = admin, pgbouncer
- ; comma-separated list of users who are just allowed to use SHOW command
+ ;; comma-separated list of users who are just allowed to use SHOW command
;stats_users = stats, root
Index: patches/patch-lib_usual_tls_tls_c
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/patches/patch-lib_usual_tls_tls_c,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_usual_tls_tls_c
--- patches/patch-lib_usual_tls_tls_c 22 Jan 2018 10:57:29 -0000 1.2
+++ patches/patch-lib_usual_tls_tls_c 20 May 2020 06:14:33 -0000
@@ -3,7 +3,7 @@
Index: lib/usual/tls/tls.c
--- lib/usual/tls/tls.c.orig
+++ lib/usual/tls/tls.c
-@@ -350,7 +350,7 @@ tls_info_callback(const SSL *ssl, int where, int rc)
+@@ -362,7 +362,7 @@ tls_info_callback(const SSL *ssl, int where, int rc)
{
struct tls *ctx = SSL_get_app_data(ssl);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:10 -0000 1.7
+++ pkg/PLIST 20 May 2020 06:14:33 -0000
@@ -2,6 +2,7 @@
@newgroup _pgbouncer:653
@newuser _pgbouncer:653:653:daemon:pgbouncer:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/log/pgbouncer/*
+@rcscript ${RCDIR}/pgbouncer
@bin bin/pgbouncer
@man man/man1/pgbouncer.1
@man man/man5/pgbouncer.5
@@ -9,9 +10,8 @@
@sample ${SYSCONFDIR}/pgbouncer/
@owner
share/doc/pgbouncer/
-share/doc/pgbouncer/NEWS.rst
-share/doc/pgbouncer/README.rst
-share/doc/pkg-readmes/${PKGSTEM}
+share/doc/pgbouncer/NEWS.md
+share/doc/pgbouncer/README.md
@mode 640
@group _pgbouncer
share/doc/pgbouncer/pgbouncer.ini
@@ -22,6 +22,5 @@
@owner _pgbouncer
@sample /var/log/pgbouncer/
@owner
-@mode
@group
-@rcscript ${RCDIR}/pgbouncer
+share/doc/pkg-readmes/${PKGSTEM}
