--- a/components/serf/Makefile	Tue Apr 18 09:25:01 2017 -0700
+++ b/components/serf/Makefile	Tue Apr 18 09:26:27 2017 -0700
@@ -25,17 +25,17 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		serf
-COMPONENT_VERSION=	1.3.8
+COMPONENT_VERSION=	1.3.9
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://serf.googlecode.com/
+COMPONENT_PROJECT_URL=	http://serf.apache.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)svn/src_releases/$(COMPONENT_ARCHIVE)
+    sha256:549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
+COMPONENT_ARCHIVE_URL=	https://www.apache.org/dist/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/libserf
 COMPONENT_ANITYA_ID=	1720
 
-TPNO=			22208
+TPNO=			34114
 
 include $(WS_MAKE_RULES)/prep.mk
 # Needed by the test: target. We override build and install.
@@ -66,6 +66,7 @@
 COMPONENT_BUILD_ARGS += LIBDIR=$(SERFLIBDIR_$(BITS))
 
 COMPONENT_TEST_CMD =	$(SCONS)
+COMPONENT_TEST_MASTER =	$(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "/^cc /d" ' \

--- a/components/serf/patches/build-solaris.patch	Tue Apr 18 09:25:01 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Changes needed to get serf to build on Solaris. Taken from:
-http://mail-archives.apache.org/mod_mbox/subversion-dev/201411.mbox/<[email protected]>
-
-These changes are already known upstream.
-
---- serf-1.3.8/SConstruct.orig	2015-03-25 06:42:50.687989565 -0700
-+++ serf-1.3.8/SConstruct	2015-03-25 06:44:01.084907971 -0700
-@@ -210,7 +210,7 @@
- # Unfortunately we can't set the .dylib compatibility_version option separately
- # from current_version, so don't use the PATCH level to avoid that build and
- # runtime patch levels have to be identical.
--env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
-+#env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
- 
- LIBNAME = 'libserf-%d' % (MAJOR,)
- if sys.platform != 'win32':
-@@ -248,6 +248,7 @@
- 
-   if sys.platform == 'sunos5':
-     env.Append(LIBS='m')
-+    env['PLATFORM'] = 'posix'
- else:
-   # Warning level 4, no unused argument warnings
-   env.Append(CCFLAGS=['/W4', '/wd4100'])

--- a/components/serf/patches/fix-tests.patch	Tue Apr 18 09:25:01 2017 -0700
+++ b/components/serf/patches/fix-tests.patch	Tue Apr 18 09:26:27 2017 -0700
@@ -1,24 +1,11 @@
-Changes needed to get the serf tests to build on Solaris.
-Remove a C++ style comment.
 Run the tests in a fixed order.
 
 These changes will be passed upstream.
 
---- serf-1.3.8/test/test_buckets.c.orig	2015-03-25 10:44:38.304724577 -0700
-+++ serf-1.3.8/test/test_buckets.c	2015-03-25 10:45:28.821762949 -0700
-@@ -1234,7 +1234,7 @@
-        uncompressed data, + 12 bytes. This info comes from zlib.h.
-        Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed
-        data. Use a buffer bigger than what we need. */
--//    buf_size = orig_len + (orig_len / 1000) + 12;
-+/*    buf_size = orig_len + (orig_len / 1000) + 12; */
-     buf_size = 100000;
- 
-     write_buf = apr_palloc(pool, buf_size);
---- serf-1.3.8/build/check.py.orig	2015-03-25 11:55:50.065102813 -0700
-+++ serf-1.3.8/build/check.py	2015-03-25 11:56:17.277942011 -0700
-@@ -42,7 +42,7 @@
-   TEST_ALL_EXE = os.path.join(testdir, TEST_ALL_EXE)
+--- serf-1.3.9/build/check.py.orig	2017-03-07 06:59:14.158690090 +0000
++++ serf-1.3.9/build/check.py	2017-03-07 06:59:39.506830744 +0000
+@@ -51,7 +51,7 @@
+   TEST_ALL_EXE = os.path.join(test_builddir, TEST_ALL_EXE)
  
    # Find test responses and run them one by one
 -  for case in glob.glob(testdir + "/testcases/*.response"):

--- a/components/serf/test/results-32.master	Tue Apr 18 09:25:01 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-scons: Reading SConscript files ...
-scons: done reading SConscript files.
-scons: Building targets ...
-/usr/bin/python2.7 build/check.py
-this is 1 test.
-i am a test.this is a test.
-Trailer-Test: f
-this is 1 test.
-i am a test.this is a test.
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
- <head>
-  <title>Test of gzip Content-Encoding</title>
- </head>
- <body>
-<h1>This is a test</h1>
-
-<p>This file was created with mod_deflate on the server side.</p>
-<pre>curl -i --output gzip.response -H "Accept-Encoding: gzip" http://localhost:8080/1.html</pre>
-
-<hr />
-<address>Apache</address>
-</body></html>
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<title>scotch.ics.uci.edu</title>
-<!--base href="http://scotch.ics.uci.edu/" /-->
-<link href="default.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body>
-
-<p>More to come!</p>
-
-<p><a href="manual/">Apache httpd 2.0 manual</a></p>
-
-<p><a href="CA.cert.pem">Trust our CA!</a></p>
-
-<p><img src="apache_pb.gif" alt="Powered by Apache!" /></p>
-
-</body>
-
-</html>
-== Testing test/testcases/chunked-empty.response ==
-== Testing test/testcases/chunked-trailers.response ==
-== Testing test/testcases/chunked.response ==
-== Testing test/testcases/deflate.response ==
-== Testing test/testcases/simple.response ==
-== Running the unit tests ==
-ERROR: test(s) failed in test_all
-scons: *** [check] Error 1
-scons: building terminated because of errors.

--- a/components/serf/test/results-64.master	Tue Apr 18 09:25:01 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-scons: Reading SConscript files ...
-scons: done reading SConscript files.
-scons: Building targets ...
-/usr/bin/python2.7 build/check.py
-this is 1 test.
-i am a test.this is a test.
-Trailer-Test: f
-this is 1 test.
-i am a test.this is a test.
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
- <head>
-  <title>Test of gzip Content-Encoding</title>
- </head>
- <body>
-<h1>This is a test</h1>
-
-<p>This file was created with mod_deflate on the server side.</p>
-<pre>curl -i --output gzip.response -H "Accept-Encoding: gzip" http://localhost:8080/1.html</pre>
-
-<hr />
-<address>Apache</address>
-</body></html>
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<title>scotch.ics.uci.edu</title>
-<!--base href="http://scotch.ics.uci.edu/" /-->
-<link href="default.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body>
-
-<p>More to come!</p>
-
-<p><a href="manual/">Apache httpd 2.0 manual</a></p>
-
-<p><a href="CA.cert.pem">Trust our CA!</a></p>
-
-<p><img src="apache_pb.gif" alt="Powered by Apache!" /></p>
-
-</body>
-
-</html>
-F................................................................
-
-There was 1 failure:
-1) test_serf_connection_request_create: test/test_util.c:438: expected <0> but was <146>
-
-!!!FAILURES!!!
-Runs: 65 Passes: 64 Fails: 1
-
-== Testing test/testcases/chunked-empty.response ==
-== Testing test/testcases/chunked-trailers.response ==
-== Testing test/testcases/chunked.response ==
-== Testing test/testcases/deflate.response ==
-== Testing test/testcases/simple.response ==
-== Running the unit tests ==
-ERROR: test(s) failed in test_all
-scons: *** [check] Error 1
-scons: building terminated because of errors.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/serf/test/results-all.master	Tue Apr 18 09:26:27 2017 -0700
@@ -0,0 +1,64 @@
+scons: Reading SConscript files ...
+Checking for GNU-compatible C compiler...(cached) no
+scons: done reading SConscript files.
+scons: Building targets ...
+/usr/bin/python2.7 build/check.py test test
+this is 1 test.
+i am a test.this is a test.
+Trailer-Test: f
+this is 1 test.
+i am a test.this is a test.
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+ <head>
+  <title>Test of gzip Content-Encoding</title>
+ </head>
+ <body>
+<h1>This is a test</h1>
+
+<p>This file was created with mod_deflate on the server side.</p>
+<pre>curl -i --output gzip.response -H "Accept-Encoding: gzip" http://localhost:8080/1.html</pre>
+
+<hr />
+<address>Apache</address>
+</body></html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>scotch.ics.uci.edu</title>
+<!--base href="http://scotch.ics.uci.edu/" /-->
+<link href="default.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<p>More to come!</p>
+
+<p><a href="manual/">Apache httpd 2.0 manual</a></p>
+
+<p><a href="CA.cert.pem">Trust our CA!</a></p>
+
+<p><img src="apache_pb.gif" alt="Powered by Apache!" /></p>
+
+</body>
+
+</html>
+F.................................................................
+
+There was 1 failure:
+1) test_serf_connection_request_create: test/test_util.c:456: expected <0> but was <146>
+
+!!!FAILURES!!!
+Runs: 66 Passes: 65 Fails: 1
+
+== Testing test/testcases/chunked-empty.response ==
+== Testing test/testcases/chunked-trailers.response ==
+== Testing test/testcases/chunked.response ==
+== Testing test/testcases/deflate.response ==
+== Testing test/testcases/simple.response ==
+== Running the unit tests ==
+ERROR: test(s) failed in test_all
+scons: *** [check] Error 1
+scons: building terminated because of errors.