timo.my...@wickedbsd.net (Timo Myyrä) writes:
> Hi,
>
> Here's an chicken update waiting for ports unlock.
> Lightly tested on my thinkpad.
>
> Timo
>
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/lang/chicken/Makefile.inc,v
> retrieving revision 1.4
> diff -u -u -p -r1.4 Makefile.inc
> --- Makefile.inc 4 Jul 2014 18:26:49 -0000 1.4
> +++ Makefile.inc 7 Aug 2015 19:38:47 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT= practical and portable Scheme system
>
> -V= 4.9.0.1
> +V= 4.10.0
> DISTNAME= chicken-${V}
>
> MAINTAINER= Timo Myyra <timo.my...@wickedbsd.net>
> @@ -30,6 +30,6 @@ FAKE_FLAGS= PREFIX=${TRUEPREFIX}
> # Based on param.h:MACHINE_STACK_GROWS_UP
> pre-build:
> .if ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "hppa64"
> - perl -pi -e 's/C_STACK_GROWS_DOWNWARD 1/C_STACK_GROWS_DOWNWARD 0/g'
> "${WRKSRC}/Makefile.bsd"
> + sed -i 's/C_STACK_GROWS_DOWNWARD 1/C_STACK_GROWS_DOWNWARD 0/g'
> "${WRKSRC}/Makefile.bsd"
> .endif
>
> Index: bootstrap/distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/chicken/bootstrap/distinfo,v
> retrieving revision 1.2
> diff -u -u -p -r1.2 distinfo
> --- bootstrap/distinfo 4 Jul 2014 18:26:49 -0000 1.2
> +++ bootstrap/distinfo 7 Aug 2015 19:38:47 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (chicken-4.9.0.1.tar.gz) =
> BN98Q5w2/BZEa9+hhuenAlj5EdLYJrUhao5rHLKqKBU=
> -SIZE (chicken-4.9.0.1.tar.gz) = 4023371
> +SHA256 (chicken-4.10.0.tar.gz) = Dgf1q80RlhmGlQ2+qlpA20Ffihtl2v+cMA6bBbM0iZs=
> +SIZE (chicken-4.10.0.tar.gz) = 4020442
> Index: core/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/chicken/core/Makefile,v
> retrieving revision 1.5
> diff -u -u -p -r1.5 Makefile
> --- core/Makefile 16 Jun 2015 14:45:04 -0000 1.5
> +++ core/Makefile 7 Aug 2015 19:38:47 -0000
> @@ -2,9 +2,7 @@
>
> SHARED_ONLY= Yes
>
> -REVISION= 1
> -
> -SHARED_LIBS= chicken 3.0
> +SHARED_LIBS= chicken 4.0 # 7
>
> TEST_TARGET= check
> TEST_DEPENDS= ${BUILD_PKGPATH}
> Index: core/distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/chicken/core/distinfo,v
> retrieving revision 1.2
> diff -u -u -p -r1.2 distinfo
> --- core/distinfo 4 Jul 2014 18:26:49 -0000 1.2
> +++ core/distinfo 7 Aug 2015 19:38:47 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (chicken-4.9.0.1.tar.gz) =
> BN98Q5w2/BZEa9+hhuenAlj5EdLYJrUhao5rHLKqKBU=
> -SIZE (chicken-4.9.0.1.tar.gz) = 4023371
> +SHA256 (chicken-4.10.0.tar.gz) = Dgf1q80RlhmGlQ2+qlpA20Ffihtl2v+cMA6bBbM0iZs=
> +SIZE (chicken-4.10.0.tar.gz) = 4020442
> Index: core/patches/patch-Makefile_bsd
> ===================================================================
> RCS file: /cvs/ports/lang/chicken/core/patches/patch-Makefile_bsd,v
> retrieving revision 1.2
> diff -u -u -p -r1.2 patch-Makefile_bsd
> --- core/patches/patch-Makefile_bsd 4 Jul 2014 18:26:49 -0000 1.2
> +++ core/patches/patch-Makefile_bsd 7 Aug 2015 19:38:47 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile_bsd,v 1.2 2014/07/04 18:26:49 juanfra Exp $
> ---- Makefile.bsd.orig Wed Jun 18 16:52:58 2014
> -+++ Makefile.bsd Wed Jun 18 16:53:35 2014
> -@@ -36,7 +36,7 @@ SRCDIR = ./
> +--- Makefile.bsd.orig Fri Jul 24 14:04:24 2015
> ++++ Makefile.bsd Fri Jul 24 20:55:28 2015
> +@@ -31,7 +31,7 @@ SRCDIR ?= ./
> ARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
>
> # options
> @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_bsd,v 1.2 2014/
>
> ifdef DEBUGBUILD
> C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
> -@@ -50,10 +50,9 @@ endif
> +@@ -45,10 +45,9 @@ endif
> LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
> LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
> -Wl,-R"$(RUNTIME_LINKER_PATH)" -Wl,-L.
> LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R"$(RUNTIME_LINKER_PATH)"
> Index: core/patches/patch-data-structures_scm
> ===================================================================
> RCS file: core/patches/patch-data-structures_scm
> diff -N core/patches/patch-data-structures_scm
> --- core/patches/patch-data-structures_scm 30 Jan 2015 14:30:30 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,37 +0,0 @@
> -$OpenBSD: patch-data-structures_scm,v 1.1 2015/01/30 14:30:30 jasper Exp $
> -
> -Security fix for CVE-2014-9651
> -http://lists.nongnu.org/archive/html/chicken-hackers/2014-12/msg00000.html
> -
> ---- data-structures.scm.orig Sat Jun 7 15:18:27 2014
> -+++ data-structures.scm Fri Jan 30 14:58:17 2015
> -@@ -303,15 +303,21 @@
> - (define (traverse which where start test loc)
> - (##sys#check-string which loc)
> - (##sys#check-string where loc)
> -- (let ([wherelen (##sys#size where)]
> -- [whichlen (##sys#size which)] )
> -+ (let* ((wherelen (##sys#size where))
> -+ (whichlen (##sys#size which))
> -+ (end (fx- wherelen whichlen)))
> - (##sys#check-exact start loc)
> -- (let loop ([istart start] [iend whichlen])
> -- (cond [(fx> iend wherelen) #f]
> -- [(test istart whichlen) istart]
> -- [else
> -- (loop (fx+ istart 1)
> -- (fx+ iend 1) ) ] ) ) ) )
> -+ (if (and (fx>= start 0)
> -+ (fx> wherelen start))
> -+ (let loop ((istart start))
> -+ (cond ((fx> istart end) #f)
> -+ ((test istart whichlen) istart)
> -+ (else (loop (fx+ istart 1)))))
> -+ (##sys#error-hook (foreign-value "C_OUT_OF_RANGE_ERROR" int)
> -+ loc
> -+ start
> -+ wherelen))))
> -+
> - (set! ##sys#substring-index
> - (lambda (which where start)
> - (traverse
> Index: core/patches/patch-defaults_make
> ===================================================================
> RCS file: /cvs/ports/lang/chicken/core/patches/patch-defaults_make,v
> retrieving revision 1.2
> diff -u -u -p -r1.2 patch-defaults_make
> --- core/patches/patch-defaults_make 4 Jul 2014 18:26:49 -0000 1.2
> +++ core/patches/patch-defaults_make 7 Aug 2015 19:38:47 -0000
> @@ -1,20 +1,19 @@
> $OpenBSD: patch-defaults_make,v 1.2 2014/07/04 18:26:49 juanfra Exp $
> ---- defaults.make.orig Wed Jun 18 16:55:23 2014
> -+++ defaults.make Wed Jun 18 16:57:01 2014
> -@@ -42,10 +42,10 @@ BINDIR = $(PREFIX)/bin
> - LIBDIR = $(PREFIX)/lib
> - SHAREDIR = $(PREFIX)/share
> - DATADIR = $(SHAREDIR)/$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
> --TOPMANDIR = $(SHAREDIR)/man
> -+TOPMANDIR = $(PREFIX)/man
> - MANDIR = $(TOPMANDIR)/man1
> - INCDIR = $(PREFIX)/include/$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
> --DOCDIR = $(DATADIR)/doc
> -+DOCDIR = $(SHAREDIR)/doc/chicken
> +--- defaults.make.orig Fri Jul 24 14:04:24 2015
> ++++ defaults.make Sat Jul 25 19:26:22 2015
> +@@ -42,9 +42,9 @@ LIBDIR ?= $(PREFIX)/lib
> + SHAREDIR ?= $(PREFIX)/share
> + DATADIR ?= $(SHAREDIR)/$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
> + INCLUDEDIR ?= $(PREFIX)/include
> +-MANDIR ?= $(SHAREDIR)/man
> ++MANDIR ?= $(PREFIX)/man
> +
> +-DOCDIR ?= $(DATADIR)/doc
> ++DOCDIR ?= $(SHAREDIR)/doc/chicken
> VARDIR ?= $(LIBDIR)
> - CHICKENLIBDIR = $(VARDIR)/$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
> - EGGDIR ?= $(CHICKENLIBDIR)/$(BINARYVERSION)
> -@@ -211,8 +211,8 @@ ifeq ($(PLATFORM),cygwin)
> + MAN1DIR ?= $(MANDIR)/man1
> + CHICKENLIBDIR ?= $(VARDIR)/$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
> +@@ -187,8 +187,8 @@ ifeq ($(PLATFORM),cygwin)
> PRIMARY_LIBCHICKEN = cyg$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)-0.dll
> LIBCHICKEN_SO_FILE = cyg$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)-0.dll
> else
> Index: core/patches/patch-eval_scm
> ===================================================================
> RCS file: /cvs/ports/lang/chicken/core/patches/patch-eval_scm,v
> retrieving revision 1.2
> diff -u -u -p -r1.2 patch-eval_scm
> --- core/patches/patch-eval_scm 4 Jul 2014 18:26:49 -0000 1.2
> +++ core/patches/patch-eval_scm 7 Aug 2015 19:38:47 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-eval_scm,v 1.2 2014/07/04 18:26:49 juanfra Exp $
> ---- eval.scm.orig Wed Jun 18 16:57:19 2014
> -+++ eval.scm Wed Jun 18 16:59:08 2014
> -@@ -1070,8 +1070,7 @@
> +--- eval.scm.orig Fri Jul 24 14:06:30 2015
> ++++ eval.scm Fri Jul 31 21:34:37 2015
> +@@ -1068,8 +1068,7 @@
> (if uses-soname?
> (string-append
> ##sys#load-library-extension
> Index: core/patches/patch-tests_data-structures-tests_scm
> ===================================================================
> RCS file: core/patches/patch-tests_data-structures-tests_scm
> diff -N core/patches/patch-tests_data-structures-tests_scm
> --- core/patches/patch-tests_data-structures-tests_scm 16 Jun 2015
> 14:45:04 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,45 +0,0 @@
> -$OpenBSD: patch-tests_data-structures-tests_scm,v 1.2 2015/06/16 14:45:04
> jasper Exp $
> -
> -Security fix for CVE-2014-9651
> -http://lists.nongnu.org/archive/html/chicken-hackers/2014-12/msg00000.html
> -
> -Security fix for CVE-2015-4556
> -http://lists.nongnu.org/archive/html/chicken-hackers/2015-06/msg00037.html
> -
> ---- tests/data-structures-tests.scm.orig Tue Jun 16 10:11:45 2015
> -+++ tests/data-structures-tests.scm Tue Jun 16 10:11:37 2015
> -@@ -1,6 +1,6 @@
> - ;;;; data-structures-tests.scm
> -
> --(use data-structures)
> -+(use data-structures lolevel)
> -
> - (define-syntax assert-error
> - (syntax-rules ()
> -@@ -42,6 +42,26 @@
> - (assert (> 0 (string-compare3-ci "foo\x00A" "foo\x00b")))
> - (assert (< 0 (string-compare3-ci "foo\x00b" "foo\x00a")))
> - (assert (< 0 (string-compare3-ci "foo\x00b" "foo\x00A")))
> -+
> -+
> -+;; This used to fail because substring-index and co. used to search
> -+;; beyond the end of the subject string when a start index > 0 was
> -+;; provided. We use object-evict to ensure that the strings are placed
> -+;; in adjacent memory ranges so we can detect this error.
> -+(let* ((foo (object-evict (make-string 32 #\x)))
> -+ (bar (object-evict "y")))
> -+ (assert (not (substring-index "y" foo 30))))
> -+
> -+(assert (string=? "bde" (string-translate* "abcd"
> -+ '(("a" . "b")
> -+ ("b" . "")
> -+ ("c" . "d")
> -+ ("d" . "e")))))
> -+(assert (string=? "bc" (string-translate* "abc"
> -+ '(("ab" . "b")
> -+ ("bc" . "WRONG")))))
> -+(assert (string=? "x" (string-translate* "ab" '(("ab" . "x")))))
> -+(assert (string=? "xy" (string-translate* "xyz" '(("z" . "")))))
> -
> - ;; topological-sort
> -
ping
