Attachment #57441 for bug #86685

View | Details | Raw Unified | Return to bug 86685
Collapse All | Expand All

Lines 6-13 Link Here

(-)/space/portstrees/FreeBSD/ports/lang/python/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= python	8	PORTNAME= python
9	PORTVERSION= 2.4.1	9	PORTVERSION= 2.4.2
10	PORTREVISION= 3
11	CATEGORIES= lang python ipv6	10	CATEGORIES= lang python ipv6
12	MASTER_SITES= ${PYTHON_MASTER_SITES}	11	MASTER_SITES= ${PYTHON_MASTER_SITES}
13	MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}	12	MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}

Lines 19-24 Link Here

(-)/space/portstrees/FreeBSD/ports/lang/python/distinfo (+2 lines)
19	SIZE (python/Python-2.4.tgz) = 9198035	19	SIZE (python/Python-2.4.tgz) = 9198035
20	MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba	20	MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba
21	SIZE (python/Python-2.4.1.tgz) = 9219882	21	SIZE (python/Python-2.4.1.tgz) = 9219882
		22	MD5 (python/Python-2.4.2.tgz) = 07cfc759546f6723bb367be5b1ce9875
		23	SIZE (python/Python-2.4.2.tgz) = 9239975
22	MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6	24	MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6
23	SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299	25	SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299
24	MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3	26	MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3




--- Lib/test/test_fcntl.py.orig	Sun Apr  3 22:45:13 2005
+++ Lib/test/test_fcntl.py	Sun Apr  3 22:45:19 2005
@@ -24,7 +24,13 @@
                     'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
                     'bsdos2', 'bsdos3', 'bsdos4',
                     'openbsd', 'openbsd2', 'openbsd3'):
-    lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
+    if struct.calcsize('l') == 8:
+        off_t = 'l'
+        pid_t = 'i'
+    else:
+        off_t = 'lxxxx'
+        pid_t = 'l'
+    lockdata = struct.pack(off_t+off_t+pid_t+'hh', 0, 0, 0, fcntl.F_WRLCK, 0)
 elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
     lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
 elif sys.platform in ['os2emx']:

Return to bug 86685

Lines 1-17 Link Here

(-)/space/portstrees/FreeBSD/ports/lang/python/files/patch-Lib::test::test_fcntl.py (-17 lines)
1	--- Lib/test/test_fcntl.py.orig Sun Apr 3 22:45:13 2005
2	+++ Lib/test/test_fcntl.py Sun Apr 3 22:45:19 2005
3	@@ -24,7 +24,13 @@
4	'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
5	'bsdos2', 'bsdos3', 'bsdos4',
6	'openbsd', 'openbsd2', 'openbsd3'):
7	- lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
8	+ if struct.calcsize('l') == 8:
9	+ off_t = 'l'
10	+ pid_t = 'i'
11	+ else:
12	+ off_t = 'lxxxx'
13	+ pid_t = 'l'
14	+ lockdata = struct.pack(off_t+off_t+pid_t+'hh', 0, 0, 0, fcntl.F_WRLCK, 0)
15	elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
16	lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
17	elif sys.platform in ['os2emx']: