[backfire] merge r23259, r23260 and r23261

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23300 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index d670f33..a906a11 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -82,10 +82,7 @@ endef
 
 define Package/ppp-mod-radius/conffiles
 /etc/ppp/radius.conf
-/etc/ppp/radius/dictionary
-/etc/ppp/radius/dictionary.asnet
-/etc/ppp/radius/dictionary.microsoft
-/etc/ppp/radius/servers
+/etc/ppp/radius/
 endef
 
 define Package/chat

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index e37fa90..943cb73 100644 (file)
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -67,6 +67,8 @@ endef
 
 define Package/uhttpd/conffiles
 /etc/config/uhttpd
+/etc/uhttpd.crt
+/etc/uhttpd.key
 endef
 
 define Package/uhttpd/install