[pkgsrc/trunk]: pkgsrc/net/httping Update to 1.2.5

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52e117e867ff
branches:  trunk
changeset: 533422:52e117e867ff
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Tue Sep 18 20:30:00 2007 +0000

description:
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

diffstat:

 net/httping/Makefile         |  11 +++++++++--
 net/httping/distinfo         |  11 +++++++----
 net/httping/patches/patch-aa |  24 ++++++++++++++++++++++++
 net/httping/patches/patch-ab |  13 +++++++++++++
 net/httping/patches/patch-ac |  12 ++++++++++++
 5 files changed, 65 insertions(+), 6 deletions(-)

diffs (106 lines):

diff -r 55d17122e308 -r 52e117e867ff net/httping/Makefile
--- a/net/httping/Makefile      Tue Sep 18 20:22:13 2007 +0000
+++ b/net/httping/Makefile      Tue Sep 18 20:30:00 2007 +0000
@@ -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 @@
 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 -r 55d17122e308 -r 52e117e867ff net/httping/distinfo
--- a/net/httping/distinfo      Tue Sep 18 20:22:13 2007 +0000
+++ b/net/httping/distinfo      Tue Sep 18 20:30:00 2007 +0000
@@ -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 -r 55d17122e308 -r 52e117e867ff net/httping/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/httping/patches/patch-aa      Tue Sep 18 20:30:00 2007 +0000
@@ -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 -r 55d17122e308 -r 52e117e867ff net/httping/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/httping/patches/patch-ab      Tue Sep 18 20:30:00 2007 +0000
@@ -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 -r 55d17122e308 -r 52e117e867ff net/httping/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/httping/patches/patch-ac      Tue Sep 18 20:30:00 2007 +0000
@@ -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