aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-09-03 01:55:13 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-09-03 01:57:01 +0300
commit3de7c681a8ff6fd8068208bea734191e63fe4cc0 (patch)
tree068c933ee8a4933085c0b61687a27ef527864d34
parent903adae9bb69bcfeb266132bffd80db16b542837 (diff)
community/chicken: eliminate race condition in build
do not patch the Scheme source file as it might get a later timestamp as the target C file
-rw-r--r--community/chicken/APKBUILD4
-rw-r--r--community/chicken/CVE-2017-6949.patch106
2 files changed, 2 insertions, 108 deletions
diff --git a/community/chicken/APKBUILD b/community/chicken/APKBUILD
index 581dcc9a119..b35795ebae6 100644
--- a/community/chicken/APKBUILD
+++ b/community/chicken/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=chicken
pkgver=4.12.0
-pkgrel=4
+pkgrel=5
pkgdesc="R5RS and R7RS compatible scheme compiler and interpreter"
url="http://call-cc.org/"
arch="all"
@@ -68,5 +68,5 @@ feathers() {
}
sha512sums="190bdc9e53aa50e93419e2483fd5baf3e2ef3bebe4e605653f2aadd9b8bbc98b192cfbb64ab1c99eeefb13a7795757f013799963bfb775862d746ed5c93d602f chicken-4.12.0.tar.gz
-14d489f68ac29b6a06775e7744164c0b4ea4f64bdf75851249c207fe5ac286185c525cc291e0eced428a1579d83a9dab9aa124c0f7ddb35f5c64ccfda692535e CVE-2017-6949.patch
+7709b6558c01490116cda11162833affa884afaed1ba2d34ee301f5439fad02a6550193266c38c3a93e88c19a680a7140eeafb23100f783979265a7c1a1eaf57 CVE-2017-6949.patch
7d594a6abaffe59a050305878ba9cc75cf588743407b2cc44e369fb22a94d42662bf8101bec93b60cacdc0046da5bc74ff1e8ac8d9e6aacfb280406cbbabce7c CVE-2017-9334.patch"
diff --git a/community/chicken/CVE-2017-6949.patch b/community/chicken/CVE-2017-6949.patch
index 389a065fc0c..c6614556a0d 100644
--- a/community/chicken/CVE-2017-6949.patch
+++ b/community/chicken/CVE-2017-6949.patch
@@ -14748,109 +14748,3 @@
+o|dropping unused closure argument: f_1488
*/
/* end of file */
---- chicken-4.12.0/srfi-4.scm
-+++ chicken-4.12.0.cve/srfi-4.scm
-@@ -255,24 +255,28 @@
-
- ;;; Basic constructors:
-
--(let* ([ext-alloc
-- (foreign-lambda* scheme-object ([int bytes])
-- "C_word *buf = (C_word *)C_malloc(bytes + sizeof(C_header));"
-+(let* ((ext-alloc
-+ (foreign-lambda* scheme-object ((size_t bytes))
-+ "C_word *buf;"
-+ "if (bytes > C_HEADER_SIZE_MASK) C_return(C_SCHEME_FALSE);"
-+ "buf = (C_word *)C_malloc(bytes + sizeof(C_header));"
- "if(buf == NULL) C_return(C_SCHEME_FALSE);"
- "C_block_header_init(buf, C_make_header(C_BYTEVECTOR_TYPE, bytes));"
-- "C_return(buf);") ]
-- [ext-free
-- (foreign-lambda* void ([scheme-object bv])
-- "C_free((void *)C_block_item(bv, 1));") ]
-- [alloc
-+ "C_return(buf);") )
-+ (ext-free
-+ (foreign-lambda* void ((scheme-object bv))
-+ "C_free((void *)C_block_item(bv, 1));") )
-+ (alloc
- (lambda (loc len ext?)
-+ (##sys#check-exact len loc)
-+ (when (fx< len 0) (##sys#error loc "size is negative" len))
- (if ext?
-- (let ([bv (ext-alloc len)])
-+ (let ((bv (ext-alloc len)))
- (or bv
- (##sys#error loc "not enough memory - cannot allocate external number vector" len)) )
-- (let ([bv (##sys#allocate-vector len #t #f #t)]) ; this could be made better...
-+ (let ((bv (##sys#allocate-vector len #t #f #t))) ; this could be made better...
- (##core#inline "C_string_to_bytevector" bv)
-- bv) ) ) ] )
-+ bv) ) ) ) )
-
- (set! release-number-vector
- (lambda (v)
-@@ -282,7 +286,6 @@
-
- (set! make-u8vector
- (lambda (len #!optional (init #f) (ext? #f) (fin? #t))
-- (##sys#check-exact len 'make-u8vector)
- (let ((v (##sys#make-structure 'u8vector (alloc 'make-u8vector len ext?))))
- (when (and ext? fin?) (set-finalizer! v ext-free))
- (if (not init)
-@@ -295,7 +298,6 @@
-
- (set! make-s8vector
- (lambda (len #!optional (init #f) (ext? #f) (fin? #t))
-- (##sys#check-exact len 'make-s8vector)
- (let ((v (##sys#make-structure 's8vector (alloc 'make-s8vector len ext?))))
- (when (and ext? fin?) (set-finalizer! v ext-free))
- (if (not init)
-@@ -308,7 +310,6 @@
-
- (set! make-u16vector
- (lambda (len #!optional (init #f) (ext? #f) (fin? #t))
-- (##sys#check-exact len 'make-u16vector)
- (let ((v (##sys#make-structure 'u16vector (alloc 'make-u16vector (##core#inline "C_fixnum_shift_left" len 1) ext?))))
- (when (and ext? fin?) (set-finalizer! v ext-free))
- (if (not init)
-@@ -321,7 +322,6 @@
-
- (set! make-s16vector
- (lambda (len #!optional (init #f) (ext? #f) (fin? #t))
-- (##sys#check-exact len 'make-s16vector)
- (let ((v (##sys#make-structure 's16vector (alloc 'make-s16vector (##core#inline "C_fixnum_shift_left" len 1) ext?))))
- (when (and ext? fin?) (set-finalizer! v ext-free))
- (if (not init)
-@@ -334,7 +334,6 @@
-
- (set! make-u32vector
- (lambda (len #!optional (init #f) (ext? #f) (fin? #t))
-- (##sys#check-exact len 'make-u32vector)
- (let ((v (##sys#make-structure 'u32vector (alloc 'make-u32vector (##core#inline "C_fixnum_shift_left" len 2) ext?))))
- (when (and ext? fin?) (set-finalizer! v ext-free))
- (if (not init)
-@@ -347,7 +346,6 @@
-
- (set! make-s32vector
- (lambda (len #!optional (init #f) (ext? #f) (fin? #t))
-- (##sys#check-exact len 'make-s32vector)
- (let ((v (##sys#make-structure 's32vector (alloc 'make-s32vector (##core#inline "C_fixnum_shift_left" len 2) ext?))))
- (when (and ext? fin?) (set-finalizer! v ext-free))
- (if (not init)
-@@ -360,7 +358,6 @@
-
- (set! make-f32vector
- (lambda (len #!optional (init #f) (ext? #f) (fin? #t))
-- (##sys#check-exact len 'make-f32vector)
- (let ((v (##sys#make-structure 'f32vector (alloc 'make-f32vector (##core#inline "C_fixnum_shift_left" len 2) ext?))))
- (when (and ext? fin?) (set-finalizer! v ext-free))
- (if (not init)
-@@ -375,7 +372,6 @@
-
- (set! make-f64vector
- (lambda (len #!optional (init #f) (ext? #f) (fin? #t))
-- (##sys#check-exact len 'make-f64vector)
- (let ((v (##sys#make-structure
- 'f64vector
- (alloc 'make-f64vector (##core#inline "C_fixnum_shift_left" len 3) ext?))))