cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to pgbouncer 1.14.0.

Browse Source 
- Cf http://www.pgbouncer.org/changelog.html, brings support for SCRAM
  authentication, which is the recommenced method to use by default in
/usr/local/share/doc/pkg-readmes/postgresql-server since a while..
- Switch from libeventextra to libevent2
- Enable tests, the ones that want to play with firewall rules are
  skipped by default (rely on sudo, and USE_SUDO being set in the env,
cf test/README.md) - all the other tests pass fine.
- update PLIST while here

maintainer timeout
This commit is contained in:
landry 2020-07-05 11:29:36 +00:00
parent 7d7dd8cd4d
commit e9b566ccf9
6 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/pgbouncer/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.29 2019/07/12 21:15:34 sthen Exp $
# $OpenBSD: Makefile,v 1.30 2020/07/05 11:29:36 landry Exp $
COMMENT = lightweight connection pooler for PostgreSQL
V = 1.9.0
V = 1.14.0
DISTNAME = pgbouncer-${V}
CATEGORIES = databases
@ -14,11 +14,11 @@ MAINTAINER = Pierre-Emmanuel Andre <pea@openbsd.org>
# 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
@ -28,9 +28,4 @@ MAKE_FLAGS+= V=1
USE_GMAKE = Yes
# 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
.include <bsd.port.mk>

4
databases/pgbouncer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (pgbouncer-1.9.0.tar.gz) = OeypYTOYY2Mn55y8vVtBEVA1vKnKG9NyVTlkZGiCXwQ=
SIZE (pgbouncer-1.9.0.tar.gz) = 469300
SHA256 (pgbouncer-1.14.0.tar.gz) = oME9EBSPVX42/37TF5Ort6SeH4sJqi1GldHCj6EB/uc=
SIZE (pgbouncer-1.14.0.tar.gz) = 578955

4
databases/pgbouncer/patches/patch-configure
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure,v 1.1 2018/01/22 10:57:29 landry Exp $
$OpenBSD: patch-configure,v 1.2 2020/07/05 11:29:36 landry Exp $
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. */

14
databases/pgbouncer/patches/patch-etc_pgbouncer_ini
View File

@ -1,22 +1,22 @@
$OpenBSD: patch-etc_pgbouncer_ini,v 1.5 2018/01/22 10:57:29 landry Exp $
$OpenBSD: patch-etc_pgbouncer_ini,v 1.6 2020/07/05 11:29:36 landry Exp $
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

4
databases/pgbouncer/patches/patch-lib_usual_tls_tls_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lib_usual_tls_tls_c,v 1.2 2018/01/22 10:57:29 landry Exp $
$OpenBSD: patch-lib_usual_tls_tls_c,v 1.3 2020/07/05 11:29:36 landry Exp $
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);

11
databases/pgbouncer/pkg/PLIST
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.7 2018/09/04 12:46:10 espie Exp $
@comment $OpenBSD: PLIST,v 1.8 2020/07/05 11:29:36 landry Exp $
@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 @@ share/doc/pgbouncer/userlist.txt
@owner _pgbouncer
@sample /var/log/pgbouncer/
@owner
@mode
@group
@rcscript ${RCDIR}/pgbouncer
share/doc/pkg-readmes/${PKGSTEM}