Changeset 30097


Ignore:
Timestamp:
2012-02-04T21:00:32+01:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.2] httping: merge r27857, r27985

Location:
branches/packages_10.03.2/net/httping
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/httping/Makefile

    r22392 r30097  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=httping 
    11 PKG_VERSION:=1.4.4 
     11PKG_VERSION:=1.5.2 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz 
    1515PKG_SOURCE_URL:=http://www.vanheusden.com/httping 
    16 PKG_MD5SUM:=e36bb30bd758c766d7260bdde6fe6450 
     16PKG_MD5SUM:=49f72b124afb8a60f152ec674a162ad6 
    1717 
     18PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) 
    1819PKG_INSTALL:=1 
    1920 
    2021include $(INCLUDE_DIR)/package.mk 
    2122 
    22 define Package/httping 
     23define Package/httping/Default 
    2324  SECTION:=net 
    2425  CATEGORY:=Network 
    25   DEPENDS:=+libopenssl 
    2626  TITLE:=Httping is like 'ping' but for http-requests 
    2727  URL:=http://www.vanheusden.com/httping/ 
    2828endef 
    2929 
    30 define Package/httping/description 
     30define Package/httping/Default/description 
    3131        Give it an url, and it'll show you how long it takes to connect, send a 
    3232        request and retrieve the reply (only the headers). Be aware that the 
     
    3434endef 
    3535 
     36define Package/httping 
     37  $(call Package/httping/Default) 
     38  DEPENDS+= +libopenssl 
     39  TITLE+= (with SSL support) 
     40  VARIANT:=ssl 
     41endef 
     42 
     43define Package/httping/description 
     44        $(call Package/httping/Default/description) 
     45        This package is built with SSL support. 
     46endef 
     47 
     48define Package/httping-nossl 
     49  $(call Package/httping/Default) 
     50  TITLE+= (without SSL support) 
     51  VARIANT:=nossl 
     52endef 
     53 
     54define Package/httping-nossl/description 
     55        $(call Package/httping/Default/description) 
     56        This package is built without SSL support. 
     57endef 
     58 
    3659MAKE_FLAGS += \ 
    37         CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ 
     60        CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" 
     61 
     62ifeq ($(BUILD_VARIANT),nossl) 
     63        MAKE_FLAGS += \ 
     64                SSL="no" \ 
     65                CFLAGS+="-DNO_SSL" 
     66endif 
    3867 
    3968define Package/httping/install 
     
    4271endef 
    4372 
     73Package/httping-nossl/install = $(Package/httping/install) 
     74 
    4475$(eval $(call BuildPackage,httping)) 
     76$(eval $(call BuildPackage,httping-nossl)) 
  • branches/packages_10.03.2/net/httping/patches/002-version.patch

    r22392 r30097  
    55 #include "error.h" 
    66  
    7 +#define VERSION "1.4.4" 
     7+#define VERSION "1.5.2" 
    88+ 
    99 static volatile int stop = 0; 
     
    1414 void version(void) 
    1515 { 
    16 -       fprintf(stderr, "HTTPing v" VERSION ", (C) 2003-2010 folkert@vanheusden.com\n"); 
    17 +       fprintf(stderr, "HTTPing v%s (C) 2003-2010 folkert@vanheusden.com\n", VERSION); 
     16-       fprintf(stderr, "HTTPing v" VERSION ", (C) 2003-2011 folkert@vanheusden.com\n"); 
     17+       fprintf(stderr, "HTTPing v%s (C) 2003-2011 folkert@vanheusden.com\n", VERSION); 
    1818 #ifndef NO_SSL 
    1919        fprintf(stderr, "SSL support included\n"); 
    2020 #endif 
    21 @@ -606,7 +608,7 @@ int main(int argc, char *argv[]) 
     21@@ -639,7 +641,7 @@ int main(int argc, char *argv[]) 
    2222        if (useragent) 
    2323                sprintf(&request[strlen(request)], "User-Agent: %s\r\n", useragent); 
Note: See TracChangeset for help on using the changeset viewer.