mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-04 10:25:25 +01:00
a67db8fcbd
Ever since an old patch version, it has (for reasonable security reasons) not supported patched with ../ in the filename. Many of our patches have been relying on this behaviour being OK, because we start off with an ancient patch version that didn't perform such checks. As soon as we need this behaviour after we build a newer patch though, we will have problems. So, let's change the policy. Patches are relative to where tarballs are extracted, rather than the "working directory" - e.g. have patches for `coreutils-9.4/src/cp.c` instead of `src/cp.c`. Keeping this consistent has a few implications; - patches are applied from the build/ directory in bash era now, with `-p0` - when patches are manually applied in the bash era, use `-p` as required, usually `-p1` - in kaem era where patches are always manually applied, `-p1` is used
110 lines
2.8 KiB
Diff
110 lines
2.8 KiB
Diff
SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
|
|
|
SPDX-License-Identifier: PSF-2.0
|
|
|
|
This is a nearly-equivalent patch to Python 2.0.1, with nearly
|
|
identical reasoning.
|
|
|
|
Python 2.3's unicode regeneration code is a bit too incompatible
|
|
with Python 2.0.1.
|
|
|
|
--- Python-2.3.7/Objects/unicodectype.c 2022-10-05 18:11:21.989603599 +1100
|
|
+++ Python-2.3.7/Objects/unicodectype.c 2022-10-05 18:14:57.335843857 +1100
|
|
@@ -29,31 +29,12 @@
|
|
const unsigned char digit;
|
|
} _PyUnicode_TypeRecord;
|
|
|
|
-#include "unicodetype_db.h"
|
|
-
|
|
-static const _PyUnicode_TypeRecord *
|
|
-gettyperecord(Py_UNICODE code)
|
|
-{
|
|
- int index;
|
|
-
|
|
- if (code >= 0x110000)
|
|
- index = 0;
|
|
- else {
|
|
- index = index1[(code>>SHIFT)];
|
|
- index = index2[(index<<SHIFT)+(code&((1<<SHIFT)-1))];
|
|
- }
|
|
-
|
|
- return &_PyUnicode_TypeRecords[index];
|
|
-}
|
|
-
|
|
/* Returns 1 for Unicode characters having the category 'Zl' or type
|
|
'B', 0 otherwise. */
|
|
|
|
int _PyUnicode_IsLinebreak(Py_UNICODE ch)
|
|
{
|
|
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
|
|
-
|
|
- return (ctype->flags & LINEBREAK_MASK) != 0;
|
|
+ return 0;
|
|
}
|
|
|
|
/* Returns the titlecase Unicode characters corresponding to ch or just
|
|
@@ -61,18 +42,7 @@
|
|
|
|
Py_UNICODE _PyUnicode_ToTitlecase(register Py_UNICODE ch)
|
|
{
|
|
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
|
|
- int delta;
|
|
-
|
|
- if (ctype->title)
|
|
- delta = ctype->title;
|
|
- else
|
|
- delta = ctype->upper;
|
|
-
|
|
- if (delta >= 32768)
|
|
- delta -= 65536;
|
|
-
|
|
- return ch + delta;
|
|
+ return ch;
|
|
}
|
|
|
|
/* Returns 1 for Unicode characters having the category 'Lt', 0
|
|
@@ -80,9 +50,7 @@
|
|
|
|
int _PyUnicode_IsTitlecase(Py_UNICODE ch)
|
|
{
|
|
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
|
|
-
|
|
- return (ctype->flags & TITLE_MASK) != 0;
|
|
+ return 0;
|
|
}
|
|
|
|
/* Returns the integer decimal (0-9) for Unicode characters having
|
|
@@ -90,9 +58,7 @@
|
|
|
|
int _PyUnicode_ToDecimalDigit(Py_UNICODE ch)
|
|
{
|
|
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
|
|
-
|
|
- return (ctype->flags & DECIMAL_MASK) ? ctype->decimal : -1;
|
|
+ return -1;
|
|
}
|
|
|
|
int _PyUnicode_IsDecimalDigit(Py_UNICODE ch)
|
|
@@ -107,9 +73,7 @@
|
|
|
|
int _PyUnicode_ToDigit(Py_UNICODE ch)
|
|
{
|
|
- const _PyUnicode_TypeRecord *ctype = gettyperecord(ch);
|
|
-
|
|
- return (ctype->flags & DIGIT_MASK) ? ctype->digit : -1;
|
|
+ return -1;
|
|
}
|
|
|
|
int _PyUnicode_IsDigit(Py_UNICODE ch)
|
|
--- Python-2.3.7/Makefile.pre.in 2005-01-12 00:49:02.000000000 +1100
|
|
+++ Python-2.3.7/Makefile.pre.in 2022-10-05 18:35:05.979846971 +1100
|
|
@@ -456,8 +456,7 @@
|
|
Python/importdl.o: $(srcdir)/Python/importdl.c
|
|
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
|
|
|
|
-Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
|
|
- $(srcdir)/Objects/unicodetype_db.h
|
|
+Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c
|
|
|
|
############################################################################
|
|
# Header files
|