Merge remote-tracking branch 'stevee/core90-fixes'

diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 52a8a8c757a944ede78d9525ad603d98b7362928..e57bc17f9ee4c8cd7a764cb7948e352556ceb620 100644 (file)
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -211,6 +211,10 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 # Remove old udev configuration
 rm -vf /etc/udev/rules.d/30-persistent-network.rules
 
+# Remove pids from dhcp client because it hang at normal shutdown
+# so let the sysvinit kill it
+rm -f /run/dhcpcd-*.pid
+
 #
 # Start services
 #
@@ -261,9 +265,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
+               rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null
        fi
 fi
 

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 2a826cd7039b7996feab4e4ce242189739167f6b..8e61354520cc96424b3e2eef755b87c5739c625e 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrus-imapd
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 

diff --git a/lfs/elinks b/lfs/elinks
index 59f1426ead95a57304beb675cc97e5cc161b268b..2727423f0269a565d5ed7a2f0e993695740bcdd9 100644 (file)
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elinks
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 

diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index dca3e40163caeb050dc546684ff0d00258171851..70c30b4e230fb8b9fcff9e4f607394f2f948e8b1 100644 (file)
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -40,9 +40,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
        fi
 fi