SHA256
1
0
forked from pool/python
OBS User unknown 2008-04-18 02:59:09 +00:00 committed by Git OBS Bridge
parent 04c7392cbd
commit 2135617fae
5 changed files with 2 additions and 56 deletions

View File

@ -1,15 +0,0 @@
--- ./Lib/test/test_socket.py.orig 2008-04-15 08:35:23.000000000 +0200
+++ ./Lib/test/test_socket.py 2008-04-15 08:35:30.000000000 +0200
@@ -453,9 +453,9 @@
# XXX(nnorwitz): http://tinyurl.com/os5jz seems to indicate
# it reasonable to get the host's addr in addition to 0.0.0.0.
# At least for eCos. This is required for the S/390 to pass.
- my_ip_addr = socket.gethostbyname(socket.gethostname())
- self.assert_(name[0] in ("0.0.0.0", my_ip_addr), '%s invalid' % name[0])
- self.assertEqual(name[1], PORT+1)
+ #my_ip_addr = socket.gethostbyname(socket.gethostname())
+ #self.assert_(name[0] in ("0.0.0.0", my_ip_addr), '%s invalid' % name[0])
+ #self.assertEqual(name[1], PORT+1)
def testGetSockOpt(self):
# Testing getsockopt()

View File

@ -1,15 +0,0 @@
--- python/trunk/Objects/stringobject.c 2008/03/26 12:49:49 61936
+++ python/trunk/Objects/stringobject.c 2008/04/10 19:50:36 62271
@@ -55,7 +55,11 @@
PyString_FromStringAndSize(const char *str, Py_ssize_t size)
{
register PyStringObject *op;
- assert(size >= 0);
+ if (size < 0) {
+ PyErr_SetString(PyExc_SystemError,
+ "Negative size passed to PyString_FromStringAndSize");
+ return NULL;
+ }
if (size == 0 && (op = nullstring) != NULL) {
#ifdef COUNT_ALLOCS
null_strings++;

View File

@ -18,7 +18,7 @@ Group: Development/Languages/Python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation for Python.
Version: 2.5.1
Release: 65
Release: 63
%define pyver 2.5.2
BuildArch: noarch
%define tarname Python-%{pyver}

View File

@ -1,15 +1,3 @@
-------------------------------------------------------------------
Wed Apr 16 21:20:07 CEST 2008 - matejcik@suse.cz
- PyString_FromStringAndSize now checks size parameter
(bnc#379534, CVE-2008-1721)
-------------------------------------------------------------------
Tue Apr 15 09:14:29 CEST 2008 - adrian@suse.de
- disable DNS lookup test when running in build service.
The XEN build hosts have no network.
-------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de

View File

@ -21,7 +21,7 @@ AutoReqProv: on
Obsoletes: python-nothreads python21 python-elementtree python-sqlite
Summary: Python Interpreter
Version: 2.5.2
Release: 13
Release: 11
%define tarname Python-%{version}
Source0: %{tarname}.tar.bz2
Source6: README.SUSE
@ -41,8 +41,6 @@ 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
@ -211,10 +209,6 @@ 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
@ -487,12 +481,6 @@ 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