httping: update to v1.4.0 (#6461)

SVN-Revision: 19072

diff --git a/net/httping/Makefile b/net/httping/Makefile
index f69530d7374b387d81f03d3cb30fb164749069d2..e7f272a112737d1c920bd39edecdea97cc9ea8de 100644 (file)
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=httping
-PKG_VERSION:=1.3.1
+PKG_VERSION:=1.4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.vanheusden.com/httping/
-PKG_MD5SUM:=fb742d577d3e7a8ea75cf97f7eb802f2
+PKG_MD5SUM:=d2bd46b12c6f2bcb5ec27bb44afd95b0
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,15 +33,12 @@ define Package/httping/description
        transmission across the network also takes time!
 endef
 
-define Build/Compile
-       $(call Build/Compile/Default, \
-               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-       )
-endef
+MAKE_FLAGS += \
+       CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 
 define Package/httping/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/httping $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/httping $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,httping))

diff --git a/net/httping/patches/001-extra_flags.patch b/net/httping/patches/001-extra_flags.patch
index 6f0a831dd84dca22924f7336002dd8d0c6a02f89..c259dc99034e9c7126f9ad3d55c4666fc1e3bb85 100644 (file)
--- a/net/httping/patches/001-extra_flags.patch
+++ b/net/httping/patches/001-extra_flags.patch
@@ -4,8 +4,8 @@
  
  WFLAGS=-Wall -W
  OFLAGS=-O2
--CFLAGS=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
-+CFLAGS=$(EXTRA_CFLAGS) $(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
+-CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
++CFLAGS+=$(EXTRA_CFLAGS) $(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
  
  PACKAGE=$(TARGET)-$(VERSION)
  PREFIX=/usr

diff --git a/net/httping/patches/002-version.patch b/net/httping/patches/002-version.patch
index 38600e90b5169d157c145fc609c22affe55527e8..b04ffc0f7ebfe99b88cc346454653c0a0bcec6d9 100644 (file)
--- a/net/httping/patches/002-version.patch
+++ b/net/httping/patches/002-version.patch
@@ -4,12 +4,12 @@
  #include "utils.h"
  #include "error.h"
  
-+#define VERSION "1.3.1"
++#define VERSION "1.4.0"
 +
  static volatile int stop = 0;
  
  int quiet = 0;
-@@ -50,7 +52,7 @@ char last_error[ERROR_BUFFER_SIZE];
+@@ -51,7 +53,7 @@ char last_error[ERROR_BUFFER_SIZE];
  
  void version(void)
  {
@@ -18,7 +18,7 @@
  #ifndef NO_SSL
        fprintf(stderr, "SSL support included\n");
  #endif
-@@ -449,7 +451,7 @@ int main(int argc, char *argv[])
+@@ -524,7 +526,7 @@ int main(int argc, char *argv[])
        if (useragent)
                sprintf(&request[strlen(request)], "User-Agent: %s\r\n", useragent);
        else