[Armadeus-commitlog] SF.net SVN: armadeus:[994] trunk
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[994] trunk
|
From: <jo...@us...> - 2009-01-05 23:56:32
|
Revision: 994
http://armadeus.svn.sourceforge.net/armadeus/?rev=994&view=rev
Author: jorasse
Date: 2009-01-05 23:56:30 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
[buildroot] upgrade curl to buildroot libcurl
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
Added Paths:
-----------
trunk/buildroot/package/libcurl/
trunk/buildroot/package/libcurl/Config.in
trunk/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
trunk/buildroot/package/libcurl/libcurl.mk
trunk/patches/068-buildroot_upgrade_to_libcurl.diff
Added: trunk/buildroot/package/libcurl/Config.in
===================================================================
--- trunk/buildroot/package/libcurl/Config.in (rev 0)
+++ trunk/buildroot/package/libcurl/Config.in 2009-01-05 23:56:30 UTC (rev 994)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBCURL
+ bool "libcurl"
+ help
+ cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
+ and Dict servers, using any of the supported protocols.
+
+ http://curl.haxx.nu/
+
+config BR2_PACKAGE_CURL
+ bool "curl binary"
+ depends on BR2_PACKAGE_LIBCURL
+ help
+ Install curl binary as well
Added: trunk/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
===================================================================
--- trunk/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch (rev 0)
+++ trunk/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch 2009-01-05 23:56:30 UTC (rev 994)
@@ -0,0 +1,25 @@
+ssluse.c: fix build breakage with --with-ssl --disable-verbose
+
+Revision 1.206 of ssluse.c removed the prefix argument to asn1_output,
+but it is still referenced in the CURL_DISABLE_VERBOSE_STRINGS case.
+
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+ lib/ssluse.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+Index: curl-7.19.2/lib/ssluse.c
+===================================================================
+--- curl-7.19.2.orig/lib/ssluse.c
++++ curl-7.19.2/lib/ssluse.c
+@@ -923,10 +923,6 @@
+ int i;
+ int year=0,month=0,day=0,hour=0,minute=0,second=0;
+
+-#ifdef CURL_DISABLE_VERBOSE_STRINGS
+- (void)prefix;
+-#endif
+-
+ i=tm->length;
+ asn1_string=(const char *)tm->data;
+
Added: trunk/buildroot/package/libcurl/libcurl.mk
===================================================================
--- trunk/buildroot/package/libcurl/libcurl.mk (rev 0)
+++ trunk/buildroot/package/libcurl/libcurl.mk 2009-01-05 23:56:30 UTC (rev 994)
@@ -0,0 +1,29 @@
+#############################################################
+#
+# libcurl
+#
+#############################################################
+LIBCURL_VERSION = 7.19.2
+LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
+LIBCURL_SITE = http://curl.haxx.se/download/
+LIBCURL_INSTALL_STAGING = YES
+LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
+ $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBCURL_DEPENDENCIES += openssl
+LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
+LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
+endif
+
+$(eval $(call AUTOTARGETS,package,libcurl))
+
+$(LIBCURL_HOOK_POST_INSTALL):
+ rm -rf $(TARGET_DIR)/usr/bin/curl-config \
+ $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
+ touch $@
+
+curl: libcurl
+curl-clean: libcurl-clean
+curl-dirclean: libcurl-dirclean
+curl-source: libcurl-source
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-05 22:03:04 UTC (rev 993)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-01-05 23:56:30 UTC (rev 994)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Sat Jan 3 20:06:58 2009
+# Tue Jan 6 00:45:51 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -370,8 +370,6 @@
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_CURL is not set
-# BR2_PACKAGE_LIBCURL is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_ETHTOOL is not set
@@ -389,6 +387,7 @@
# BR2_PACKAGE_L2TP is not set
# BR2_PACKAGE_LIBCGI is not set
# BR2_PACKAGE_LIBCGICC is not set
+# BR2_PACKAGE_LIBCURL is not set
# BR2_PACKAGE_LIBEXOSIP2 is not set
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBPCAP is not set
Added: trunk/patches/068-buildroot_upgrade_to_libcurl.diff
===================================================================
--- trunk/patches/068-buildroot_upgrade_to_libcurl.diff (rev 0)
+++ trunk/patches/068-buildroot_upgrade_to_libcurl.diff 2009-01-05 23:56:30 UTC (rev 994)
@@ -0,0 +1,275 @@
+--- buildroot/package/Config.in.ref 2009-01-05 22:57:30.000000000 +0100
++++ buildroot/package/Config.in 2009-01-06 00:11:31.000000000 +0100
+@@ -145,7 +145,6 @@
+ source "package/boa/Config.in"
+ source "package/bind/Config.in"
+ source "package/bridge-utils/Config.in"
+-source "package/curl/Config.in"
+ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+ source "package/dhcp/Config.in"
+ endif
+@@ -164,6 +163,7 @@
+ source "package/l2tp/Config.in"
+ source "package/libcgi/Config.in"
+ source "package/libcgicc/Config.in"
++source "package/libcurl/Config.in"
+ source "package/libeXosip2/Config.in"
+ source "package/libosip2/Config.in"
+ source "package/libpcap/Config.in"
+diff -urN buildroot/package/curl.ori/Config.in buildroot/package/curl/Config.in
+--- buildroot/package/curl.ori/Config.in 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/Config.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,15 +0,0 @@
+-config BR2_PACKAGE_CURL
+- bool "curl"
+- help
+- cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
+- and Dict servers, using any of the supported protocols.
+-
+- http://curl.haxx.nu/
+-
+-config BR2_PACKAGE_LIBCURL
+- bool "libcurl"
+- help
+- cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
+- and Dict servers, using any of the supported protocols.
+-
+- http://curl.haxx.nu/
+diff -urN buildroot/package/curl.ori/curl-7.10.4-path.patch buildroot/package/curl/curl-7.10.4-path.patch
+--- buildroot/package/curl.ori/curl-7.10.4-path.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.10.4-path.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,13 +0,0 @@
+---- curl-7.10.4/lib/Makefile.am
+-+++ curl-7.10.4/lib/Makefile.am
+-@@ -78,8 +78,8 @@
+-
+- install-data-hook:
+- @if test -n "@CURL_CA_BUNDLE@"; then \
+-- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
+-- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
+-+ $(mkinstalldirs) `dirname $(prefix)/../@CURL_CA_BUNDLE@`; \
+-+ @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(prefix)/../@CURL_CA_BUNDLE@; \
+- fi
+-
+- # this hook is mainly for non-unix systems to build even if configure
+diff -urN buildroot/package/curl.ori/curl-7.12.0-nousr.patch buildroot/package/curl/curl-7.12.0-nousr.patch
+--- buildroot/package/curl.ori/curl-7.12.0-nousr.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.12.0-nousr.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+---- curl-7.12.0/configure.ac.orig 2004-05-25 23:43:39.000000000 +0200
+-+++ curl-7.12.0/configure.ac 2004-07-26 15:12:03.029071072 +0200
+-@@ -742,5 +742,5 @@
+- dnl check the given spot right away!
+- EXTRA_SSL=$OPT_SSL
+-- LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
+-+ #LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
+- CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+- ;;
+-@@ -750,5 +750,5 @@
+- HAVECRYPTO="yes"
+- ],[
+-- LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib$libsuff"
+-+ LDFLAGS="$CLEANLDFLAGS"
+- CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+- AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
+diff -urN buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch buildroot/package/curl/curl-7.13.1-2005-3185.patch
+--- buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.13.1-2005-3185.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+---- curl-7.13.1/lib/http_ntlm.c.2005-3185 2005-02-22 13:10:30.000000000 +0100
+-+++ curl-7.13.1/lib/http_ntlm.c 2005-10-19 15:18:42.165859528 +0200
+-@@ -534,6 +534,13 @@
+- size=64;
+- ntlmbuf[62]=ntlmbuf[63]=0;
+-
+-+ /* Make sure that the user and domain strings fit in the target buffer
+-+ before we copy them there. */
+-+ if(size + userlen + domlen >= sizeof(ntlmbuf)) {
+-+ failf(conn->data, "user + domain name too big");
+-+ return CURLE_OUT_OF_MEMORY;
+-+ }
+-+
+- memcpy(&ntlmbuf[size], domain, domlen);
+- size += domlen;
+-
+diff -urN buildroot/package/curl.ori/curl-7.13.1-auth.patch buildroot/package/curl/curl-7.13.1-auth.patch
+--- buildroot/package/curl.ori/curl-7.13.1-auth.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.13.1-auth.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,48 +0,0 @@
+---- curl-7.13.1/lib/http.c.pom 2005-02-19 00:53:07.000000000 +0100
+-+++ curl-7.13.1/lib/http.c 2005-04-27 11:48:40.000000000 +0200
+-@@ -455,6 +455,7 @@
+- /* To prevent the user+password to get sent to other than the original
+- host due to a location-follow, we do some weirdo checks here */
+- if(!data->state.this_is_a_follow ||
+-+ conn->bits.netrc ||
+- !data->state.first_host ||
+- curl_strequal(data->state.first_host, conn->host.name) ||
+- data->set.http_disable_hostname_check_before_authentication) {
+---- curl-7.13.1/lib/url.c.pom 2005-02-09 23:47:57.000000000 +0100
+-+++ curl-7.13.1/lib/url.c 2005-04-27 11:45:59.000000000 +0200
+-@@ -3131,15 +3131,23 @@
+- user, passwd);
+- }
+-
+-+ conn->bits.netrc = FALSE;
+- if (data->set.use_netrc != CURL_NETRC_IGNORED) {
+- if(Curl_parsenetrc(conn->host.name,
+- user, passwd,
+- data->set.netrc_file)) {
+-- infof(data, "Couldn't find host %s in the " DOT_CHAR "netrc file, using defaults\n",
+-+ infof(data, "Couldn't find host %s in the " DOT_CHAR
+-+ "netrc file, using defaults\n",
+- conn->host.name);
+- }
+-- else
+-+ else {
+-+ /* set bits.netrc TRUE to remember that we got the name from a .netrc
+-+ file, so that it is safe to use even if we followed a Location: to a
+-+ different host or similar. */
+-+ conn->bits.netrc = TRUE;
+-+
+- conn->bits.user_passwd = 1; /* enable user+password */
+-+ }
+- }
+-
+- /* If our protocol needs a password and we have none, use the defaults */
+---- curl-7.13.1/lib/urldata.h.pom 2005-02-09 14:06:56.000000000 +0100
+-+++ curl-7.13.1/lib/urldata.h 2005-04-27 11:50:31.000000000 +0200
+-@@ -388,6 +388,7 @@
+- bool ftp_use_lprt; /* As set with CURLOPT_FTP_USE_EPRT, but if we find out
+- LPRT doesn't work we disable it for the forthcoming
+- requests */
+-+ bool netrc; /* name+password provided by netrc */
+- };
+-
+- struct hostname {
+diff -urN buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch
+--- buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,23 +0,0 @@
+---- curl-7.13.1/lib/url.c.cve-2005-4077 2005-12-08 13:08:03.000000000 +0100
+-+++ curl-7.13.1/lib/url.c 2005-12-08 13:15:56.565790336 +0100
+-@@ -2313,12 +2313,18 @@
+- if(urllen < LEAST_PATH_ALLOC)
+- urllen=LEAST_PATH_ALLOC;
+-
+-- conn->pathbuffer=(char *)malloc(urllen);
+-+ /*
+-+ * We malloc() the buffers below urllen+2 to make room for to possibilities:
+-+ * 1 - an extra terminating zero
+-+ * 2 - an extra slash (in case a syntax like "www.host.com?moo" is used)
+-+ */
+-+
+-+ conn->pathbuffer=(char *)malloc(urllen+3);
+- if(NULL == conn->pathbuffer)
+- return CURLE_OUT_OF_MEMORY; /* really bad error */
+- conn->path = conn->pathbuffer;
+-
+-- conn->host.rawalloc=(char *)malloc(urllen);
+-+ conn->host.rawalloc=(char *)malloc(urllen+3);
+- if(NULL == conn->host.rawalloc)
+- return CURLE_OUT_OF_MEMORY;
+- conn->host.name = conn->host.rawalloc;
+diff -urN buildroot/package/curl.ori/curl.mk buildroot/package/curl/curl.mk
+--- buildroot/package/curl.ori/curl.mk 2008-11-03 09:15:13.000000000 +0100
++++ buildroot/package/curl/curl.mk 1970-01-01 01:00:00.000000000 +0100
+@@ -1,97 +0,0 @@
+-#############################################################
+-#
+-# curl
+-#
+-#############################################################
+-CURL_VERSION:=7.17.1
+-LIBCURL_VERSION:=4.0.1
+-CURL_SOURCE:=curl-$(CURL_VERSION).tar.bz2
+-CURL_SITE:=http://curl.haxx.se/download/
+-CURL_CAT:=$(BZCAT)
+-CURL_DIR:=$(BUILD_DIR)/curl-$(CURL_VERSION)
+-CURL_BINARY:=curl
+-CURL_DESTDIR:=$(STAGING_DIR)/usr
+-
+-$(DL_DIR)/$(CURL_SOURCE):
+- $(WGET) -P $(DL_DIR) $(CURL_SITE)/$(CURL_SOURCE)
+-
+-curl-source: $(DL_DIR)/$(CURL_SOURCE)
+-
+-$(CURL_DIR)/.unpacked: $(DL_DIR)/$(CURL_SOURCE)
+- $(CURL_CAT) $(DL_DIR)/$(CURL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+- toolchain/patch-kernel.sh $(CURL_DIR) package/curl/ curl-$(CURL_VERSION)-\*.patch*
+- touch $(CURL_DIR)/.unpacked
+-
+-$(CURL_DIR)/.configured: $(CURL_DIR)/.unpacked
+- (cd $(CURL_DIR); rm -rf config.cache; \
+- aclocal; \
+- libtoolize --force; \
+- ./reconf; )
+- $(CONFIG_UPDATE) $(CURL_DIR)
+- (cd $(CURL_DIR); \
+- $(TARGET_CONFIGURE_OPTS) \
+- $(TARGET_CONFIGURE_ARGS) \
+- ./configure \
+- --target=$(GNU_TARGET_NAME) \
+- --host=$(GNU_TARGET_NAME) \
+- --build=$(GNU_HOST_NAME) \
+- --prefix=/usr \
+- --exec-prefix=/usr \
+- --bindir=/usr/bin \
+- --sbindir=/usr/sbin \
+- --libdir=/usr/lib \
+- --libexecdir=/usr/lib \
+- --sysconfdir=/etc \
+- --datadir=/usr/share \
+- --localstatedir=/var \
+- --includedir=/usr/include \
+- --mandir=/usr/share/man \
+- --infodir=/usr/share/info \
+- )
+- touch $(CURL_DIR)/.configured
+-
+-$(CURL_DIR)/src/.libs/$(CURL_BINARY): $(CURL_DIR)/.configured
+- $(MAKE) -C $(CURL_DIR)
+-
+-$(CURL_DESTDIR)/bin/$(CURL_BINARY): $(CURL_DIR)/src/.libs/$(CURL_BINARY)
+- -mkdir $(CURL_DESTDIR)/bin
+- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(CURL_DIR) install
+- $(SED) "s,^libdir=.*,libdir=\'$(CURL_DESTDIR)/lib\',g" $(CURL_DESTDIR)/lib/libcurl.la
+- touch $(CURL_DESTDIR)/bin/$(CURL_BINARY)
+-
+-$(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION): $(CURL_DESTDIR)/bin/$(CURL_BINARY)
+- -mkdir $(TARGET_DIR)/usr/lib
+- -mkdir $(TARGET_DIR)/usr/bin
+- cp -a $(CURL_DESTDIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
+-
+-$(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
+- cp -a $(CURL_DESTDIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
+-
+-curl: uclibc $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
+-
+-libcurl: $(CURL_DESTDIR)/bin/$(CURL_BINARY)
+-
+-curl-clean:
+- rm -f $(TARGET_DIR)/usr/lib/libcurl.so*
+- rm -f $(TARGET_DIR)/usr/bin/curl
+- rm -f $(CURL_DESTDIR)/bin/curl*
+- rm -f $(CURL_DESTDIR)/lib/libcurl.so*
+- rm -rf $(CURL_DESTDIR)/include/curl
+- -$(MAKE) -C $(CURL_DIR) clean
+-
+-curl-dirclean:
+- rm -rf $(CURL_DIR)
+-
+-#############################################################
+-#
+-# Toplevel Makefile options
+-#
+-#############################################################
+-ifeq ($(strip $(BR2_PACKAGE_CURL)),y)
+-TARGETS+=curl
+-endif
+-ifeq ($(strip $(BR2_PACKAGE_LIBCURL)),y)
+-TARGETS+=libcurl
+-endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
