OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=20

python.spec

@@ -21,7 +21,7 @@ AutoReqProv:    on
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
 Version:        2.5.2
-Release:        11
+Release:        14
 %define       tarname        Python-%{version}
 Source0:        %{tarname}.tar.bz2
 Source6:        README.SUSE
@@ -41,6 +41,8 @@ Patch27:        python-2.5-https_warn.patch
 Patch28:        python-2.5.2-subprocess-eintr-safety.patch
 Patch30:        python-2.5.1-sqlite.patch
 Patch31:        python-2.5.2-fwrapv.patch
+Patch32:        disable-dns-test.diff
+Patch33:        python-2.5.2-from-string-and-size.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 %define         idle_name         idle
@@ -209,6 +211,10 @@ Python2.x, it is part of the core Python distribution.
 %patch28
 %patch30
 %patch31
+%if 0%{?suse_version}
+%patch32
+%endif
+%patch33 -p2
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
 find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -481,6 +487,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/python2
 
 %changelog
+* Wed Apr 16 2008 matejcik@suse.cz
+- PyString_FromStringAndSize now checks size parameter
+  (bnc#379534, CVE-2008-1721)
+* Tue Apr 15 2008 adrian@suse.de
+- disable DNS lookup test when running in build service.
+  The XEN build hosts have no network.
 * Thu Apr 10 2008 ro@suse.de
 - added baselibs.conf file to build xxbit packages
   for multilib support