From 717470058ff825cc32f4eee7ffaa44986aeb1e32 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 5 May 2012 23:19:36 +0200 Subject: [PATCH 1/4] core59: add openssl to core update. --- config/rootfiles/core/59/filelists/openssh | 1 + config/rootfiles/core/59/filelists/openssl | 1 + 2 files changed, 2 insertions(+) create mode 120000 config/rootfiles/core/59/filelists/openssh create mode 120000 config/rootfiles/core/59/filelists/openssl diff --git a/config/rootfiles/core/59/filelists/openssh b/config/rootfiles/core/59/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /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 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/59/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file From b5c3859e301bab60fd6a1f905b52ffa3ce407d6b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 5 May 2012 23:21:18 +0200 Subject: [PATCH 2/4] fix core58 merge problem. --- config/rootfiles/core/58/filelists/files | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files index 19d98e57c..047127e7e 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 From 6bdc39023580e1634b77f3529cdc3654b58cfd6f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 5 May 2012 23:23:53 +0200 Subject: [PATCH 3/4] python: update to 2.7.3. --- config/rootfiles/common/python | 25 +++++++++++++------ config/rootfiles/core/59/filelists/python | 1 + lfs/python | 4 +-- ...gdbm-1.patch => Python-2.7.3-gdbm-1.patch} | 0 4 files changed, 21 insertions(+), 9 deletions(-) create mode 120000 config/rootfiles/core/59/filelists/python rename src/patches/{Python-2.7.2-gdbm-1.patch => Python-2.7.3-gdbm-1.patch} (100%) diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index c6421cb94..3472e2517 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/core/59/filelists/python b/config/rootfiles/core/59/filelists/python new file mode 120000 index 000000000..ffe6e2c49 --- /dev/null +++ b/config/rootfiles/core/59/filelists/python @@ -0,0 +1 @@ +../../../common/python \ No newline at end of file diff --git a/lfs/python b/lfs/python index 0deaadd11..6095e5ed0 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/src/patches/Python-2.7.2-gdbm-1.patch b/src/patches/Python-2.7.3-gdbm-1.patch similarity index 100% rename from src/patches/Python-2.7.2-gdbm-1.patch rename to src/patches/Python-2.7.3-gdbm-1.patch From a526de38bc9d4aacc3275ad7e0405006df5b7dbc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 5 May 2012 23:25:07 +0200 Subject: [PATCH 4/4] strongswan: update to 4.6.3. --- config/rootfiles/common/strongswan | 3 +++ config/rootfiles/core/59/filelists/strongswan | 1 + lfs/strongswan | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 120000 config/rootfiles/core/59/filelists/strongswan diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 9b02c0b6f..4c7d558b1 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/59/filelists/strongswan b/config/rootfiles/core/59/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/59/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/lfs/strongswan b/lfs/strongswan index 964f2ed46..44497d480 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)