* [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a18da317d3b9802572f2f174d1b76a1eba7ff53b
@ 2012-05-12 17:35 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-05-12 17:35 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 32608 bytes --]
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, master has been updated
via a18da317d3b9802572f2f174d1b76a1eba7ff53b (commit)
via c7c8b4aaecc68b12fa3ad89d2eabe82581b969ad (commit)
via db083dd81ece9a52f1badc189d34f89b228a28c0 (commit)
via 58574e318b594d471a6c9376ade91d7f7c6f4644 (commit)
via dc7239d678ca426485814c95060ac72d987b814d (commit)
via 8074eed711092b90ae279fa968545a27d2655fd6 (commit)
via 68eeed828507c6edc395772d6d9c81f1cc12dd53 (commit)
via d66d6f88273637d34b649184543862f588a7d9e3 (commit)
via 36585d00bd91bb7207627ca4e46c5d3c6f20cd26 (commit)
via 8f6a5178e816689fc6bd38aebfc0cfc41aa5d37d (commit)
via 54798036675c0eebb8dedb55d2e509d8385cc363 (commit)
via a6f4183e83385cbd21d31db07171fb7109b81d54 (commit)
via 75c2cf6f51d4f7d8e513b6df6a25b30e8a834f9f (commit)
from 9f82cdb1f8a804b52ab28f6dfb42b08b90e1197c (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 a18da317d3b9802572f2f174d1b76a1eba7ff53b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 12 19:22:26 2012 +0200
finished core59.
commit c7c8b4aaecc68b12fa3ad89d2eabe82581b969ad
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 12 19:15:38 2012 +0200
GeoIP: update database to 01052012.
commit db083dd81ece9a52f1badc189d34f89b228a28c0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 12 17:13:45 2012 +0200
dhcpcd: ignore MTU Smaller than 577.
Normally 576 is the smallest valid mtu but some cable provider set this
also if they support much higher mtu's. Fedora does not accept
this to prevent speed problems with such isp connections so we do the same.
If you really need mtu=576 you can still force at at the setup.
commit 58574e318b594d471a6c9376ade91d7f7c6f4644
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 12 15:33:42 2012 +0200
php: security update to 5.3.13 (CVE-2012-2311).
commit dc7239d678ca426485814c95060ac72d987b814d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 12 15:32:47 2012 +0200
openssh: update to 6.0p1.
commit 8074eed711092b90ae279fa968545a27d2655fd6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 12 15:30:38 2012 +0200
openssl: security update to 0.9.8x (CVE-2012-2333).
Invalid TLS/DTLS record attack (CVE-2012-2333)
===============================================
A flaw in the OpenSSL handling of CBC mode ciphersuites in TLS 1.1, 1.2 and
DTLS can be exploited in a denial of service attack on both clients and
servers.
DTLS applications are affected in all versions of OpenSSL. TLS is only
affected in OpenSSL 1.0.1 and later.
Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic fuzzing
as a service testing platform.
The fix was developed by Stephen Henson of the OpenSSL core team.
Affected users should upgrade to OpenSSL 1.0.1c, 1.0.0j or 0.9.8x
References
==========
URL for this Security Advisory:
http://www.openssl.org/news/secadv_20120510.txt
commit 68eeed828507c6edc395772d6d9c81f1cc12dd53
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 6 12:51:14 2012 +0200
traceroute: update to 2.0.18 and fix name resolution.
fixes #10097
commit d66d6f88273637d34b649184543862f588a7d9e3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 23:25:07 2012 +0200
strongswan: update to 4.6.3.
commit 36585d00bd91bb7207627ca4e46c5d3c6f20cd26
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 23:23:53 2012 +0200
python: update to 2.7.3.
commit 8f6a5178e816689fc6bd38aebfc0cfc41aa5d37d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 23:21:18 2012 +0200
fix core58 merge problem.
Conflicts:
config/rootfiles/core/58/filelists/files
commit 54798036675c0eebb8dedb55d2e509d8385cc363
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 23:19:36 2012 +0200
core59: add openssl to core update.
commit a6f4183e83385cbd21d31db07171fb7109b81d54
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 2 19:42:02 2012 +0200
openssl: security update to 0.9.8w. (CVE-2012-2131).
SN1 BIO incomplete fix (CVE-2012-2131)
=======================================
It was discovered that the fix for CVE-2012-2110 released on 19 Apr
2012 was not sufficient to correct the issue for OpenSSL 0.9.8.
Please see http://www.openssl.org/news/secadv_20120419.txt for details
of that vulnerability.
This issue only affects OpenSSL 0.9.8v. OpenSSL 1.0.1a and 1.0.0i
already contain a patch sufficient to correct CVE-2012-2110.
Thanks to Red Hat for discovering and fixing this issue.
Affected users should upgrade to 0.9.8w.
References
==========
URL for this Security Advisory:
http://www.openssl.org/news/secadv_20120424.txt
commit 75c2cf6f51d4f7d8e513b6df6a25b30e8a834f9f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 9 12:19:06 2012 +0200
started core59.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/openssl | 2 +-
config/rootfiles/common/python | 25 +++++++++++----
config/rootfiles/common/strongswan | 3 ++
config/rootfiles/core/58/filelists/files | 4 ++
config/rootfiles/core/{55 => 59}/exclude | 0
config/rootfiles/core/{54 => 59}/filelists/GeoIP | 0
config/rootfiles/core/59/filelists/Net-Telnet | 1 +
config/rootfiles/core/59/filelists/files | 7 ++++
config/rootfiles/core/{55 => 59}/filelists/openssh | 0
config/rootfiles/core/{55 => 59}/filelists/openssl | 0
config/rootfiles/core/{57 => 59}/filelists/php | 0
.../{oldcore/50 => core/59}/filelists/python | 0
.../rootfiles/core/{53 => 59}/filelists/strongswan | 0
config/rootfiles/core/{52 => 59}/meta | 0
config/rootfiles/core/{58 => 59}/update.sh | 24 +++++++--------
lfs/GeoIP | 4 +-
lfs/dhcpcd | 5 ++-
lfs/openssh | 4 +-
lfs/openssl | 4 +-
lfs/php | 6 ++--
lfs/python | 4 +-
lfs/strongswan | 4 +-
lfs/traceroute | 8 ++--
make.sh | 4 +-
....7.2-gdbm-1.patch => Python-2.7.3-gdbm-1.patch} | 0
src/patches/traceroute-2.0.18-ipfire.patch | 31 ++++++++++++++++++++
26 files changed, 99 insertions(+), 41 deletions(-)
copy config/rootfiles/core/{55 => 59}/exclude (100%)
copy config/rootfiles/core/{54 => 59}/filelists/GeoIP (100%)
create mode 120000 config/rootfiles/core/59/filelists/Net-Telnet
create mode 100644 config/rootfiles/core/59/filelists/files
copy config/rootfiles/core/{55 => 59}/filelists/openssh (100%)
copy config/rootfiles/core/{55 => 59}/filelists/openssl (100%)
copy config/rootfiles/core/{57 => 59}/filelists/php (100%)
copy config/rootfiles/{oldcore/50 => core/59}/filelists/python (100%)
copy config/rootfiles/core/{53 => 59}/filelists/strongswan (100%)
copy config/rootfiles/core/{52 => 59}/meta (100%)
copy config/rootfiles/core/{58 => 59}/update.sh (87%)
rename src/patches/{Python-2.7.2-gdbm-1.patch => Python-2.7.3-gdbm-1.patch} (100%)
create mode 100644 src/patches/traceroute-2.0.18-ipfire.patch
Difference in files:
diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index bc1ac49..02e4c1c 100644
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -1116,7 +1116,6 @@ usr/lib/libssl.so.0.9.8
#usr/share/man/man3/dsa.3
#usr/share/man/man3/ecdsa.3
#usr/share/man/man3/engine.3
-#usr/share/man/man3/err.3
#usr/share/man/man3/evp.3
#usr/share/man/man3/hmac.3
#usr/share/man/man3/i2d_ASN1_OBJECT.3
@@ -1164,6 +1163,7 @@ usr/lib/libssl.so.0.9.8
#usr/share/man/man3/md5.3
#usr/share/man/man3/mdc2.3
#usr/share/man/man3/pem.3
+#usr/share/man/man3/rand.3
#usr/share/man/man3/rc4.3
#usr/share/man/man3/ripemd.3
#usr/share/man/man3/rsa.3
diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python
index c6421cb..3472e25 100644
--- a/config/rootfiles/common/python
+++ b/config/rootfiles/common/python
@@ -3,6 +3,8 @@
#usr/bin/pydoc
usr/bin/python
#usr/bin/python-config
+usr/bin/python2
+#usr/bin/python2-config
usr/bin/python2.7
#usr/bin/python2.7-config
#usr/bin/smtpd.py
@@ -103,6 +105,7 @@ usr/lib/libpython2.7.so
usr/lib/libpython2.7.so.1.0
#usr/lib/pkgconfig/python-2.7.pc
#usr/lib/pkgconfig/python.pc
+#usr/lib/pkgconfig/python2.pc
#usr/lib/python2.7
#usr/lib/python2.7/BaseHTTPServer.py
usr/lib/python2.7/BaseHTTPServer.pyc
@@ -920,6 +923,7 @@ usr/lib/python2.7/dis.pyc
#usr/lib/python2.7/distutils/tests/test_versionpredicate.py
#usr/lib/python2.7/distutils/tests/test_versionpredicate.pyc
#usr/lib/python2.7/distutils/tests/test_versionpredicate.pyo
+#usr/lib/python2.7/distutils/tests/xxmodule.c
#usr/lib/python2.7/distutils/text_file.py
#usr/lib/python2.7/distutils/text_file.pyc
#usr/lib/python2.7/distutils/text_file.pyo
@@ -1815,7 +1819,7 @@ usr/lib/python2.7/json/tool.pyc
usr/lib/python2.7/keyword.pyc
#usr/lib/python2.7/keyword.pyo
#usr/lib/python2.7/lib-dynload
-usr/lib/python2.7/lib-dynload/Python-2.7.2-py2.7.egg-info
+usr/lib/python2.7/lib-dynload/Python-2.7.3-py2.7.egg-info
usr/lib/python2.7/lib-dynload/_bisect.so
usr/lib/python2.7/lib-dynload/_bsddb.so
usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -1973,9 +1977,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
#usr/lib/python2.7/lib-tk/turtle.pyo
#usr/lib/python2.7/lib2to3
#usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.2.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.3.final.0.pickle
#usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.2.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.3.final.0.pickle
#usr/lib/python2.7/lib2to3/__init__.py
#usr/lib/python2.7/lib2to3/__init__.pyc
#usr/lib/python2.7/lib2to3/__init__.pyo
@@ -2666,6 +2670,10 @@ usr/lib/python2.7/tempfile.pyc
#usr/lib/python2.7/test/cjkencodings/gbk.txt
#usr/lib/python2.7/test/cjkencodings/hz-utf8.txt
#usr/lib/python2.7/test/cjkencodings/hz.txt
+#usr/lib/python2.7/test/cjkencodings/iso2022_jp-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/iso2022_jp.txt
+#usr/lib/python2.7/test/cjkencodings/iso2022_kr-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/iso2022_kr.txt
#usr/lib/python2.7/test/cjkencodings/johab-utf8.txt
#usr/lib/python2.7/test/cjkencodings/johab.txt
#usr/lib/python2.7/test/cjkencodings/shift_jis-utf8.txt
@@ -2861,6 +2869,7 @@ usr/lib/python2.7/tempfile.pyc
#usr/lib/python2.7/test/mapping_tests.pyc
#usr/lib/python2.7/test/mapping_tests.pyo
#usr/lib/python2.7/test/math_testcases.txt
+#usr/lib/python2.7/test/nokia.pem
#usr/lib/python2.7/test/nullcert.pem
#usr/lib/python2.7/test/outstanding_bugs.py
#usr/lib/python2.7/test/outstanding_bugs.pyc
@@ -2889,9 +2898,6 @@ usr/lib/python2.7/tempfile.pyc
#usr/lib/python2.7/test/re_tests.py
#usr/lib/python2.7/test/re_tests.pyc
#usr/lib/python2.7/test/re_tests.pyo
-#usr/lib/python2.7/test/regex_tests.py
-#usr/lib/python2.7/test/regex_tests.pyc
-#usr/lib/python2.7/test/regex_tests.pyo
#usr/lib/python2.7/test/regrtest.py
#usr/lib/python2.7/test/regrtest.pyc
#usr/lib/python2.7/test/regrtest.pyo
@@ -2924,7 +2930,6 @@ usr/lib/python2.7/tempfile.pyc
#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc
#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo
-#usr/lib/python2.7/test/svn_python_org_https_cert.pem
#usr/lib/python2.7/test/test_MimeWriter.py
#usr/lib/python2.7/test/test_MimeWriter.pyc
#usr/lib/python2.7/test/test_MimeWriter.pyo
@@ -3093,6 +3098,9 @@ usr/lib/python2.7/tempfile.pyc
#usr/lib/python2.7/test/test_codecencodings_hk.py
#usr/lib/python2.7/test/test_codecencodings_hk.pyc
#usr/lib/python2.7/test/test_codecencodings_hk.pyo
+#usr/lib/python2.7/test/test_codecencodings_iso2022.py
+#usr/lib/python2.7/test/test_codecencodings_iso2022.pyc
+#usr/lib/python2.7/test/test_codecencodings_iso2022.pyo
#usr/lib/python2.7/test/test_codecencodings_jp.py
#usr/lib/python2.7/test/test_codecencodings_jp.pyc
#usr/lib/python2.7/test/test_codecencodings_jp.pyo
@@ -3722,6 +3730,9 @@ usr/lib/python2.7/tempfile.pyc
#usr/lib/python2.7/test/test_py3kwarn.py
#usr/lib/python2.7/test/test_py3kwarn.pyc
#usr/lib/python2.7/test/test_py3kwarn.pyo
+#usr/lib/python2.7/test/test_py_compile.py
+#usr/lib/python2.7/test/test_py_compile.pyc
+#usr/lib/python2.7/test/test_py_compile.pyo
#usr/lib/python2.7/test/test_pyclbr.py
#usr/lib/python2.7/test/test_pyclbr.pyc
#usr/lib/python2.7/test/test_pyclbr.pyo
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 9b02c0b..4c7d558 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -33,6 +33,9 @@ usr/lib/ipsec/plugins/libstrongswan-aes.so
#usr/lib/ipsec/plugins/libstrongswan-attr.a
#usr/lib/ipsec/plugins/libstrongswan-attr.la
usr/lib/ipsec/plugins/libstrongswan-attr.so
+#usr/lib/ipsec/plugins/libstrongswan-cmac.a
+#usr/lib/ipsec/plugins/libstrongswan-cmac.la
+usr/lib/ipsec/plugins/libstrongswan-cmac.so
#usr/lib/ipsec/plugins/libstrongswan-constraints.a
#usr/lib/ipsec/plugins/libstrongswan-constraints.la
usr/lib/ipsec/plugins/libstrongswan-constraints.so
diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
index afb3d99..047127e 100644
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@ -1,3 +1,7 @@
etc/system-release
etc/issue
etc/vimrc
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/general-functions.pl
+var/ipfire/langs
diff --git a/config/rootfiles/core/59/exclude b/config/rootfiles/core/59/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/core/59/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/59/filelists/GeoIP b/config/rootfiles/core/59/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/59/filelists/Net-Telnet b/config/rootfiles/core/59/filelists/Net-Telnet
new file mode 120000
index 0000000..66ca926
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/Net-Telnet
@@ -0,0 +1 @@
+../../../common/Net-Telnet
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/files b/config/rootfiles/core/59/filelists/files
new file mode 100644
index 0000000..fef386b
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/files
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/general-functions.pl
+var/ipfire/langs
+var/ipfire/dhcpc/dhcpcd-hooks/10-mtu
diff --git a/config/rootfiles/core/59/filelists/openssh b/config/rootfiles/core/59/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/openssl b/config/rootfiles/core/59/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/php b/config/rootfiles/core/59/filelists/php
new file mode 120000
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/python b/config/rootfiles/core/59/filelists/python
new file mode 120000
index 0000000..ffe6e2c
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/python
@@ -0,0 +1 @@
+../../../common/python
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/strongswan b/config/rootfiles/core/59/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/59/meta b/config/rootfiles/core/59/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/59/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/59/update.sh b/config/rootfiles/core/59/update.sh
new file mode 100644
index 0000000..5a3cc2a
--- /dev/null
+++ b/config/rootfiles/core/59/update.sh
@@ -0,0 +1,82 @@
+#!/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(a)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=59
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+#
+#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
+#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/lfs/GeoIP b/lfs/GeoIP
index 271bab6..f1b200b 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
include Config
VER = 1.17
-DATVER = 03032012
+DATVER = 01052012
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = 98ba2a5c177cdfa8da6f9fab524e948d
+GeoIP.dat-$(DATVER).gz_MD5 = bb073125a92b1ee3dba202b1cec922c4
install : $(TARGET)
diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index e843b9a..f7a8c36 100644
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2012 IPFire Team <info(a)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 #
@@ -76,6 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--mandir=/usr/share/man --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
ln -sf /etc/rc.d/init.d/networking/dhcpcd.exe \
$(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/70-dhcpcd.exe
rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/20-resolv.conf
@@ -84,5 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/50-yp.conf
rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/50-ypbind
+ sed -i -e "s|-ge 576|-gt 576|g" $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/10-mtu
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/openssh b/lfs/openssh
index f7d129d..26ac555 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
include Config
-VER = 5.9p1
+VER = 6.0p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = afe17eee7e98d3b8550cc349834a85d0
+$(DL_FILE)_MD5 = 3c9347aa67862881c5da3f3b1c08da7b
install : $(TARGET)
diff --git a/lfs/openssl b/lfs/openssl
index 9d559e1..9aef173 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER = 0.9.8u
+VER = 0.9.8x
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cb41e94f762ed63e41d1cca2b8430ede
+$(DL_FILE)_MD5 = ee17e9bc805c8cc7d0afac3b0ef78eda
install : $(TARGET)
diff --git a/lfs/php b/lfs/php
index 2a883de..075d4fb 100644
--- a/lfs/php
+++ b/lfs/php
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2012 IPFire Team <info(a)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 #
@@ -24,7 +24,7 @@
include Config
-VER = 5.3.10
+VER = 5.3.13
THISAPP = php-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
-$(DL_FILE)_MD5 = 816259e5ca7d0a7e943e56a3bb32b17f
+$(DL_FILE)_MD5 = 370be99c5cdc2e756c82c44d774933c8
idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
diff --git a/lfs/python b/lfs/python
index 0deaadd..6095e5e 100644
--- a/lfs/python
+++ b/lfs/python
@@ -24,7 +24,7 @@
include Config
-VER = 2.7.2
+VER = 2.7.3
THISAPP = Python-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 75c87a80c6ddb0b785a57ea3583e04fa
+$(DL_FILE)_MD5 = 62c4c1699170078c469f79ddfed21bc0
install : $(TARGET)
diff --git a/lfs/strongswan b/lfs/strongswan
index 964f2ed..44497d4 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 4.6.2
+VER = 4.6.3
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ed64e6746011930a70f3a271dc0e3c9e
+$(DL_FILE)_MD5 = 34146e514ced1738b4f2d9e7169bbb52
install : $(TARGET)
diff --git a/lfs/traceroute b/lfs/traceroute
index fec18a4..74cffc7 100644
--- a/lfs/traceroute
+++ b/lfs/traceroute
@@ -24,7 +24,7 @@
include Config
-VER = 2.0.12
+VER = 2.0.18
THISAPP = traceroute-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = traceroute
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2262a9d30ae85f12b759a38ef827f8f7
+$(DL_FILE)_MD5 = b7254149b7f081cce07f4b9e065ba5ef
install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && sed -i 's|hints.ai_flags = AI_IDN;|/* hints.ai_flags = AI_IDN; */|g' traceroute/traceroute.c
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-ipfire.patch
cd $(DIR_APP) && make
cd $(DIR_APP) && make install prefix=/usr bindir=/usr/sbin
chmod u-s /usr/sbin/traceroute
diff --git a/make.sh b/make.sh
index 3535beb..3b447c8 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.11" # Version number
-CORE="58" # Core Level (Filename)
-PAKFIRE_CORE="58" # Core Level (PAKFIRE)
+CORE="59" # Core Level (Filename)
+PAKFIRE_CORE="59" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
diff --git a/src/patches/Python-2.7.2-gdbm-1.patch b/src/patches/Python-2.7.2-gdbm-1.patch
deleted file mode 100644
index c72b452..0000000
--- a/src/patches/Python-2.7.2-gdbm-1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py
---- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200
-+++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200
-@@ -1125,7 +1125,7 @@
- 'ndbm'):
- ndbm_libs = ['ndbm']
- else:
-- ndbm_libs = []
-+ ndbm_libs = ['gdbm', 'gdbm_compat' ]
- print "building dbm using ndbm"
- dbmext = Extension('dbm', ['dbmmodule.c'],
- define_macros=[
-@@ -1140,7 +1140,7 @@
- if self.compiler.find_library_file(lib_dirs,
- 'gdbm_compat'):
- gdbm_libs.append('gdbm_compat')
-- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
-+ if find_file("ndbm.h", inc_dirs, []) is not None:
- print "building dbm using gdbm"
- dbmext = Extension(
- 'dbm', ['dbmmodule.c'],
diff --git a/src/patches/Python-2.7.3-gdbm-1.patch b/src/patches/Python-2.7.3-gdbm-1.patch
new file mode 100644
index 0000000..c72b452
--- /dev/null
+++ b/src/patches/Python-2.7.3-gdbm-1.patch
@@ -0,0 +1,21 @@
+diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py
+--- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200
++++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200
+@@ -1125,7 +1125,7 @@
+ 'ndbm'):
+ ndbm_libs = ['ndbm']
+ else:
+- ndbm_libs = []
++ ndbm_libs = ['gdbm', 'gdbm_compat' ]
+ print "building dbm using ndbm"
+ dbmext = Extension('dbm', ['dbmmodule.c'],
+ define_macros=[
+@@ -1140,7 +1140,7 @@
+ if self.compiler.find_library_file(lib_dirs,
+ 'gdbm_compat'):
+ gdbm_libs.append('gdbm_compat')
+- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
++ if find_file("ndbm.h", inc_dirs, []) is not None:
+ print "building dbm using gdbm"
+ dbmext = Extension(
+ 'dbm', ['dbmmodule.c'],
diff --git a/src/patches/traceroute-2.0.18-ipfire.patch b/src/patches/traceroute-2.0.18-ipfire.patch
new file mode 100644
index 0000000..14f09d8
--- /dev/null
+++ b/src/patches/traceroute-2.0.18-ipfire.patch
@@ -0,0 +1,31 @@
+diff -Naur traceroute-2.0.18.org/traceroute/traceroute.c traceroute-2.0.18/traceroute/traceroute.c
+--- traceroute-2.0.18.org/traceroute/traceroute.c 2011-08-18 17:19:48.000000000 +0200
++++ traceroute-2.0.18/traceroute/traceroute.c 2012-05-06 12:42:55.000000000 +0200
+@@ -31,6 +31,9 @@
+ #include "version.h"
+ #include "traceroute.h"
+
++#ifndef IPV6_TCLASS
++#define IPV6_TCLASS 67
++#endif
+
+ #ifndef ICMP6_DST_UNREACH_BEYONDSCOPE
+ #ifdef ICMP6_DST_UNREACH_NOTNEIGHBOR
+@@ -186,7 +189,7 @@
+
+ memset (&hints, 0, sizeof (hints));
+ hints.ai_family = af;
+- hints.ai_flags = AI_IDN;
++ /* hints.ai_flags = AI_IDN; */
+
+ ret = getaddrinfo (name, NULL, &hints, &res);
+ if (ret) {
+@@ -688,7 +691,7 @@
+
+ buf[0] = '\0';
+ getnameinfo (&res->sa, sizeof (*res), buf, sizeof (buf),
+- 0, 0, NI_IDN);
++ 0, 0, 0);
+ printf (" %s (%s)", buf[0] ? buf : str, str);
+ }
+
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-12 17:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-12 17:35 [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a18da317d3b9802572f2f174d1b76a1eba7ff53b git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox