View | Details | Raw Unified | Return to bug 202957 | Differences between
and this patch

Collapse All | Expand All

(-)pgbouncer/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/databases/pgbouncer/Makefile 389143 2015-06-10 20:28:54Z delphij $
2
# $FreeBSD: head/databases/pgbouncer/Makefile 389143 2015-06-10 20:28:54Z delphij $
3
3
4
PORTNAME=	pgbouncer
4
PORTNAME=	pgbouncer
5
PORTVERSION=	1.5.5
5
PORTVERSION=	1.6
6
CATEGORIES=	databases
6
CATEGORIES=	databases
7
MASTER_SITES=	https://pgbouncer.github.io/downloads/
7
MASTER_SITES=	https://pgbouncer.github.io/downloads/
8
8
(-)pgbouncer/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pgbouncer-1.5.5.tar.gz) = d65a192d1e2e69bf445d536f10211857959fc38e0247d1974e8008253080e234
1
SHA256 (pgbouncer-1.6.tar.gz) = d0aec755afcdcff0538b513f71ba4de03041f21ed5548171df9de53099efa916
2
SIZE (pgbouncer-1.5.5.tar.gz) = 336145
2
SIZE (pgbouncer-1.6.tar.gz) = 412700
(-)pgbouncer/files/patch-keepalive (-46 lines)
Lines 1-46 Link Here
1
--- src/util.c.orig	2011-12-07 15:04:13.000000000 +0400
2
+++ src/util.c	2011-12-07 15:04:07.000000000 +0400
3
@@ -126,7 +126,7 @@
4
 		res = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
5
 		if (res < 0)
6
 			goto fail;
7
-#ifdef __linux__
8
+#ifdef TCP_KEEPCNT
9
 		/* set count of keepalive packets */
10
 		if (cf_tcp_keepcnt > 0) {
11
 			val = cf_tcp_keepcnt;
12
@@ -134,6 +134,8 @@
13
 			if (res < 0)
14
 				goto fail;
15
 		}
16
+#endif
17
+#ifdef TCP_KEEPIDLE
18
 		/* how long the connection can stay idle before sending keepalive pkts */
19
 		if (cf_tcp_keepidle) {
20
 			val = cf_tcp_keepidle;
21
@@ -141,6 +143,8 @@
22
 			if (res < 0)
23
 				goto fail;
24
 		}
25
+#endif
26
+#ifdef TCP_KEEPINTVL
27
 		/* time between packets */
28
 		if (cf_tcp_keepintvl) {
29
 			val = cf_tcp_keepintvl;
30
@@ -148,7 +152,7 @@
31
 			if (res < 0)
32
 				goto fail;
33
 		}
34
-#else
35
+#endif
36
 #ifdef TCP_KEEPALIVE
37
 		if (cf_tcp_keepidle) {
38
 			val = cf_tcp_keepidle;
39
@@ -157,7 +161,6 @@
40
 				goto fail;
41
 		}
42
 #endif
43
-#endif
44
 	}
45
 
46
 	/* set in-kernel socket buffer size */
(-)pgbouncer/files/patch-lib-usual-crypto-csrandom.c (+11 lines)
Line 0 Link Here
1
--- lib/usual/crypto/csrandom.c.orig	2015-07-31 12:23:11 UTC
2
+++ lib/usual/crypto/csrandom.c
3
@@ -40,7 +40,7 @@ void csrandom_bytes(void *buf, size_t nb
4
 	arc4random_buf(buf, nbytes);
5
 }
6
 
7
-uint32_t csrandom_range(upper_bound)
8
+uint32_t csrandom_range(uint32_t upper_bound)
9
 {
10
 	return arc4random_uniform(upper_bound);
11
 }

Return to bug 202957