Skip to content

Commit

Permalink
curl:
Browse files Browse the repository at this point in the history
 * bump version to [http://curl.haxx.se/changes.html#7_36_0 7.36.0]


git-svn-id: file:///var/svn/freetz/trunk@11911 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information
er13 committed Mar 29, 2014
1 parent 88da51e commit 0ed7812
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Latest changes:
* bird 1.4.0
* CCID 1.4.13
* cifs-utils 6.2
* curl 7.35.0
* curl 7.36.0
* cyassl 2.9.0
* dbus 1.6.18
* dnsmasq 2.68
Expand Down
2 changes: 1 addition & 1 deletion make/curl/Config.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
config FREETZ_PACKAGE_CURL
bool "Curl 7.35.0 (binary only)"
bool "Curl 7.36.0 (binary only)"
default n
select FREETZ_LIB_libcurl if ! FREETZ_PACKAGE_CURL_STATIC
help
Expand Down
4 changes: 2 additions & 2 deletions make/curl/curl.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$(call PKG_INIT_BIN, 7.35.0)
$(call PKG_INIT_BIN, 7.36.0)
$(PKG)_LIB_VERSION:=4.3.0
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.bz2
$(PKG)_SOURCE_MD5:=c18fbdd031adb0529ae09fce399f2d10
$(PKG)_SOURCE_MD5:=e6d1f9d1b59da5062109ffe14e0569a4
$(PKG)_SITE:=http://curl.haxx.se/download

$(PKG)_BINARY:=$($(PKG)_DIR)/src$(if $(FREETZ_PACKAGE_CURL_STATIC),,/.libs)/curl
Expand Down
2 changes: 1 addition & 1 deletion make/curl/patches/101-cross_compile_writable_argv.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- configure
+++ configure
@@ -20946,7 +20946,9 @@
@@ -20947,7 +20947,9 @@
$as_echo_n "checking if argv can be written to... " >&6; }
if test "$cross_compiling" = yes; then :

Expand Down
2 changes: 1 addition & 1 deletion make/curl/patches/102-binary_static.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- src/Makefile.in
+++ src/Makefile.in
@@ -210,7 +210,7 @@
@@ -211,7 +211,7 @@
curl_OBJECTS = $(am_curl_OBJECTS)
curl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
Expand Down
14 changes: 14 additions & 0 deletions make/curl/patches/103-no_manual_compile_fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- src/tool_operate.c
+++ src/tool_operate.c
@@ -1793,9 +1793,11 @@
/* Check if we were asked for the help */
if(res == PARAM_HELP_REQUESTED)
tool_help();
+#ifdef USE_MANUAL
/* Check if we were asked for the manual */
else if(res == PARAM_MANUAL_REQUESTED)
hugehelp();
+#endif
/* Check if we were asked for the version information */
else if(res == PARAM_VERSION_INFO_REQUESTED)
tool_version_info();
2 changes: 1 addition & 1 deletion make/curl/patches/130-CPPFLAGS_as_CFLAGS.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
;;
-rpath*)
xc_bad_var_cflags=yes
@@ -39314,13 +39317,16 @@
@@ -39320,13 +39323,16 @@
for xc_word in $CFLAGS; do
case "$xc_word" in
-D*)
Expand Down
4 changes: 2 additions & 2 deletions make/curl/patches/200-uclibc-cyassl-pthread.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- configure
+++ configure
@@ -12442,6 +12442,8 @@
@@ -12443,6 +12443,8 @@
;;
esac

Expand All @@ -9,7 +9,7 @@
ld_shlibs=yes

# On some targets, GNU ld is compatible enough with the native linker
@@ -23473,7 +23475,7 @@
@@ -23477,7 +23479,7 @@



Expand Down

0 comments on commit 0ed7812

Please sign in to comment.