Author: bdubbs
Date: 2008-12-30 20:08:28 -0700 (Tue, 30 Dec 2008)
New Revision: 2032
Added:
trunk/Python/Python-2.6.1-gdbm-1.patch
trunk/Python/Python-2.6.1-testing-1.patch
Log:
Add new Python patches for 2.6.1
Added: trunk/Python/Python-2.6.1-gdbm-1.patch
===================================================================
--- trunk/Python/Python-2.6.1-gdbm-1.patch (rev 0)
+++ trunk/Python/Python-2.6.1-gdbm-1.patch 2008-12-31 03:08:28 UTC (rev
2032)
@@ -0,0 +1,28 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2003-12-26
+Initial Package Version: 2.3.3
+Origin: Greg Schafer and Jim Gifford
+Description: Fixes Python build issue with gdbm
+Comment: Rediffed for Python-2.6.1 by Bruce Dubbs 2008-12-30
+
+$LastChangedBy$
+$Date$
+
+diff -Naur Python-2.6.1/setup.py Python-2.6.1.new/setup.py
+--- Python-2.6.1/setup.py 2008-11-04 14:43:31.000000000 -0600
++++ Python-2.6.1.new/setup.py 2008-12-30 17:17:37.000000000 -0600
+@@ -1015,12 +1015,12 @@
+ if self.compiler.find_library_file(lib_dirs, 'ndbm'):
+ ndbm_libs = ['ndbm']
+ else:
+- ndbm_libs = []
++ ndbm_libs = ['gdbm', 'gdbm_compat']
+ exts.append( Extension('dbm', ['dbmmodule.c'],
+ define_macros=[('HAVE_NDBM_H',None)],
+ libraries = ndbm_libs ) )
+ elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
+- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
++ and find_file("ndbm.h", inc_dirs, []) is not None):
+ exts.append( Extension('dbm', ['dbmmodule.c'],
+
define_macros=[('HAVE_GDBM_NDBM_H',None)],
+ libraries = ['gdbm'] ) )
Property changes on: trunk/Python/Python-2.6.1-gdbm-1.patch
___________________________________________________________________
Name: svn:keywords
+ Date Author
Added: trunk/Python/Python-2.6.1-testing-1.patch
===================================================================
--- trunk/Python/Python-2.6.1-testing-1.patch (rev 0)
+++ trunk/Python/Python-2.6.1-testing-1.patch 2008-12-31 03:08:28 UTC (rev
2032)
@@ -0,0 +1,33 @@
+Submitted By: Bruce Dubbs (bdubbs at linuxfromscratch dot org)
+Date: 2008-12-30
+Initial Package Version: 2.6.1
+Origin: Upstream
+Description: Fixes Python testing failure
+
+$LastChangedBy$
+$Date$
+
+--- Python-2.6.1/Lib/test/test_urllib2_localnet.py 2008-06-13
17:38:33.000000000 -0500
++++ Python-2.6.1.new/Lib/test/test_urllib2_localnet.py 2008-12-30
18:05:42.000000000 -0600
+@@ -474,7 +474,7 @@
+ # domain will be spared to serve its defined
+ # purpose.
+ # urllib2.urlopen, "http://www.sadflkjsasadf.com/";)
+- urllib2.urlopen, "http://www.python.invalid./";)
++ urllib2.urlopen, "http://sadflkjsasf.i.nvali.d/";)
+
+
+ def test_main():
+diff -Naur Python-2.6.1/Lib/test/test_urllibnet.py
Python-2.6.1.new/Lib/test/test_urllibnet.py
+--- Python-2.6.1/Lib/test/test_urllibnet.py 2008-09-08 19:49:16.000000000
-0500
++++ Python-2.6.1.new/Lib/test/test_urllibnet.py 2008-12-30 17:44:08.000000000
-0600
+@@ -137,7 +137,7 @@
+ # domain will be spared to serve its defined
+ # purpose.
+ # urllib.urlopen, "http://www.sadflkjsasadf.com/";)
+- urllib.urlopen, "http://www.python.invalid./";)
++ urllib.urlopen, "http://sadflkjsasf.i.nvali.d/";)
+
+ class urlretrieveNetworkTests(unittest.TestCase):
+ """Tests urllib.urlretrieve using the network."""
+
Property changes on: trunk/Python/Python-2.6.1-testing-1.patch
___________________________________________________________________
Name: svn:keywords
+ Date Author
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
