From: Timo Myyrä <timo.myyra@bittivirhe.fi>
Subject: (maintainer update) lang/chicken-5.4.0
To: ports@openbsd.org
Date: Mon, 29 Jul 2024 08:32:17 +0300

Hi,

Chicken Scheme got a new release recently.
Release notes: https://code.call-cc.org/releases/5.4.0/NEWS

The diff is quite mechanical and package seems to work fine on amd64.

Timo

diff /usr/ports
commit - 91c62197c95d894e5fecbb4866735eb37d9ec02a
path + /usr/ports
blob - e2fb248312a5074b5bad84609ded5586a1c7b465
file + lang/chicken/Makefile.inc
--- lang/chicken/Makefile.inc
+++ lang/chicken/Makefile.inc
@@ -1,6 +1,6 @@
 COMMENT=	practical and portable Scheme system
 
-V=		5.3.0
+V=		5.4.0
 DISTNAME=	chicken-${V}
 
 MAINTAINER=	Timo Myyra <timo.myyra@bittivirhe.fi>
blob - 57049ed0f5677f59428cb73abd77ef3c63e05b2d
file + lang/chicken/bootstrap/distinfo
--- lang/chicken/bootstrap/distinfo
+++ lang/chicken/bootstrap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
-SIZE (chicken-5.3.0.tar.gz) = 4069549
+SHA256 (chicken-5.4.0.tar.gz) = PF1KphwRZ79tm/nq+JHadjC6n188Fb8JUVpwOb/N7F8=
+SIZE (chicken-5.4.0.tar.gz) = 4109135
blob - 698e6ee50d44b90efb2511fd63086afd8dcd8d42
file + lang/chicken/core/Makefile
--- lang/chicken/core/Makefile
+++ lang/chicken/core/Makefile
@@ -1,7 +1,5 @@
-REVISION=	0
+SHARED_LIBS=	chicken	8.1 # 11
 
-SHARED_LIBS=	chicken	8.0 # 11
-
 TEST_TARGET=	check
 TEST_DEPENDS=	${BUILD_PKGPATH}
 
blob - 57049ed0f5677f59428cb73abd77ef3c63e05b2d
file + lang/chicken/core/distinfo
--- lang/chicken/core/distinfo
+++ lang/chicken/core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
-SIZE (chicken-5.3.0.tar.gz) = 4069549
+SHA256 (chicken-5.4.0.tar.gz) = PF1KphwRZ79tm/nq+JHadjC6n188Fb8JUVpwOb/N7F8=
+SIZE (chicken-5.4.0.tar.gz) = 4109135
blob - 2fdb162761259163988c4b657c4e55198fbcd6ad
file + lang/chicken/core/patches/patch-Makefile_bsd
--- lang/chicken/core/patches/patch-Makefile_bsd
+++ lang/chicken/core/patches/patch-Makefile_bsd
@@ -1,7 +1,7 @@
 Index: Makefile.bsd
 --- Makefile.bsd.orig
 +++ Makefile.bsd
-@@ -45,7 +45,7 @@ endif
+@@ -48,7 +48,7 @@ endif
  LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
  LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-rpath="$(RUNTIME_LINKER_PATH)" -Wl,-L.
  LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
blob - 811e276ace40dcd20ccded7a3e2396d7875d1428
file + lang/chicken/core/patches/patch-defaults_make
--- lang/chicken/core/patches/patch-defaults_make
+++ lang/chicken/core/patches/patch-defaults_make
@@ -13,7 +13,7 @@ Index: defaults.make
  VARDIR ?= $(LIBDIR)
  MAN1DIR ?= $(MANDIR)/man1
  CHICKENLIBDIR ?= $(VARDIR)/$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
-@@ -190,8 +190,8 @@ ifeq ($(PLATFORM),cygwin)
+@@ -191,8 +191,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
@@ -24,7 +24,7 @@ Index: defaults.make
  endif
  endif
  LIBCHICKEN_SO_LIBRARIES ?= $(LIBRARIES)
