--- a/components/curl/Makefile	Mon May 18 23:01:24 2015 -0700
+++ b/components/curl/Makefile	Tue May 19 16:53:20 2015 -0700
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =        curl
-COMPONENT_VERSION=      7.40.0
+COMPONENT_VERSION=      7.42.1
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=  http://curl.haxx.se/
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:c2e0705a13e53f8f924d1eaeb2ab94f59a9e162007c489b9ab0c96238bddf84b
+    sha256:4fc504f4fac56d091162707941d06c72a4222fc6fa48ca8193e44ee74baf079c
 COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/curl
 
-TPNO=			21343
+TPNO=			22725
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -88,7 +88,7 @@
 	'-e "s|\(^/bin/bash ../../libtool\).*|\1|" ' \
 	'-e "s|\(^libtool: link:\).*|\1|" ' \
 	'-e "s|remaining: ..:..|remaining: xx:xx|" ' \
-	'-e "s|\(^TESTDONE: 964 tests were considered during\).*|\1|" ' \
+	'-e "s|\(^TESTDONE: 984 tests were considered during\).*|\1|" ' \
 	'-e "s|\(^\* curl $(COMPONENT_VERSION)\).*|\1|" ' \
 	'-e "s|\(^\* Host:\).*|\1|" ' \
 	'-e "s|\(^\* System: SunOS\).*|\1|" ' \
@@ -99,6 +99,10 @@
 	'-e "/^debug.:/d" ' \
 	'-e "/^monitor debug.:/d" '
 
+# master test results are not entirely clean, so not
+# appropriate to run at top level
+$(SKIP_TEST_AT_TOP_LEVEL)
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 configure:	$(CONFIGURE_32_and_64)