From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 6 Oct 2008 16:50:29 +0000 (+0000)
Subject: merge r12869-12871 to 8.09
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=7887c4a715c07d4de6c9386262270c8729d588c3

merge r12869-12871 to 8.09

SVN-Revision: 12873
---

diff --git a/include/target.mk b/include/target.mk
index 559f8dde20..5b7bf9829e 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -15,6 +15,8 @@ DEVICE_TYPE?=router
 DEFAULT_PACKAGES:=base-files libgcc uclibc busybox dropbear mtd uci opkg
 # For router targets
 DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper bridge firewall
+# LuCI
+DEFAULT_PACKAGES.router+=luci-admin-full luci-i18n-english luci-app-firewall luci-sgi-cgi
 
 # Additional packages for Linux 2.6
 ifneq ($(KERNEL),2.4)
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index 78a43d7782..9a1cc95bb3 100644
--- a/package/busybox/patches/310-passwd_access.patch
+++ b/package/busybox/patches/310-passwd_access.patch
@@ -3,7 +3,7 @@
 
 --- a/networking/httpd.c
 +++ b/networking/httpd.c
-@@ -1697,21 +1697,32 @@
+@@ -1697,21 +1697,32 @@ static int check_user_passwd(const char 
  
  		if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
  			char *md5_passwd;
@@ -17,7 +17,7 @@
 +
 +				pwd = getpwnam(&md5_passwd[4]);
 +				if(!pwd->pw_passwd || !pwd->pw_passwd[0] || pwd->pw_passwd[0] == '!')
-+					continue;
++					return 1;
 +
 +				md5_passwd = pwd->pw_passwd;
 +				goto check_md5_pw;
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 9c10f9554c..32370d50c1 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -237,6 +237,7 @@ EOF
 
 sub gen_target_config() {
 	my @target = parse_target_metadata();
+	my %defaults;
 
 	my @target_sort = sort {
 		target_name($a) cmp target_name($b);
@@ -290,6 +291,7 @@ EOF
 			my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
 			foreach my $pkg (@pkglist) {
 				print "\tselect DEFAULT_$pkg\n";
+				$defaults{$pkg} = 1;
 			}
 			print "\n";
 		}
@@ -319,6 +321,10 @@ config LINUX_$v
 	bool
 EOF
 	}
+	foreach my $def (sort keys %defaults) {
+		print "\tconfig DEFAULT_".$def."\n";
+		print "\t\tbool\n\n";
+	}
 }
 
 my %dep_check;
@@ -431,8 +437,6 @@ sub print_package_config_category($) {
 			}
 			$menus{$menu} or $menus{$menu} = [];
 			push @{$menus{$menu}}, $pkg;
-			print "\tconfig DEFAULT_".$pkg->{name}."\n";
-			print "\t\tbool\n\n";
 		}
 	}
 	my @menus = sort {