aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/python15/Makefile2
-rw-r--r--lang/python15/files/patch-Lib:os.py76
-rw-r--r--lang/python20/Makefile1
-rw-r--r--lang/python20/files/patch-Lib:os.py76
-rw-r--r--lang/python21/Makefile1
-rw-r--r--lang/python21/files/patch-Lib:os.py93
-rw-r--r--lang/python21/files/patch-Modules:Setup.dist19
7 files changed, 267 insertions, 1 deletions
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index fae0b0e986e5..dd7e11b5134c 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= python
PORTVERSION= 1.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang python
MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
diff --git a/lang/python15/files/patch-Lib:os.py b/lang/python15/files/patch-Lib:os.py
new file mode 100644
index 000000000000..4a18ed119cbb
--- /dev/null
+++ b/lang/python15/files/patch-Lib:os.py
@@ -0,0 +1,76 @@
+*** Lib/os.py.orig Mon Feb 22 09:40:34 1999
+--- Lib/os.py Mon Nov 11 15:08:52 2002
+***************
+*** 185,192 ****
+ def execvpe(file, args, env):
+ _execvpe(file, args, env)
+
+- _notfound = None
+ def _execvpe(file, args, env = None):
+ if env:
+ func = execve
+ argrest = (args, env)
+--- 185,193 ----
+ def execvpe(file, args, env):
+ _execvpe(file, args, env)
+
+ def _execvpe(file, args, env = None):
++ from errno import ENOENT, ENOTDIR
++
+ if env:
+ func = execve
+ argrest = (args, env)
+***************
+*** 194,200 ****
+ func = execv
+ argrest = (args,)
+ env = environ
+- global _notfound
+ head, tail = path.split(file)
+ if head:
+ apply(func, (file,) + argrest)
+--- 195,200 ----
+***************
+*** 205,224 ****
+ envpath = defpath
+ import string
+ PATH = string.splitfields(envpath, pathsep)
+! if not _notfound:
+! import tempfile
+! # Exec a file that is guaranteed not to exist
+! try: execv(tempfile.mktemp(), ())
+! except error, _notfound: pass
+! exc, arg = error, _notfound
+ for dir in PATH:
+ fullname = path.join(dir, file)
+ try:
+ apply(func, (fullname,) + argrest)
+! except error, (errno, msg):
+! if errno != arg[0]:
+! exc, arg = error, (errno, msg)
+! raise exc, arg
+
+ # Change environ to automatically call putenv() if it exists
+ try:
+--- 205,225 ----
+ envpath = defpath
+ import string
+ PATH = string.splitfields(envpath, pathsep)
+! saved_exc = None
+! saved_tb = None
+ for dir in PATH:
+ fullname = path.join(dir, file)
+ try:
+ apply(func, (fullname,) + argrest)
+! except error, e:
+! tb = sys.exc_info()[2]
+! if (e.errno != ENOENT and e.errno != ENOTDIR
+! and saved_exc is None):
+! saved_exc = e
+! saved_tb = tb
+! if saved_exc:
+! raise error, saved_exc, saved_tb
+! raise error, e, tb
+
+ # Change environ to automatically call putenv() if it exists
+ try:
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index badff2a277e2..e3fbaa3df64d 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= python
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python20/files/patch-Lib:os.py b/lang/python20/files/patch-Lib:os.py
new file mode 100644
index 000000000000..b11bae7fccab
--- /dev/null
+++ b/lang/python20/files/patch-Lib:os.py
@@ -0,0 +1,76 @@
+*** Lib/os.py.orig Thu Sep 28 14:10:56 2000
+--- Lib/os.py Mon Nov 11 15:18:05 2002
+***************
+*** 234,241 ****
+ args may be a list or tuple of strings. """
+ _execvpe(file, args, env)
+
+- _notfound = None
+ def _execvpe(file, args, env=None):
+ if env is not None:
+ func = execve
+ argrest = (args, env)
+--- 234,242 ----
+ args may be a list or tuple of strings. """
+ _execvpe(file, args, env)
+
+ def _execvpe(file, args, env=None):
++ from errno import ENOENT, ENOTDIR
++
+ if env is not None:
+ func = execve
+ argrest = (args, env)
+***************
+*** 243,249 ****
+ func = execv
+ argrest = (args,)
+ env = environ
+- global _notfound
+ head, tail = path.split(file)
+ if head:
+ apply(func, (file,) + argrest)
+--- 244,249 ----
+***************
+*** 253,272 ****
+ else:
+ envpath = defpath
+ PATH = envpath.split(pathsep)
+! if not _notfound:
+! import tempfile
+! # Exec a file that is guaranteed not to exist
+! try: execv(tempfile.mktemp(), ('blah',))
+! except error, _notfound: pass
+! exc, arg = error, _notfound
+ for dir in PATH:
+ fullname = path.join(dir, file)
+ try:
+ apply(func, (fullname,) + argrest)
+! except error, (errno, msg):
+! if errno != arg[0]:
+! exc, arg = error, (errno, msg)
+! raise exc, arg
+
+ # Change environ to automatically call putenv() if it exists
+ try:
+--- 253,273 ----
+ else:
+ envpath = defpath
+ PATH = envpath.split(pathsep)
+! saved_exc = None
+! saved_tb = None
+ for dir in PATH:
+ fullname = path.join(dir, file)
+ try:
+ apply(func, (fullname,) + argrest)
+! except error, e:
+! tb = sys.exc_info()[2]
+! if (e.errno != ENOENT and e.errno != ENOTDIR
+! and saved_exc is None):
+! saved_exc = e
+! saved_tb = tb
+! if saved_exc:
+! raise error, saved_exc, saved_tb
+! raise error, e, tb
+
+ # Change environ to automatically call putenv() if it exists
+ try:
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 65a9181195c7..abdb69d9de82 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -7,6 +7,7 @@
PORTNAME= python
PORTVERSION= 2.1.3
+PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python21/files/patch-Lib:os.py b/lang/python21/files/patch-Lib:os.py
new file mode 100644
index 000000000000..e73b5b8c2b7d
--- /dev/null
+++ b/lang/python21/files/patch-Lib:os.py
@@ -0,0 +1,93 @@
+*** Lib/os.py.orig Mon Nov 11 15:04:17 2002
+--- Lib/os.py Mon Nov 11 15:05:36 2002
+***************
+*** 301,308 ****
+
+ __all__.extend(["execl","execle","execlp","execlpe","execvp","execvpe"])
+
+- _notfound = None
+ def _execvpe(file, args, env=None):
+ if env is not None:
+ func = execve
+ argrest = (args, env)
+--- 301,309 ----
+
+ __all__.extend(["execl","execle","execlp","execlpe","execvp","execvpe"])
+
+ def _execvpe(file, args, env=None):
++ from errno import ENOENT, ENOTDIR
++
+ if env is not None:
+ func = execve
+ argrest = (args, env)
+***************
+*** 310,316 ****
+ func = execv
+ argrest = (args,)
+ env = environ
+! global _notfound
+ head, tail = path.split(file)
+ if head:
+ apply(func, (file,) + argrest)
+--- 311,317 ----
+ func = execv
+ argrest = (args,)
+ env = environ
+!
+ head, tail = path.split(file)
+ if head:
+ apply(func, (file,) + argrest)
+***************
+*** 320,349 ****
+ else:
+ envpath = defpath
+ PATH = envpath.split(pathsep)
+! if not _notfound:
+! if sys.platform[:4] == 'beos':
+! # Process handling (fork, wait) under BeOS (up to 5.0)
+! # doesn't interoperate reliably with the thread interlocking
+! # that happens during an import. The actual error we need
+! # is the same on BeOS for posix.open() et al., ENOENT.
+! try: unlink('/_#.# ## #.#')
+! except error, _notfound: pass
+! else:
+! import tempfile
+! t = tempfile.mktemp()
+! # Exec a file that is guaranteed not to exist
+! try: execv(t, ('blah',))
+! except error, _notfound: pass
+! exc, arg = error, _notfound
+ for dir in PATH:
+ fullname = path.join(dir, file)
+ try:
+ apply(func, (fullname,) + argrest)
+! except error, (errno, msg):
+! if errno != arg[0]:
+! exc, arg = error, (errno, msg)
+! raise exc, arg
+!
+
+ # Change environ to automatically call putenv() if it exists
+ try:
+--- 321,341 ----
+ else:
+ envpath = defpath
+ PATH = envpath.split(pathsep)
+! saved_exc = None
+! saved_tb = None
+ for dir in PATH:
+ fullname = path.join(dir, file)
+ try:
+ apply(func, (fullname,) + argrest)
+! except error, e:
+! tb = sys.exc_info()[2]
+! if (e.errno != ENOENT and e.errno != ENOTDIR
+! and saved_exc is None):
+! saved_exc = e
+! saved_tb = tb
+! if saved_exc:
+! raise error, saved_exc, saved_tb
+! raise error, e, tb
+
+ # Change environ to automatically call putenv() if it exists
+ try:
diff --git a/lang/python21/files/patch-Modules:Setup.dist b/lang/python21/files/patch-Modules:Setup.dist
new file mode 100644
index 000000000000..8a213c626da9
--- /dev/null
+++ b/lang/python21/files/patch-Modules:Setup.dist
@@ -0,0 +1,19 @@
+*** Modules/Setup.dist.orig Mon Nov 11 15:38:27 2002
+--- Modules/Setup.dist Mon Nov 11 15:38:41 2002
+***************
+*** 162,168 ****
+ #fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
+ #pwd pwdmodule.c # pwd(3)
+ #grp grpmodule.c # grp(3)
+! #errno errnomodule.c # posix (UNIX) errno values
+ #select selectmodule.c # select(2); not on ancient System V
+
+ # Memory-mapped files (also works on Win32).
+--- 162,168 ----
+ #fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
+ #pwd pwdmodule.c # pwd(3)
+ #grp grpmodule.c # grp(3)
+! errno errnomodule.c # posix (UNIX) errno values
+ #select selectmodule.c # select(2); not on ancient System V
+
+ # Memory-mapped files (also works on Win32).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 22:25:21 +0000