From 1f92831170d5be9cb0511f6f9360d3c2daf3d24c Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Mon, 7 May 2007 03:58:30 +0000 Subject: Add new packages. --- package/curl/Config.in | 17 ++++++ package/curl/curl-7.10.4-path.patch | 13 +++++ package/curl/curl-7.12.0-nousr.patch | 16 ++++++ package/curl/curl-7.13.1-2005-3185.patch | 16 ++++++ package/curl/curl-7.13.1-auth.patch | 48 +++++++++++++++++ package/curl/curl-7.13.1-cve-2005-4077.patch | 23 ++++++++ package/curl/curl.mk | 81 ++++++++++++++++++++++++++++ 7 files changed, 214 insertions(+) create mode 100644 package/curl/Config.in create mode 100644 package/curl/curl-7.10.4-path.patch create mode 100644 package/curl/curl-7.12.0-nousr.patch create mode 100644 package/curl/curl-7.13.1-2005-3185.patch create mode 100644 package/curl/curl-7.13.1-auth.patch create mode 100644 package/curl/curl-7.13.1-cve-2005-4077.patch create mode 100644 package/curl/curl.mk (limited to 'package/curl') diff --git a/package/curl/Config.in b/package/curl/Config.in new file mode 100644 index 000000000..409053fa3 --- /dev/null +++ b/package/curl/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_CURL + bool "curl" + default n + 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" + default n + 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 --git a/package/curl/curl-7.10.4-path.patch b/package/curl/curl-7.10.4-path.patch new file mode 100644 index 000000000..a972618eb --- /dev/null +++ b/package/curl/curl-7.10.4-path.patch @@ -0,0 +1,13 @@ +--- 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 --git a/package/curl/curl-7.12.0-nousr.patch b/package/curl/curl-7.12.0-nousr.patch new file mode 100644 index 000000000..ea0e7d0b6 --- /dev/null +++ b/package/curl/curl-7.12.0-nousr.patch @@ -0,0 +1,16 @@ +--- 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 --git a/package/curl/curl-7.13.1-2005-3185.patch b/package/curl/curl-7.13.1-2005-3185.patch new file mode 100644 index 000000000..1df6dcee5 --- /dev/null +++ b/package/curl/curl-7.13.1-2005-3185.patch @@ -0,0 +1,16 @@ +--- 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 --git a/package/curl/curl-7.13.1-auth.patch b/package/curl/curl-7.13.1-auth.patch new file mode 100644 index 000000000..1488e83f2 --- /dev/null +++ b/package/curl/curl-7.13.1-auth.patch @@ -0,0 +1,48 @@ +--- 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 --git a/package/curl/curl-7.13.1-cve-2005-4077.patch b/package/curl/curl-7.13.1-cve-2005-4077.patch new file mode 100644 index 000000000..8960ea79a --- /dev/null +++ b/package/curl/curl-7.13.1-cve-2005-4077.patch @@ -0,0 +1,23 @@ +--- 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 --git a/package/curl/curl.mk b/package/curl/curl.mk new file mode 100644 index 000000000..05cc2fb50 --- /dev/null +++ b/package/curl/curl.mk @@ -0,0 +1,81 @@ +############################################################# +# +# curl +# +############################################################# +CURL_VERSION:=7.13.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 + +$(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/ \*.patch* + touch $(CURL_DIR)/.unpacked + +$(CURL_DIR)/.configured: $(CURL_DIR)/.unpacked + (cd $(CURL_DIR); rm -rf config.cache; \ + aclocal; \ + libtoolize --force; \ + ./reconf; \ + $(TARGET_CONFIGURE_OPTS) \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=$(STAGING_DIR) \ + ); + touch $(CURL_DIR)/.configured + +$(CURL_DIR)/src/.libs/$(CURL_BINARY): $(CURL_DIR)/.configured + $(MAKE) -C $(CURL_DIR) + +$(STAGING_DIR)/bin/$(CURL_BINARY): $(CURL_DIR)/src/.libs/$(CURL_BINARY) + -mkdir $(STAGING_DIR)/bin + $(MAKE) prefix=$(STAGING_DIR) -C $(CURL_DIR) install + -rm -rf $(STAGING_DIR)/man + touch $(STAGING_DIR)/bin/$(CURL_BINARY) + +$(TARGET_DIR)/usr/lib/libcurl.so.3.0.0: $(STAGING_DIR)/bin/$(CURL_BINARY) + -mkdir $(TARGET_DIR)/usr/lib + -mkdir $(TARGET_DIR)/usr/bin + cp -a $(STAGING_DIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib + $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0 + +$(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0 + cp -a $(STAGING_DIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin + $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/$(CURL_BINARY) + +curl: uclibc $(TARGET_DIR)/usr/bin/$(CURL_BINARY) + +libcurl: $(STAGING_DIR)/bin/$(CURL_BINARY) + +curl-clean: + rm -f $(TARGET_DIR)/usr/lib/libcurl.so* + rm -f $(TARGET_DIR)/usr/bin/curl + rm -f $(STAGING_DIR)/bin/curl* + rm -f $(STAGING_DIR)/lib/libcurl.so* + rm -rf $(STAGING_DIR)/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 -- cgit v1.2.3