Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
bfff4ae3
Commit
bfff4ae3
authored
Dec 16, 2019
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Plain Diff
version up: many components
parents
733c1e8a
adc45383
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
94 additions
and
150 deletions
+94
-150
component/apache/buildout.cfg
component/apache/buildout.cfg
+2
-2
component/curl/buildout.cfg
component/curl/buildout.cfg
+12
-5
component/file/0001-fix-libmagic-correctly-detect-msooxml-files.patch
...le/0001-fix-libmagic-correctly-detect-msooxml-files.patch
+0
-74
component/file/buildout.cfg
component/file/buildout.cfg
+3
-3
component/ghostscript/buildout.cfg
component/ghostscript/buildout.cfg
+2
-2
component/glib/buildout.cfg
component/glib/buildout.cfg
+2
-2
component/groonga/buildout.cfg
component/groonga/buildout.cfg
+2
-2
component/haproxy/buildout.cfg
component/haproxy/buildout.cfg
+2
-2
component/libexpat/buildout.cfg
component/libexpat/buildout.cfg
+10
-2
component/libpng/buildout.cfg
component/libpng/buildout.cfg
+4
-9
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+4
-4
component/nginx/buildout.cfg
component/nginx/buildout.cfg
+2
-2
component/openssl/buildout.cfg
component/openssl/buildout.cfg
+4
-4
component/python-2.7/buildout.cfg
component/python-2.7/buildout.cfg
+3
-3
component/python-2.7/pytracemalloc_pep445.patch
component/python-2.7/pytracemalloc_pep445.patch
+42
-34
component/unstable/opera/buildout.cfg
component/unstable/opera/buildout.cfg
+0
-0
No files found.
component/apache/buildout.cfg
View file @
bfff4ae3
...
...
@@ -38,9 +38,9 @@ md5sum = 2202b18f269ad606d70e1864857ed93c
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
recipe = slapos.recipe.cmmi
shared = false
version = 2.4.
39
version = 2.4.
41
url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
md5sum =
930e217ba2d71e708a3f1521ecae7ec0
md5sum =
dfc674f8f454e3bc2d4ccd73ad3b5f1e
pre-configure =
cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
...
...
component/curl/buildout.cfg
View file @
bfff4ae3
...
...
@@ -15,10 +15,11 @@ parts =
[curl]
recipe = slapos.recipe.cmmi
shared = true
url = http://curl.haxx.se/download/curl-7.6
0
.0.tar.xz
md5sum =
a889cd11b4ae8794b7030472cb4df0a0
url = http://curl.haxx.se/download/curl-7.6
7
.0.tar.xz
md5sum =
d55351b88dec558dd3a24dabb2c2d899
configure-options =
--disable-static
--disable-esni
--disable-ldap
--disable-ldaps
--disable-rtsp
...
...
@@ -29,22 +30,28 @@ configure-options =
--disable-imap
--disable-smtp
--disable-gopher
--disable-manual
--enable-ipv6
--disable-sspi
--disable-alt-svc
--with-zlib=${zlib:location}
--with-ssl=${openssl:location}
--without-gnutls
--without-polarssl
--without-mbedtls
--without-
cyassl
--without-
mesalink
--without-nss
--without-axtls
--without-libpsl
--without-libmetalink
--without-libssh2
--without-librtmp
--without-libidn
--without-libidn
2
--with-nghttp2=${nghttp2:location}
--without-ngtcp2
--without-nghttp3
--without-quiche
--without-zsh-functions-dir
--without-fish-functions-dir
environment =
PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
...
...
component/file/0001-fix-libmagic-correctly-detect-msooxml-files.patch
deleted
100644 → 0
View file @
733c1e8a
From a975c66c81e45433a668b7daeb4c903a78cb9d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 27 Sep 2019 01:56:24 +0200
Subject: [PATCH] fix libmagic correctly detect msooxml files
Coming from slapos patch on component:
commit 7a24c4e4ff96a7d00072db891761cea8db7b9122
Author: Boris Kocherov <bk@raskon.ru>
Date: Sun Feb 4 10:52:17 2018 +0300
component/file: fix libmagic correctly detect msooxml files
that was reformatted as a patch so that component/file supports shared
slapos.recipe.cmmi. Maybe file now include a proper fix.
---
magic/Magdir/msooxml | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/magic/Magdir/msooxml b/magic/Magdir/msooxml
index 059e729c..f8431dc8 100644
--- a/magic/Magdir/msooxml
+++ b/magic/Magdir/msooxml
@@ -1,4 +1,3 @@
-
#------------------------------------------------------------------------------
# $File: msooxml,v 1.5 2014/08/05 07:38:45 christos Exp $
# msooxml: file(1) magic for Microsoft Office XML
@@ -13,24 +12,34 @@
# which can distinguish between the three types
# start by checking for ZIP local file header signature
-0 string PK\003\004
+0 string PK\003\004
!:strength +10
# make sure the first file is correct
->0x1E regex \\[Content_Types\\]\\.xml|_rels/\\.rels
+>0x1E regex \\[Content_Types\\]\\.xml|_rels/\\.rels
# skip to the second local file header
# since some documents include a 520-byte extra field following the file
# header, we need to scan for the next header
->>(18.l+49) search/2000 PK\003\004
+>>(18.l+49) search/2000 PK\003\004
# now skip to the *third* local file header; again, we need to scan due to a
# 520-byte extra field following the file header
->>>&26 search/1000 PK\003\004
+>>>&26 search/1000 PK\003\004
+# and check the subdirectory name to determine which type of OOXML
+# file we have. Correct the mimetype with the registered ones:
+# http://technet.microsoft.com/en-us/library/cc179224.aspx
+>>>>&26 string word/ Microsoft Word 2007+
+!:mime application/vnd.openxmlformats-officedocument.wordprocessingml.document
+>>>>&26 string ppt/ Microsoft PowerPoint 2007+
+!:mime application/vnd.openxmlformats-officedocument.presentationml.presentation
+>>>>&26 string xl/ Microsoft Excel 2007+
+!:mime application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+
+>>1104 search/300 PK\003\004
# and check the subdirectory name to determine which type of OOXML
# file we have. Correct the mimetype with the registered ones:
# http://technet.microsoft.com/en-us/library/cc179224.aspx
->>>>&26 string word/ Microsoft Word 2007+
+>>>&26 string word/ Microsoft Word 2007+
!:mime application/vnd.openxmlformats-officedocument.wordprocessingml.document
->>>>&26 string ppt/ Microsoft PowerPoint 2007+
+>>>&26 string ppt/ Microsoft PowerPoint 2007+
!:mime application/vnd.openxmlformats-officedocument.presentationml.presentation
->>>>&26 string xl/ Microsoft Excel 2007+
+>>>&26 string xl/ Microsoft Excel 2007+
!:mime application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
->>>>&26 default x Microsoft OOXML
--
2.11.0
component/file/buildout.cfg
View file @
bfff4ae3
...
...
@@ -10,8 +10,8 @@ extends =
[file]
recipe = slapos.recipe.cmmi
shared = true
url = http://ftp.icm.edu.pl/packages/file/file-5.3
2
.tar.gz
md5sum =
4f2503752ff041895090ed643561043
5
url = http://ftp.icm.edu.pl/packages/file/file-5.3
7
.tar.gz
md5sum =
80c29aca745466c6c24d11f05932907
5
configure-options =
--disable-static
environment =
...
...
@@ -21,4 +21,4 @@ environment =
patch-binary = ${patch:location}/bin/patch
patch-options = -p1
patches =
${:_profile_base_location_}/0001-fix-libmagic-correctly-detect-msooxml-files.patch#5e66a340d8ec7212d485e17d9af95f2
4
https://sources.debian.org/data/main/f/file/1:5.37-6/debian/patches/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch#fb6f7d32ce89573bf4b4b302c812e39
4
component/ghostscript/buildout.cfg
View file @
bfff4ae3
...
...
@@ -32,5 +32,5 @@ environment =
[ghostscript-9]
<= ghostscript-common
url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9
27/ghostscript-9.27
.tar.xz
md5sum =
dd531503dbbc524f73528359e2ea145
c
url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9
50/ghostscript-9.50
.tar.xz
md5sum =
6cea6bae4a7cdfac6ccb09f07f0caf8
c
component/glib/buildout.cfg
View file @
bfff4ae3
...
...
@@ -13,8 +13,8 @@ parts =
[glib]
recipe = slapos.recipe.cmmi
shared = true
url = http
://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/glib-2.50.2
.tar.xz
md5sum =
5eeb2bfaf78a07be59585e8b6e80b1d6
url = http
s://ftp.gnome.org/pub/gnome/sources/glib/2.56/glib-2.56.4
.tar.xz
md5sum =
17c3dca43d99a4882384f1a7b530b80b
configure-options =
--with-python=${buildout:executable}
--disable-libmount
...
...
component/groonga/buildout.cfg
View file @
bfff4ae3
...
...
@@ -15,8 +15,8 @@ extends =
[groonga]
recipe = slapos.recipe.cmmi
shared = false
url = https://packages.groonga.org/source/groonga/groonga-9.
0.9
.tar.gz
md5sum = 8
77bc3e2840e2935f606fb3d2d359a2c
url = https://packages.groonga.org/source/groonga/groonga-9.
1.0
.tar.gz
md5sum = 8
1722e0bc8cc0cfdddcafde2087b71df
# temporary patch to respect more tokens in natural language mode.
patches =
${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
...
...
component/haproxy/buildout.cfg
View file @
bfff4ae3
...
...
@@ -13,8 +13,8 @@ parts = haproxy
[haproxy]
recipe = slapos.recipe.cmmi
shared = true
url = http://www.haproxy.org/download/1.8/src/haproxy-1.8.
4
.tar.gz
md5sum =
540cd21169e8828d5d11894b2fa74ab4
url = http://www.haproxy.org/download/1.8/src/haproxy-1.8.
23
.tar.gz
md5sum =
6c35b83a9969449c4b79783a2119551e
configure-command = true
# If the system is running on Linux 2.6, we use "linux26" as the TARGET,
# otherwise use "generic".
...
...
component/libexpat/buildout.cfg
View file @
bfff4ae3
[buildout]
extends =
../lunzip/buildout.cfg
parts =
libexpat
[libexpat]
recipe = slapos.recipe.cmmi
shared = true
url = http
://downloads.sourceforge.net/project/expat/expat/2.2.1/expat-2.2.1.tar.bz2
md5sum =
d9c3baeab58774cefc2f04faf29f2cf8
url = http
s://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.lz
md5sum =
c356e4f2092df4f0b0ffef904f001842
configure-options =
--disable-static
--without-xmlwf
--without-examples
--without-tests
--without-docbook
environment =
PATH=${lunzip:location}/bin:%(PATH)s
component/libpng/buildout.cfg
View file @
bfff4ae3
...
...
@@ -19,15 +19,10 @@ environment =
[libpng12]
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.2.58.tar.xz
md5sum = 1fe68fa3cdab99dbcfd2a6b4de95645f
[libpng15]
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.5.29.tar.xz
md5sum = b9e5452ee9681c313638efedb16c12a6
url = http://download.sourceforge.net/libpng/libpng-1.2.59.tar.xz
md5sum = e120f48f4e27e72255bc366c73aae1db
[libpng]
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.6.3
2
.tar.xz
md5sum =
e01be057a9369183c959b793a685ad15
url = http://download.sourceforge.net/libpng/libpng-1.6.3
7
.tar.xz
md5sum =
015e8e15db1eecde5f2eb9eb5b6e59e9
component/mariadb/buildout.cfg
View file @
bfff4ae3
...
...
@@ -29,8 +29,8 @@ parts =
[mariadb]
recipe = slapos.recipe.cmmi
url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
version = 10.3.2
0
md5sum =
a87a9532568c0ed50d25ce7e7c60d67d
version = 10.3.2
1
md5sum =
c5b9ed98f2f57f7b809d4ec9c1515107
location = ${buildout:parts-directory}/${:_buildout_section_name_}
pre-configure =
set -e '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake
...
...
@@ -84,8 +84,8 @@ post-install =
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# http://mroonga.github.com/
recipe = slapos.recipe.cmmi
url = https://packages.groonga.org/source/mroonga/mroonga-9.
09
.tar.gz
md5sum =
1b4ec3a8c6b4b459bd7a94f2bb8ad585
url = https://packages.groonga.org/source/mroonga/mroonga-9.
10
.tar.gz
md5sum =
30a3010fd5ef11a8bd440053f1624bdb
pre-configure = set -e
rm -rf fake_mariadb_source
mkdir -p fake_mariadb_source
...
...
component/nginx/buildout.cfg
View file @
bfff4ae3
...
...
@@ -13,8 +13,8 @@ parts = nginx-output
[nginx-common]
recipe = slapos.recipe.cmmi
shared = false
url = https://nginx.org/download/nginx-1.17.
1
.tar.gz
md5sum = 5
1021f3e8204a5fc809f5e695a4508db
url = https://nginx.org/download/nginx-1.17.
6
.tar.gz
md5sum = 5
5022aa5715386c994f6773478822853
[nginx]
<= nginx-common
...
...
component/openssl/buildout.cfg
View file @
bfff4ae3
...
...
@@ -17,8 +17,8 @@ parts =
[openssl]
recipe = slapos.recipe.cmmi
shared = true
url = https://www.openssl.org/source/openssl-1.1.
0j
.tar.gz
md5sum =
b4ca5b78ae6ae79da80790b30dbedbdc
url = https://www.openssl.org/source/openssl-1.1.
1d
.tar.gz
md5sum =
3be209000dbc7e1b95bcdf47980a3baa
location = @@LOCATION@@
# 'prefix' option to override --openssldir/--prefix (which is useful
# when combined with DESTDIR). Used by slapos.package.git/obs
...
...
@@ -57,8 +57,8 @@ openssl = ${openssl:location}/bin/openssl
[openssl-1.0]
recipe = slapos.recipe.cmmi
shared = true
url = https://www.openssl.org/source/openssl-1.0.2
p
.tar.gz
md5sum =
ac5eb30bf5798aa14b1ae6d0e7da58df
url = https://www.openssl.org/source/openssl-1.0.2
t
.tar.gz
md5sum =
ef66581b80f06eae42f5268bc0b50c6d
location = @@LOCATION@@
# 'prefix' option to override --openssldir/--prefix (which is useful
# when combined with INSTALL_PREFIX). Used by slapos.package.git/obs
...
...
component/python-2.7/buildout.cfg
View file @
bfff4ae3
...
...
@@ -29,9 +29,9 @@ python = python2.7
[python2.7]
recipe = slapos.recipe.cmmi
shared = true
package_version = 2.7.1
5
package_version = 2.7.1
7
package_version_suffix =
md5sum =
a80ae3cc478460b922242f43a1b4094
d
md5sum =
b3b6d2c92f42a60667814358ab9f0cf
d
# This is actually the default setting for prefix, but we can't use it in
# other settings in this part if we don't set it explicitly here.
...
...
@@ -42,7 +42,7 @@ executable = ${:prefix}/bin/python${:version}
patch-options = -p1
patches =
${:_profile_base_location_}/fix_compiler_module_issue_20613.patch#94443a77f903e9de880a029967fa6aa7
${:_profile_base_location_}/pytracemalloc_pep445.patch#
3dfad79654af9671325f988c36fb6be2
${:_profile_base_location_}/pytracemalloc_pep445.patch#
9f3145817afa2b7fad801fde8447e396
${:_profile_base_location_}/disabled_module_list.patch#71ad30d32bcdbc50c19cf48675b1246e
${:_profile_base_location_}/asyncore_poll_insteadof_select.patch#ab6991c0ee6e25aeb8951e71f280a2f1
url =
...
...
component/python-2.7/pytracemalloc_pep445.patch
View file @
bfff4ae3
...
...
@@ -492,7 +492,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
#ifdef WITH_PYMALLOC
#ifdef HAVE_MMAP
@@ -2
14,7 +489
,7 @@
@@ -2
20,7 +495
,7 @@
* Arenas are allocated with mmap() on systems supporting anonymous memory
* mappings to reduce heap fragmentation.
*/
...
...
@@ -501,7 +501,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
#ifdef WITH_MEMORY_LIMITS
#define MAX_ARENAS (SMALL_MEMORY_LIMIT / ARENA_SIZE)
@@ -58
1,7 +856
,7 @@
@@ -58
7,7 +862
,7 @@
return NULL; /* overflow */
#endif
nbytes = numarenas * sizeof(*arenas);
...
...
@@ -510,7 +510,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
if (arenaobj == NULL)
return NULL;
arenas = arenaobj;
@@ -7
85,9 +1060
,8 @@
@@ -7
91,9 +1066
,8 @@
* Unless the optimizer reorders everything, being too smart...
*/
...
...
@@ -522,7 +522,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
{
block *bp;
poolp pool;
@@ -80
2,15 +1076
,6 @@
@@ -80
8,15 +1082
,6 @@
#endif
/*
...
...
@@ -538,7 +538,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
* This implicitly redirects malloc(0).
*/
if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
@@ -98
1,17 +1246
,13 @@
@@ -98
7,17 +1252
,13 @@
* last chance to serve the request) or when the max memory limit
* has been reached.
*/
...
...
@@ -559,7 +559,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
{
poolp pool;
block *lastfree;
@@ -121
1,7 +1472
,7 @@
@@ -121
7,7 +1478
,7 @@
redirect:
#endif
/* We didn't allocate this address. */
...
...
@@ -568,7 +568,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
}
/* realloc. If p is NULL, this acts like malloc(nbytes). Else if nbytes==0,
@@ -12
19,10 +1480
,8 @@
@@ -12
25,10 +1486
,8 @@
* return a non-NULL result.
*/
...
...
@@ -581,7 +581,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
{
void *bp;
poolp pool;
@@ -123
2,16 +1491
,7 @@
@@ -123
8,16 +1497
,7 @@
#endif
if (p == NULL)
...
...
@@ -599,7 +599,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
#ifdef WITH_VALGRIND
/* Treat running_on_valgrind == -1 the same as 0 */
@@ -12
69,10 +1519
,10 @@
@@ -12
75,10 +1525
,10 @@
}
size = nbytes;
}
...
...
@@ -612,7 +612,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
}
return bp;
}
@@ -129
0,40 +1540
,17 @@
@@ -129
6,40 +1546
,17 @@
* at p. Instead we punt: let C continue to manage this block.
*/
if (nbytes)
...
...
@@ -655,7 +655,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
#endif /* WITH_PYMALLOC */
#ifdef PYMALLOC_DEBUG
@@ -134
3,10 +1570
,6 @@
@@ -134
9,10 +1576
,6 @@
#define DEADBYTE 0xDB /* dead (newly freed) memory */
#define FORBIDDENBYTE 0xFB /* untouchable bytes at each end of a block */
...
...
@@ -666,7 +666,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
static size_t serialno = 0; /* incremented on each debug {m,re}alloc */
/* serialno is always incremented via calling this routine. The point is
@@ -14
29,58 +1652
,18 @@
@@ -14
67,58 +1690
,18 @@
p[2*S+n: 2*S+n+S]
Copies of FORBIDDENBYTE. Used to catch over- writes and reads.
p[2*S+n+S: 2*S+n+2*S]
...
...
@@ -722,7 +722,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
-
-/* generic debug memory api, with an "id" to identify the API in use */
-void *
-_PyObject_DebugMallocApi(char
id
, size_t nbytes)
-_PyObject_DebugMallocApi(char
api
, size_t nbytes)
+static void *
+_PyMem_DebugMallocCtx(void *ctx, size_t nbytes)
{
...
...
@@ -730,25 +730,27 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
uchar *p; /* base address of malloc'ed block */
uchar *tail; /* p + 2*SST + nbytes == pointer to tail pad bytes */
size_t total; /* nbytes + 4*SST */
@@ -1491,14 +1674,14 @@
/* overflow: can't represent total as a size_t */
@@ -1530,7 +1713,7 @@
return NULL;
- p = (uchar *)PyObject_Malloc(total);
+ p = (uchar *)api->alloc.malloc(api->alloc.ctx, total);
if (p == NULL)
return NULL;
if (api == _PYMALLOC_OBJ_ID) {
- p = (uchar *)PyObject_Malloc(total);
+ p = (uchar *)api->alloc.malloc(api->alloc.ctx, total);
}
else {
p = (uchar *)_PyMem_Malloc(total);
@@ -1540,8 +1723,8 @@
/* at p, write size (SST bytes),
id
(1 byte), pad (SST-1 bytes) */
/* at p, write size (SST bytes),
api
(1 byte), pad (SST-1 bytes) */
write_size_t(p, nbytes);
- p[SST] = (uchar)
id
;
- p[SST] = (uchar)
api
;
- memset(p + SST + 1 , FORBIDDENBYTE, SST-1);
+ p[SST] = (uchar)api->api_id;
+ memset(p + SST + 1, FORBIDDENBYTE, SST-1);
if (nbytes > 0)
memset(p + 2*SST, CLEANBYTE, nbytes);
@@ -15
16,35 +1699,37
@@
@@ -15
59,40 +1742,42
@@
Then fills the original bytes with DEADBYTE.
Then calls the underlying free.
*/
...
...
@@ -769,8 +771,13 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
nbytes += 4*SST;
if (nbytes > 0)
memset(q, DEADBYTE, nbytes);
- PyObject_Free(q);
+ api->alloc.free(api->alloc.ctx, q);
if (api == _PYMALLOC_OBJ_ID) {
- PyObject_Free(q);
+ api->alloc.free(api->alloc.ctx, q);
}
else {
_PyMem_Free(q);
}
}
-void *
...
...
@@ -795,7 +802,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
bumpserialno();
original_nbytes = read_size_t(q - 2*SST);
total = nbytes + 4*SST;
@@ -1
552,16 +1737,12
@@
@@ -1
600,17 +1785,13
@@
/* overflow: can't represent total as a size_t */
return NULL;
...
...
@@ -808,13 +815,14 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
* case we didn't get the chance to mark the old memory with DEADBYTE,
* but we live with that.
*/
- q = (uchar *)PyObject_Realloc(q - 2*SST, total);
+ oldq = q;
+ q = (uchar *)api->alloc.realloc(api->alloc.ctx, q - 2*SST, total);
if (q == NULL) {
if (nbytes <= original_nbytes) {
/* bpo-31626: the memset() above expects that realloc never fails
@@ -1571,11 +1752,17 @@
if (api == _PYMALLOC_OBJ_ID) {
- q = (uchar *)PyObject_Realloc(q - 2*SST, total);
+ oldq = q;
+ q = (uchar *)api->alloc.realloc(api->alloc.ctx, q - 2*SST, total);
}
else {
q = (uchar *)_PyMem_Realloc(q - 2*SST, total);
@@ -1624,11 +1805,17 @@
return NULL;
}
...
...
@@ -833,7 +841,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
tail = q + nbytes;
memset(tail, FORBIDDENBYTE, SST);
write_size_t(tail + SST, serialno);
@@ -1
594,8 +1781
,8 @@
@@ -1
647,8 +1834
,8 @@
* and call Py_FatalError to kill the program.
* The API id, is also checked.
*/
...
...
@@ -844,7 +852,7 @@ diff -Naru a/Objects/obmalloc.c b/Objects/obmalloc.c
{
const uchar *q = (const uchar *)p;
char msgbuf[64];
@@ -19
41,3 +2128
,44 @@
@@ -19
94,3 +2181
,44 @@
arenas[arenaindex_temp].address != 0;
}
#endif
...
...
component/opera/buildout.cfg
→
component/
unstable/
opera/buildout.cfg
View file @
bfff4ae3
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment