svn commit: r393835 - in head/net/samba42: . files
Timur I. Bakeyev
timur at FreeBSD.org
Sun Aug 9 23:42:37 UTC 2015
Author: timur
Date: Sun Aug 9 23:42:35 2015
New Revision: 393835
URL: https://svnweb.freebsd.org/changeset/ports/393835
Log:
Upgrade port to the 4.2.3 revision
Modified:
head/net/samba42/Makefile
head/net/samba42/distinfo
head/net/samba42/files/patch-source4__lib__http__http.c
Modified: head/net/samba42/Makefile
==============================================================================
--- head/net/samba42/Makefile Sun Aug 9 23:26:37 2015 (r393834)
+++ head/net/samba42/Makefile Sun Aug 9 23:42:35 2015 (r393835)
@@ -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 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0
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}
Modified: head/net/samba42/distinfo
==============================================================================
--- head/net/samba42/distinfo Sun Aug 9 23:26:37 2015 (r393834)
+++ head/net/samba42/distinfo Sun Aug 9 23:42:35 2015 (r393835)
@@ -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
Modified: head/net/samba42/files/patch-source4__lib__http__http.c
==============================================================================
--- head/net/samba42/files/patch-source4__lib__http__http.c Sun Aug 9 23:26:37 2015 (r393834)
+++ head/net/samba42/files/patch-source4__lib__http__http.c Sun Aug 9 23:42:35 2015 (r393835)
@@ -1,5 +1,5 @@
---- 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
+--- source4/lib/http/http.c.orig 2015-07-14 10:41:44.000000000 +0000
++++ source4/lib/http/http.c 2015-08-09 23:25:46.480162006 +0000
@@ -112,7 +112,19 @@
return HTTP_ALL_DATA_READ;
}
@@ -15,7 +15,7 @@
+ 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));
@@ -29,7 +29,7 @@
char *msg = NULL;
char major;
char minor;
-@@ -158,19 +170,32 @@
+@@ -158,12 +170,22 @@
return false;
}
@@ -46,17 +46,17 @@
+ 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, "
- "code->%d, message->%s\n", __func__, n, protocol, major, minor,
- code, msg));
--
+#endif
+
if (n != 5) {
DEBUG(0, ("%s: Error parsing header\n", __func__));
- status = false;
+@@ -171,6 +193,10 @@
goto error;
}
More information about the svn-ports-all
mailing list