sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to Python 2.4.1

Browse source
This commit is contained in:
Hye-Shik Chang 2005-04-03 13:55:44 +00:00
parent 364c0decf1
commit 88c5d79c02
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=132349
11 changed files with 88 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mk/bsd.python.mk
View file

@ -216,9 +216,9 @@ PYTHON_SUFFIX= 25
# Python-2.4
.elif ${PYTHON_VERSION} == "python2.4"
PYTHON_PORTVERSION?=2.4
PYTHON_PORTVERSION?=2.4.1
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python
PYTHON_REL= 240
PYTHON_REL= 241
PYTHON_SUFFIX= 24
# Python-2.3

3
lang/python/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= python
PORTVERSION= 2.4
PORTREVISION= 1
PORTVERSION= 2.4.1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}

2
lang/python/distinfo
View file

@ -17,5 +17,7 @@ MD5 (python/Python-2.3.5.tgz) = 7a1ecc1196c5c0e9d4eef90ba684c4e9
SIZE (python/Python-2.3.5.tgz) = 8535749
MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606
SIZE (python/Python-2.4.tgz) = 9198035
MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba
SIZE (python/Python-2.4.1.tgz) = 9219882
MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6
SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299

125
lang/python/files/patch-Lib::SimpleXMLRPCServer.py
View file

