Attachment #228971 for bug #259388

View | Details | Raw Unified | Return to bug 259388
Collapse All | Expand All

Lines 1-8 Link Here

(-)pgbouncer/Makefile (-2 / +1 lines)
1	# Created by: Sergey Skvortsov <skv@protey.ru>	1	# Created by: Sergey Skvortsov <skv@protey.ru>
2		2
3	PORTNAME= pgbouncer	3	PORTNAME= pgbouncer
4	PORTVERSION= 1.14.0	4	PORTVERSION= 1.16.0
5	PORTREVISION= 1
6	CATEGORIES= databases	5	CATEGORIES= databases
7	MASTER_SITES= https://pgbouncer.github.io/downloads/files/${PORTVERSION}/ \	6	MASTER_SITES= https://pgbouncer.github.io/downloads/files/${PORTVERSION}/ \
8	http://pgbouncer.github.io/downloads/files/${PORTVERSION}/	7	http://pgbouncer.github.io/downloads/files/${PORTVERSION}/

Lines 1-3 Link Here

(-)pgbouncer/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1592427794	1	TIMESTAMP = 1635022010
2	SHA256 (pgbouncer-1.14.0.tar.gz) = a0c13d10148f557e36ff7ed31793abb7a49e1f8b09aa2d4695d1c28fa101fee7	2	SHA256 (pgbouncer-1.16.0.tar.gz) = a4a391618bb83caaee2a8cd9653974f4c1b98b95987d5cabbbeb801da6342652
3	SIZE (pgbouncer-1.14.0.tar.gz) = 578955	3	SIZE (pgbouncer-1.16.0.tar.gz) = 592136




--- 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

Return to bug 259388

Lines 1-25 Link Here

(-)pgbouncer/files/patch-src_pooler.c (-25 lines)
1	--- src/pooler.c.orig 2020-05-26 09:38:55 UTC
2	+++ src/pooler.c
3	@@ -127,16 +127,16 @@ static bool add_listen(int af, const struct sockaddr *
4	* unportable, so perhaps better to avoid it.)
5	*/
6	if (af != AF_UNIX && cf_so_reuseport) {
7	-#if defined(SO_REUSEPORT)
8	+#if defined(SO_REUSEPORT_LB)
9	int val = 1;
10	- errpos = "setsockopt/SO_REUSEPORT";
11	- res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
12	+ errpos = "setsockopt/SO_REUSEPORT_LB";
13	+ res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT_LB, &val, sizeof(val));
14	if (res < 0)
15	goto failed;
16	-#elif defined(SO_REUSEPORT_LB)
17	+#elif defined(SO_REUSEPORT)
18	int val = 1;
19	- errpos = "setsockopt/SO_REUSEPORT_LB";
20	- res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT_LB, &val, sizeof(val));
21	+ errpos = "setsockopt/SO_REUSEPORT";
22	+ res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
23	if (res < 0)
24	goto failed;
25	#else