Temporary disabled mediatomb (not work with curl update)

diff --git a/config/rootfiles/packages/mediatomb b/config/rootfiles/packages/mediatomb-disabled
similarity index 100%
rename from config/rootfiles/packages/mediatomb
rename to config/rootfiles/packages/mediatomb-disabled

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index ec07e6825e959970fa107d40ea6ac0d5b567d665..672d83f96481eab40352ba0ce5e309fb8107dc7e 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -70,7 +70,7 @@
 * cpufrequtils-004
 * cryptsetup-1.0.6
 * cups-1.3.9
-* curl-7.15.3
+* curl-7.19.4
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * db-4.4.20
@@ -129,7 +129,7 @@
 * httpd-2.2.11
 * hwdata
 * iana-etc-2.10
-* icecast-2.3.1
+* icecast-2.3.2
 * icegenerator-0.5.5-pre2
 * igmpproxy-src-0.1-beta2
 * inetutils-1.4.2
@@ -180,7 +180,6 @@
 * logrotate-3.7.1
 * logwatch-7.3.6
 * lsof-4.78
-* lynis-1.2.1
 * lynis-1.2.3
 * lzo-2.02
 * m4-1.4.4
@@ -192,7 +191,6 @@
 * mbr-1.1.8
 * mc-4.6.1
 * mechanize-0.1.8
-* mediatomb-0.11.0
 * memtest86+-1.65
 * misc-progs
 * mkinitcpio-0.5.9

diff --git a/lfs/mpfire b/lfs/mpfire
index 098ffbbb33b3bd7d875f2a8a4b0188036917789e..b966be0fc3c153f6482c98054da4a1bb0f4d5c78 100644 (file)
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -63,6 +63,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 664 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/
        install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/
        echo "Folder for mpd database" > /var/ipfire/mpfire/db/info
+       echo "Folder for music files" > /var/mp3/info
        chown root.nobody /var/ipfire/mpfire/{mpd.conf,playlist.m3u}
        chown nobody.nobody /var/ipfire/mpfire/{settings,webradio}
        chmod 664 /var/ipfire/mpfire/playlist.m3u

diff --git a/make.sh b/make.sh
index 1a692c0176a4a6739162989970e43aab028341a9..e952b085eeef625ec848766a4023406daeb3da40 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -588,7 +588,7 @@ buildipfire() {
   ipfiremake sshfs
   ipfiremake sqlite
   ipfiremake taglib
-  ipfiremake mediatomb
+#  ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin