Merge remote-tracking branch 'origin/next' into thirteen

Conflicts:
	make.sh

diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp
index c2f5aed0557230addc606acb68dc87f82859ee69..381309c2762883d9fe1579fc3e96ab4c89253b94 100644 (file)
--- a/config/rootfiles/common/dhcp
+++ b/config/rootfiles/common/dhcp
@@ -1,5 +1,6 @@
-#etc/dhclient.conf
-etc/dhcpd.conf
+#etc/dhcp
+#etc/dhcp/dhclient.conf
+etc/dhcp/dhcpd.conf
 #usr/bin/omshell
 #usr/include/dhcpctl
 #usr/include/dhcpctl/dhcpctl.h

diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/core/63/exclude
new file mode 100644 (file)
index 0000000..b6a8d1d
--- /dev/null
+++ b/config/rootfiles/core/63/exclude
@@ -0,0 +1,13 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases

diff --git a/config/rootfiles/core/63/filelists/dhcp b/config/rootfiles/core/63/filelists/dhcp
new file mode 120000 (symlink)
index 0000000..32d8da4
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/dhcp
@@ -0,0 +1 @@
+../../../common/dhcp
\ No newline at end of file

diff --git a/config/rootfiles/core/63/filelists/files b/config/rootfiles/core/63/filelists/files
new file mode 100644 (file)
index 0000000..1455a87
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/network-vlans
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi

diff --git a/config/rootfiles/core/63/filelists/fireinfo b/config/rootfiles/core/63/filelists/fireinfo
new file mode 120000 (symlink)
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file

diff --git a/config/rootfiles/core/63/meta b/config/rootfiles/core/63/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/63/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/core/63/update.sh
new file mode 100644 (file)
index 0000000..9b3fec5
--- /dev/null
+++ b/config/rootfiles/core/63/update.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=62
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Remove old symlink to DHCP server configuration file.
+rm -f /etc/dhcpd.conf
+
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+#      depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+#      depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+#      depmod -a 2.6.32.45-ipfire     >/dev/null 2>&1
+#      depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#      depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+#fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 6987adeda7088b48ed7fe0251bf65462c01d36ea..db38453ffd4e5e5a4ac3f7e5ec110cd4053133a0 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.14
+usr/lib/libclamav.so.6.1.15
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.14
+usr/lib/libclamunrar.so.6.1.15
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.14
+usr/lib/libclamunrar_iface.so.6.1.15
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 04a87cf63087e4f65236099bc9c93fd5b2a82c2e..6919c8cf5d3dd882afa076236f79abcf3ff1a8ee 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -241,19 +241,22 @@ END
 print <<END;
 
 
+
 <!-- Table of networks -->
 <table border='0' width=80%>
-  <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}
-       <th bgcolor='$color{'color20'}'>IP
-       <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}
-  <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br>
-       <td width='30%' align='center'>$ipaddr 
-       <td width='45%' align='center'>$connstate
+  <tr>  <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th>
+        <th bgcolor='$color{'color20'}'>IP</th>
+        <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr>
+  <tr>  <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td>
+        <td width='30%' align='center'>$ipaddr </td>
+        <td width='45%' align='center'>$connstate 
 END
 if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
 print `/usr/local/bin/dialctrl.pl show`;
 print <<END;
-       <tr><td colspan='2'>
+        </td></tr>
+        <tr><td colspan='2'>
+
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'profile'}:
                        <select name='PROFILE'>
 END

diff --git a/lfs/clamav b/lfs/clamav
index a717023024db36707fe71f78408ab2b114148bee..f5924d9029b062f0ea5344c1716539c4d44f7996 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.97.5
+VER        = 0.97.6
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4d4b93243a5add0216acc4f24f43a895
+$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2
 
 install : $(TARGET)
 

diff --git a/lfs/dhcp b/lfs/dhcp
index 603dbd73ff7ef17c2968ae4a79a02dfdafac87eb..083c31fa1107bc70daf28789d5d386f4893b8891 100644 (file)
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
-                       --sysconfdir=/etc \
+                       --sysconfdir=/etc/dhcp \
                        --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
                        --disable-static \
                        --enable-paranoia \
@@ -125,6 +125,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mkdir -pv /var/state/dhcp
        touch /var/state/dhcp/dhcpd.leases
 
-       ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
+       ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index e02365f45bbbdc1767f6c831b9779eecf4028da3..c139bf52751ae37aff328351ed41758c5c867c8d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="62"                                                      # Core Level (Filename)
+CORE="63"                                                      # Core Level (Filename)
 PAKFIRE_CORE="62"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan