From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 30 Oct 2008 23:02:36 +0000 (+0000)
Subject: merge 13082/3 to 8.09
X-Git-Tag: 8.09_rc1~5
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0662608f1dda9370d685840a2a2982fe41a388cc;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge 13082/3 to 8.09

SVN-Revision: 13086
---

diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown
index 9eadad31e8..883f8ec428 100755
--- a/package/base-files/files/sbin/ifdown
+++ b/package/base-files/files/sbin/ifdown
@@ -4,6 +4,7 @@
 . /etc/functions.sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 [ "x$1" = "x-a" ] && {
+	[ -e "/tmp/resolv.conf.auto" ] && rm /tmp/resolv.conf.auto
 	config_cb() {
 		[ interface != "$1" -o -z "$2" ] || eval "$0 $2"
 	}
diff --git a/package/opkg/patches/002-remove-gpg-warning b/package/opkg/patches/002-remove-gpg-warning
new file mode 100644
index 0000000000..27973e103d
--- /dev/null
+++ b/package/opkg/patches/002-remove-gpg-warning
@@ -0,0 +1,22 @@
+--- opkg-4564/libopkg/opkg_download.c-orig	2008-10-29 22:38:18.000000000 -0500
++++ opkg-4564/libopkg/opkg_download.c	2008-10-29 22:39:13.000000000 -0500
+@@ -335,7 +335,6 @@
+ 
+     return status;
+ #else
+-    opkg_message (conf, OPKG_NOTICE, "Signature check for %s was skipped because GPG support was not enabled in this build\n");
+     return 0;
+ #endif
+ }
+--- opkg-4564/libopkg/opkg_cmd.c-orig	2008-10-29 22:38:25.000000000 -0500
++++ opkg-4564/libopkg/opkg_cmd.c	2008-10-29 22:39:49.000000000 -0500
+@@ -287,9 +287,6 @@
+ 	  unlink (tmp_file_name);
+ 	  free (tmp_file_name);
+ 	  free (url);
+-#else
+-	  opkg_message (conf, OPKG_NOTICE, "Signiture check for %s skipped "
+-              "because GPG support was not enabled in this build\n", src->name);
+ #endif
+ 	  free(list_file_name);
+      }