-@@ -280,8 +280,8 @@ DYNAMIC_CHICKEN_UNIT_IMPORT_LIBRARIES = continuation e
+@@ -281,8 +281,8 @@ DYNAMIC_CHICKEN_UNIT_IMPORT_LIBRARIES = continuation e
  # targets
  
  CHICKEN_PROGRAM = $(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
blob - b3862a27ff7be64ba786da1aeca277dbe9b92574
file + /dev/null
--- lang/chicken/core/patches/patch-egg-compile_scm
+++ /dev/null
@@ -1,51 +0,0 @@
-Fix CVE-2022-45145 by backporting commit a08f8f548d772ef410c672ba33a27108d8d434f3.
-
-See: https://lists.nongnu.org/archive/html/chicken-announce/2022-11/msg00000.html
-
-Index: egg-compile.scm
---- egg-compile.scm.orig
-+++ egg-compile.scm
-@@ -1191,7 +1191,7 @@ EOF
- 
- ~a ~a~a
- ~a ~a~a
--cat >~a~a <<ENDINFO
-+cat >~a~a <<'ENDINFO'
- ~aENDINFO~%
- EOF
-                mkdir ddir qdir
-@@ -1201,11 +1201,18 @@ EOF
-        (printf #<<EOF
- 
- ~a ~a~a
--echo ~a >~a~a~%
-+copy /y nul ~a~a~%
-+~a
- EOF
-                mkdir ddir qdir
--               (string-intersperse (string-split infostr "\n") "^\n\n")
--               ddir dest)))))
-+	       ddir dest
-+	       (string-intersperse (map (lambda (line)
-+					  (ensure-line-limit
-+                                             (caretize (format "echo ~a >>~a~a"
-+                                                               line ddir dest))
-+                                             8191 ))
-+					(string-split infostr "\n"))
-+				   "\n"))))))
- 
- ;;; some utilities for mangling + quoting
- 
-@@ -1277,3 +1284,12 @@ EOF
- (define (joins strs) (string-intersperse strs " "))
- 
- (define (maybe f x) (if f (list x) '()))
-+
-+(define (caretize str)
-+  (string-translate* str '(("&" . "^&") ("^" . "^^") ("|" . "^|")
-+			   ("<" . "^<") (">" . "^>"))))
-+
-+(define (ensure-line-limit str lim)
-+  (when (>= (string-length str) lim)
-+    (error "line length exceeds platform limit: " str))
-+  str)
blob - 3d2a682c6060298060c97f30329f6e821b0c0ca8
file + lang/chicken/core/patches/patch-eval_scm
--- lang/chicken/core/patches/patch-eval_scm
+++ lang/chicken/core/patches/patch-eval_scm
@@ -1,7 +1,7 @@
 Index: eval.scm
 --- eval.scm.orig
 +++ eval.scm
-@@ -1115,8 +1115,7 @@
+@@ -1131,8 +1131,7 @@
  	 (if uses-soname?
  	     (string-append
  	      load-library-extension
blob - f772a08073e4740aec04a60b28400e00002ede66
file + lang/chicken/core/patches/patch-rules_make
--- lang/chicken/core/patches/patch-rules_make
+++ lang/chicken/core/patches/patch-rules_make
@@ -11,7 +11,7 @@ Index: rules.make
  	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_LINKER_OPTIONS) \
  	  $(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
  ifdef USES_SONAME
-@@ -281,9 +281,6 @@ ifdef DLLSINPATH
+@@ -282,9 +282,6 @@ ifdef DLLSINPATH
  	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(IBINDIR)"
  else
  ifdef USES_SONAME
@@ -21,7 +21,7 @@ Index: rules.make
  	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE)"
  endif
  endif
-@@ -415,7 +412,7 @@ uninstall:
+@@ -412,7 +409,7 @@ uninstall:
  	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A)"
  	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
  ifdef USES_SONAME
@@ -30,7 +30,7 @@ Index: rules.make
  endif
  ifdef WINDOWS
  	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) "$(DESTDIR)$(IBINDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
-@@ -972,7 +969,7 @@ clean:
+@@ -977,7 +974,7 @@ clean:
  	  $(foreach lib,$(DYNAMIC_IMPORT_LIBRARIES),chicken.$(lib).import.scm) \
  	  $(BUILD_CONFIG_FILES)
  ifdef USES_SONAME