From 99de3c8caf6f0a8038c11f23334aa0ae66e54206 Mon Sep 17 00:00:00 2001 From: tsarna Date: Sat, 11 Jul 1998 20:33:12 +0000 Subject: Two changes: - Use -fPIC instead of -fpic (latter breaks py-Numeric on sparc). Suggested by tv@netbsd.org. This is inherited by most py-* packages. Change sent to guido@cnri.reston.va.us. - Remove official patches from patches dir. Use PATCHFILES mechanism instead to get them from www.python.org. --- lang/python/patches/patch-aa | 18 --- lang/python/patches/patch-ab | 19 ---- lang/python/patches/patch-ac | 50 --------- lang/python/patches/patch-ad | 27 ----- lang/python/patches/patch-ae | 112 ------------------- lang/python/patches/patch-af | 17 --- lang/python/patches/patch-ag | 116 ------------------- lang/python/patches/patch-ah | 25 ----- lang/python/patches/patch-ai | 33 ------ lang/python/patches/patch-aj | 15 --- lang/python/patches/patch-ak | 21 ---- lang/python/patches/patch-al | 257 ------------------------------------------- lang/python/patches/patch-am | 137 ----------------------- lang/python/patches/patch-an | 19 ---- lang/python/patches/patch-ao | 12 -- lang/python/patches/patch-ba | 30 +++++ 16 files changed, 30 insertions(+), 878 deletions(-) delete mode 100644 lang/python/patches/patch-aa delete mode 100644 lang/python/patches/patch-ab delete mode 100644 lang/python/patches/patch-ac delete mode 100644 lang/python/patches/patch-ad delete mode 100644 lang/python/patches/patch-ae delete mode 100644 lang/python/patches/patch-af delete mode 100644 lang/python/patches/patch-ag delete mode 100644 lang/python/patches/patch-ah delete mode 100644 lang/python/patches/patch-ai delete mode 100644 lang/python/patches/patch-aj delete mode 100644 lang/python/patches/patch-ak delete mode 100644 lang/python/patches/patch-al delete mode 100644 lang/python/patches/patch-am delete mode 100644 lang/python/patches/patch-an delete mode 100644 lang/python/patches/patch-ao create mode 100644 lang/python/patches/patch-ba (limited to 'lang/python/patches') diff --git a/lang/python/patches/patch-aa b/lang/python/patches/patch-aa deleted file mode 100644 index 535ff66f062..00000000000 --- a/lang/python/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -Index: Tools/freeze/freeze.py -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Tools/freeze/freeze.py,v -retrieving revision 1.25 -retrieving revision 1.26 -diff -c -r1.25 -r1.26 -*** freeze.py 1998/03/20 17:37:18 1.25 ---- freeze.py 1998/04/20 17:53:19 1.26 -*************** -*** 72,78 **** - import os - import string - import sys -- import addpack - - - # Import the freeze-private modules ---- 72,77 ---- diff --git a/lang/python/patches/patch-ab b/lang/python/patches/patch-ab deleted file mode 100644 index 72377f139f9..00000000000 --- a/lang/python/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -Index: Modules/_tkinter.c -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Modules/_tkinter.c,v -retrieving revision 1.62 -diff -c -r1.62 _tkinter.c -*** _tkinter.c 1998/04/10 22:27:26 1.62 ---- _tkinter.c 1998/04/20 18:19:51 -*************** -*** 1548,1554 **** ---- 1548,1556 ---- - if (PyErr_Occurred()) - return; - -+ #if TKMAJORMINOR >= 8000 - Py_AtExit(Tcl_Finalize); -+ #endif - - #ifdef macintosh - /* diff --git a/lang/python/patches/patch-ac b/lang/python/patches/patch-ac deleted file mode 100644 index af99bd641e4..00000000000 --- a/lang/python/patches/patch-ac +++ /dev/null @@ -1,50 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/configure.in,v -retrieving revision 1.83 -retrieving revision 1.84 -diff -c -r1.83 -r1.84 -*** configure.in 1998/04/13 15:27:01 1.83 ---- configure.in 1998/04/20 18:51:54 1.84 -*************** -*** 314,320 **** - SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";; - IRIX*/6*) case $CC in - *gcc*) CCSHARED="-shared";; -! *) CCSHARED="-shared -all";; - esac;; - esac - fi ---- 314,320 ---- - SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";; - IRIX*/6*) case $CC in - *gcc*) CCSHARED="-shared";; -! *) CCSHARED="";; - esac;; - esac - fi -Index: configure -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/configure,v -retrieving revision 1.76 -retrieving revision 1.77 -diff -c -r1.76 -r1.77 -*** configure 1998/04/13 15:26:57 1.76 ---- configure 1998/04/20 18:51:49 1.77 -*************** -*** 1865,1871 **** - SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";; - IRIX*/6*) case $CC in - *gcc*) CCSHARED="-shared";; -! *) CCSHARED="-shared -all";; - esac;; - esac - fi ---- 1865,1871 ---- - SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";; - IRIX*/6*) case $CC in - *gcc*) CCSHARED="-shared";; -! *) CCSHARED="";; - esac;; - esac - fi diff --git a/lang/python/patches/patch-ad b/lang/python/patches/patch-ad deleted file mode 100644 index fd125b4be72..00000000000 --- a/lang/python/patches/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ -Index: Objects/object.c -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Objects/object.c,v -retrieving revision 2.55 -retrieving revision 2.56 -diff -c -r2.55 -r2.56 -*** object.c 1998/04/11 15:17:34 2.55 ---- object.c 1998/04/21 22:25:01 2.56 -*************** -*** 188,195 **** - ret = -1; - } - else { -! fprintf(fp, "%s", -! PyString_AsString(s)); - } - Py_XDECREF(s); - } ---- 188,195 ---- - ret = -1; - } - else { -! ret = PyObject_Print(s, fp, -! Py_PRINT_RAW); - } - Py_XDECREF(s); - } diff --git a/lang/python/patches/patch-ae b/lang/python/patches/patch-ae deleted file mode 100644 index 67195edc461..00000000000 --- a/lang/python/patches/patch-ae +++ /dev/null @@ -1,112 +0,0 @@ -Index: Modules/parsermodule.c -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Modules/parsermodule.c,v -retrieving revision 2.25 -retrieving revision 2.26 -diff -c -r2.25 -r2.26 -*** parsermodule.c 1998/04/13 18:45:18 2.25 ---- parsermodule.c 1998/04/21 22:31:45 2.26 -*************** -*** 473,483 **** - - static PyMethodDef - parser_methods[] = { -! {"compile", parser_compileast, METH_VARARGS}, -! {"isexpr", parser_isexpr, METH_VARARGS}, -! {"issuite", parser_issuite, METH_VARARGS}, -! {"tolist", parser_ast2list, METH_VARARGS}, -! {"totuple", parser_ast2tuple, METH_VARARGS}, - - {NULL} - }; ---- 473,488 ---- - - static PyMethodDef - parser_methods[] = { -! {"compile", (PyCFunction)parser_compileast, METH_VARARGS, -! "Compile this AST object into a code object."}, -! {"isexpr", (PyCFunction)parser_isexpr, METH_VARARGS, -! "Determines if this AST object was created from an expression."}, -! {"issuite", (PyCFunction)parser_issuite, METH_VARARGS, -! "Determines if this AST object was created from a suite."}, -! {"tolist", (PyCFunction)parser_ast2list, METH_VARARGS, -! "Creates a list-tree representation of this AST."}, -! {"totuple", (PyCFunction)parser_ast2tuple, METH_VARARGS, -! "Creates a tuple-tree representation of this AST."}, - - {NULL} - }; -*************** -*** 2685,2711 **** - * inheritance. - */ - static PyMethodDef parser_functions[] = { -! {"ast2tuple", parser_ast2tuple, METH_VARARGS, - "Creates a tuple-tree representation of an AST."}, -! {"ast2list", parser_ast2list, METH_VARARGS, - "Creates a list-tree representation of an AST."}, -! {"compileast", parser_compileast, METH_VARARGS, - "Compiles an AST object into a code object."}, -! {"expr", parser_expr, METH_VARARGS, - "Creates an AST object from an expression."}, -! {"isexpr", parser_isexpr, METH_VARARGS, - "Determines if an AST object was created from an expression."}, -! {"issuite", parser_issuite, METH_VARARGS, - "Determines if an AST object was created from a suite."}, -! {"suite", parser_suite, METH_VARARGS, - "Creates an AST object from a suite."}, -! {"sequence2ast", parser_tuple2ast, METH_VARARGS, - "Creates an AST object from a tree representation."}, -! {"tuple2ast", parser_tuple2ast, METH_VARARGS, - "Creates an AST object from a tree representation."}, - - /* private stuff: support pickle module */ -! {"_pickler", parser__pickler, METH_VARARGS, - "Returns the pickle magic to allow ast objects to be pickled."}, - - {0, 0, 0} ---- 2690,2716 ---- - * inheritance. - */ - static PyMethodDef parser_functions[] = { -! {"ast2tuple", (PyCFunction)parser_ast2tuple, METH_VARARGS, - "Creates a tuple-tree representation of an AST."}, -! {"ast2list", (PyCFunction)parser_ast2list, METH_VARARGS, - "Creates a list-tree representation of an AST."}, -! {"compileast", (PyCFunction)parser_compileast, METH_VARARGS, - "Compiles an AST object into a code object."}, -! {"expr", (PyCFunction)parser_expr, METH_VARARGS, - "Creates an AST object from an expression."}, -! {"isexpr", (PyCFunction)parser_isexpr, METH_VARARGS, - "Determines if an AST object was created from an expression."}, -! {"issuite", (PyCFunction)parser_issuite, METH_VARARGS, - "Determines if an AST object was created from a suite."}, -! {"suite", (PyCFunction)parser_suite, METH_VARARGS, - "Creates an AST object from a suite."}, -! {"sequence2ast", (PyCFunction)parser_tuple2ast, METH_VARARGS, - "Creates an AST object from a tree representation."}, -! {"tuple2ast", (PyCFunction)parser_tuple2ast, METH_VARARGS, - "Creates an AST object from a tree representation."}, - - /* private stuff: support pickle module */ -! {"_pickler", (PyCFunction)parser__pickler, METH_VARARGS, - "Returns the pickle magic to allow ast objects to be pickled."}, - - {0, 0, 0} -*************** -*** 2761,2767 **** - /* register to support pickling */ - module = PyImport_ImportModule("copy_reg"); - if (module != NULL) { -! PyObject *func, *constructor, *pickler; - - func = PyObject_GetAttrString(module, "pickle"); - pickle_constructor = PyDict_GetItemString(dict, "sequence2ast"); ---- 2766,2772 ---- - /* register to support pickling */ - module = PyImport_ImportModule("copy_reg"); - if (module != NULL) { -! PyObject *func, *pickler; - - func = PyObject_GetAttrString(module, "pickle"); - pickle_constructor = PyDict_GetItemString(dict, "sequence2ast"); diff --git a/lang/python/patches/patch-af b/lang/python/patches/patch-af deleted file mode 100644 index 3e9f9673398..00000000000 --- a/lang/python/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -Index: Modules/zlibmodule.c -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Modules/zlibmodule.c,v -retrieving revision 2.12 -diff -c -r2.12 zlibmodule.c -*** zlibmodule.c 1997/12/18 05:21:29 2.12 ---- zlibmodule.c 1998/04/22 21:32:04 -*************** -*** 217,222 **** ---- 217,223 ---- - { - case(Z_STREAM_END): - break; -+ case(Z_BUF_ERROR): - case(Z_OK): - /* need more memory */ - if (_PyString_Resize(&result_str, r_strlen << 1) == -1) diff --git a/lang/python/patches/patch-ag b/lang/python/patches/patch-ag deleted file mode 100644 index d6dff2946ab..00000000000 --- a/lang/python/patches/patch-ag +++ /dev/null @@ -1,116 +0,0 @@ -Index: Lib/string.py -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Lib/string.py,v -retrieving revision 1.41 -retrieving revision 1.42 -diff -c -r1.41 -r1.42 -*** string.py 1998/03/30 17:22:30 1.41 ---- string.py 1998/04/20 14:01:00 1.42 -*************** -*** 326,348 **** - return r - - # "Safe" environment for eval() -! safe_env = {"__builtins__": {}} - - # Convert string to float -! re = None - def atof(str): - """atof(s) -> float - - Return the floating point number represented by the string s. - - """ -! global re -! if re is None: - # Don't fail if re doesn't exist -- just skip the syntax check - try: - import re - except ImportError: -! re = 0 - sign = '' - s = strip(str) - if s and s[0] in '+-': ---- 326,350 ---- - return r - - # "Safe" environment for eval() -! _safe_env = {"__builtins__": {}} - - # Convert string to float -! _re = None - def atof(str): - """atof(s) -> float - - Return the floating point number represented by the string s. - - """ -! global _re -! if _re is None: - # Don't fail if re doesn't exist -- just skip the syntax check - try: - import re - except ImportError: -! _re = 0 -! else: -! _re = re - sign = '' - s = strip(str) - if s and s[0] in '+-': -*************** -*** 351,360 **** - if not s: - raise ValueError, 'non-float argument to string.atof' - while s[0] == '0' and len(s) > 1 and s[1] in digits: s = s[1:] -! if re and not re.match('[0-9]*(\.[0-9]*)?([eE][-+]?[0-9]+)?$', s): - raise ValueError, 'non-float argument to string.atof' - try: -! return float(eval(sign + s, safe_env)) - except SyntaxError: - raise ValueError, 'non-float argument to string.atof' - ---- 353,362 ---- - if not s: - raise ValueError, 'non-float argument to string.atof' - while s[0] == '0' and len(s) > 1 and s[1] in digits: s = s[1:] -! if _re and not _re.match('[0-9]*(\.[0-9]*)?([eE][-+]?[0-9]+)?$', s): - raise ValueError, 'non-float argument to string.atof' - try: -! return float(eval(sign + s, _safe_env)) - except SyntaxError: - raise ValueError, 'non-float argument to string.atof' - -*************** -*** 384,390 **** - for c in s: - if c not in digits: - raise ValueError, 'non-integer argument to string.atoi' -! return eval(sign + s, safe_env) - - # Convert string to long integer - def atol(str, base=10): ---- 386,392 ---- - for c in s: - if c not in digits: - raise ValueError, 'non-integer argument to string.atoi' -! return eval(sign + s, _safe_env) - - # Convert string to long integer - def atol(str, base=10): -*************** -*** 413,419 **** - for c in s: - if c not in digits: - raise ValueError, 'non-integer argument to string.atol' -! return eval(sign + s + 'L', safe_env) - - # Left-justify a string - def ljust(s, width): ---- 415,421 ---- - for c in s: - if c not in digits: - raise ValueError, 'non-integer argument to string.atol' -! return eval(sign + s + 'L', _safe_env) - - # Left-justify a string - def ljust(s, width): diff --git a/lang/python/patches/patch-ah b/lang/python/patches/patch-ah deleted file mode 100644 index 5f78c315e69..00000000000 --- a/lang/python/patches/patch-ah +++ /dev/null @@ -1,25 +0,0 @@ -Index: Python/bltinmodule.c -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Python/bltinmodule.c,v -retrieving revision 2.115 -retrieving revision 2.116 -diff -c -r2.115 -r2.116 -*** bltinmodule.c 1998/04/10 22:25:25 2.115 ---- bltinmodule.c 1998/04/23 21:46:19 2.116 -*************** -*** 1282,1288 **** - Py_DECREF(v); - return NULL; - } -! PyList_SetItem(v, i, w); - ilow += istep; - } - return v; ---- 1282,1288 ---- - Py_DECREF(v); - return NULL; - } -! PyList_GET_ITEM(v, i) = w; - ilow += istep; - } - return v; diff --git a/lang/python/patches/patch-ai b/lang/python/patches/patch-ai deleted file mode 100644 index d35ef1c0b08..00000000000 --- a/lang/python/patches/patch-ai +++ /dev/null @@ -1,33 +0,0 @@ -Index: Modules/timemodule.c -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Modules/timemodule.c,v -retrieving revision 2.58 -diff -c -r2.58 timemodule.c -*** timemodule.c 1998/03/06 17:16:21 2.58 ---- timemodule.c 1998/04/27 18:47:53 -*************** -*** 304,309 **** ---- 304,311 ---- - char *outbuf = 0; - int i; - -+ memset((ANY *) &buf, '\0', sizeof(buf)); -+ - if (!PyArg_ParseTuple(args, "s(iiiiiiiii)", - &fmt, - &(buf.tm_year), -*************** -*** 321,332 **** - buf.tm_mon--; - buf.tm_wday = (buf.tm_wday + 1) % 7; - buf.tm_yday--; -- #ifdef HAVE_MKTIME -- /* This call is only there to adjust the numbers to be within -- bounds. When we don't have mktime(), we say the caller is -- responsible for that... */ -- (void) mktime(&buf); -- #endif - /* I hate these functions that presume you know how big the output - * will be ahead of time... - */ ---- 323,328 ---- diff --git a/lang/python/patches/patch-aj b/lang/python/patches/patch-aj deleted file mode 100644 index 06c2b493ff0..00000000000 --- a/lang/python/patches/patch-aj +++ /dev/null @@ -1,15 +0,0 @@ ---- Objects/fileobject.c.orig Sat Apr 11 00:16:34 1998 -+++ Objects/fileobject.c Wed May 6 23:09:41 1998 -@@ -415,7 +415,11 @@ - struct stat st; - if (fstat(fileno(f->f_fp), &st) == 0) { - end = st.st_size; -- pos = ftell(f->f_fp); -+ pos = lseek(fileno(f->f_fp), 0L, SEEK_CUR); -+ if (pos >= 0) -+ pos = ftell(f->f_fp); -+ if (pos < 0) -+ clearerr(f->f_fp); - if (end > pos && pos >= 0) - return end - pos + 1; - /* Add 1 so if the file were to grow we'd notice. */ diff --git a/lang/python/patches/patch-ak b/lang/python/patches/patch-ak deleted file mode 100644 index 0aff359273f..00000000000 --- a/lang/python/patches/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ ---- Lib/urllib.py.orig Sat Apr 11 03:18:35 1998 -+++ Lib/urllib.py Wed May 6 23:26:57 1998 -@@ -221,6 +221,7 @@ - else: - host, selector = url - urltype, rest = splittype(selector) -+ url = rest - user_passwd = None - if string.lower(urltype) != 'http': - realhost = None -@@ -455,8 +456,8 @@ - user, passwd = self.get_user_passwd(host, realm, i) - if not (user or passwd): return None - host = user + ':' + passwd + '@' + host -- newurl = '//' + host + selector -- return self.open_http(newurl) -+ newurl = 'http://' + host + selector -+ return self.open(newurl) - - def get_user_passwd(self, host, realm, clear_cache = 0): - key = realm + '@' + string.lower(host) diff --git a/lang/python/patches/patch-al b/lang/python/patches/patch-al deleted file mode 100644 index 3e6d40d16f6..00000000000 --- a/lang/python/patches/patch-al +++ /dev/null @@ -1,257 +0,0 @@ -Index: Modules/pcre-int.h -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Modules/pcre-int.h,v -retrieving revision 2.3 -diff -c -r2.3 pcre-int.h -*** pcre-int.h 1998/04/03 21:13:23 2.3 ---- pcre-int.h 1998/05/01 14:52:20 -*************** -*** 3,9 **** - *************************************************/ - - -! #define PCRE_VERSION "1.07 16-Feb-1998" - - - /* This is a library of functions to support regular expressions whose syntax ---- 3,9 ---- - *************************************************/ - - -! #define PCRE_VERSION "1.09 28-Apr-1998" - - - /* This is a library of functions to support regular expressions whose syntax -*************** -*** 80,90 **** - #ifdef FOR_PYTHON - #define PUBLIC_OPTIONS \ - (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \ -! PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_LOCALE) - #else - #define PUBLIC_OPTIONS \ - (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \ -! PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA) - #endif - #define PUBLIC_EXEC_OPTIONS \ - (PCRE_CASELESS|PCRE_ANCHORED|PCRE_MULTILINE|PCRE_NOTBOL|PCRE_NOTEOL| \ ---- 80,91 ---- - #ifdef FOR_PYTHON - #define PUBLIC_OPTIONS \ - (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \ -! PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY| \ -! PCRE_LOCALE) - #else - #define PUBLIC_OPTIONS \ - (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \ -! PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY) - #endif - #define PUBLIC_EXEC_OPTIONS \ - (PCRE_CASELESS|PCRE_ANCHORED|PCRE_MULTILINE|PCRE_NOTBOL|PCRE_NOTEOL| \ -Index: Modules/pcre.h -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Modules/pcre.h,v -retrieving revision 2.6 -diff -c -r2.6 pcre.h -*** pcre.h 1998/04/03 21:13:25 2.6 ---- pcre.h 1998/05/01 14:52:20 -*************** -*** 34,39 **** ---- 34,40 ---- - #define PCRE_EXTRA 0x0040 - #define PCRE_NOTBOL 0x0080 - #define PCRE_NOTEOL 0x0100 -+ #define PCRE_UNGREEDY 0x0400 - #ifdef FOR_PYTHON - #define PCRE_LOCALE 0x0200 - #endif -Index: Modules/pypcre.c -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/Modules/pypcre.c,v -retrieving revision 2.12 -diff -c -r2.12 pypcre.c -*** pypcre.c 1998/04/10 21:50:23 2.12 ---- pypcre.c 1998/05/01 14:52:21 -*************** -*** 1216,1221 **** ---- 1216,1222 ---- - int repeat_type, op_type; - int repeat_min, repeat_max; - int bravalue, length; -+ int greedy_default, greedy_non_default; - register int c; - register uschar *code = *codeptr; - const uschar *ptr = *ptrptr; -*************** -*** 1224,1229 **** ---- 1225,1235 ---- - uschar class[32]; - uschar *class_flag; /* Pointer to the single-byte flag for OP_CLASS_L */ - -+ /* Set up the default and non-default settings for greediness */ -+ -+ greedy_default = ((options & PCRE_UNGREEDY) != 0); -+ greedy_non_default = greedy_default ^ 1; -+ - /* Switch on next character until the end of the branch */ - - for (;; ptr++) -*************** -*** 1536,1545 **** - goto FAILED; - } - -! /* If the next character is '?' this is a minimizing repeat. Advance to the - next character. */ - -! if (ptr[1] == '?') { repeat_type = 1; ptr++; } else repeat_type = 0; - - /* If the maximum is zero then the minimum must also be zero; Perl allows - this case, so we do too - by simply omitting the item altogether. */ ---- 1542,1554 ---- - goto FAILED; - } - -! /* If the next character is '?' this is a minimizing repeat, by default, -! but if PCRE_UNGREEDY is set, it works the other way round. Advance to the - next character. */ - -! if (ptr[1] == '?') -! { repeat_type = greedy_non_default; ptr++; } -! else repeat_type = greedy_default; - - /* If the maximum is zero then the minimum must also be zero; Perl allows - this case, so we do too - by simply omitting the item altogether. */ -*************** -*** 1628,1641 **** - /* If the mininum is 1 and the previous item was a character string, - we either have to put back the item that got cancelled if the string - length was 1, or add the character back onto the end of a longer -! string. For a character type nothing need be done; it will just get put -! back naturally. */ - - else if (*previous == OP_CHARS) - { - if (code == previous) code += 2; else previous[1]++; - } - - /* If the maximum is unlimited, insert an OP_STAR. */ - - if (repeat_max < 0) ---- 1637,1656 ---- - /* If the mininum is 1 and the previous item was a character string, - we either have to put back the item that got cancelled if the string - length was 1, or add the character back onto the end of a longer -! string. For a character type nothing need be done; it will just get -! put back naturally. Note that the final character is always going to -! get added below. */ - - else if (*previous == OP_CHARS) - { - if (code == previous) code += 2; else previous[1]++; - } - -+ /* For a single negated character we also have to put back the -+ item that got cancelled. */ -+ -+ else if (*previous == OP_NOT) code++; -+ - /* If the maximum is unlimited, insert an OP_STAR. */ - - if (repeat_max < 0) -*************** -*** 1779,1784 **** ---- 1794,1801 ---- - case 'm': - case 's': - case 'x': -+ case 'U': -+ case 'X': - ptr++; - while (*ptr != ')') ptr++; - previous = NULL; -*************** -*** 2484,2490 **** - ptr += 2; - break; - } -! /* Else fall thourh */ - - /* Else loop setting valid options until ) is met. Anything else is an - error. */ ---- 2501,2507 ---- - ptr += 2; - break; - } -! /* Else fall through */ - - /* Else loop setting valid options until ) is met. Anything else is an - error. */ -*************** -*** 2519,2524 **** ---- 2536,2551 ---- - length -= spaces; /* Already counted spaces */ - continue; - } -+ else if (c == 'X') -+ { -+ options |= PCRE_EXTRA; -+ continue; -+ } -+ else if (c == 'U') -+ { -+ options |= PCRE_UNGREEDY; -+ continue; -+ } - else if (c == ')') break; - - *errorptr = ERR12; -*************** -*** 2725,2738 **** - - if (re->options != 0) - { -! printf("%s%s%s%s%s%s%s\n", - ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "", - ((re->options & PCRE_CASELESS) != 0)? "caseless " : "", - ((re->options & PCRE_EXTENDED) != 0)? "extended " : "", - ((re->options & PCRE_MULTILINE) != 0)? "multiline " : "", - ((re->options & PCRE_DOTALL) != 0)? "dotall " : "", - ((re->options & PCRE_DOLLAR_ENDONLY) != 0)? "endonly " : "", -! ((re->options & PCRE_EXTRA) != 0)? "extra " : ""); - } - - if ((re->options & PCRE_FIRSTSET) != 0) ---- 2752,2766 ---- - - if (re->options != 0) - { -! printf("%s%s%s%s%s%s%s%s\n", - ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "", - ((re->options & PCRE_CASELESS) != 0)? "caseless " : "", - ((re->options & PCRE_EXTENDED) != 0)? "extended " : "", - ((re->options & PCRE_MULTILINE) != 0)? "multiline " : "", - ((re->options & PCRE_DOTALL) != 0)? "dotall " : "", - ((re->options & PCRE_DOLLAR_ENDONLY) != 0)? "endonly " : "", -! ((re->options & PCRE_EXTRA) != 0)? "extra " : "", -! ((re->options & PCRE_UNGREEDY) != 0)? "ungreedy " : ""); - } - - if ((re->options & PCRE_FIRSTSET) != 0) -*************** -*** 3070,3076 **** - if (md->offset_top == NULL || md->eptr == NULL || md->ecode == NULL || - md->off_num == NULL || md->r1 == NULL || md->r2 == NULL) - { -! PyErr_SetString(PyExc_MemoryError, "Can't increase failure stack for re operation"); - longjmp(md->error_env, 1); - } - return 0; ---- 3098,3104 ---- - if (md->offset_top == NULL || md->eptr == NULL || md->ecode == NULL || - md->off_num == NULL || md->r1 == NULL || md->r2 == NULL) - { -! PyErr_NoMemory(); - longjmp(md->error_env, 1); - } - return 0; diff --git a/lang/python/patches/patch-am b/lang/python/patches/patch-am deleted file mode 100644 index dadeb9dbc28..00000000000 --- a/lang/python/patches/patch-am +++ /dev/null @@ -1,137 +0,0 @@ -Index: config.h.in -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/config.h.in,v -retrieving revision 2.34 -diff -c -r2.34 config.h.in -*** config.h.in 1998/04/10 19:17:15 2.34 ---- config.h.in 1998/05/01 16:47:39 -*************** -*** 396,398 **** ---- 396,401 ---- - - /* Define if you have the ieee library (-lieee). */ - #undef HAVE_LIBIEEE -+ -+ /* Define if you have the m library (-lm). */ -+ #undef HAVE_LIBM -Index: configure -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/configure,v -retrieving revision 1.77 -diff -c -r1.77 configure -*** configure 1998/04/20 18:51:49 1.77 ---- configure 1998/05/01 16:54:17 -*************** -*** 1989,2012 **** - echo "$ac_t""no" 1>&6 - fi - # Dynamic linking for HP-UX -! echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6 -! echo "configure:1994: checking for getpwnam in -lsun" >&5 -! ac_lib_var=`echo sun'_'getpwnam | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lsun $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ---- 1989,2012 ---- - echo "$ac_t""no" 1>&6 - fi - # Dynamic linking for HP-UX -! echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -! echo "configure:1994: checking for pow in -lm" >&5 -! ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lm $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -*************** -*** 2024,2041 **** - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! ac_tr_lib=HAVE_LIB`echo sun | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 - fi -! # NIS (== YP) interface for IRIX 4 - # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. - # However on SGI IRIX, these exist but are broken. - if test "$ac_sys_system" != IRIX ---- 2024,2041 ---- - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 - fi -! # Std math lib -- assume needed if it exists - # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. - # However on SGI IRIX, these exist but are broken. - if test "$ac_sys_system" != IRIX -Index: configure.in -=================================================================== -RCS file: /projects/cvsroot/python/dist/src/configure.in,v -retrieving revision 1.84 -diff -c -r1.84 configure.in -*** configure.in 1998/04/20 18:51:54 1.84 ---- configure.in 1998/05/01 16:54:12 -*************** -*** 345,351 **** - # checks for libraries - AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV - AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX -! AC_CHECK_LIB(sun, getpwnam) # NIS (== YP) interface for IRIX 4 - # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. - # However on SGI IRIX, these exist but are broken. - if test "$ac_sys_system" != IRIX ---- 345,351 ---- - # checks for libraries - AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV - AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX -! AC_CHECK_LIB(m, pow) # Std math lib -- assume needed if it exists - # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. - # However on SGI IRIX, these exist but are broken. - if test "$ac_sys_system" != IRIX diff --git a/lang/python/patches/patch-an b/lang/python/patches/patch-an deleted file mode 100644 index 9ef1134d0a0..00000000000 --- a/lang/python/patches/patch-an +++ /dev/null @@ -1,19 +0,0 @@ ---- Lib/sgmllib.py.orig Thu Mar 26 22:12:54 1998 -+++ Lib/sgmllib.py Wed May 6 23:10:29 1998 -@@ -30,12 +30,12 @@ - endbracket = re.compile('[<>]') - special = re.compile(']*>') - commentopen = re.compile('