From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4fec525d81f9fbb94d12990823a1d063c1e96681 Date: Wed, 03 Oct 2012 20:58:26 +0200 Message-ID: <20121003185827.7365220120@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5296163680797524020==" List-Id: --===============5296163680797524020== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 3.x development tree". The branch, master has been updated via 4fec525d81f9fbb94d12990823a1d063c1e96681 (commit) via 1f6a2693b495f2d20ebf13dc7c95d68f9ee141b6 (commit) via e035b2dfaf87bcfe34b63a8b79a645b5d3038fdd (commit) via e40e92128e48e0e56c18561ffd5a77e5f7b7d800 (commit) from 405f79679ce3fe8ef7a9279f27f26d50056f15f0 (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 4fec525d81f9fbb94d12990823a1d063c1e96681 Author: Michael Tremer Date: Wed Oct 3 20:53:03 2012 +0200 pakfire: Import latest patches from upstream. commit 1f6a2693b495f2d20ebf13dc7c95d68f9ee141b6 Author: Michael Tremer Date: Wed Oct 3 20:39:16 2012 +0200 python-tornado: Build for Python 3. commit e035b2dfaf87bcfe34b63a8b79a645b5d3038fdd Author: Michael Tremer Date: Wed Oct 3 20:38:53 2012 +0200 python-setuptools: Build for Python 3. commit e40e92128e48e0e56c18561ffd5a77e5f7b7d800 Author: Michael Tremer Date: Wed Oct 3 20:29:42 2012 +0200 network: Reapply dependencies. ----------------------------------------------------------------------- Summary of changes: network/network.nm | 6 +- pakfire/pakfire.nm | 2 +- ...-QA-Remove-obsoleted-python-hardlink-tool.patch | 39 +++++++++++++++++ ...ompile-Make-script-more-robust-for-errors.patch | 45 +++++++++++++++++++ python-setuptools/python-setuptools.nm | 46 ++++++++++++++++--- python-tornado/python-tornado.nm | 39 ++++++++++++++-- 6 files changed, 160 insertions(+), 17 deletions(-) create mode 100644 pakfire/patches/0007-QA-Remove-obsoleted-python-hardlink-= tool.patch create mode 100644 pakfire/patches/0008-py-compile-Make-script-more-robust-f= or-errors.patch Difference in files: diff --git a/network/network.nm b/network/network.nm index 23f01cf..83781fd 100644 --- a/network/network.nm +++ b/network/network.nm @@ -6,7 +6,7 @@ name =3D network epoch =3D 1 version =3D 005 -release =3D 1.1 +release =3D 1.2 arch =3D noarch =20 maintainer =3D Michael Tremer @@ -37,7 +37,7 @@ packages requires aiccu bash >=3D 4.0 - #dhcp >=3D 4.2.4-1 + dhcp >=3D 4.2.4-1 ebtables hostapd initscripts >=3D 1:2.99-18 @@ -52,7 +52,7 @@ packages sqlite systemd-units tunctl - #wpa_supplicant >=3D 1.0-2 + wpa_supplicant >=3D 1.0-2 /usr/bin/ipcalc /usr/bin/logger end diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index d862b32..501e9cc 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -5,7 +5,7 @@ =20 name =3D pakfire version =3D 0.9.23 -release =3D 3 +release =3D 4 =20 maintainer =3D Michael Tremer groups =3D System/Packaging diff --git a/pakfire/patches/0007-QA-Remove-obsoleted-python-hardlink-tool.pa= tch b/pakfire/patches/0007-QA-Remove-obsoleted-python-hardlink-tool.patch new file mode 100644 index 0000000..869118d --- /dev/null +++ b/pakfire/patches/0007-QA-Remove-obsoleted-python-hardlink-tool.patch @@ -0,0 +1,39 @@ +From 99c47627b24f5a16897aa85ed83eb3919ea6ea85 Mon Sep 17 00:00:00 2001 +From: Michael Tremer +Date: Wed, 3 Oct 2012 01:02:06 +0200 +Subject: [PATCH 7/8] QA: Remove obsoleted python hardlink tool. + +--- + tools/quality-agent.d/090-python-hardlinks | 20 -------------------- + 1 file changed, 20 deletions(-) + delete mode 100755 tools/quality-agent.d/090-python-hardlinks + +diff --git a/tools/quality-agent.d/090-python-hardlinks b/tools/quality-agen= t.d/090-python-hardlinks +deleted file mode 100755 +index e2abf76..0000000 +--- a/tools/quality-agent.d/090-python-hardlinks ++++ /dev/null +@@ -1,20 +0,0 @@ +-#!/bin/bash +- +-. $(dirname ${0})/qa-include +- +-DESC=3D"Python byte-code files could be hardlinked if the optimized one is = equal" +-DESC=3D"${DESC} to the other one." +- +-function check() { +- for py in $(find ${BUILDROOT} -type f -name "*.py"); do +- if [ -e "${py}c" ] && [ -e "${py}o" ]; then +- if cmp -s "${py}c" "${py}o"; then +- log DEBUG " ${py}c -> ${py}o" +- ln -f "${py}c" "${py}o" +- fi +- fi +- done +-} +- +-run +- +--=20 +1.7.11.4 + diff --git a/pakfire/patches/0008-py-compile-Make-script-more-robust-for-erro= rs.patch b/pakfire/patches/0008-py-compile-Make-script-more-robust-for-errors= .patch new file mode 100644 index 0000000..59c3922 --- /dev/null +++ b/pakfire/patches/0008-py-compile-Make-script-more-robust-for-errors.patch @@ -0,0 +1,45 @@ +From 61918bfab20eaba61bb8ce7e8397a28806d029d2 Mon Sep 17 00:00:00 2001 +From: Michael Tremer +Date: Wed, 3 Oct 2012 14:56:41 +0200 +Subject: [PATCH 8/8] py-compile: Make script more robust for errors. + +--- + tools/py-compile | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tools/py-compile b/tools/py-compile +index 5ccd8f9..2749042 100755 +--- a/tools/py-compile ++++ b/tools/py-compile +@@ -33,14 +33,18 @@ tempfile=3D$(mktemp) + trap "rm -f ${tempfile}" EXIT +=20 + cat > ${tempfile} </dev/null) +=20 + # Compile with optimization. + ${python_interpreter} -O ${tempfile} ${filelist} +@@ -49,7 +53,7 @@ ${python_interpreter} -O ${tempfile} ${filelist} + ${python_interpreter} ${tempfile} ${filelist} +=20 + # Hardlink identical files. +-for pyc in $(find ${paths} -type f -a -name "*.pyc"); do ++for pyc in $(find ${paths} -type f -a -name "*.pyc" 2>/dev/null); do + pyo=3D"${pyc/.pyc/.pyo}" +=20 + if cmp -s "${pyc}" "${pyo}"; then +--=20 +1.7.11.4 + diff --git a/python-setuptools/python-setuptools.nm b/python-setuptools/pytho= n-setuptools.nm index e4d8fe8..01cca94 100644 --- a/python-setuptools/python-setuptools.nm +++ b/python-setuptools/python-setuptools.nm @@ -5,7 +5,7 @@ =20 name =3D python-setuptools version =3D 0.6.28 -release =3D 1 +release =3D 2 arch =3D noarch thisapp =3D distribute-%{version} =20 @@ -25,32 +25,62 @@ source_dl =3D http://pypi.python.org/packages/source/d/d= istribute/ =20 build requires + pakfire-builder >=3D 0.9.23-2 python-devel + python3-devel end =20 + DIR_APP3 =3D %{DIR_APP}-python3 + prepare_cmds + cp -av %{DIR_APP} %{DIR_APP3} + + pushd %{DIR_APP3} + for file in setuptools/command/easy_install.py distribute_setup.py ; do + sed -i '1s|^#!python|#!%{python3}|' $file + done + popd + # Scripts seem to have a wrong hashbang for file in setuptools/command/easy_install.py distribute_setup.py ; do - sed -i '1s|^#!python|#!/usr/bin/python|' $file + sed -i '1s|^#!python|#!%{python}|' $file done =20 # Fix file permissions. - chmod -R 644 %{DIR_APP}/distribute.egg-info + chmod -R 644 {%{DIR_APP},%{DIR_APP3}}/distribute.egg-info end =20 build - CFLAGS=3D"%{CFLAGS}" python setup.py build + pushd %{DIR_APP3} + CFLAGS=3D"%{CFLAGS}" %{python3} setup.py build + popd + + CFLAGS=3D"%{CFLAGS}" %{python} setup.py build end =20 install - python setup.py install --skip-build --root=3D%{BUILDROOT} + pushd %{DIR_APP3} + %{python3} setup.py install --skip-build --root=3D%{BUILDROOT} =20 - # XXX %{PYTHON_EXTRACT_EGG} /usr/lib/python*/site-packages/%{name}*.egg - rm -vf %{BUILDROOT}/usr/lib/python*/site-packages/setuptools/*.exe - rm -rvf %{BUILDROOT}/usr/lib/python*/site-packages/setuptools/tests + rm -rvf %{BUILDROOT}%{python3_sitelib}/setuptools/tests + chmod +x %{BUILDROOT}%{python3_sitelib}/setuptools/command/easy_install.py + popd + + %{python} setup.py install --skip-build --root=3D%{BUILDROOT} + + rm -rvf %{BUILDROOT}%{python_sitelib}/setuptools/tests + chmod +x %{BUILDROOT}%{python_sitelib}/setuptools/command/easy_install.py + + find %{BUILDROOT}{%{python_sitelib},%{python3_sitelib}} -name "*.exe" | xa= rgs rm -vf end end =20 packages package %{name} + + package python3-setuptools + template PYTHON3 + + files +=3D %{bindir}/easy_install-3* + end end diff --git a/python-tornado/python-tornado.nm b/python-tornado/python-tornado= .nm index 1242655..78fcbba 100644 --- a/python-tornado/python-tornado.nm +++ b/python-tornado/python-tornado.nm @@ -4,7 +4,7 @@ ############################################################################= ### =20 name =3D python-tornado -version =3D 0.2 +version =3D 2.4 release =3D 1 arch =3D noarch thisapp =3D tornado-%{version} @@ -12,7 +12,7 @@ thisapp =3D tornado-%{version} maintainer =3D Michael Tremer groups =3D Development/Libraries url =3D http://www.tornadoweb.org/ -license =3D Apache2.0 +license =3D ASL 2.0 summary =3D A python based non-blocking web server. =20 description @@ -21,22 +21,51 @@ description and reasonably fast. end =20 -source_dl =3D +source_dl =3D http://github.com/downloads/facebook/tornado/ =20 build requires + pakfire-builder >=3D 0.9.23-2 python-devel + python3-devel + python3-setuptools + python3-tools + end + + DIR_APP3 =3D %{DIR_APP}-python3 + + prepare_cmds + find tornado -name "*py" | xargs sed -e '/^#!\//, 1d' -i + + cp -a %{DIR_APP} %{DIR_APP3} + 2to3 --write --nobackups %{DIR_APP3} end =20 build - python setup.py build + pushd %{DIR_APP3} + %{python3} setup.py build + popd + + %{python} setup.py build end =20 install - python setup.py install --skip-build --root=3D%{BUILDROOT} + pushd %{DIR_APP3} + %{python3} setup.py install --skip-build --root=3D%{BUILDROOT} + popd + + %{python} setup.py install --skip-build --root=3D%{BUILDROOT} end end =20 packages package %{name} + requires + python-pycurl + end + end + + package python3-tornado + template PYTHON3 + end end hooks/post-receive -- IPFire 3.x development tree --===============5296163680797524020==--