From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 30 May 2017 19:29:20 +0000 (+0200)
Subject: Merge branch 'core110'
X-Git-Tag: v2.19-core111~3
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=203601bf686a3248f4a807d728ed53bc7c499e0d;hp=82d25bae628797aa3af43c077b29b30fa91d6b30

Merge branch 'core110'
---

diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh
index 2011d4d9d8..ada4fc59cd 100644
--- 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 d46bc7c4bc..109db07d7c 100644
--- 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 6b057f7c37..93039b772f 100644
--- 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"