Hello community,
here is the log from the commit of package python3 for openSUSE:Factory checked
in at 2013-11-22 19:01:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3 (Old)
and /work/SRC/openSUSE:Factory/.python3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3/python3-base.changes 2013-08-13
13:08:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3.new/python3-base.changes
2013-11-22 19:01:36.000000000 +0100
@@ -1,0 +2,23 @@
+Fri Nov 22 13:17:23 UTC 2013 - speili...@suse.com
+
+- Add python-3.3.3-skip-distutils-test_sysconfig_module.patch:
+ + Disable global and distutils sysconfig comparison test, we deviate
+ from the default depending on optflags
+
+-------------------------------------------------------------------
+Tue Nov 19 14:28:41 UTC 2013 - jmate...@suse.com
+
+- update to 3.3.3
+ * bugfix-only release
+ * many SSL-related fixes
+ * upstream fix for CVE-2013-4238
+ * upstream fixes for CVE-2013-1752
+- move example module xxlimited to python3-testsuite
+- remove --with-wide-unicode config option, it is now the default
+ (and only) choice
+- don't touch anything between make and makeinstall
+- drop python-3.2b2-buildtime-generate.patch - the issue was caused
+ by touching things between make and makeinstall
+- link pycache entries for import_failed hooks properly
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python3/python3-doc.changes 2013-06-15
10:50:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3.new/python3-doc.changes 2013-11-22
19:01:36.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 19 16:13:18 UTC 2013 - jmate...@suse.com
+
+- update to 3.3.3
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python3/python3.changes 2013-10-17
17:46:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3.new/python3.changes 2013-11-22
19:01:36.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 19 14:36:18 UTC 2013 - jmate...@suse.com
+
+- update to 3.3.3
+- move example module xxlimited to python3-testsuite
+- drop CVE-2013-4238_py33.patch - it is upstreamed
+
+-------------------------------------------------------------------
Old:
----
CVE-2013-4238_py33.patch
Python-3.3.2.tar.xz
python-3.3.2-docs-html.tar.bz2
python-3.3.2-docs-pdf-a4.tar.bz2
python-3.3.2-docs-pdf-letter.tar.bz2
New:
----
Python-3.3.3.tar.xz
python-3.3.3-docs-html.tar.bz2
python-3.3.3-docs-pdf-a4.tar.bz2
python-3.3.3-docs-pdf-letter.tar.bz2
python-3.3.3-skip-distutils-test_sysconfig_module.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-base.spec ++++++
--- /var/tmp/diff_new_pack.Zx4InB/_old 2013-11-22 19:01:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Zx4InB/_new 2013-11-22 19:01:39.000000000 +0100
@@ -36,7 +36,7 @@
Summary: Python3 Interpreter
License: Python-2.0
Group: Development/Languages/Python
-Version: 3.3.2
+Version: 3.3.3
Release: 0
%define tarversion %{version}
%define tarname Python-%{tarversion}
@@ -69,8 +69,6 @@
Patch03: python-2.6b1-canonicalize2.patch
# support finding packages in /usr/local, install to /usr/local by default
Patch04: python-3.3.0b1-localpath.patch
-# fix usage of "python" executable in "make install"
-Patch05: python-3.2b2-buildtime-generate.patch
# replace DATE, TIME and COMPILER by fixed definitions to aid reproducible
builds
Patch06: python-3.3.0b1-fix_date_time_compiler.patch
# fix wrong include path in curses-panel module
@@ -81,8 +79,8 @@
Patch10: ctypes-libffi-aarch64.patch
# Disable SO_REUSEPORT constant in tests, because it's not supported on older
kernels
Patch11: python-3.3.2-no-REUSEPORT.patch
-# CVE-2013-4073 - incorrect handling of NULL bytes in SSL certificate fields
-Patch12: CVE-2013-4238_py33.patch
+# Disable global and distutils sysconfig comparison test, we deviate from the
default depending on optflags
+Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch
### COMMON-PATCH-END ###
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -130,7 +128,7 @@
Requires: %{name} = %{version}
Summary: Python Utility and Demonstration Scripts
Group: Development/Languages/Python
-Obsoletes: python3-demo <= %{version}
+Obsoletes: python3-demo < %{version}
Provides: python3-demo = %{version}
%description -n python3-tools
@@ -154,7 +152,7 @@
%package -n python3-devel
Requires: %{name} = %{version}
Provides: python3-2to3 = %{version}
-Obsoletes: python3-2to3 <= %{version}
+Obsoletes: python3-2to3 < %{version}
Summary: Include Files and Libraries Mandatory for Building Python
Modules
Group: Development/Languages/Python
@@ -206,7 +204,6 @@
#%%patch03
#- canonicalize disabled, needs testing whether the exploit still works
%patch04
-%patch05 -p1
%patch06 -p1
%patch07
%patch09 -p1
@@ -240,8 +237,7 @@
--docdir=%{_docdir}/python \
--enable-ipv6 \
--with-fpectl \
- --enable-shared \
- --with-wide-unicode
+ --enable-shared
LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \
make %{?_smp_mflags} profile-opt
@@ -281,15 +277,6 @@
#make test TESTOPTS="-l -u network -v"
%install
-# replace rest of /usr/local/bin/python or /usr/bin/python2.5 with
/usr/bin/python3
-find . -path "./Parser" -prune \
- -o -path "./Python/makeopcodetargets.py" -prune \
- -o -name '*.py' -type f -print0 \
-| xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' \
-| xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env
+)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@'
-# the grep inbetween makes it much faster
-
-# install it
make \
OPT="%{optflags} -fPIC" \
DESTDIR=$RPM_BUILD_ROOT \
@@ -366,7 +353,7 @@
ln import_failed.py $module.py
pushd __pycache__
for i in import_failed*; do
- ln $i $module${i%import_failed}
+ ln $i $module${i#import_failed}
done
popd
done
@@ -374,6 +361,12 @@
)
echo %{sitedir}/_import_failed >
$RPM_BUILD_ROOT/%{sitedir}/site-packages/zzzz-import-failed-hooks.pth
+# fix shebangs
+for dir in %{sitedir} %{_docdir}/%{name}; do
+ find $RPM_BUILD_ROOT/$dir -name '*.py' -type f -print0 \
+ | xargs -0 sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env
+)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@'
+done
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -400,7 +393,7 @@
%doc Lib/idlelib/TODO.txt
%doc Lib/idlelib/extend.txt
%doc Lib/idlelib/ChangeLog
-%attr(755, root, root) %{_bindir}/idle3
+%{_bindir}/idle3
%attr(755, root, root) %{_bindir}/idle%{python_version}
%files -n python3-devel
@@ -423,6 +416,7 @@
%{sitedir}/*/test
%{dynlib _ctypes_test}
%{dynlib _testcapi}
+%{dynlib xxlimited}
# workaround for missing packages
%dir %{sitedir}/sqlite3
%dir %{sitedir}/tkinter
@@ -439,6 +433,8 @@
%doc %{_docdir}/%{name}/README.SUSE
%doc %{_mandir}/man1/python3.1*
%doc %{_mandir}/man1/python%{python_version}.1*
+# license text, not a doc because the code can use it at run-time
+%{sitedir}/LICENSE.txt
# makefile etc
%{sitedir}/config-%{python_abi}
/etc/rpm/macros.python3
@@ -505,7 +501,7 @@
%dir %{sitedir}/site-packages
%dir %{sitedir}/site-packages/__pycache__
%exclude %{sitedir}/*/test
-%{sitedir}/*.*
+%{sitedir}/*.py
%{sitedir}/ctypes
%{sitedir}/collections
%{sitedir}/concurrent
@@ -530,13 +526,14 @@
# import-failed hooks
%{sitedir}/_import_failed
%{sitedir}/site-packages/zzzz-import-failed-hooks.pth
+# symlinks
+%{_bindir}/pyvenv
+%{_bindir}/python3
+%{_bindir}/pydoc3
# executables
-%attr(755, root, root) %{_bindir}/pydoc3
%attr(755, root, root) %{_bindir}/pydoc%{python_version}
%attr(755, root, root) %{_bindir}/python%{python_abi}
%attr(755, root, root) %{_bindir}/python%{python_version}
-%attr(755, root, root) %{_bindir}/python3
-%attr(755, root, root) %{_bindir}/pyvenv
%attr(755, root, root) %{_bindir}/pyvenv-%{python_version}
%changelog
++++++ python3-doc.spec ++++++
--- /var/tmp/diff_new_pack.Zx4InB/_old 2013-11-22 19:01:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Zx4InB/_new 2013-11-22 19:01:39.000000000 +0100
@@ -23,13 +23,13 @@
Summary: Additional Package Documentation for Python.
License: Python-2.0
Group: Development/Languages/Python
-Version: 3.3.2
+Version: 3.3.3
Release: 0
BuildArch: noarch
%define tarversion %{version}
%define tarname Python-%{tarversion}
%define pyname python3
-%define pyver 3.3.2
+%define pyver 3.3.3
Enhances: %{pyname}=%{pyver}
Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz
# docs for current version are regenerated every day
@@ -56,8 +56,6 @@
Patch03: python-2.6b1-canonicalize2.patch
# support finding packages in /usr/local, install to /usr/local by default
Patch04: python-3.3.0b1-localpath.patch
-# fix usage of "python" executable in "make install"
-Patch05: python-3.2b2-buildtime-generate.patch
# replace DATE, TIME and COMPILER by fixed definitions to aid reproducible
builds
Patch06: python-3.3.0b1-fix_date_time_compiler.patch
# fix wrong include path in curses-panel module
@@ -68,8 +66,6 @@
Patch10: ctypes-libffi-aarch64.patch
# Disable SO_REUSEPORT constant in tests, because it's not supported on older
kernels
Patch11: python-3.3.2-no-REUSEPORT.patch
-# CVE-2013-4073 - incorrect handling of NULL bytes in SSL certificate fields
-Patch12: CVE-2013-4238_py33.patch
### COMMON-PATCH-END ###
### COMMON-DEF-BEGIN ###
@@ -130,13 +126,11 @@
#%%patch03
#- canonicalize disabled, needs testing whether the exploit still works
%patch04
-%patch05 -p1
%patch06 -p1
%patch07
%patch09 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
# drop Autoconf version requirement
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
++++++ python3.spec ++++++
--- /var/tmp/diff_new_pack.Zx4InB/_old 2013-11-22 19:01:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Zx4InB/_new 2013-11-22 19:01:39.000000000 +0100
@@ -40,7 +40,7 @@
Summary: Python3 Interpreter
License: Python-2.0
Group: Development/Languages/Python
-Version: 3.3.2
+Version: 3.3.3
Release: 0
%define tarversion %{version}
%define tarname Python-%{tarversion}
@@ -67,8 +67,6 @@
Patch03: python-2.6b1-canonicalize2.patch
# support finding packages in /usr/local, install to /usr/local by default
Patch04: python-3.3.0b1-localpath.patch
-# fix usage of "python" executable in "make install"
-Patch05: python-3.2b2-buildtime-generate.patch
# replace DATE, TIME and COMPILER by fixed definitions to aid reproducible
builds
Patch06: python-3.3.0b1-fix_date_time_compiler.patch
# fix wrong include path in curses-panel module
@@ -79,8 +77,6 @@
Patch10: ctypes-libffi-aarch64.patch
# Disable SO_REUSEPORT constant in tests, because it's not supported on older
kernels
Patch11: python-3.3.2-no-REUSEPORT.patch
-# CVE-2013-4073 - incorrect handling of NULL bytes in SSL certificate fields
-Patch12: CVE-2013-4238_py33.patch
### COMMON-PATCH-END ###
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -176,13 +172,11 @@
#%%patch03
#- canonicalize disabled, needs testing whether the exploit still works
%patch04
-%patch05 -p1
%patch06 -p1
%patch07
%patch09 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
# drop Autoconf version requirement
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
@@ -196,7 +190,7 @@
autoreconf -f -i .
# prevent make from trying to rebuild asdl stuff, which requires existing
# python installation
-touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
+touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
Objects/typeslots.inc
./configure \
--prefix=%{_prefix} \
@@ -221,11 +215,6 @@
make test TESTOPTS="-u -network,-gui $TESTS"
%install
-# replace rest of /usr/local/bin/python or /usr/bin/python2.5 with
/usr/bin/python3
-find . -path "./Parser" -prune -o -path "./Python/makeopcodetargets.py" -prune
-o -name '*.py' -type f -print0 | xargs -0 grep -lE '^#! *(/usr/.*bin/(env
+)?)?python' | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env
+)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@'
-# the grep inbetween makes it much faster
-
-# install it
make \
OPT="%{optflags} -fPIC" \
DESTDIR=$RPM_BUILD_ROOT \
@@ -259,12 +248,16 @@
_lzma \
math mmap _multibytecodec _multiprocessing nis ossaudiodev parser _pickle \
_posixsubprocess _random resource select _socket spwd _struct syslog \
- termios _testbuffer time unicodedata zlib _ctypes_test _testcapi \
+ termios _testbuffer time unicodedata zlib _ctypes_test _testcapi xxlimited
\
_md5 _sha1 _sha256 _sha512
do
eval rm "$RPM_BUILD_ROOT%{sitedir}/lib-dynload/$library.*"
done
+# fix shebangs
+find $RPM_BUILD_ROOT%{sitedir} -name '*.py' -type f -print0 \
+ | xargs -0 sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env
+)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@'
+
%fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version}
%files tk
@@ -298,6 +291,5 @@
%{dynlib readline}
%{dynlib _sqlite3}
%{dynlib _ssl}
-%{dynlib xxlimited}
%changelog
++++++ Python-3.3.2.tar.xz -> Python-3.3.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/python3/Python-3.3.2.tar.xz
/work/SRC/openSUSE:Factory/.python3.new/Python-3.3.3.tar.xz differ: char 26,
line 1
++++++ import_failed.map ++++++
--- /var/tmp/diff_new_pack.Zx4InB/_old 2013-11-22 19:01:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Zx4InB/_new 2013-11-22 19:01:39.000000000 +0100
@@ -1,7 +1,7 @@
python3-tools: turtledemo
python3-idle: idlelib
-python3-testsuite: test _ctypes_test _testcapi
+python3-testsuite: test _ctypes_test _testcapi xxlimited
python3-tk: tkinter _tkinter
python3-curses: curses _curses _curses_panel
python3-dbm: dbm _dbm _gdbm
-python3: sqlite3 xml xmlrpc _hashlib pyexpat readline _sqlite3 _ssl xxlimited
+python3: sqlite3 xml xmlrpc _hashlib pyexpat readline _sqlite3 _ssl
++++++ python-3.3.2-no-REUSEPORT.patch ++++++
--- /var/tmp/diff_new_pack.Zx4InB/_old 2013-11-22 19:01:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Zx4InB/_new 2013-11-22 19:01:39.000000000 +0100
@@ -1,7 +1,7 @@
-Index: Python-2.7.4/Lib/test/support.py
+Index: Python-2.7.4/Lib/test/support/__init__.py
===================================================================
---- Python-2.7.4.orig/Lib/test/support.py 2013-04-06 16:02:32.000000000
+0200
-+++ Python-2.7.4/Lib/test/support.py 2013-05-09 17:46:46.789663295 +0200
+--- Python-2.7.4.orig/Lib/test/support/__init__.py 2013-04-06
16:02:32.000000000 +0200
++++ Python-2.7.4/Lib/test/support/__init__.py 2013-05-09 17:46:46.789663295
+0200
@@ -371,10 +371,10 @@
if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1:
raise TestFailed("tests should never set the SO_REUSEADDR "
\
++++++ python-3.3.2-docs-html.tar.bz2 -> python-3.3.3-docs-html.tar.bz2 ++++++
++++ 53199 lines of diff (skipped)
++++++ python-3.3.2-docs-pdf-a4.tar.bz2 -> python-3.3.3-docs-pdf-a4.tar.bz2
++++++
/work/SRC/openSUSE:Factory/python3/python-3.3.2-docs-pdf-a4.tar.bz2
/work/SRC/openSUSE:Factory/.python3.new/python-3.3.3-docs-pdf-a4.tar.bz2
differ: char 11, line 1
++++++ python-3.3.2-docs-pdf-letter.tar.bz2 ->
python-3.3.3-docs-pdf-letter.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/python3/python-3.3.2-docs-pdf-letter.tar.bz2
/work/SRC/openSUSE:Factory/.python3.new/python-3.3.3-docs-pdf-letter.tar.bz2
differ: char 11, line 1
++++++ python-3.3.3-skip-distutils-test_sysconfig_module.patch ++++++
diff -ruN a/Lib/distutils/tests/test_sysconfig.py
b/Lib/distutils/tests/test_sysconfig.py
--- a/Lib/distutils/tests/test_sysconfig.py 2013-11-17 08:22:31.000000000
+0100
+++ b/Lib/distutils/tests/test_sysconfig.py 2013-11-22 14:05:40.718570645
+0100
@@ -127,6 +127,7 @@
'OTHER': 'foo'})
+ @unittest.skip("Either fix distutil's sysconfig everytime we add new
compiler flags or we just skip this test")
def test_sysconfig_module(self):
import sysconfig as global_sysconfig
self.assertEqual(global_sysconfig.get_config_var('CFLAGS'),
sysconfig.get_config_var('CFLAGS'))
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
