Le Tue, Jul 18, 2023 at 08:47:00AM +0200, Landry Breuil a écrit :
> hi,
>
> simple update to latest, cf
> https://www.pgbouncer.org/changelog.html#pgbouncer-119x - now it
> defaults to md5 instead of trust. it should also improve scram support
> (cf https://www.pgbouncer.org/changelog.html#pgbouncer-117x) which is
> now default in psql..
>
> not tested on openbsd, but using it fine on debian..
now for 1.20.0 :) unless i hear from you pea@, will be commited with
maintainer timeout in 2 weeks..
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile 8 Nov 2022 11:14:45 -0000 1.37
+++ Makefile 27 Jul 2023 06:49:52 -0000
@@ -1,8 +1,7 @@
COMMENT = lightweight connection pooler for PostgreSQL
-V = 1.16.1
+V = 1.20.0
DISTNAME = pgbouncer-${V}
-REVISION = 1
CATEGORIES = databases
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo 17 Dec 2021 13:18:38 -0000 1.15
+++ distinfo 27 Jul 2023 06:49:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (pgbouncer-1.16.1.tar.gz) = CHR36eR2bQMrBLewBsDI1kFgpUFBp7/CxuWueuEb9/w=
-SIZE (pgbouncer-1.16.1.tar.gz) = 591450
+SHA256 (pgbouncer-1.20.0.tar.gz) = 5w1afLi3Hdfbq/01cdcaS2uZ8uhdjXGvHnNPbYZjXw4=
+SIZE (pgbouncer-1.20.0.tar.gz) = 638020
Index: patches/patch-etc_pgbouncer_ini
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/patches/patch-etc_pgbouncer_ini,v
retrieving revision 1.7
diff -u -r1.7 patch-etc_pgbouncer_ini
--- patches/patch-etc_pgbouncer_ini 11 Mar 2022 18:31:35 -0000 1.7
+++ patches/patch-etc_pgbouncer_ini 27 Jul 2023 06:49:52 -0000
@@ -1,20 +1,10 @@
Index: etc/pgbouncer.ini
--- etc/pgbouncer.ini.orig
+++ etc/pgbouncer.ini
-@@ -112,7 +112,7 @@ listen_port = 6432
- ;;;
-
- ;; any, trust, plain, md5, cert, hba, pam
--auth_type = trust
-+auth_type = md5
- auth_file = /etc/pgbouncer/userlist.txt
-
- ;; Path to HBA-style auth config
-@@ -127,7 +127,7 @@ auth_file = /etc/pgbouncer/userlist.txt
- ;;;
+@@ -138,6 +138,7 @@ auth_file = /etc/pgbouncer/userlist.txt
;; comma-separated list of users who are allowed to change settings
--;admin_users = user2, someadmin, otheradmin
+ ;admin_users = user2, someadmin, otheradmin
+admin_users = admin, pgbouncer
;; comma-separated list of users who are just allowed to use SHOW command
Index: patches/patch-lib_usual_tls_tls_compat_h
===================================================================
RCS file:
/cvs/ports/databases/pgbouncer/patches/patch-lib_usual_tls_tls_compat_h,v
retrieving revision 1.4
diff -u -r1.4 patch-lib_usual_tls_tls_compat_h
--- patches/patch-lib_usual_tls_tls_compat_h 11 Mar 2022 18:31:36 -0000
1.4
+++ patches/patch-lib_usual_tls_tls_compat_h 27 Jul 2023 06:49:52 -0000
@@ -11,12 +11,12 @@
#define NID_kx_ecdhe (-90)
#define NID_kx_dhe (-91)
-@@ -79,7 +78,7 @@ static inline X509_OBJECT *X509_STORE_CTX_get_obj_by_s
+@@ -78,6 +77,8 @@ static inline X509_OBJECT *X509_STORE_CTX_get_obj_by_s
+ }
return NULL;
}
-
--
++
+#endif
- #endif
- /* ecdh_auto is broken - ignores main EC key */
+ /*
+ * We need these specific functions for OpenSSL 3.0.0 because the
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/pgbouncer/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST 8 Nov 2022 11:14:45 -0000 1.10
+++ pkg/PLIST 27 Jul 2023 06:49:52 -0000
@@ -11,10 +11,17 @@
share/doc/pgbouncer/
share/doc/pgbouncer/NEWS.md
share/doc/pgbouncer/README.md
+share/doc/pgbouncer/pgbouncer-minimal.ini
@mode 640
@group _pgbouncer
share/doc/pgbouncer/pgbouncer.ini
@sample ${SYSCONFDIR}/pgbouncer/pgbouncer.ini
+@mode
+@group
+share/doc/pgbouncer/pgbouncer.service
+share/doc/pgbouncer/pgbouncer.socket
+@mode 640
+@group _pgbouncer
share/doc/pgbouncer/userlist.txt
@sample ${SYSCONFDIR}/pgbouncer/userlist.txt
@mode
