package/busybox/patches/520-ipkg_secure.patch

   1 Index: busybox-1.7.2/archival/libipkg/ipkg_conf.c
   2 ===================================================================
   3 --- busybox-1.7.2.orig/archival/libipkg/ipkg_conf.c     2007-10-30 15:38:45.000000000 -0500
   4 +++ busybox-1.7.2/archival/libipkg/ipkg_conf.c  2007-10-30 15:38:47.000000000 -0500
   5 @@ -66,6 +66,8 @@
   6           { "offline_root_pre_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd },
   7           { "proxy_passwd", IPKG_OPT_TYPE_STRING, &conf->proxy_passwd },
   8           { "proxy_user", IPKG_OPT_TYPE_STRING, &conf->proxy_user },
   9 +         { "http_user", IPKG_OPT_TYPE_STRING, &conf->http_user },
  10 +         { "http_passwd", IPKG_OPT_TYPE_STRING, &conf->http_passwd },
  11           { "query-all", IPKG_OPT_TYPE_BOOL, &conf->query_all },
  12           { "verbose-wget", IPKG_OPT_TYPE_BOOL, &conf->verbose_wget },
  13           { "verbosity", IPKG_OPT_TYPE_BOOL, &conf->verbosity },
  14 @@ -160,6 +162,9 @@
  15       conf->proxy_user = NULL;
  16       conf->proxy_passwd = NULL;
  17
  18 +     conf->http_user = NULL;
  19 +     conf->http_passwd = NULL;
  20 +
  21       pkg_hash_init("pkg-hash", &conf->pkg_hash, IPKG_CONF_DEFAULT_HASH_LEN);
  22       hash_table_init("file-hash", &conf->file_hash, IPKG_CONF_DEFAULT_HASH_LEN);
  23       hash_table_init("obs-file-hash", &conf->obs_file_hash, IPKG_CONF_DEFAULT_HASH_LEN);
  24 Index: busybox-1.7.2/archival/libipkg/ipkg_conf.h
  25 ===================================================================
  26 --- busybox-1.7.2.orig/archival/libipkg/ipkg_conf.h     2007-10-30 15:38:45.000000000 -0500
  27 +++ busybox-1.7.2/archival/libipkg/ipkg_conf.h  2007-10-30 15:38:47.000000000 -0500
  28 @@ -79,6 +79,10 @@
  29       char *proxy_user;
  30       char *proxy_passwd;
  31
  32 +     /* http user/pass */
  33 +     char *http_user;
  34 +     char *http_passwd;
  35 +
  36       hash_table_t pkg_hash;
  37       hash_table_t file_hash;
  38       hash_table_t obs_file_hash;
  39 Index: busybox-1.7.2/archival/libipkg/ipkg_download.c
  40 ===================================================================
  41 --- busybox-1.7.2.orig/archival/libipkg/ipkg_download.c 2007-10-30 15:38:45.000000000 -0500
  42 +++ busybox-1.7.2/archival/libipkg/ipkg_download.c      2007-10-30 15:38:47.000000000 -0500
  43 @@ -69,8 +69,12 @@
  44      }
  45
  46      /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */
  47 -    sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s",
  48 +    sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s%s %s%s %s -P %s %s",
  49                   (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "",
  50 +          conf->http_user ? "--http-user=" : "",
  51 +          conf->http_user ? conf->http_user : "",
  52 +          conf->http_passwd ? "--http-password=" : "",
  53 +          conf->http_passwd ? conf->http_passwd : "",
  54                   conf->proxy_user ? "--proxy-user=" : "",
  55                   conf->proxy_user ? conf->proxy_user : "",
  56                   conf->proxy_passwd ? "--proxy-passwd=" : "",