@ -1,125 +0,0 @@
Index: Lib/SimpleXMLRPCServer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/SimpleXMLRPCServer.py,v
retrieving revision 1.7.8.1
diff -c -r1.7.8.1 SimpleXMLRPCServer.py
*** Lib/SimpleXMLRPCServer.py 3 Oct 2004 23:23:00 -0000 1.7.8.1
--- Lib/SimpleXMLRPCServer.py 3 Feb 2005 05:33:55 -0000
***************
*** 107,120 ****
import types
import os
! def resolve_dotted_attribute(obj, attr):
"""resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
Resolves a dotted attribute name to an object. Raises
an AttributeError if any attribute in the chain starts with a '_'.
"""
! for i in attr.split('.'):
if i.startswith('_'):
raise AttributeError(
'attempt to access private attribute "%s"' % i
--- 107,128 ----
import types
import os
! def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
"""resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
Resolves a dotted attribute name to an object. Raises
an AttributeError if any attribute in the chain starts with a '_'.
+
+ If the optional allow_dotted_names argument is false, dots are not
+ supported and this function operates similar to getattr(obj, attr).
"""
! if allow_dotted_names:
! attrs = attr.split('.')
! else:
! attrs = [attr]
!
! for i in attrs:
if i.startswith('_'):
raise AttributeError(
'attempt to access private attribute "%s"' % i
***************
*** 156,162 ****
self.funcs = {}
self.instance = None
! def register_instance(self, instance):
"""Registers an instance to respond to XML-RPC requests.
Only one instance can be installed at a time.
--- 164,170 ----
self.funcs = {}
self.instance = None
! def register_instance(self, instance, allow_dotted_names=False):
"""Registers an instance to respond to XML-RPC requests.
Only one instance can be installed at a time.
***************
*** 174,182 ****
--- 182,204 ----
If a registered function matches a XML-RPC request, then it
will be called instead of the registered instance.
+
+ If the optional allow_dotted_names argument is true and the
+ instance does not have a _dispatch method, method names
+ containing dots are supported and resolved, as long as none of
+ the name segments start with an '_'.
+
+ *** SECURITY WARNING: ***
+
+ Enabling the allow_dotted_names options allows intruders
+ to access your module's global variables and may allow
+ intruders to execute arbitrary code on your machine. Only
+ use this option on a secure, closed network.
+
"""
self.instance = instance
+ self.allow_dotted_names = allow_dotted_names
def register_function(self, function, name = None):
"""Registers a function to respond to XML-RPC requests.
***************
*** 295,301 ****
try:
method = resolve_dotted_attribute(
self.instance,
! method_name
)
except AttributeError:
pass
--- 317,324 ----
try:
method = resolve_dotted_attribute(
self.instance,
! method_name,
! self.allow_dotted_names
)
except AttributeError:
pass
***************
*** 374,380 ****
try:
func = resolve_dotted_attribute(
self.instance,
! method
)
except AttributeError:
pass
--- 397,404 ----
try:
func = resolve_dotted_attribute(
self.instance,
! method,
! self.allow_dotted_names
)
except AttributeError:
pass

17
lang/python/files/patch-Lib::test::test_fcntl.py Normal file
View file

@ -0,0 +1,17 @@
--- 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']:

23
lang/python/pkg-plist
View file

@ -500,6 +500,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo
lib/%%PYTHON_VERSION%%/distutils/sysconfig.py
lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc
lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py
lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/support.py
lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo
lib/%%PYTHON_VERSION%%/distutils/text_file.py
lib/%%PYTHON_VERSION%%/distutils/text_file.pyc
lib/%%PYTHON_VERSION%%/distutils/text_file.pyo
@ -635,6 +656,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt
lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt
lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt
lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt
lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt
lib/%%PYTHON_VERSION%%/email/test/test_email.py
lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
@ -3360,6 +3382,7 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/email/test/data
@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/tests
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
@dirrm lib/%%PYTHON_VERSION%%/curses

3
lang/python24/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= python
PORTVERSION= 2.4
PORTREVISION= 1
PORTVERSION= 2.4.1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}

2
lang/python24/distinfo
View file

@ -17,5 +17,7 @@ MD5 (python/Python-2.3.5.tgz) = 7a1ecc1196c5c0e9d4eef90ba684c4e9
SIZE (python/Python-2.3.5.tgz) = 8535749
MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606
SIZE (python/Python-2.4.tgz) = 9198035
MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba
SIZE (python/Python-2.4.1.tgz) = 9219882
MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6
SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299

125
lang/python24/files/patch-Lib::SimpleXMLRPCServer.py
View file

@ -1,125 +0,0 @@
Index: Lib/SimpleXMLRPCServer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/SimpleXMLRPCServer.py,v
retrieving revision 1.7.8.1
diff -c -r1.7.8.1 SimpleXMLRPCServer.py
*** Lib/SimpleXMLRPCServer.py 3 Oct 2004 23:23:00 -0000 1.7.8.1
--- Lib/SimpleXMLRPCServer.py 3 Feb 2005 05:33:55 -0000
***************
*** 107,120 ****
import types
import os
! def resolve_dotted_attribute(obj, attr):
"""resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
Resolves a dotted attribute name to an object. Raises
an AttributeError if any attribute in the chain starts with a '_'.
"""
! for i in attr.split('.'):
if i.startswith('_'):
raise AttributeError(
'attempt to access private attribute "%s"' % i
--- 107,128 ----
import types
import os
! def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
"""resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
Resolves a dotted attribute name to an object. Raises
an AttributeError if any attribute in the chain starts with a '_'.
+
+ If the optional allow_dotted_names argument is false, dots are not
+ supported and this function operates similar to getattr(obj, attr).
"""
! if allow_dotted_names:
! attrs = attr.split('.')
! else:
! attrs = [attr]
!
! for i in attrs:
if i.startswith('_'):
raise AttributeError(
'attempt to access private attribute "%s"' % i
***************
*** 156,162 ****
self.funcs = {}
self.instance = None
! def register_instance(self, instance):
"""Registers an instance to respond to XML-RPC requests.
Only one instance can be installed at a time.
--- 164,170 ----
self.funcs = {}
self.instance = None
! def register_instance(self, instance, allow_dotted_names=False):
"""Registers an instance to respond to XML-RPC requests.
Only one instance can be installed at a time.
***************
*** 174,182 ****
--- 182,204 ----
If a registered function matches a XML-RPC request, then it
will be called instead of the registered instance.
+
+ If the optional allow_dotted_names argument is true and the
+ instance does not have a _dispatch method, method names
+ containing dots are supported and resolved, as long as none of
+ the name segments start with an '_'.
+
+ *** SECURITY WARNING: ***
+
+ Enabling the allow_dotted_names options allows intruders
+ to access your module's global variables and may allow
+ intruders to execute arbitrary code on your machine. Only
+ use this option on a secure, closed network.
+
"""
self.instance = instance
+ self.allow_dotted_names = allow_dotted_names
def register_function(self, function, name = None):
"""Registers a function to respond to XML-RPC requests.
***************
*** 295,301 ****
try:
method = resolve_dotted_attribute(
self.instance,
! method_name
)
except AttributeError:
pass
--- 317,324 ----
try:
method = resolve_dotted_attribute(
self.instance,
! method_name,
! self.allow_dotted_names
)
except AttributeError:
pass
***************
*** 374,380 ****
try:
func = resolve_dotted_attribute(
self.instance,
! method
)
except AttributeError:
pass
--- 397,404 ----
try:
func = resolve_dotted_attribute(
self.instance,
! method,
! self.allow_dotted_names
)
except AttributeError:
pass

17
lang/python24/files/patch-Lib::test::test_fcntl.py Normal file
View file

@ -0,0 +1,17 @@
--- 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']:

23
lang/python24/pkg-plist
View file

@ -500,6 +500,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo
lib/%%PYTHON_VERSION%%/distutils/sysconfig.py
lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc
lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py
lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/support.py
lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo
lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py
lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc
lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo
lib/%%PYTHON_VERSION%%/distutils/text_file.py
lib/%%PYTHON_VERSION%%/distutils/text_file.pyc
lib/%%PYTHON_VERSION%%/distutils/text_file.pyo
@ -635,6 +656,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt
lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt
lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt
lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt
lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt
lib/%%PYTHON_VERSION%%/email/test/test_email.py
lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
@ -3360,6 +3382,7 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/email/test/data
@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/tests
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
@dirrm lib/%%PYTHON_VERSION%%/curses