Attachment 158982 Details for Bug 201696 – patch samba42

[patch] patch samba42

samba42.diff (text/plain), 4.07 KB, created by Kurt Jaeger on 2015-07-19 21:23:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-07-19 21:23:30 UTC

Size: 4.07 KB

patch

obsolete

>diff -r -u -N net/samba42/Makefile /usr/home/pi/myp/net/samba42/Makefile
>--- net/samba42/Makefile	2015-06-09 21:25:15.000000000 +0200
>+++ /usr/home/pi/myp/net/samba42/Makefile	2015-07-19 23:22:28.000000000 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=		${SAMBA4_BASENAME}42
> PORTVERSION?=		${SAMBA4_VERSION}
>-PORTREVISION?=		1
>+PORTREVISION?=		0
> CATEGORIES?=		net
> MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
> DISTNAME=		${SAMBA4_DISTNAME}
>@@ -17,7 +17,7 @@
> 
> SAMBA4_BASENAME=	samba
> SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
>-SAMBA4_VERSION=		4.2.2
>+SAMBA4_VERSION=		4.2.3
> SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
> 
> WRKSRC?=		${WRKDIR}/${DISTNAME}
>@@ -95,12 +95,12 @@
> RUN_DEPENDS+=		talloc>=2.1.2:${PORTSDIR}/devel/talloc
> SAMBA4_BUNDLED_LIBS+=	!talloc
> # tevent
>-BUILD_DEPENDS+=		tevent>=0.9.24:${PORTSDIR}/devel/tevent
>-RUN_DEPENDS+=		tevent>=0.9.24:${PORTSDIR}/devel/tevent
>+BUILD_DEPENDS+=		tevent>=0.9.25:${PORTSDIR}/devel/tevent
>+RUN_DEPENDS+=		tevent>=0.9.25:${PORTSDIR}/devel/tevent
> SAMBA4_BUNDLED_LIBS+=	!tevent
> # tdb
>-BUILD_DEPENDS+=		tdb>=1.3.4:${PORTSDIR}/databases/tdb
>-RUN_DEPENDS+=		tdb>=1.3.4:${PORTSDIR}/databases/tdb
>+BUILD_DEPENDS+=		tdb>=1.3.6:${PORTSDIR}/databases/tdb
>+RUN_DEPENDS+=		tdb>=1.3.6:${PORTSDIR}/databases/tdb
> SAMBA4_BUNDLED_LIBS+=	!tdb
> # ntdb
> BUILD_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
>diff -r -u -N net/samba42/distinfo /usr/home/pi/myp/net/samba42/distinfo
>--- net/samba42/distinfo	2015-06-08 06:32:04.000000000 +0200
>+++ /usr/home/pi/myp/net/samba42/distinfo	2015-07-19 22:57:30.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (samba-4.2.2.tar.gz) = 27d6c69dc3afee38fd28051001d2d4bdae38c567612a9ec6477bb5567e2abc1e
>-SIZE (samba-4.2.2.tar.gz) = 20708020
>+SHA256 (samba-4.2.3.tar.gz) = b6dfa5ae4818d891ee2fcff04a5912f4a4fb2394b4f5e66a2a15b428da094c7c
>+SIZE (samba-4.2.3.tar.gz) = 20721283
>diff -r -u -N net/samba42/files/patch-source4__lib__http__http.c /usr/home/pi/myp/net/samba42/files/patch-source4__lib__http__http.c
>--- net/samba42/files/patch-source4__lib__http__http.c	2015-06-08 06:32:04.000000000 +0200
>+++ /usr/home/pi/myp/net/samba42/files/patch-source4__lib__http__http.c	2015-07-19 23:03:04.000000000 +0200
>@@ -1,26 +1,24 @@
>---- source4/lib/http/http.c.orig	2015-05-23 00:27:12.430849126 +0000
>-+++ source4/lib/http/http.c	2015-05-28 02:27:41.829717329 +0000
>-@@ -112,7 +112,19 @@
>+--- source4/lib/http/http.c.orig	2015-07-14 12:41:44.000000000 +0200
>++++ source4/lib/http/http.c	2015-07-19 23:02:16.000000000 +0200
>+@@ -112,7 +112,17 @@
>  		return HTTP_ALL_DATA_READ;
>  	}
>  
> +#ifdef FREEBSD
> +	int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0;
> +	n = sscanf(line, "%n%*[^:]%n: %n%*[^\r\n]%n\r\n", &s0, &s1, &s2, &s3);
>-+
> +	if(n >= 0) {
> +		key = calloc(sizeof(char), s1-s0+1);
> +		value = calloc(sizeof(char), s3-s2+1);
>-+
> +		n = sscanf(line, "%[^:]: %[^\r\n]\r\n", key, value);
> +	}
> +#else
>- 	n = sscanf(line, "%a[^:]: %a[^\r\n]\r\n", &key, &value);
>+ 	n = sscanf(line, "%m[^:]: %m[^\r\n]\r\n", &key, &value);
> +#endif
>  	if (n != 2) {
>  		DEBUG(0, ("%s: Error parsing header '%s'\n", __func__, line));
>  		status = HTTP_DATA_CORRUPTED;
>-@@ -138,7 +150,7 @@
>+@@ -138,7 +148,7 @@
>  static bool http_parse_response_line(struct http_read_response_state *state)
>  {
>  	bool	status = true;
>@@ -29,24 +27,24 @@
>  	char	*msg = NULL;
>  	char	major;
>  	char	minor;
>-@@ -158,19 +170,32 @@
>+@@ -158,19 +168,32 @@
>  		return false;
>  	}
>  
>-+#ifdef FREEBSD
>++	#ifdef FREEBSD
> +	int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0;
> +	n = sscanf(line, "%n%*[^/]%n/%c.%c %d %n%*[^\r\n]%n\r\n",
>-+		   &s0, &s1, &major, &minor, &code, &s2, &s3);
>++		&s0, &s1, &major, &minor, &code, &s2, &s3);
> +
> +	if(n == 3) {
> +		protocol = calloc(sizeof(char), s1-s0+1);
> +		msg = calloc(sizeof(char), s3-s2+1);
> +
> +		n = sscanf(line, "%[^/]/%c.%c %d %[^\r\n]\r\n",
>-+			protocol, &major, &minor, &code, msg);
>++		protocol, &major, &minor, &code, msg);
> +	}
> +#else
>- 	n = sscanf(line, "%a[^/]/%c.%c %d %a[^\r\n]\r\n",
>+ 	n = sscanf(line, "%m[^/]/%c.%c %d %m[^\r\n]\r\n",
>  		   &protocol, &major, &minor, &code, &msg);
> -
> -	DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, "

Actions: View | Diff

Attachments on bug 201696: 158979 | 158980 | 158981 | 158982