[backfire] merge r23050, r23052, r23159 and r23174

[openwrt-10.03/.git] / package / opkg / patches / 011-old-config-location.patch

diff --git a/package/opkg/patches/011-old-config-location.patch b/package/opkg/patches/011-old-config-location.patch
index 4094713f3483925e788baf777d3a3011dc450635..85c6d68ffdf7440a48b52b6ee26e156296fef956 100644 (file)
--- a/package/opkg/patches/011-old-config-location.patch
+++ b/package/opkg/patches/011-old-config-location.patch
@@ -1,11 +1,9 @@
 --- a/src/opkg-cl.c
 +++ b/src/opkg-cl.c
-@@ -172,7 +172,10 @@ args_parse(int argc, char *argv[])
-                       printf("Confusion: getopt_long returned %d\n", c);
+@@ -200,6 +200,9 @@ args_parse(int argc, char *argv[])
                }
        }
--    
-+
+ 
 +      if(!conf->conf_file && !conf->offline_root)
 +              conf->conf_file = xstrdup("/etc/opkg.conf");
 +