--- a/components/httping/Makefile	Fri Feb 22 16:32:48 2013 -0800
+++ b/components/httping/Makefile	Mon Feb 25 07:31:04 2013 -0800
@@ -18,17 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		httping
-COMPONENT_VERSION=	1.4.4
+COMPONENT_VERSION=	1.5.7
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.vanheusden.com/httping/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:f00da30e0744d86ed832f6a49ae455b9447570af3589e1111a1c6210a51cafee
+    sha256:b0d3d3e9708b7395b0c47c1c1cfdd17613e631360eaffd1c43edc599911e7411
 COMPONENT_ARCHIVE_URL=	http://www.vanheusden.com/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/httping
 
@@ -36,16 +36,24 @@
 include ../../make-rules/justmake.mk
 include ../../make-rules/ips.mk
 
-COMPONENT_BUILD_ARGS +=	CFLAGS="$(CFLAGS) -Dstrndup=strndup -DVERSION=\\\"$(COMPONENT_VERSION)\\\""
+CC +=		$(CC_BITS)
+
+# Override the values in the Makefile but get optimization level etc. from 
+# make-rules/shared-macros.mk.
+COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS) -DVERSION=\\\"$(COMPONENT_VERSION)\\\""
+COMPONENT_BUILD_ARGS += WFLAGS=""
 COMPONENT_BUILD_ARGS +=	LDFLAGS="$(LDFLAGS) -lsocket -lnsl -lssl -lcrypto"
 COMPONENT_BUILD_ENV += CC="$(CC)"
 
-# common targets
-build:		$(BUILD_32)
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
 
-install:	$(INSTALL_32)
+# common targets
+build:		$(BUILD_64)
 
-test:	$(NO_TESTS)
+install:	$(INSTALL_64)
+
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 

--- a/components/httping/httping.p5m	Fri Feb 22 16:32:48 2013 -0800
+++ b/components/httping/httping.p5m	Mon Feb 25 07:31:04 2013 -0800
@@ -18,32 +18,25 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-set name=pkg.fmri value=pkg:/diagnostic/httping@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/diagnostic/httping@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Ping for HTTP requests"
 set name=pkg.description \
-	value="Give httping an url, and it'll show you how long it takes to connect, send a request and retrieve the reply (only the headers)."
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
+    value="Give httping an url, and it'll show you how long it takes to connect, send a request and retrieve the reply (only the headers)."
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/118 value=PSARC/2013/044
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-	value=PSARC/2009/118
-
-license httping.license license='GPLv2'
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/doc
-dir path=/usr/share/doc/httping
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/httping
-file path=usr/share/doc/httping/license.txt
-file path=usr/share/doc/httping/license.OpenSSL
-file path=usr/share/doc/httping/readme.txt
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/httping.1
+license httping.license license=GPLv2

--- a/components/httping/patches/Makefile.patch	Fri Feb 22 16:32:48 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- httping-1.4.4/Makefile	Sat Jul 24 03:32:07 2010
-+++ httping-1.4.4/Makefile.new	Fri Jul 15 09:54:53 2011
-@@ -16,7 +16,7 @@
- 
- TARGET=httping
- 
--WFLAGS=-Wall -W
-+WFLAGS=
- OFLAGS=-O2
- CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
- 

--- a/components/httping/patches/httping.1.patch	Fri Feb 22 16:32:48 2013 -0800
+++ b/components/httping/patches/httping.1.patch	Mon Feb 25 07:31:04 2013 -0800
@@ -1,5 +1,8 @@
---- httping-1.4.4/httping.1	Sat Jul 24 03:32:07 2010
-+++ httping-1.4.4/httping.1.new	Fri Jul 15 09:55:46 2011
+Need to divide the man page synopsis into two lines otherwise it's truncated.
+Also remove a Linux specific comment.
+
+--- httping-1.5.7/httping.1.orig	2013-02-15 07:48:07.796654766 -0800
++++ httping-1.5.7/httping.1	2013-02-15 07:49:39.972784905 -0800
 @@ -11,7 +11,8 @@
  .BI "httping [" options "]
  .sp
@@ -10,3 +13,12 @@
  .SH DESCRIPTION
  The program
  .B httping
+@@ -104,7 +105,7 @@
+ Activate the basic authentication, Username follow the -U, Password the -P.
+ .TP
+ .B "\-F"
+-Attempt TCP Fast Open while trying to connect to a server (for Linux kernel 3.7.0 onwards)
++Attempt TCP Fast Open while trying to connect to a server.
+ .TP
+ .B "\-V"
+ Show the version and exit.