diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile index fbe2855b598e..430486806c35 100644 --- a/databases/pgbouncer/Makefile +++ b/databases/pgbouncer/Makefile @@ -1,65 +1,64 @@ # Created by: Sergey Skvortsov PORTNAME= pgbouncer -PORTVERSION= 1.14.0 -PORTREVISION= 1 +PORTVERSION= 1.16.0 CATEGORIES= databases MASTER_SITES= https://pgbouncer.github.io/downloads/files/${PORTVERSION}/ \ http://pgbouncer.github.io/downloads/files/${PORTVERSION}/ MAINTAINER= m.tsatsenko@gmail.com COMMENT= Lightweight connection pooler for PostgreSQL LICENSE= BSD2CLAUSE LIB_DEPENDS= libevent.so:devel/libevent BUILD_DEPENDS+= ${LOCALBASE}/bin/gsed:textproc/gsed USES= cpe gmake ssl pkgconfig PORTSCOUT= site:https://pgbouncer.github.io/downloads/ USERS= pgbouncer GROUPS= pgbouncer USE_RC_SUBR= pgbouncer GNU_CONFIGURE= yes OPTIONS_DEFINE= CARES CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_CONFIGURE_WITH= cares CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --enable-evdns CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" PGBOUNCER_USER?= pgbouncer PGBOUNCER_GROUP?= pgbouncer PGBOUNCER_RUNDIR?= /var/run/pgbouncer PGBOUNCER_LOGDIR?= /var/log/pgbouncer PLIST_SUB+= PGBOUNCER_USER="${USERS}" \ PGBOUNCER_GROUP="${GROUPS}" \ PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \ PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" SUB_LIST+= PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" post-patch: @${REINPLACE_CMD} -e "s|= pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \ -e "s|= pgbouncer.pid|= ${PGBOUNCER_RUNDIR}/pgbouncer.pid|g" \ ${WRKSRC}/etc/pgbouncer.ini @${REINPLACE_CMD} -e "s|sed -n|${LOCALBASE}/bin/gsed -n|g" \ ${WRKSRC}/lib/find_modules.sh do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pgbouncer ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.5 ${STAGEDIR}${PREFIX}/man/man5/ ${INSTALL_DATA} ${WRKSRC}/etc/pgbouncer.ini \ ${STAGEDIR}${PREFIX}/etc/pgbouncer.ini.sample ${INSTALL_DATA} ${WRKSRC}/etc/userlist.txt \ ${STAGEDIR}${PREFIX}/etc/pgbouncer.users.sample @${MKDIR} ${STAGEDIR}${PGBOUNCER_RUNDIR} \ ${STAGEDIR}${PGBOUNCER_LOGDIR} .include diff --git a/databases/pgbouncer/distinfo b/databases/pgbouncer/distinfo index b490dccd8afa..56326eeeb9e9 100644 --- a/databases/pgbouncer/distinfo +++ b/databases/pgbouncer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592427794 -SHA256 (pgbouncer-1.14.0.tar.gz) = a0c13d10148f557e36ff7ed31793abb7a49e1f8b09aa2d4695d1c28fa101fee7 -SIZE (pgbouncer-1.14.0.tar.gz) = 578955 +TIMESTAMP = 1635022010 +SHA256 (pgbouncer-1.16.0.tar.gz) = a4a391618bb83caaee2a8cd9653974f4c1b98b95987d5cabbbeb801da6342652 +SIZE (pgbouncer-1.16.0.tar.gz) = 592136 diff --git a/databases/pgbouncer/files/patch-src_pooler.c b/databases/pgbouncer/files/patch-src_pooler.c deleted file mode 100644 index 6ea7b0c1dc0c..000000000000 --- a/databases/pgbouncer/files/patch-src_pooler.c +++ /dev/null @@ -1,25 +0,0 @@ ---- src/pooler.c.orig 2020-05-26 09:38:55 UTC -+++ src/pooler.c -@@ -127,16 +127,16 @@ static bool add_listen(int af, const struct sockaddr * - * unportable, so perhaps better to avoid it.) - */ - if (af != AF_UNIX && cf_so_reuseport) { --#if defined(SO_REUSEPORT) -+#if defined(SO_REUSEPORT_LB) - int val = 1; -- errpos = "setsockopt/SO_REUSEPORT"; -- res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val)); -+ errpos = "setsockopt/SO_REUSEPORT_LB"; -+ res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT_LB, &val, sizeof(val)); - if (res < 0) - goto failed; --#elif defined(SO_REUSEPORT_LB) -+#elif defined(SO_REUSEPORT) - int val = 1; -- errpos = "setsockopt/SO_REUSEPORT_LB"; -- res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT_LB, &val, sizeof(val)); -+ errpos = "setsockopt/SO_REUSEPORT"; -+ res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val)); - if (res < 0) - goto failed; - #else