Re: [Update] pgbouncer 1.7.2

[Daniel Jakots]

On Thu, 7 Dec 2017 15:20:23 +0100, Pierre-Emmanuel André
 wrote:

> Comments, ok ?

A patch needs to be regen:
(lazily inlined, so may be mangled :p)

with that, lgtm ports wise so ok danj@

Index: patches/patch-etc_pgbouncer_ini
===
RCS file: /cvs/ports/databases/pgbouncer/patches/patch-etc_pgbouncer_ini,v
retrieving revision 1.3
diff -u -p -r1.3 patch-etc_pgbouncer_ini
--- patches/patch-etc_pgbouncer_ini 18 Jun 2012 11:38:48 -  1.3
+++ patches/patch-etc_pgbouncer_ini 12 Dec 2017 00:25:22 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-etc_pgbouncer_ini,v 1.3 2012/06/18 11:38:48 pea Exp $
 etc/pgbouncer.ini.orig Wed Jun  6 10:41:02 2012
-+++ etc/pgbouncer.ini  Wed Jun  6 10:41:26 2012
-@@ -50,7 +50,7 @@ listen_port = 6432
+Index: etc/pgbouncer.ini
+--- etc/pgbouncer.ini.orig
 etc/pgbouncer.ini
+@@ -98,7 +98,7 @@ listen_port = 6432
  ;;;
  
  ; any, trust, plain, crypt, md5
@@ -10,7 +11,7 @@ $OpenBSD: patch-etc_pgbouncer_ini,v 1.3 
  ;auth_file = /8.0/main/global/pg_auth
  auth_file = /etc/pgbouncer/userlist.txt
  
-@@ -59,7 +59,7 @@ auth_file = /etc/pgbouncer/userlist.txt
+@@ -114,7 +114,7 @@ auth_file = /etc/pgbouncer/userlist.txt
  ;;;
  
  ; comma-separated list of users, who are allowed to change settings

[Update] pgbouncer 1.7.2

[Pierre-Emmanuel André]

Hi,

Small diff to update pgbouncer to it's latest version (1.7.2).
Tested on @amd64.

Comments, ok ?

Index: Makefile
===
RCS file: /cvs/ports/databases/pgbouncer/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile	1 Jun 2017 19:18:56 -	1.23
+++ Makefile	7 Dec 2017 14:18:14 -
@@ -2,9 +2,8 @@
 
 COMMENT = 	lightweight connection pooler for PostgreSQL
 
-V = 		1.6.1
+V = 		1.7.2
 DISTNAME = 	pgbouncer-${V}
-REVISION =	0
 
 CATEGORIES = 	databases
 
@@ -15,7 +14,7 @@ MAINTAINER = 	Pierre-Emmanuel Andre https://pgbouncer.github.io/downloads/files/${V}/
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgbouncer/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	11 Sep 2015 12:39:27 -	1.9
+++ distinfo	7 Dec 2017 14:18:14 -
@@ -1,2 +1,2 @@
-SHA256 (pgbouncer-1.6.1.tar.gz) = QP9c2EOZtNo7qGStZU/hVaDtCFJh5o8+MbEReBKxcFY=
-SIZE (pgbouncer-1.6.1.tar.gz) = 431076
+SHA256 (pgbouncer-1.7.2.tar.gz) = 3jazGP5KLyCl9g0cXqYsHKMx9oE9LEhIZuy1kmWhYLo=
+SIZE (pgbouncer-1.7.2.tar.gz) = 462374
Index: patches/patch-lib_usual_tls_tls_c
===
RCS file: patches/patch-lib_usual_tls_tls_c
diff -N patches/patch-lib_usual_tls_tls_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-lib_usual_tls_tls_c	7 Dec 2017 14:18:14 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: lib/usual/tls/tls.c
+--- lib/usual/tls/tls.c.orig
 lib/usual/tls/tls.c
+@@ -287,7 +287,7 @@ tls_info_callback(const SSL *ssl, int where, int rc)
+ {
+ 	struct tls *ctx = SSL_get_app_data(ssl);
+ 
+-#ifdef USE_LIBSSL_INTERNALS
++#if defined(USE_LIBSSL_INTERNALS) && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050100fL)
+ 	if (!(ctx->state & TLS_HANDSHAKE_COMPLETE) && ssl->s3) {
+ 		/* steal info about used DH key */
+ 		if (ssl->s3->tmp.dh && !ctx->used_dh_bits) {
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/pgbouncer/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST	17 Jan 2012 13:57:24 -	1.5
+++ pkg/PLIST	7 Dec 2017 14:18:14 -
@@ -9,8 +9,8 @@
 @sample ${SYSCONFDIR}/pgbouncer/
 @owner
 share/doc/pgbouncer/
-share/doc/pgbouncer/NEWS
-share/doc/pgbouncer/README
+share/doc/pgbouncer/NEWS.rst
+share/doc/pgbouncer/README.rst
 share/doc/pkg-readmes/${FULLPKGNAME}
 @mode 640
 @group _pgbouncer

[Update] pgbouncer 1.7.2

[Pierre-Emmanuel André]

Hi,

Small diff to update pgbouncer.
Tested on @amd64 with PostgreSQL 9.5.3.
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/pgbouncer/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile	11 Sep 2015 12:39:27 -	1.22
+++ Makefile	3 Aug 2016 13:45:21 -
@@ -2,7 +2,7 @@
 
 COMMENT = 	lightweight connection pooler for PostgreSQL
 
-V = 		1.6.1
+V = 		1.7.2
 DISTNAME = 	pgbouncer-${V}
 
 CATEGORIES = 	databases
@@ -14,7 +14,7 @@ MAINTAINER = 	Pierre-Emmanuel Andre https://pgbouncer.github.io/downloads/files/${V}/
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgbouncer/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	11 Sep 2015 12:39:27 -	1.9
+++ distinfo	3 Aug 2016 13:45:21 -
@@ -1,2 +1,2 @@
-SHA256 (pgbouncer-1.6.1.tar.gz) = QP9c2EOZtNo7qGStZU/hVaDtCFJh5o8+MbEReBKxcFY=
-SIZE (pgbouncer-1.6.1.tar.gz) = 431076
+SHA256 (pgbouncer-1.7.2.tar.gz) = 3jazGP5KLyCl9g0cXqYsHKMx9oE9LEhIZuy1kmWhYLo=
+SIZE (pgbouncer-1.7.2.tar.gz) = 462374
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/pgbouncer/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST	17 Jan 2012 13:57:24 -	1.5
+++ pkg/PLIST	3 Aug 2016 13:45:21 -
@@ -9,8 +9,8 @@
 @sample ${SYSCONFDIR}/pgbouncer/
 @owner
 share/doc/pgbouncer/
-share/doc/pgbouncer/NEWS
-share/doc/pgbouncer/README
+share/doc/pgbouncer/NEWS.rst
+share/doc/pgbouncer/README.rst
 share/doc/pkg-readmes/${FULLPKGNAME}
 @mode 640
 @group _pgbouncer