Merge remote-tracking branch 'origin/next' into install-raid

diff --git a/config/findutils/updatedb b/config/findutils/updatedb
new file mode 100644 (file)
index 0000000..6cc1886
--- /dev/null
+++ b/config/findutils/updatedb
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+[ -x "/usr/bin/updatedb" ] || exit 0
+
+LOCKFILE="/var/lib/locate/updatedb.lock"
+
+trap "rm -f $LOCKFILE" EXIT
+
+if [ -e "$LOCKFILE" ]; then
+       echo >&2 "Warning: $LOCKFILE present, not running updatedb."
+       exit 1
+else
+       touch "$LOCKFILE"
+fi
+
+/usr/bin/updatedb

diff --git a/config/rootfiles/common/fcron b/config/rootfiles/common/fcron
index b3a1c49606f1817aeffd974604200f0585532518..89f68a76ccf391f353f147c0df31cfc0519b93bd 100644 (file)
--- a/config/rootfiles/common/fcron
+++ b/config/rootfiles/common/fcron
@@ -11,7 +11,6 @@ etc/fcron.hourly/info.txt
 etc/fcron.minutely/info.txt
 #etc/fcron.monthly
 etc/fcron.monthly/info.txt
-#etc/fcron.weekly
 etc/fcron.weekly/info.txt
 usr/bin/fcronsighup
 usr/bin/fcrontab

diff --git a/config/rootfiles/common/findutils b/config/rootfiles/common/findutils
index 13cae26eb880da30124d918248af1c0ba300244f..ac4fffe95161109fc79d92f01c2551ec46d61f65 100644 (file)
--- a/config/rootfiles/common/findutils
+++ b/config/rootfiles/common/findutils
@@ -1,3 +1,5 @@
+#etc/fcron.weekly
+etc/fcron.weekly/updatedb
 bin/find
 usr/bin/locate
 #usr/bin/oldfind

diff --git a/config/rootfiles/packages/minidlna b/config/rootfiles/packages/minidlna
index c30e30b406cd31fbdd5260b4b901ccf69f6b413c..f0b9536538e85de954b78f6a03bd9e4601919364 100644 (file)
--- a/config/rootfiles/packages/minidlna
+++ b/config/rootfiles/packages/minidlna
@@ -1,3 +1,15 @@
 etc/rc.d/init.d/minidlna
 etc/minidlna.conf
-usr/sbin/minidlna
+usr/sbin/minidlnad
+#usr/share/locale/da/LC_MESSAGES/minidlna.mo
+#usr/share/locale/de/LC_MESSAGES/minidlna.mo
+#usr/share/locale/es/LC_MESSAGES/minidlna.mo
+#usr/share/locale/fr/LC_MESSAGES/minidlna.mo
+#usr/share/locale/it/LC_MESSAGES/minidlna.mo
+#usr/share/locale/ja/LC_MESSAGES/minidlna.mo
+#usr/share/locale/nb/LC_MESSAGES/minidlna.mo
+#usr/share/locale/nl/LC_MESSAGES/minidlna.mo
+#usr/share/locale/pl/LC_MESSAGES/minidlna.mo
+#usr/share/locale/ru/LC_MESSAGES/minidlna.mo
+#usr/share/locale/sl/LC_MESSAGES/minidlna.mo
+#usr/share/locale/sv/LC_MESSAGES/minidlna.mo

diff --git a/lfs/findutils b/lfs/findutils
index c05aca3cb712f853996ef290898d29a264ea5141..e2dd04a02296e15ec50569911d370cc9f62bbbd3 100644 (file)
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -91,6 +91,10 @@ ifeq "$(ROOT)" ""
        mv -v /usr/bin/find /bin
        sed -i -e 's|BINDIR=/usr/bin|BINDIR=/bin|' /usr/bin/updatedb
        -mkdir -p /var/lib/locate
+
+       -mkdir -pv /etc/fcron.weekly
+       install -v -m 754 $(DIR_SRC)/config/findutils/updatedb \
+               /etc/fcron.weekly/updatedb
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/minidlna b/lfs/minidlna
index 26ec3dd0087ed71f7601eb3f06adf88363a847f3..155cd4a07146f4dfad5995013948a42a40b4c173 100644 (file)
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 1.0.25
+VER        = 1.1.3
 
 THISAPP    = minidlna-$(VER)
-DL_FILE    = minidlna_$(VER)_src.tar.gz
+DL_FILE    = minidlna-$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = minidlna
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "ffmpeg flac libexif libid3tag libogg sqlite"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d966256baf2f9b068b9de871ab5dade5
+$(DL_FILE)_MD5 = 879027192c89e5376cdd2ae2d1aa33b4
 
 install : $(TARGET)
 
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i '/include/a #include <limits.h>/' metadata.c
+       cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
 

diff --git a/src/initscripts/init.d/minidlna b/src/initscripts/init.d/minidlna
index 682306760b5edb783d4c7cfbcead90a315eca370..74ad8f880f3d714fcd9b1c49273f5966574dbc03 100644 (file)
--- a/src/initscripts/init.d/minidlna
+++ b/src/initscripts/init.d/minidlna
@@ -16,17 +16,17 @@
 case "${1}" in
        start)
                boot_mesg "Starting minidlna..."
-               loadproc /usr/sbin/minidlna
+               loadproc /usr/sbin/minidlnad
                ;;
 
        stop)
                boot_mesg "Stopping minidlna..."
-               killproc /usr/sbin/minidlna
+               killproc /usr/sbin/minidlnad
                ;;
 
        reload)
                boot_mesg "Reloading minidlna..."
-               reloadproc /usr/sbin/minidlna
+               reloadproc /usr/sbin/minidlnad
                ;;
 
        restart)
@@ -36,7 +36,7 @@ case "${1}" in
                ;;
 
        status)
-               statusproc /usr/sbin/minidlna
+               statusproc /usr/sbin/minidlnad
                ;;
 
        *)