openwrt/upstream - upstream openwrt

	Commit message (Expand)	Author	Age	Files	Lines
*	change the recursive dependency template to use more make evaluation - the sh...	Felix Fietkau	2010-11-24	1	-21/+22
*	ignore vim .swp files when scanning for updates (#7867)	Jo-Philipp Wich	2010-09-03	1	-1/+1
*	speed up the build system by including include/shell.sh on shell commands onl...	Felix Fietkau	2010-08-19	1	-1/+1
*	fix timestamp checks for build system paths which have '.svn' in their direct...	Felix Fietkau	2010-04-14	1	-1/+1
*	add autorebuild check for menuconfig	Felix Fietkau	2007-10-14	1	-1/+1
*	clean up recursive dependency handling, use timestamp.pl again, because it sa...	Felix Fietkau	2007-08-30	1	-15/+31
*	fix a rebuild bug related to quilt	Felix Fietkau	2007-07-30	1	-3/+5
*	ignore filenames that can cause problems for the recursive dependency handling	Felix Fietkau	2007-07-26	1	-2/+2
*	fix recursive dependencies on build directories - should lead to fewer sponta...	Felix Fietkau	2007-05-09	1	-8/+9
*	ignore errors in the find command for dep checks	Felix Fietkau	2007-04-18	1	-1/+1
*	clean up dependency handling for autorebuilds	Felix Fietkau	2007-04-15	1	-0/+28

--- a/archival/libipkg/ipkg_conf.c +++ b/archival/libipkg/ipkg_conf.c @@ -66,6 +66,8 @@ { "offline_root_pre_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd }, { "proxy_passwd", IPKG_OPT_TYPE_STRING, &conf->proxy_passwd }, { "proxy_user", IPKG_OPT_TYPE_STRING, &conf->proxy_user }, + { "http_user", IPKG_OPT_TYPE_STRING, &conf->http_user }, + { "http_passwd", IPKG_OPT_TYPE_STRING, &conf->http_passwd }, { "query-all", IPKG_OPT_TYPE_BOOL, &conf->query_all }, { "verbose-wget", IPKG_OPT_TYPE_BOOL, &conf->verbose_wget }, { "verbosity", IPKG_OPT_TYPE_BOOL, &conf->verbosity }, @@ -160,6 +162,9 @@ conf->proxy_user = NULL; conf->proxy_passwd = NULL; + conf->http_user = NULL; + conf->http_passwd = NULL; + pkg_hash_init("pkg-hash", &conf->pkg_hash, IPKG_CONF_DEFAULT_HASH_LEN); hash_table_init("file-hash", &conf->file_hash, IPKG_CONF_DEFAULT_HASH_LEN); hash_table_init("obs-file-hash", &conf->obs_file_hash, IPKG_CONF_DEFAULT_HASH_LEN); --- a/archival/libipkg/ipkg_conf.h +++ b/archival/libipkg/ipkg_conf.h @@ -79,6 +79,10 @@ char *proxy_user; char *proxy_passwd; + /* http user/pass */ + char *http_user; + char *http_passwd; + hash_table_t pkg_hash; hash_table_t file_hash; hash_table_t obs_file_hash; --- a/archival/libipkg/ipkg_download.c +++ b/archival/libipkg/ipkg_download.c @@ -69,8 +69,12 @@ } /* 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 %s -P %s %s", + sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s%s %s%s %s -P %s %s", (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "", + conf->http_user ? "--http-user=" : "", + conf->http_user ? conf->http_user : "", + conf->http_passwd ? "--http-password=" : "", + conf->http_passwd ? conf->http_passwd : "", conf->proxy_user ? "--proxy-user=" : "", conf->proxy_user ? conf->proxy_user : "", conf->proxy_passwd ? "--proxy-passwd=" : "",