From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 20 Sep 2009 10:55:03 +0000 (+0000)
Subject: [package] update httping to 1.3.1 (#5800)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=2430337ce26bf0ce9d54b8d214106a6b794c4aa9

[package] update httping to 1.3.1 (#5800)

SVN-Revision: 17621
---

diff --git a/net/httping/Makefile b/net/httping/Makefile
index d05ef1c8d1..f69530d737 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=httping
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.3.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.vanheusden.com/httping/
-PKG_MD5SUM:=41c912a9ecc904e51d7260053fc2195c
+PKG_MD5SUM:=fb742d577d3e7a8ea75cf97f7eb802f2
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/httping/patches/001-extra_flags.patch b/net/httping/patches/001-extra_flags.patch
index 6d30ce35a3..6f0a831dd8 100644
--- a/net/httping/patches/001-extra_flags.patch
+++ b/net/httping/patches/001-extra_flags.patch
@@ -1,13 +1,20 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -15,8 +15,8 @@
- include version
+@@ -18,7 +18,7 @@ TARGET=httping
  
- DEBUG=-g # -D_DEBUG
--LDFLAGS+=-lssl -lcrypto $(DEBUG)
--CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
-+LDFLAGS+=$(EXTRA_LDFLAGS) -lssl -lcrypto $(DEBUG)
-+CFLAGS+=$(EXTRA_CFLAGS) -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
+ WFLAGS=-Wall -W
+ OFLAGS=-O2
+-CFLAGS=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
++CFLAGS=$(EXTRA_CFLAGS) $(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
  
- OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
+ PACKAGE=$(TARGET)-$(VERSION)
+ PREFIX=/usr
+@@ -47,7 +47,7 @@ ifeq ($(SSL),no)
+ CFLAGS+=-DNO_SSL
+ else
+ OBJS+=mssl.o
+-LDFLAGS+=-lssl -lcrypto
++LDFLAGS+=$(EXTRA_LDFLAGS) -lssl -lcrypto
+ endif
  
+ ifeq ($(DEBUG),yes)
diff --git a/net/httping/patches/002-version.patch b/net/httping/patches/002-version.patch
index fad6c2603f..38600e90b5 100644
--- a/net/httping/patches/002-version.patch
+++ b/net/httping/patches/002-version.patch
@@ -4,7 +4,7 @@
  #include "utils.h"
  #include "error.h"
  
-+#define VERSION "1.3.0"
++#define VERSION "1.3.1"
 +
  static volatile int stop = 0;
  
@@ -13,12 +13,12 @@
  
  void version(void)
  {
--	fprintf(stderr, "HTTPing v" VERSION ", (C) 2003-2008 folkert@vanheusden.com\n");
-+	fprintf(stderr, "HTTPing v%s (C) 2003-2008 folkert@vanheusden.com\n", VERSION);
+-	fprintf(stderr, "HTTPing v" VERSION ", (C) 2003-2009 folkert@vanheusden.com\n");
++	fprintf(stderr, "HTTPing v%s (C) 2003-2009 folkert@vanheusden.com\n", VERSION);
  #ifndef NO_SSL
  	fprintf(stderr, "SSL support included\n");
  #endif
-@@ -444,7 +446,7 @@ int main(int argc, char *argv[])
+@@ -449,7 +451,7 @@ int main(int argc, char *argv[])
  	if (useragent)
  		sprintf(&request[strlen(request)], "User-Agent: %s\r\n", useragent);
  	else