diff options
Diffstat (limited to 'package/opkg/patches')
-rw-r--r-- | package/opkg/patches/001-use-wget | 77 | ||||
-rw-r--r-- | package/opkg/patches/002-fix-autogen | 8 |
2 files changed, 85 insertions, 0 deletions
diff --git a/package/opkg/patches/001-use-wget b/package/opkg/patches/001-use-wget new file mode 100644 index 0000000000..a8ec7c518a --- /dev/null +++ b/package/opkg/patches/001-use-wget @@ -0,0 +1,77 @@ +Index: opkg-4561/libopkg/opkg_download.c +=================================================================== +--- opkg-4561/libopkg/opkg_download.c (revision 4480) ++++ opkg-4561/libopkg/opkg_download.c (working copy) +@@ -17,7 +17,9 @@ + General Public License for more details. + */ + #include "config.h" ++#ifdef HAVE_CURL + #include <curl/curl.h> ++#endif + #ifdef HAVE_GPGME + #include <gpgme.h> + #endif +@@ -74,6 +76,7 @@ + setenv("no_proxy", conf->no_proxy, 1); + } + ++#ifdef HAVE_CURL + CURL *curl; + CURLcode res; + FILE * file = fopen (tmp_file_location, "w"); +@@ -119,6 +122,31 @@ + free(src_basec); + return -1; + } ++#else /* if wget is selected */ ++ char *cmd; ++ /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */ ++ sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s -P %s %s", ++ (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "", ++ conf->proxy_user ? "--proxy-user=" : "", ++ conf->proxy_user ? conf->proxy_user : "", ++ conf->proxy_passwd ? "--proxy-passwd=" : "", ++ conf->proxy_passwd ? conf->proxy_passwd : "", ++ conf->tmp_dir, ++ src); ++ err = xsystem(cmd); ++ if (err) { ++ if (err != -1) { ++ opkg_message(conf,OPKG_ERROR, "%s: ERROR: Command failed with return value %d: `%s'\n", ++ __FUNCTION__, err, cmd); ++ } ++ unlink(tmp_file_location); ++ free(tmp_file_location); ++ free(src_basec); ++ free(cmd); ++ return EINVAL; ++ } ++ free(cmd); ++#endif + + err = file_move(tmp_file_location, dest_file_name); + +Index: opkg-4561/configure.ac +=================================================================== +--- opkg-4561/configure.ac (revision 4480) ++++ opkg-4561/configure.ac (working copy) +@@ -22,9 +22,16 @@ + + # Checks for libraries + +-# check for libcurl +-PKG_CHECK_MODULES(CURL, libcurl) ++AC_ARG_ENABLE(curl, ++ AC_HELP_STRING([--enable-curl], [Enable use of libcurl instead of wget ++ [[default=yes]] ]), ++ [want_curl="$enableval"], [want_curl="yes"]) + ++if test "x$want_curl" = "xyes"; then ++ # check for libcurl ++ PKG_CHECK_MODULES(CURL, libcurl) ++ AC_DEFINE(HAVE_CURL, 1, [Define if you want to use libcurl instead of wget]) ++fi + + + dnl ********** diff --git a/package/opkg/patches/002-fix-autogen b/package/opkg/patches/002-fix-autogen new file mode 100644 index 0000000000..0d39c42298 --- /dev/null +++ b/package/opkg/patches/002-fix-autogen @@ -0,0 +1,8 @@ +--- opkg-4561/autogen.sh-orig 2008-07-28 18:00:33.000000000 -0500 ++++ opkg-4561/autogen.sh 2008-07-28 18:00:45.000000000 -0500 +@@ -1,5 +1,3 @@ + #! /bin/sh + autoreconf -v --install || exit 1 + glib-gettextize --force --copy || exit 1 +-./configure --enable-maintainer-mode "$@" +- |