summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/curl/Makefile12
-rw-r--r--package/curl/patches/patch-configure25
-rw-r--r--package/curl/patches/patch-ltmain_sh6
3 files changed, 9 insertions, 34 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile
index a39a93d..c736621 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= curl
-PKG_VERSION:= 7.24.0
+PKG_VERSION:= 7.28.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= b93420f80a2baaa61a0f45214eddc2ba
+PKG_MD5SUM:= cbdc0a79bdf6e657dd387c3d88d802e3
PKG_DESCR:= a client-side URL transfer tool
PKG_SECTION:= www
PKG_DEPENDS:= libcurl
@@ -24,7 +24,7 @@ PKGSC_LIBCURL_DEV:= devel
PKG_FLAVOURS_CURL:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
-PKG_CHOICES_CURL:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
+PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
PKGCD_WITHOUT_SSL:= use no SSL
PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp
@@ -39,15 +39,15 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL}))
$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV}))
-ifeq (${ADK_PACKAGE_CURL_WITHOUT_SSL},y)
+ifeq (${ADK_PACKAGE_LIBCURL_WITHOUT_SSL},y)
CONFIGURE_ARGS+= --without-ssl \
--without-gnutls
endif
-ifeq (${ADK_PACKAGE_CURL_WITH_OPENSSL},y)
+ifeq (${ADK_PACKAGE_LIBCURL_WITH_OPENSSL},y)
CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \
--without-gnutls
endif
-ifeq (${ADK_PACKAGE_CURL_WITH_GNUTLS},y)
+ifeq (${ADK_PACKAGE_LIBCURL_WITH_GNUTLS},y)
CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \
--without-ssl
endif
diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure
deleted file mode 100644
index b930df6..0000000
--- a/package/curl/patches/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
---- curl-7.22.0.orig/configure 2011-09-12 22:22:04.000000000 +0200
-+++ curl-7.22.0/configure 2011-10-15 03:05:05.000000000 +0200
-@@ -20641,14 +20641,6 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
-- if test "$OPENSSL_ENABLED" = "1"; then
-- if test -n "$LIB_OPENSSL"; then
--
-- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
-- export LD_LIBRARY_PATH
-- { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
--$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
-- fi
-
- #
-
-@@ -21230,7 +21222,6 @@ $as_echo "$as_me: WARNING: $tst_warns" >
-
- fi
-
--fi
-
-
-
diff --git a/package/curl/patches/patch-ltmain_sh b/package/curl/patches/patch-ltmain_sh
index 5b2293c..07db5c6 100644
--- a/package/curl/patches/patch-ltmain_sh
+++ b/package/curl/patches/patch-ltmain_sh
@@ -1,6 +1,6 @@
---- curl-7.22.0.orig/ltmain.sh 2011-09-12 22:21:51.000000000 +0200
-+++ curl-7.22.0/ltmain.sh 2011-10-15 03:03:37.000000000 +0200
-@@ -5840,7 +5840,7 @@ func_mode_link ()
+--- curl-7.28.0.orig/ltmain.sh 2012-08-16 19:20:36.000000000 +0200
++++ curl-7.28.0/ltmain.sh 2012-10-14 14:00:11.000000000 +0200
+@@ -5853,7 +5853,7 @@ func_mode_link ()
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \