From owner-svn-ports-all@freebsd.org Sat Aug 15 19:23:19 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 284F537BE41; Sat, 15 Aug 2020 19:23:19 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BTVZv0KMkz4csq; Sat, 15 Aug 2020 19:23:19 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E36BF240BC; Sat, 15 Aug 2020 19:23:18 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07FJNI04020042; Sat, 15 Aug 2020 19:23:18 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07FJNIOU020041; Sat, 15 Aug 2020 19:23:18 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202008151923.07FJNIOU020041@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 15 Aug 2020 19:23:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545059 - in head/databases/pgbouncer: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/databases/pgbouncer: . files X-SVN-Commit-Revision: 545059 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Aug 2020 19:23:19 -0000 Author: swills Date: Sat Aug 15 19:23:18 2020 New Revision: 545059 URL: https://svnweb.freebsd.org/changeset/ports/545059 Log: databases/pgbouncer: fix usage SO_REUSEPORT_LB PR: 247956 Submitted by: Dmitry Wagin Approved by: m.tsatsenko@gmail.com (maintainer) Added: head/databases/pgbouncer/files/patch-src_pooler.c (contents, props changed) Modified: head/databases/pgbouncer/Makefile (contents, props changed) Modified: head/databases/pgbouncer/Makefile ============================================================================== --- head/databases/pgbouncer/Makefile Sat Aug 15 18:58:05 2020 (r545058) +++ head/databases/pgbouncer/Makefile Sat Aug 15 19:23:18 2020 (r545059) @@ -3,6 +3,7 @@ PORTNAME= pgbouncer PORTVERSION= 1.14.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://pgbouncer.github.io/downloads/files/${PORTVERSION}/ \ http://pgbouncer.github.io/downloads/files/${PORTVERSION}/ Added: head/databases/pgbouncer/files/patch-src_pooler.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pgbouncer/files/patch-src_pooler.c Sat Aug 15 19:23:18 2020 (r545059) @@ -0,0 +1,25 @@ +--- 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