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, thirteen has been updated via 5e0a1a503b90c5c80016399308bb2585edba219b (commit) via b96220a4274284723db83a2b73dbda1ff4adfd37 (commit) via c7d6609dc0196d9cc87b2013c0bee039574b0bea (commit) via 789e6f5c8ebf3eacebf40d56f0b972df851e9d40 (commit) via 1cded5eefd1516f5e35f16086b4fde737907e20f (commit) via 00f9fa160d2089ddb5ed09ec7dcec35af94f76bc (commit) via e851b1c35c1a7962a9087b7e0c78fb1410c42037 (commit) via e5d406ab9edb68599069389ee39f333d77fc68fe (commit) from 421102e775e8822f0c48f730dff86efc8cd20ce8 (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 5e0a1a503b90c5c80016399308bb2585edba219b Merge: 421102e b96220a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Sep 23 05:02:34 2012 -0400
Merge remote-tracking branch 'origin/next' into thirteen
Conflicts: make.sh
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/dhcp | 5 +++-- config/rootfiles/core/{strongswan => 63}/exclude | 1 + .../{oldcore/51 => core/63}/filelists/dhcp | 0 .../{oldcore/58 => core/63}/filelists/files | 4 +--- .../rootfiles/core/{61 => 63}/filelists/fireinfo | 0 config/rootfiles/core/{60 => 63}/meta | 0 config/rootfiles/core/{62 => 63}/update.sh | 3 +++ config/rootfiles/packages/clamav | 6 +++--- html/cgi-bin/index.cgi | 17 ++++++++++------- lfs/clamav | 4 ++-- lfs/dhcp | 4 ++-- make.sh | 2 +- 12 files changed, 26 insertions(+), 20 deletions(-) copy config/rootfiles/core/{strongswan => 63}/exclude (90%) copy config/rootfiles/{oldcore/51 => core/63}/filelists/dhcp (100%) copy config/rootfiles/{oldcore/58 => core/63}/filelists/files (62%) copy config/rootfiles/core/{61 => 63}/filelists/fireinfo (100%) copy config/rootfiles/core/{60 => 63}/meta (100%) copy config/rootfiles/core/{62 => 63}/update.sh (97%)
Difference in files: diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp index c2f5aed..381309c 100644 --- 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 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 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 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 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 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 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 6987ade..db38453 100644 --- 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 04a87cf..6919c8c 100644 --- 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 a717023..f5924d9 100644 --- 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 603dbd7..083c31f 100644 --- 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 e02365f..c139bf5 100755 --- 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
hooks/post-receive -- IPFire 2.x development tree