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, next has been updated via 650a4d8097023cc6e8f54d86db377e756a29c07c (commit) via 9e7e1c143d874e713725c77444cadd734b131047 (commit) via 25057c911bfd2972df3d12d6e0d6f1c8f2af0294 (commit) via aba19c3022093d3e3f187707cd810a1b417a1cc6 (commit) from eb12fca108f40e1b66f05c2291565530050a7724 (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 650a4d8097023cc6e8f54d86db377e756a29c07c Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 6 22:26:22 2012 +0100

Add libpng update to core update 58.

commit 9e7e1c143d874e713725c77444cadd734b131047 Merge: 25057c9 aba19c3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 6 22:24:28 2012 +0100

Merge branch 'libpng-update' into next

commit 25057c911bfd2972df3d12d6e0d6f1c8f2af0294 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 6 22:23:29 2012 +0100

Open core update 58 and import changes that were already commited.

commit aba19c3022093d3e3f187707cd810a1b417a1cc6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 4 11:17:22 2012 +0100

libpng: Update to 1.2.46.

Fixes several security issues from 2011.

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

Summary of changes: config/rootfiles/common/libpng | 4 ++-- config/rootfiles/core/{55 => 58}/exclude | 0 config/rootfiles/core/{55 => 58}/filelists/files | 1 + .../{oldcore/39 => core/58}/filelists/libpng | 0 config/rootfiles/core/{53 => 58}/filelists/openvpn | 0 .../rootfiles/core/{53 => 58}/filelists/strongswan | 0 config/rootfiles/core/{52 => 58}/meta | 0 config/rootfiles/core/{57 => 58}/update.sh | 8 ++------ lfs/libpng | 8 ++++---- make.sh | 2 +- 10 files changed, 10 insertions(+), 13 deletions(-) copy config/rootfiles/core/{55 => 58}/exclude (100%) copy config/rootfiles/core/{55 => 58}/filelists/files (74%) copy config/rootfiles/{oldcore/39 => core/58}/filelists/libpng (100%) copy config/rootfiles/core/{53 => 58}/filelists/openvpn (100%) copy config/rootfiles/core/{53 => 58}/filelists/strongswan (100%) copy config/rootfiles/core/{52 => 58}/meta (100%) copy config/rootfiles/core/{57 => 58}/update.sh (94%)

Difference in files: diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng index 2b2ab10..c29eaa7 100644 --- a/config/rootfiles/common/libpng +++ b/config/rootfiles/common/libpng @@ -9,12 +9,12 @@ #usr/lib/libpng.la usr/lib/libpng.so usr/lib/libpng.so.3 -usr/lib/libpng.so.3.44.0 +usr/lib/libpng.so.3.46.0 #usr/lib/libpng12.a #usr/lib/libpng12.la usr/lib/libpng12.so usr/lib/libpng12.so.0 -usr/lib/libpng12.so.0.44.0 +usr/lib/libpng12.so.0.46.0 #usr/lib/pkgconfig/libpng.pc #usr/lib/pkgconfig/libpng12.pc #usr/share/man/man3/libpng.3 diff --git a/config/rootfiles/core/58/exclude b/config/rootfiles/core/58/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/58/exclude @@ -0,0 +1,12 @@ +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 diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files new file mode 100644 index 0000000..afb3d99 --- /dev/null +++ b/config/rootfiles/core/58/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +etc/vimrc diff --git a/config/rootfiles/core/58/filelists/libpng b/config/rootfiles/core/58/filelists/libpng new file mode 120000 index 0000000..8ef96e2 --- /dev/null +++ b/config/rootfiles/core/58/filelists/libpng @@ -0,0 +1 @@ +../../../common/libpng \ No newline at end of file diff --git a/config/rootfiles/core/58/filelists/openvpn b/config/rootfiles/core/58/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/58/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/58/filelists/strongswan b/config/rootfiles/core/58/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/58/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/58/meta b/config/rootfiles/core/58/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/58/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/58/update.sh b/config/rootfiles/core/58/update.sh new file mode 100644 index 0000000..d05fb84 --- /dev/null +++ b/config/rootfiles/core/58/update.sh @@ -0,0 +1,77 @@ +#!/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=58 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services +/etc/init.d/ipsec stop + +# +#Extract files +extract_files + +# +#Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#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 + +#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/lfs/libpng b/lfs/libpng index 60b25a0..7075118 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -24,10 +24,10 @@

include Config

-VER = 1.2.44 +VER = 1.2.46

THISAPP = libpng-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 098ab673ab74015978db98667febc4a9 +$(DL_FILE)_MD5 = 03ddfc17ad321db93f984581e9415d22

install : $(TARGET)

@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :

$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/make.sh b/make.sh index 598681d..18b986e 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="57" # Core Level (Filename) +CORE="58" # Core Level (Filename) PAKFIRE_CORE="57" # 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