[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 00ac9578ef7d09a6bb2ef247d2ee428fcc11239f

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 00ac9578ef7d09a6bb2ef247d2ee428fcc11239f

[git]

[-- Attachment #1: Type: text/plain, Size: 2784 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  00ac9578ef7d09a6bb2ef247d2ee428fcc11239f (commit)
       via  f6c97e0b44421c1d420dbf19ee127246c2786575 (commit)
       via  eca0e5dc820f3c53d8f2a6c0128dcd5af13c06e6 (commit)
       via  61f45200cf9e4b943299ffdbd6795906e6101fa0 (commit)
      from  2e25aed0fdb38d5fde21e9c28c40e16fd20b1900 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 00ac9578ef7d09a6bb2ef247d2ee428fcc11239f
Merge: eca0e5dc8 f6c97e0b4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Jan 29 19:46:30 2018 +0100

    Merge remote-tracking branch 'origin/next'

commit eca0e5dc820f3c53d8f2a6c0128dcd5af13c06e6
Merge: 2e25aed0f 61f45200c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Jan 29 19:14:08 2018 +0100

    Merge remote-tracking branch 'origin/next'

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/118/filelists/files |  1 +
 config/rootfiles/core/118/update.sh       | 12 ++++++++++++
 2 files changed, 13 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files
index f019f2ca9..b46a8871a 100644
--- a/config/rootfiles/core/118/filelists/files
+++ b/config/rootfiles/core/118/filelists/files
@@ -15,4 +15,5 @@ usr/lib/firewall/rules.pl
 usr/local/bin/syslogdctrl
 usr/sbin/updxlrator
 var/ipfire/langs
+var/ipfire/menu.d/30-network.menu
 var/ipfire/updatexlrator/bin/download
diff --git a/config/rootfiles/core/118/update.sh b/config/rootfiles/core/118/update.sh
index 49d67f223..965d8348d 100644
--- a/config/rootfiles/core/118/update.sh
+++ b/config/rootfiles/core/118/update.sh
@@ -56,6 +56,18 @@ ldconfig
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# remove dropped packages
+for package in python-libvirt owncloud mediatomb openmailadmin \
+		tunctl phpSANE cacti nagios nagiosql ffmpeg-libs \
+		sslscan pound vsftpd imspector tripwire; do
+	if [ -e /opt/pakfire/db/installed/meta-$package ]; then
+		pakfire remove -y $package
+	fi
+	rm -f /opt/pakfire/db/installed/meta-$package
+	rm -f /opt/pakfire/db/meta/meta-$package
+	rm -f /opt/pakfire/db/rootfiles/$package
+done
+
 # Start services
 /etc/init.d/unbound start
 /etc/init.d/apache restart


hooks/post-receive
--
IPFire 2.x development tree