merge r12869-12871 to 8.09

SVN-Revision: 12873

diff --git a/include/target.mk b/include/target.mk
index 559f8dde20760edf4806146d6ad39ac8e3d3c475..5b7bf9829e8cdebb76e45431fce1073645ad9ba5 100644 (file)
--- 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 78a43d7782dfd4cb957984379dcfd04a72cd3788..9a1cc95bb3268ce86138d699f4572bc6c86071f0 100644 (file)
--- 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 9c10f9554ca01c7e8c4d9ca44c6bad04ecb64488..32370d50c16567aebf928564ba467547f7d81b69 100755 (executable)
--- 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 {