Hello community,
here is the log from the commit of package python for openSUSE:Factory checked
in at 2013-11-26 19:33:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python (Old)
and /work/SRC/openSUSE:Factory/.python.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python/python-base.changes 2013-10-11
12:54:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2013-11-26
19:33:33.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Nov 21 15:39:28 UTC 2013 - jmate...@suse.com
+
+- update to 2.7.6
+ * bugfix-only release
+ * SSL-related fixes
+ * upstream fix for CVE-2013-4238
+ * upstream fixes for CVE-2013-1752
+- removed upstreamed patch CVE-2013-4238_py27.patch
+- reintroduce audioop.so as the problems with it seem to be fixed
+ (bnc#831442)
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python/python-doc.changes 2013-06-25
06:57:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python.new/python-doc.changes 2013-11-26
19:33:33.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 21 15:55:04 UTC 2013 - jmate...@suse.com
+
+- update to 2.7.6
+- docs are now versioned with patchlevel too
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python/python.changes 2013-09-26
19:43:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python.new/python.changes 2013-11-26
19:33:33.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 21 15:54:55 UTC 2013 - jmate...@suse.com
+
+- update to 2.7.6
+
+-------------------------------------------------------------------
Old:
----
CVE-2013-4238_py27.patch
Python-2.7.5.tar.xz
python-2.7.5-docs-html.tar.bz2
python-2.7.5-docs-pdf-a4.tar.bz2
python-2.7.5-docs-pdf-letter.tar.bz2
New:
----
Python-2.7.6.tar.xz
python-2.7.6-docs-html.tar.bz2
python-2.7.6-docs-pdf-a4.tar.bz2
python-2.7.6-docs-pdf-letter.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-base.spec ++++++
--- /var/tmp/diff_new_pack.CqkVhw/_old 2013-11-26 19:33:35.000000000 +0100
+++ /var/tmp/diff_new_pack.CqkVhw/_new 2013-11-26 19:33:35.000000000 +0100
@@ -17,7 +17,7 @@
Name: python-base
-Version: 2.7.5
+Version: 2.7.6
Release: 0
Summary: Python Interpreter base package
License: Python-2.0
@@ -50,7 +50,6 @@
Patch22: python-2.7.4-aarch64.patch
Patch23: python-2.7.4-no-REUSEPORT.patch
Patch24: python-bsddb6.diff
-Patch25: CVE-2013-4238_py27.patch
# COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake
@@ -142,7 +141,6 @@
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac
@@ -227,9 +225,8 @@
CLEANUP_DIR="%{buildroot}%{_libdir}/python%{python_version}"
# don't distribute precompiled windows installers (duh)
rm -f $CLEANUP_DIR/distutils/command/*.exe
-# kill imageop.so and audioop.so, they are rarely used and insecure
+# kill imageop.so - it used to be insecure and it is deprecated anyway
rm -f $CLEANUP_DIR/lib-dynload/imageop.so
-rm -f $CLEANUP_DIR/lib-dynload/audioop.so
# link shared library instead of static library that tools expect
ln -s ../../libpython%{python_version}.so
%{buildroot}%{_libdir}/python%{python_version}/config/libpython%{python_version}.so
# remove various things that don't need to be in python-base
@@ -348,6 +345,7 @@
%{_libdir}/python%{python_version}/lib-dynload/_struct.so
%{_libdir}/python%{python_version}/lib-dynload/_testcapi.so
%{_libdir}/python%{python_version}/lib-dynload/array.so
+%{_libdir}/python%{python_version}/lib-dynload/audioop.so
%{_libdir}/python%{python_version}/lib-dynload/binascii.so
%{_libdir}/python%{python_version}/lib-dynload/bz2.so
%{_libdir}/python%{python_version}/lib-dynload/cPickle.so
++++++ python-doc.spec ++++++
--- /var/tmp/diff_new_pack.CqkVhw/_old 2013-11-26 19:33:35.000000000 +0100
+++ /var/tmp/diff_new_pack.CqkVhw/_new 2013-11-26 19:33:35.000000000 +0100
@@ -16,23 +16,22 @@
#
Name: python-doc
-Version: 2.7
+Version: 2.7.6
Release: 0
Summary: Additional Package Documentation for Python
License: Python-2.0
Group: Development/Languages/Python
Url: http://www.python.org/
-%define pyver 2.7.5
-%define tarname Python-%{pyver}
+%define tarname Python-%{version}
Source0: %{tarname}.tar.xz
# docs for current version are regenerated every day
# this messes with autobuild "file changed" checks
#Source1:
http://docs.python.org/%{version}/archives/python-%{pyver}-docs-html.tar.bz2
#Source2:
http://docs.python.org/%{version}/archives/python-%{pyver}-docs-pdf-a4.tar.bz2
#Source3:
http://docs.python.org/%{version}/archives/python-%{pyver}-docs-pdf-letter.tar.bz2
-Source1: python-%{pyver}-docs-html.tar.bz2
-Source2: python-%{pyver}-docs-pdf-a4.tar.bz2
-Source3: python-%{pyver}-docs-pdf-letter.tar.bz2
+Source1: python-%{version}-docs-html.tar.bz2
+Source2: python-%{version}-docs-pdf-a4.tar.bz2
+Source3: python-%{version}-docs-pdf-letter.tar.bz2
%if 0%{suse_version} <= 1210
BuildRequires: xz
%endif
@@ -56,7 +55,6 @@
Patch22: python-2.7.4-aarch64.patch
Patch23: python-2.7.4-no-REUSEPORT.patch
Patch24: python-bsddb6.diff
-Patch25: CVE-2013-4238_py27.patch
# COMMON-PATCH-END
Provides: pyth_doc
Provides: pyth_ps
@@ -64,7 +62,7 @@
Obsoletes: pyth_ps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-Enhances: python = %{pyver}
+Enhances: python = %{version}
%description
Tutorial, Global Module Index, Language Reference, Library Reference,
@@ -104,7 +102,6 @@
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac
@@ -117,7 +114,7 @@
export PDOCS=%{buildroot}%{_docdir}/python
install -d -m 755 $PDOCS/Misc
tar xfj %{SOURCE1} -C $PDOCS/
-mv $PDOCS/python-%{pyver}-docs-html $PDOCS/html
+mv $PDOCS/python-%{version}-docs-html $PDOCS/html
tar xfj %{SOURCE2} -C $PDOCS
mv $PDOCS/docs-pdf $PDOCS/paper-a4
tar xfj %{SOURCE3} -C $PDOCS
++++++ python.spec ++++++
--- /var/tmp/diff_new_pack.CqkVhw/_old 2013-11-26 19:33:35.000000000 +0100
+++ /var/tmp/diff_new_pack.CqkVhw/_new 2013-11-26 19:33:35.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: python
-Version: 2.7.5
+Version: 2.7.6
Release: 0
Summary: Python Interpreter
License: Python-2.0
@@ -56,7 +56,6 @@
Patch22: python-2.7.4-aarch64.patch
Patch23: python-2.7.4-no-REUSEPORT.patch
Patch24: python-bsddb6.diff
-Patch25: CVE-2013-4238_py27.patch
# COMMON-PATCH-END
BuildRequires: automake
BuildRequires: db-devel
@@ -180,7 +179,6 @@
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac
++++++ Python-2.7.5.tar.xz -> Python-2.7.6.tar.xz ++++++
/work/SRC/openSUSE:Factory/python/Python-2.7.5.tar.xz
/work/SRC/openSUSE:Factory/.python.new/Python-2.7.6.tar.xz differ: char 26,
line 1
++++++ python-2.7.5-multilib.patch ++++++
--- /var/tmp/diff_new_pack.CqkVhw/_old 2013-11-26 19:33:35.000000000 +0100
+++ /var/tmp/diff_new_pack.CqkVhw/_new 2013-11-26 19:33:35.000000000 +0100
@@ -1,6 +1,8 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -732,6 +732,41 @@
+Index: Python-2.7.6/configure.ac
+===================================================================
+--- Python-2.7.6.orig/configure.ac 2013-11-19 17:34:49.063388540 +0100
++++ Python-2.7.6/configure.ac 2013-11-19 17:35:02.848465919 +0100
+@@ -733,6 +733,41 @@
;;
esac
@@ -42,8 +44,10 @@
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
---- a/Include/pythonrun.h
-+++ b/Include/pythonrun.h
+Index: Python-2.7.6/Include/pythonrun.h
+===================================================================
+--- Python-2.7.6.orig/Include/pythonrun.h 2013-11-19 17:34:49.063388540
+0100
++++ Python-2.7.6/Include/pythonrun.h 2013-11-19 17:35:02.848465919 +0100
@@ -108,6 +108,8 @@
/* In their own files */
PyAPI_FUNC(const char *) Py_GetVersion(void);
@@ -53,8 +57,10 @@
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
---- a/Lib/distutils/command/install.py
-+++ b/Lib/distutils/command/install.py
+Index: Python-2.7.6/Lib/distutils/command/install.py
+===================================================================
+--- Python-2.7.6.orig/Lib/distutils/command/install.py 2013-11-19
17:34:49.064388546 +0100
++++ Python-2.7.6/Lib/distutils/command/install.py 2013-11-19
17:35:02.849465924 +0100
@@ -22,6 +22,8 @@
from site import USER_SITE
@@ -73,8 +79,10 @@
'headers': '$base/include/python$py_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
+Index: Python-2.7.6/Lib/distutils/sysconfig.py
+===================================================================
+--- Python-2.7.6.orig/Lib/distutils/sysconfig.py 2013-11-19
17:34:49.064388546 +0100
++++ Python-2.7.6/Lib/distutils/sysconfig.py 2013-11-19 17:35:02.849465924
+0100
@@ -119,8 +119,11 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
@@ -89,8 +97,10 @@
if standard_lib:
return libpython
else:
---- a/Lib/pydoc.py
-+++ b/Lib/pydoc.py
+Index: Python-2.7.6/Lib/pydoc.py
+===================================================================
+--- Python-2.7.6.orig/Lib/pydoc.py 2013-11-19 17:34:49.064388546 +0100
++++ Python-2.7.6/Lib/pydoc.py 2013-11-19 17:35:02.849465924 +0100
@@ -352,7 +352,7 @@
docloc = os.environ.get("PYTHONDOCS",
@@ -100,8 +110,10 @@
"python"+sys.version[0:3])
if (isinstance(object, type(os)) and
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
---- a/Lib/site.py
-+++ b/Lib/site.py
+Index: Python-2.7.6/Lib/site.py
+===================================================================
+--- Python-2.7.6.orig/Lib/site.py 2013-11-19 17:34:49.065388551 +0100
++++ Python-2.7.6/Lib/site.py 2013-11-19 17:35:02.849465924 +0100
@@ -288,13 +288,18 @@
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
@@ -124,8 +136,10 @@
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
# locations.
---- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
+Index: Python-2.7.6/Lib/sysconfig.py
+===================================================================
+--- Python-2.7.6.orig/Lib/sysconfig.py 2013-11-19 17:34:49.065388551 +0100
++++ Python-2.7.6/Lib/sysconfig.py 2013-11-19 17:35:02.849465924 +0100
@@ -7,10 +7,10 @@
_INSTALL_SCHEMES = {
@@ -154,8 +168,10 @@
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
---- a/Lib/test/test_dl.py
-+++ b/Lib/test/test_dl.py
+Index: Python-2.7.6/Lib/test/test_dl.py
+===================================================================
+--- Python-2.7.6.orig/Lib/test/test_dl.py 2013-11-19 17:34:49.065388551
+0100
++++ Python-2.7.6/Lib/test/test_dl.py 2013-11-19 17:35:02.849465924 +0100
@@ -5,10 +5,11 @@
import unittest
from test.test_support import verbose, import_module
@@ -170,8 +186,10 @@
('/usr/bin/cygwin1.dll', 'getpid'),
('/usr/lib/libc.dylib', 'getpid'),
]
---- a/Lib/test/test_site.py
-+++ b/Lib/test/test_site.py
+Index: Python-2.7.6/Lib/test/test_site.py
+===================================================================
+--- Python-2.7.6.orig/Lib/test/test_site.py 2013-11-19 17:34:49.065388551
+0100
++++ Python-2.7.6/Lib/test/test_site.py 2013-11-19 17:35:02.850465930 +0100
@@ -241,12 +241,16 @@
self.assertEqual(dirs[2], wanted)
elif os.sep == '/':
@@ -192,8 +210,10 @@
else:
# other platforms
self.assertEqual(len(dirs), 2)
---- a/Lib/trace.py
-+++ b/Lib/trace.py
+Index: Python-2.7.6/Lib/trace.py
+===================================================================
+--- Python-2.7.6.orig/Lib/trace.py 2013-11-19 17:34:49.065388551 +0100
++++ Python-2.7.6/Lib/trace.py 2013-11-19 17:35:02.850465930 +0100
@@ -754,10 +754,10 @@
# should I also call expanduser? (after all, could use $HOME)
@@ -207,8 +227,10 @@
"python" + sys.version[:3]))
s = os.path.normpath(s)
ignore_dirs.append(s)
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
+Index: Python-2.7.6/Makefile.pre.in
+===================================================================
+--- Python-2.7.6.orig/Makefile.pre.in 2013-11-19 17:34:49.066388557 +0100
++++ Python-2.7.6/Makefile.pre.in 2013-11-19 17:35:02.850465930 +0100
@@ -87,6 +87,8 @@
# Machine-dependent subdirectories
@@ -218,7 +240,7 @@
# Multiarch directory (may be empty)
MULTIARCH= @MULTIARCH@
-@@ -579,6 +581,7 @@
+@@ -584,6 +586,7 @@
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
@@ -226,7 +248,7 @@
-o $@ $(srcdir)/Modules/getpath.c
Modules/python.o: $(srcdir)/Modules/python.c
-@@ -621,7 +624,7 @@
+@@ -626,7 +629,7 @@
Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
Python/getplatform.o: $(srcdir)/Python/getplatform.c
@@ -235,8 +257,10 @@
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@
$(srcdir)/Python/importdl.c
---- a/Modules/getpath.c
-+++ b/Modules/getpath.c
+Index: Python-2.7.6/Modules/getpath.c
+===================================================================
+--- Python-2.7.6.orig/Modules/getpath.c 2013-11-19 17:34:49.066388557
+0100
++++ Python-2.7.6/Modules/getpath.c 2013-11-19 17:35:02.850465930 +0100
@@ -116,9 +116,11 @@
#define EXEC_PREFIX PREFIX
#endif
@@ -260,8 +284,10 @@
static void
reduce(char *dir)
---- a/Python/getplatform.c
-+++ b/Python/getplatform.c
+Index: Python-2.7.6/Python/getplatform.c
+===================================================================
+--- Python-2.7.6.orig/Python/getplatform.c 2013-11-19 17:34:49.066388557
+0100
++++ Python-2.7.6/Python/getplatform.c 2013-11-19 17:35:02.850465930 +0100
@@ -10,3 +10,23 @@
{
return PLATFORM;
@@ -286,8 +312,10 @@
+{
+ return LIB;
+}
---- a/Python/sysmodule.c
-+++ b/Python/sysmodule.c
+Index: Python-2.7.6/Python/sysmodule.c
+===================================================================
+--- Python-2.7.6.orig/Python/sysmodule.c 2013-11-19 17:34:49.066388557
+0100
++++ Python-2.7.6/Python/sysmodule.c 2013-11-19 17:35:02.850465930 +0100
@@ -1419,6 +1419,10 @@
PyString_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
@@ -299,18 +327,20 @@
SET_SYS_FROM_STRING("executable",
PyString_FromString(Py_GetProgramFullPath()));
SET_SYS_FROM_STRING("prefix",
---- a/setup.py
-+++ b/setup.py
-@@ -437,7 +437,7 @@
-
+Index: Python-2.7.6/setup.py
+===================================================================
+--- Python-2.7.6.orig/setup.py 2013-11-19 17:34:49.067388562 +0100
++++ Python-2.7.6/setup.py 2013-11-19 17:35:35.826650956 +0100
+@@ -438,7 +438,7 @@
def detect_modules(self):
# Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/' + sys.lib)
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- self.add_gcc_paths()
- self.add_multiarch_paths()
-@@ -756,11 +756,11 @@
+ if not cross_compiling:
+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/' +
sys.lib)
+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ if cross_compiling:
+ self.add_gcc_paths()
+@@ -758,11 +758,11 @@
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
@@ -324,7 +354,7 @@
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
-@@ -1861,18 +1861,17 @@
+@@ -1910,18 +1910,17 @@
# Check for various platform-specific directories
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
++++++ python-2.7.5-docs-html.tar.bz2 -> python-2.7.6-docs-html.tar.bz2 ++++++
++++ 46510 lines of diff (skipped)
++++++ python-2.7.5-docs-pdf-a4.tar.bz2 -> python-2.7.6-docs-pdf-a4.tar.bz2
++++++
/work/SRC/openSUSE:Factory/python/python-2.7.5-docs-pdf-a4.tar.bz2
/work/SRC/openSUSE:Factory/.python.new/python-2.7.6-docs-pdf-a4.tar.bz2 differ:
char 11, line 1
++++++ python-2.7.5-docs-pdf-letter.tar.bz2 ->
python-2.7.6-docs-pdf-letter.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/python/python-2.7.5-docs-pdf-letter.tar.bz2
/work/SRC/openSUSE:Factory/.python.new/python-2.7.6-docs-pdf-letter.tar.bz2
differ: char 11, line 1
++++++ remove-static-libpython.diff ++++++
--- /var/tmp/diff_new_pack.CqkVhw/_old 2013-11-26 19:33:39.000000000 +0100
+++ /var/tmp/diff_new_pack.CqkVhw/_new 2013-11-26 19:33:39.000000000 +0100
@@ -1,6 +1,8 @@
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -434,7 +434,7 @@
+Index: Python-2.7.6/Makefile.pre.in
+===================================================================
+--- Python-2.7.6.orig/Makefile.pre.in 2013-11-19 17:36:56.968106247 +0100
++++ Python-2.7.6/Makefile.pre.in 2013-11-19 17:36:56.972106270 +0100
+@@ -438,7 +438,7 @@
# Build the interpreter
@@ -9,8 +11,8 @@
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/python.o \
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-@@ -460,18 +460,6 @@
- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+@@ -465,18 +465,6 @@
+ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)'
\
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-# Build static library
@@ -28,7 +30,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME)
$(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -1089,18 +1077,6 @@
+@@ -1094,18 +1082,6 @@
else true; \
fi; \
done
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
