[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. fef20dab7453231b19228efb90577070d2548c50
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, kernel-update has been updated via fef20dab7453231b19228efb90577070d2548c50 (commit) via 5b6fdbf9d5cf00bcba7d78bfaa8dd976a5d96411 (commit) via 7f76d8cb4aa2a932fd1b00f0f55110a7ea4d3ee1 (commit) via 4a3ae7fa37f591efba96cc4104ca9a0e39556945 (commit) via be5a3b36a70dc92e898b1f6c997f6a90a5654e56 (commit) via d7d2dca96403baeb02b182afbb56679837f1a904 (commit) via 423d77a71fd48916b88b39d5554b37bd5743f453 (commit) via 6666803d83db59c429976e75d931dea0af19a81c (commit) via 9070a6c331e58200548ee4bd134c2ef8f558a867 (commit) via a526de38bc9d4aacc3275ad7e0405006df5b7dbc (commit) via 6bdc39023580e1634b77f3529cdc3654b58cfd6f (commit) via b5c3859e301bab60fd6a1f905b52ffa3ce407d6b (commit) via 717470058ff825cc32f4eee7ffaa44986aeb1e32 (commit) from 71af1843723e08a23864af50de27438bde6595f0 (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 fef20dab7453231b19228efb90577070d2548c50 Merge: 71af184 5b6fdbf Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 14 10:40:15 2012 +0200
Merge remote-tracking branch 'origin/next' into kernel-update
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/python | 25 +++++++++++---- config/rootfiles/common/strongswan | 3 ++ config/rootfiles/core/58/filelists/files | 3 -- config/rootfiles/core/{54 => 59}/filelists/GeoIP | 0 config/rootfiles/core/59/filelists/files | 1 + 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 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 | 2 +- ....7.2-gdbm-1.patch => Python-2.7.3-gdbm-1.patch} | 0 src/patches/traceroute-2.0.18-ipfire.patch | 31 ++++++++++++++++++++ 21 files changed, 75 insertions(+), 29 deletions(-) copy config/rootfiles/core/{54 => 59}/filelists/GeoIP (100%) 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%) 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/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/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/files b/config/rootfiles/core/59/filelists/files index 16464c7..fef386b 100644 --- a/config/rootfiles/core/59/filelists/files +++ b/config/rootfiles/core/59/filelists/files @@ -4,3 +4,4 @@ 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/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@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 c58c048..9aef173 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@
include Config
-VER = 0.9.8w +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 = 4ceb7d570e42c094b360cc7b8e848a0b +$(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@ipfire.org # +# Copyright (C) 2007-2012 IPFire Team info@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 b1b8514..9e34c03 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number CORE="59" # Core Level (Filename) -PAKFIRE_CORE="58" # Core Level (PAKFIRE) +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
-
git＠ipfire.org