Merge branch 'core110'

diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh
index 2011d4d9d874f01d494f185a000ac0c0783d5758..ada4fc59cdc0b502a3311eb4d4bf5fd70427987d 100644 (file)
--- a/config/rootfiles/core/110/update.sh
+++ b/config/rootfiles/core/110/update.sh
@@ -47,6 +47,14 @@ ldconfig
 # Remove deprecated options
 sed -e "/^RSAAuthentication/d" -i /etc/ssh/sshd_config
 
+# Remove avahi from system and pakfire db
+for i in $(cat /opt/pakfire/db/rootfiles/avahi); do
+    rm -rfv /${i}
+done
+rm -fv /opt/pakfire/db/rootfiles/avahi
+rm -fv /opt/pakfire/db/*/meta-avahi
+rm -fv /etc/rc.d/rc*.d/???avahi
+
 # Start services
 /etc/init.d/unbound start
 /etc/init.d/sshd restart

diff --git a/lfs/cups-filters b/lfs/cups-filters
index d46bc7c4bc027bc011edabda3032d245bcdcd295..109db07d7cc91673913d866d7aadd421a1868d4f 100644 (file)
--- a/lfs/cups-filters
+++ b/lfs/cups-filters
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups-filters
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "cups ghostscript"
 

diff --git a/lfs/mpd b/lfs/mpd
index 6b057f7c37a6463cd6dc9102c6c0aafc0a3d1d4f..93039b772f3d690c188444b80d8fb4c27679832c 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 16
+PAK_VER    = 17
 
 DEPS       = "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libid3tag libvorbis opus"