Merge remote-tracking branch 'origin/master' into kernel-4.14

diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files
index f019f2ca912ed04d8810ef3c86e62f5e48b700e3..22d1c7cc94a736e1409bff84ac715baf265c49e8 100644 (file)
--- a/config/rootfiles/core/118/filelists/files
+++ b/config/rootfiles/core/118/filelists/files
@@ -11,8 +11,11 @@ srv/web/ipfire/cgi-bin/fireinfo.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
 srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
 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 49d67f223ee33b13d5eddac08f55d073c75292d8..965d8348da1641f3586c4e92e14695e86513f7a5 100644 (file)
--- 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

diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index 6d7dfacaa2c58b282102e70b6ea361e4323b8543..d73c4226518f3082086f993e0681db410d789597 100644 (file)
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -118,18 +118,18 @@ int main(void)
       if (strcmp(protocol, "tcp") == 0)
       {
          /* write line for TCP */
-         snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+         snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+\\)@@\\?.\\+$/\\1@@%s/' /etc/syslog.conf >&%d", hostname, config_fd);
       }
       else
       {
          /* write line for UDP */
-         snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+         snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+\\)@@\\?.\\+$/\\1@%s/' /etc/syslog.conf >&%d", hostname, config_fd);
       }
    }
    else
    {
       /* if remote syslog has been disabled */
-      snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd );
+      snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@@\\?.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd );
    }
 
      /* if the return code isn't 0 failsafe */