Commit 1f928311 authored by "Steven J. Hill"'s avatar "Steven J. Hill"
Browse files

Add new packages.

parent 0a41ba39
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ source "package/mpatrol/Config.in"
source "package/pkgconfig/Config.in"
source "package/readline/Config.in"
source "package/valgrind/Config.in"
source "package/xerces/Config.in"

comment "Other stuff"
source "package/at/Config.in"
@@ -65,7 +66,9 @@ endif
source "package/libelf/Config.in"
source "package/libevent/Config.in"
source "package/libfloat/Config.in"
source "package/liblockfile/Config.in"
source "package/libsysfs/Config.in"
source "package/lockfile-progs/Config.in"
source "package/lsof/Config.in"
source "package/ltp-testsuite/Config.in"
source "package/ltrace/Config.in"
@@ -120,6 +123,7 @@ source "package/avahi/Config.in"
source "package/boa/Config.in"
source "package/bind/Config.in"
source "package/bridge/Config.in"
source "package/curl/Config.in"
if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
source "package/dhcp/Config.in"
endif

package/curl/Config.in

0 → 100644
+17 −0
Original line number Diff line number Diff line
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/
+13 −0
Original line number Diff line number Diff line
--- 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
+16 −0
Original line number Diff line number Diff line
--- 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,[
+16 −0
Original line number Diff line number Diff line
--- 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;
 
Loading