Attachment 160819 Details for Bug 202957 – the patch

[patch] the patch

pgbouncer.txt (text/plain), 2.76 KB, created by m.tsatsenko on 2015-09-07 19:40:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: m.tsatsenko

Created: 2015-09-07 19:40:51 UTC

Size: 2.76 KB

patch

obsolete

>diff -urN pgbouncer.orig/Makefile pgbouncer/Makefile
>--- pgbouncer.orig/Makefile	2015-08-27 17:23:22.576347705 +0300
>+++ pgbouncer/Makefile	2015-08-27 17:25:26.822638260 +0300
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/databases/pgbouncer/Makefile 389143 2015-06-10 20:28:54Z delphij $
> 
> PORTNAME=	pgbouncer
>-PORTVERSION=	1.5.5
>+PORTVERSION=	1.6
> CATEGORIES=	databases
> MASTER_SITES=	https://pgbouncer.github.io/downloads/
> 
>diff -urN pgbouncer.orig/distinfo pgbouncer/distinfo
>--- pgbouncer.orig/distinfo	2015-08-27 17:23:22.576347705 +0300
>+++ pgbouncer/distinfo	2015-08-27 17:25:28.683338585 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (pgbouncer-1.5.5.tar.gz) = d65a192d1e2e69bf445d536f10211857959fc38e0247d1974e8008253080e234
>-SIZE (pgbouncer-1.5.5.tar.gz) = 336145
>+SHA256 (pgbouncer-1.6.tar.gz) = d0aec755afcdcff0538b513f71ba4de03041f21ed5548171df9de53099efa916
>+SIZE (pgbouncer-1.6.tar.gz) = 412700
>diff -urN pgbouncer.orig/files/patch-keepalive pgbouncer/files/patch-keepalive
>--- pgbouncer.orig/files/patch-keepalive	2015-08-27 17:23:22.576347705 +0300
>+++ pgbouncer/files/patch-keepalive	1970-01-01 03:00:00.000000000 +0300
>@@ -1,46 +0,0 @@
>---- src/util.c.orig	2011-12-07 15:04:13.000000000 +0400
>-+++ src/util.c	2011-12-07 15:04:07.000000000 +0400
>-@@ -126,7 +126,7 @@
>- 		res = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
>- 		if (res < 0)
>- 			goto fail;
>--#ifdef __linux__
>-+#ifdef TCP_KEEPCNT
>- 		/* set count of keepalive packets */
>- 		if (cf_tcp_keepcnt > 0) {
>- 			val = cf_tcp_keepcnt;
>-@@ -134,6 +134,8 @@
>- 			if (res < 0)
>- 				goto fail;
>- 		}
>-+#endif
>-+#ifdef TCP_KEEPIDLE
>- 		/* how long the connection can stay idle before sending keepalive pkts */
>- 		if (cf_tcp_keepidle) {
>- 			val = cf_tcp_keepidle;
>-@@ -141,6 +143,8 @@
>- 			if (res < 0)
>- 				goto fail;
>- 		}
>-+#endif
>-+#ifdef TCP_KEEPINTVL
>- 		/* time between packets */
>- 		if (cf_tcp_keepintvl) {
>- 			val = cf_tcp_keepintvl;
>-@@ -148,7 +152,7 @@
>- 			if (res < 0)
>- 				goto fail;
>- 		}
>--#else
>-+#endif
>- #ifdef TCP_KEEPALIVE
>- 		if (cf_tcp_keepidle) {
>- 			val = cf_tcp_keepidle;
>-@@ -157,7 +161,6 @@
>- 				goto fail;
>- 		}
>- #endif
>--#endif
>- 	}
>- 
>- 	/* set in-kernel socket buffer size */
>diff -urN pgbouncer.orig/files/patch-lib-usual-crypto-csrandom.c pgbouncer/files/patch-lib-usual-crypto-csrandom.c
>--- pgbouncer.orig/files/patch-lib-usual-crypto-csrandom.c	1970-01-01 03:00:00.000000000 +0300
>+++ pgbouncer/files/patch-lib-usual-crypto-csrandom.c	2015-09-07 22:36:27.619339854 +0300
>@@ -0,0 +1,11 @@
>+--- lib/usual/crypto/csrandom.c.orig	2015-07-31 12:23:11 UTC
>++++ lib/usual/crypto/csrandom.c
>+@@ -40,7 +40,7 @@ void csrandom_bytes(void *buf, size_t nb
>+ 	arc4random_buf(buf, nbytes);
>+ }
>+ 
>+-uint32_t csrandom_range(upper_bound)
>++uint32_t csrandom_range(uint32_t upper_bound)
>+ {
>+ 	return arc4random_uniform(upper_bound);
>+ }

Actions: View | Diff

Attachments on bug 202957: 160819 | 160846 | 160858 | 160859