From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a526de38bc9d4aacc3275ad7e0405006df5b7dbc
Date: Sat, 05 May 2012 23:30:07 +0200 [thread overview]
Message-ID: <20120505213014.956DA2018E@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 13704 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, next has been updated
via a526de38bc9d4aacc3275ad7e0405006df5b7dbc (commit)
via 6bdc39023580e1634b77f3529cdc3654b58cfd6f (commit)
via b5c3859e301bab60fd6a1f905b52ffa3ce407d6b (commit)
via 717470058ff825cc32f4eee7ffaa44986aeb1e32 (commit)
from 8f17b54f9686052a7bc5708ad9eb96fe99463363 (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 a526de38bc9d4aacc3275ad7e0405006df5b7dbc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 23:25:07 2012 +0200
strongswan: update to 4.6.3.
commit 6bdc39023580e1634b77f3529cdc3654b58cfd6f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 23:23:53 2012 +0200
python: update to 2.7.3.
commit b5c3859e301bab60fd6a1f905b52ffa3ce407d6b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 23:21:18 2012 +0200
fix core58 merge problem.
commit 717470058ff825cc32f4eee7ffaa44986aeb1e32
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 23:19:36 2012 +0200
core59: add openssl to core update.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/python | 25 ++++++++++++++-----
config/rootfiles/common/strongswan | 3 ++
config/rootfiles/core/58/filelists/files | 3 --
config/rootfiles/core/{55 => 59}/filelists/openssh | 0
config/rootfiles/core/{55 => 59}/filelists/openssl | 0
.../{oldcore/50 => core/59}/filelists/python | 0
.../rootfiles/core/{53 => 59}/filelists/strongswan | 0
lfs/python | 4 +-
lfs/strongswan | 4 +-
....7.2-gdbm-1.patch => Python-2.7.3-gdbm-1.patch} | 0
10 files changed, 25 insertions(+), 14 deletions(-)
copy config/rootfiles/core/{55 => 59}/filelists/openssh (100%)
copy config/rootfiles/core/{55 => 59}/filelists/openssl (100%)
copy config/rootfiles/{oldcore/50 => core/59}/filelists/python (100%)
copy config/rootfiles/core/{53 => 59}/filelists/strongswan (100%)
rename src/patches/{Python-2.7.2-gdbm-1.patch => Python-2.7.3-gdbm-1.patch} (100%)
Difference in files:
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 19d98e5..047127e 100644
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@ -1,10 +1,7 @@
etc/system-release
etc/issue
etc/vimrc
-<<<<<<< HEAD
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
-=======
->>>>>>> master
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/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/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/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'],
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-05-05 21:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120505213014.956DA2018E@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox