Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20555268 httping should be updated to version 2.4
authorRich Burridge <rich.burridge@oracle.com>
Mon, 02 Mar 2015 18:08:31 -0800
changeset 3890 9eec2b00040d
parent 3889 6d2b22b9de00
child 3891 d2dffb0b5ea6
20555268 httping should be updated to version 2.4
components/httping/Makefile file | annotate | diff | comparison | revisions
components/httping/httping.p5m file | annotate | diff | comparison | revisions
components/httping/patches/httping.1.patch file | annotate | diff | comparison | revisions 
--- a/components/httping/Makefile	Mon Mar 02 18:06:32 2015 -0800
+++ b/components/httping/Makefile	Mon Mar 02 18:08:31 2015 -0800
@@ -23,34 +23,30 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		httping
-COMPONENT_VERSION=	1.5.7
+COMPONENT_VERSION=	2.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.vanheusden.com/httping/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b0d3d3e9708b7395b0c47c1c1cfdd17613e631360eaffd1c43edc599911e7411
+    sha256:dab59f02b08bfbbc978c005bb16d2db6fe21e1fc841fde96af3d497ddfc82084
 COMPONENT_ARCHIVE_URL=	http://www.vanheusden.com/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/httping
 
-TPNO=			9238
+TPNO=			21552
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/justmake.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+COMPILER =	gcc
+
 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_ARGS +=	LDFLAGS="$(LDFLAGS) -lfftw3 -lssl -lcrypto -lresolv -lm"
 COMPONENT_BUILD_ENV += CC="$(CC)"
 
-# Enable ASLR for this component
 ASLR_MODE = $(ASLR_ENABLE)
 
-# common targets
 build:		$(BUILD_64)
 
 install:	$(INSTALL_64)
@@ -58,5 +54,8 @@
 test:		$(NO_TESTS)
 
 
+REQUIRED_PACKAGES += library/fftw-3
 REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
 REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/httping/httping.p5m	Mon Mar 02 18:06:32 2015 -0800
+++ b/components/httping/httping.p5m	Mon Mar 02 18:08:31 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -36,5 +36,6 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2009/118 value=PSARC/2013/044
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/httping
+file path=usr/share/locale/nl/LC_MESSAGES/httping.mo
 file path=usr/share/man/man1/httping.1
 license httping.license license=GPLv2
--- a/components/httping/patches/httping.1.patch	Mon Mar 02 18:06:32 2015 -0800
+++ b/components/httping/patches/httping.1.patch	Mon Mar 02 18:08:31 2015 -0800
@@ -1,24 +1,15 @@
-Need to divide the man page synopsis into two lines otherwise it's truncated.
-Also remove a Linux specific comment.
+Remove a Linux specific comment from the httping man page.
+
+This change will not be sent upstream.
 
---- 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
- options:
--.BI "[\-g url] [\-h hostname] [\-p portnumber] [\-x proxyhost:port] [\-c count] [\-i interval] [\-t timeout] [\-s] [\-G] [\-b] [\-L xferlimit] [\-X] [\-l] [\-z] [\-f] [\-m] [\-o rc,...] [\-e string] [\-I useragent string] [\-R referer string] [\-r] [\-n warn,crit] [\-N mode] [\-q] [\-V]"
-+.BI "[\-g url] [\-h hostname] [\-p portnumber] [\-x proxyhost:port] [\-c count] [\-i interval] [\-t timeout] [\-s] [\-G] [\-b] [\-L xferlimit] [\-X] [\-l] [\-z] [\-f] [\-m] [\-o rc,...] [\-e string]"
-+.BI "[\-I useragent string] [\-R referer string] [\-r] [\-n warn,crit] [\-N mode] [\-q] [\-V]"
- .SH DESCRIPTION
- The program
- .B httping
-@@ -104,7 +105,7 @@
- Activate the basic authentication, Username follow the -U, Password the -P.
+--- httping-2.4/httping.1.orig	2015-02-16 08:15:41.545818708 -0800
++++ httping-2.4/httping.1	2015-02-16 08:16:09.286228137 -0800
+@@ -49,7 +49,7 @@
+ Retrieve proxy settings from environment variables ('http_proxy' and 'https_proxy').
  .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 (for Linux, version 3.7 onwards of the kernel)   
 +Attempt TCP Fast Open while trying to connect to a server.
  .TP
- .B "\-V"
- Show the version and exit.
+ .B "\-f"
+ Flood ping: do not sit idle between each ping but ping as fast as the computer and network allow you to.
upstream/oracle/userland-gate