Update to 1.2.5

Fix build on systems that don't have strndup(3) (PR #36281)
1.2.5 showing the status code would garble the screen
1.2.4 fixed memory-leak in SSL code

5 files changed, 65 insertions, 6 deletions

diff --git a/net/httping/Makefile b/net/httping/Makefile
index f0cc2221109..9927b719027 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/07/01 15:56:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/18 20:30:00 adrianp Exp $
 #
 
-DISTNAME=		httping-1.2.3
+DISTNAME=		httping-1.2.5
 CATEGORIES=		net
 MASTER_SITES=		http://www.vanheusden.com/httping/
 EXTRACT_SUFX=		.tgz
@@ -10,8 +10,15 @@ MAINTAINER=		adrianp@NetBSD.org
 HOMEPAGE=		http://www.vanheusden.com/httping/
 COMMENT=		Like 'ping' but for http-requests
 
+.include "../../mk/bsd.prefs.mk"
+
 LDFLAGS.SunOS=		-lnsl -lsocket
 
+.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[123]*)) || ${OPSYS} == "Darwin"
+.else
+CFLAGS+=	-DHAVE_STRNDUP
+.endif
+
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/httping.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/httping ${PREFIX}/bin
diff --git a/net/httping/distinfo b/net/httping/distinfo
index c0f836df146..16dd19273bb 100644
--- a/net/httping/distinfo
+++ b/net/httping/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/07/01 15:56:08 adrianp Exp $
+$NetBSD: distinfo,v 1.4 2007/09/18 20:30:00 adrianp Exp $
 
-SHA1 (httping-1.2.3.tgz) = 06042be0f1e3d602e0483ecf621c24bec2ada24c
-RMD160 (httping-1.2.3.tgz) = 58df5bf96689cb4e16df88e6ac9da7ffff6c8779
-Size (httping-1.2.3.tgz) = 13082 bytes
+SHA1 (httping-1.2.5.tgz) = f1d1c4797d47c1c34d1132bdb4e42b131c859e6d
+RMD160 (httping-1.2.5.tgz) = 8e89fbe7308e4b1d3f4e87b7fae9b10edc273218
+Size (httping-1.2.5.tgz) = 13078 bytes
+SHA1 (patch-aa) = 398c2b9a4152f2b4aaad85fc5829ae3b8f85d7fa
+SHA1 (patch-ab) = 28f13ce32299c6dab791ae411e58567500834c04
+SHA1 (patch-ac) = 8840c6d810d6b6ed299d5ea09fc9ca5874ab0e26
diff --git a/net/httping/patches/patch-aa b/net/httping/patches/patch-aa
new file mode 100644
index 00000000000..86e82fb8839
--- /dev/null
+++ b/net/httping/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2007/09/18 20:30:00 adrianp Exp $
+
+--- Makefile.orig	2007-07-26 09:00:31.000000000 +0100
++++ Makefile
+@@ -14,16 +14,15 @@
+ 
+ include version
+ 
+-DEBUG=-g # -D_DEBUG
+-LDFLAGS+=-lssl -lcrypto $(DEBUG)
+-CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
++LDFLAGS+=-lssl -lcrypto
++CFLAGS+=-DVERSION=\"$(VERSION)\"
+ 
+ OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
+ 
+ all: httping
+ 
+ httping: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o httping
++	$(CC) -W $(OBJS) $(LDFLAGS) -o httping
+ 	#
+ 	# Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
+ 
diff --git a/net/httping/patches/patch-ab b/net/httping/patches/patch-ab
new file mode 100644
index 00000000000..f70f7bf606e
--- /dev/null
+++ b/net/httping/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/09/18 20:30:01 adrianp Exp $
+
+--- str.c.orig	2007-07-26 09:00:31.000000000 +0100
++++ str.c
+@@ -18,7 +18,7 @@
+ #include "mem.h"
+ #include "utils.h"
+ 
+-#ifndef strndup
++#ifndef HAVE_STRNDUP
+ char *strndup(char *in, int size)
+ {
+ 	char *out = mymalloc(size + 1, "strndup");
diff --git a/net/httping/patches/patch-ac b/net/httping/patches/patch-ac
new file mode 100644
index 00000000000..e720eec2f70
--- /dev/null
+++ b/net/httping/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2007/09/18 20:30:01 adrianp Exp $
+
+--- str.h.orig	2007-07-26 09:00:31.000000000 +0100
++++ str.h
+@@ -15,6 +15,6 @@
+ 
+ #include <string.h>
+ 
+-#ifndef strndup
++#ifndef HAVE_STRNDUP
+ char *strndup(char *in, int size);
+ #endif