Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	config/rootfiles/packages/miniupnpd

diff --git a/config/rootfiles/packages/miniupnpd b/config/rootfiles/packages/miniupnpd
index cd3c612119ccc97a60a90c0f02574d19ab36379a..cdad3be614a5802ff0f7ec55b6b3aa4889cba6a7 100644 (file)
--- a/config/rootfiles/packages/miniupnpd
+++ b/config/rootfiles/packages/miniupnpd
@@ -1,6 +1,6 @@
+etc/miniupnpd
+etc/miniupnpd/miniupnpd.conf
 etc/rc.d/init.d/miniupnpd
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-miniupnpd
-etc/miniupnpd
-etc/miniupnpd/miniupnpd.conf
 usr/sbin/miniupnpd

diff --git a/lfs/fireinfo b/lfs/fireinfo
index d898a399c2c4dee8a5561dfda8c881fd1355ecd4..a0aafbf5bcd6b452c0259b8cd63058960fc9813e 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.2
+VER        = 0.3
 
 THISAPP    = fireinfo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 30870d3a8f9d47611efc148a76a5b87f
+$(DL_FILE)_MD5 = 2105bf88213dfd2198891a96eeb08949
 
 install : $(TARGET)