diff options
author | J0WI <J0WI@users.noreply.github.com> | 2020-05-10 18:21:09 +0200 |
---|---|---|
committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2020-05-11 11:40:50 +0200 |
commit | 0cf1590968658095222949e2ea859171538abe34 (patch) | |
tree | 177b69e45c138c0828809c3ef10d49e784cf005b | |
parent | 522d5e123a58132cb62cb04b6522815f5929147c (diff) |
testing/racket: upgrade to 7.7
-rw-r--r-- | testing/racket/APKBUILD | 29 | ||||
-rw-r--r-- | testing/racket/libressl.patch | 53 | ||||
-rw-r--r-- | testing/racket/makefile-fix-bashism.patch | 38 | ||||
-rw-r--r-- | testing/racket/musl-fixes.patch | 26 | ||||
-rw-r--r-- | testing/racket/paxmark.patch | 77 |
5 files changed, 7 insertions, 216 deletions
diff --git a/testing/racket/APKBUILD b/testing/racket/APKBUILD index 75dccf420c3..6fa22ffcd21 100644 --- a/testing/racket/APKBUILD +++ b/testing/racket/APKBUILD @@ -5,20 +5,16 @@ # TODO: Install even packages from the full tarball? # TODO: Figure out how to run tests. pkgname=racket -pkgver=6.12 -pkgrel=4 +pkgver=7.7 +pkgrel=0 pkgdesc="A general purpose programming language in the Lisp-Scheme family" url="https://racket-lang.org/" -arch="all" +arch="all !armv7" # fails to build gmp_arm_gcc.o license="LGPL-3.0-or-later MIT" -depends="ca-certificates libressl3.0-libcrypto libressl3.0-libssl" -makedepends="chrpath libffi-dev libucontext-dev paxmark" +depends="ca-certificates libcrypto1.1 libssl1.1" +makedepends="chrpath libffi-dev libucontext-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://download.racket-lang.org/releases/$pkgver/installers/racket-minimal-$pkgver-src.tgz - paxmark.patch - musl-fixes.patch - makefile-fix-bashism.patch - libressl.patch" +source="https://download.racket-lang.org/releases/$pkgver/installers/racket-minimal-$pkgver-src.tgz" prepare() { default_prepare @@ -52,18 +48,7 @@ package() { # Remove redundant RPATH. chrpath -d usr/bin/racket usr/lib/racket/gracket - # Needed when running on Grsecurity kernel. - paxmark m usr/bin/racket - paxmark m usr/lib/racket/gracket - - mkdir -p usr/share/licenses/$pkgname - mv usr/share/racket/COPYING* usr/share/licenses/$pkgname/ - rm -Rf usr/share/applications } -sha512sums="f342f0e475abb8ceb692cc66cde8d0741f0b106721210d427b569453ead642bbb951dd182378bcb468c53e170c2691cf05a64ccd49fc5a701ff24047874eb82a racket-minimal-6.12-src.tgz -ff7804e37cbab237921f7d4c334f6cbb2909e9284b7b2cec1dfd3e73ec189b8ecf0cb0cabd1abedb09020f2a57ad4c32088ea73e5cb71afdafce39a7a718b10c paxmark.patch -6af0ae984ac54f167f0513795905e9dc845e1c1554935f73958d4e21c5fad35eca791866cfdf94dfcee586ec28335d90520d769010c63cd6ab528e6be3f2c21c musl-fixes.patch -1a96718e6a065bd08f0ff046e799fd4d7657d99789b2cdda8cf7cdd8c2d91742dd34fb43f4c6fabde89a764e073bdecdd96e2caeee49feaac242d30b17d6422b makefile-fix-bashism.patch -780f9d0336acfe887a30ed044df93adbc4a09a5154b5edf034b225a7de350788077820d9f8cc633d2527015e30348bd7b083991e77caa88871ddc5cf899d07f3 libressl.patch" +sha512sums="e683a2f90dc2f0a0f73d07319f9241359c85593d2e227183c604fa60c734bc922a0c184cae4934dc04f71b889f433c40902098b02c03078a3da8bb0a10c24e30 racket-minimal-7.7-src.tgz" diff --git a/testing/racket/libressl.patch b/testing/racket/libressl.patch deleted file mode 100644 index 0b2e83b6f89..00000000000 --- a/testing/racket/libressl.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ru racket-6.12.orig/collects/openssl/libcrypto.rkt racket-6.12/collects/openssl/libcrypto.rkt ---- racket-6.12.orig/collects/openssl/libcrypto.rkt 2017-01-07 15:34:14.000000000 +0200 -+++ racket-6.12/collects/openssl/libcrypto.rkt 2018-04-09 09:42:53.241968324 +0300 -@@ -37,7 +37,13 @@ - ;; Other specific known versions - "1.0.1k" "1.0.1j" "1.0.1g" "1.0.1e" - "1.0" "1.0.0" "1.0.0e" "1.0.0d" "1.0.0c" "1.0.0b" "1.0.0a" -- "0.9.8e" "0.9.8b" "0.9.8" "0.9.7")) -+ "0.9.8e" "0.9.8b" "0.9.8" "0.9.7" -+ -+ ;; LibreSSL -+ "43" ;; 2.7.2+ -+ "42" ;; 2.6.3+ -+ "41" ;; 2.5.5+ -+)) - - (define libcrypto-load-fail-reason #f) - -diff -ru racket-6.12.orig/collects/openssl/libssl.rkt racket-6.12/collects/openssl/libssl.rkt ---- racket-6.12.orig/collects/openssl/libssl.rkt 2016-04-15 23:33:56.000000000 +0300 -+++ racket-6.12/collects/openssl/libssl.rkt 2018-04-09 09:43:20.028984576 +0300 -@@ -9,6 +9,25 @@ - (provide libssl - libssl-load-fail-reason) - -+(define libssl-versions -+ '(;; Versionless (eg from devel pkg) -+ "" -+ -+ ;; Compatibility-based version / SONAME -+ "10" ;; Fedora -+ "1.0.0" ;; Debian, Ubuntu -+ -+ ;; Other specific known versions -+ "1.0.1k" "1.0.1j" "1.0.1g" "1.0.1e" -+ "1.0" "1.0.0" "1.0.0e" "1.0.0d" "1.0.0c" "1.0.0b" "1.0.0a" -+ "0.9.8e" "0.9.8b" "0.9.8" "0.9.7" -+ -+ ;; LibreSSL -+ "45" ;; 2.7.2+ -+ "44" ;; 2.6.3+ -+ "43" ;; 2.5.3+ -+)) -+ - (define libssl-load-fail-reason #f) - - ;; We need to declare because they might be distributed with PLT Scheme -@@ -28,4 +47,4 @@ - (lambda (x) - (set! libssl-load-fail-reason (exn-message x)) - #f)]) -- (ffi-lib libssl-so openssl-lib-versions)))) -+ (ffi-lib libssl-so libssl-versions)))) diff --git a/testing/racket/makefile-fix-bashism.patch b/testing/racket/makefile-fix-bashism.patch deleted file mode 100644 index 4f3ebbcfddf..00000000000 --- a/testing/racket/makefile-fix-bashism.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2ad51be9ccb1f0717732875edbb1bb0b33caa2a2 Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Thu, 15 Mar 2018 01:24:49 +0100 -Subject: [PATCH] Fix bashism in Makefile for better portability - -Syntax `[[ "foo" != /* ]]` is not defined by POSIX Shell Command -Language. It's supported only by ksh, Bash and ZSH. Other POSIX -shells, such as ash or dash, does not support it. - -This patch replaces this problematic syntax with simple case statement -that is supported by all POSIX-sh compatible shells, including (but not -limited to) ash, bash, dash, ZSH. - -Upstream-Issue: https://github.com/racket/racket/pull/1990 ---- - racket/src/Makefile.in | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/racket/src/Makefile.in b/racket/src/Makefile.in -index 76483c1793..24c2e5aeba 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -109,11 +109,10 @@ plain-install: - $(MAKE) plain-install-@MAIN_VARIANT@ - - install-common-first: -- if [ "$(DESTDIR)" != "" ]; then \ -- if [[ "$(DESTDIR)" != /* ]]; then \ -- echo "expected an absolute path for DESTDIR; given: $(DESTDIR)"; exit 1; \ -- fi; \ -- fi -+ case "$(DESTDIR)" in \ -+ "" | /*) ;; \ -+ *) echo "expected an absolute path for DESTDIR; given: $(DESTDIR)"; exit 1;; \ -+ esac - mkdir -p $(ALLDIRINFO) - - install-common-middle: diff --git a/testing/racket/musl-fixes.patch b/testing/racket/musl-fixes.patch deleted file mode 100644 index 32eaad0c54c..00000000000 --- a/testing/racket/musl-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch fixes error: - - env XFORM_USE_PRECOMP=xsrc/precomp.h ../racketcgc -cqu ./xform.rkt --setup . --depends --cpp "gcc -E -I./.. -I./../include -I./../../rktio -I../../rktio -Os -fomit-frame-pointer -pthread -DUSE_SENORA_GC -DMZ_USES_SHARED_LIB " --keep-lines -o xsrc/future.c ./../src/future.c - Error [GCING] 234 in ./../src/bool.c: Function mz_long_double_eqv declared __xform_nongcing__, but includes a function call at __FLOAT_BITS. - Error [GCING] 270 in ./../src/bool.c: Function double_eqv declared __xform_nongcing__, but includes a function call at __FLOAT_BITS. - xform: Errors converting - context...: - src/racket/gc2/xform-collects/compiler/priva...:8:2: xform - src/racket/gc2/xform-collects/xform/xform-mo...: [running body] - src/racket/gc2/xform.rkt: [running body] - -Resources: - * https://github.com/racket/racket/issues/1638 - * https://github.com/NixOS/nixpkgs/pull/31017 - * https://github.com/racket/racket/pull/1886 - ---- a/collects/compiler/private/xform.rkt ---- a/collects/compiler/private/xform.rkt -@@ -924,6 +924,7 @@ - |GetStdHandle| |__CFStringMakeConstantString| - _vswprintf_c - malloc strdup -+ __FLOAT_BITS __DOUBLE_BITS ; musl - - scheme_make_small_bignum scheme_make_small_rational scheme_make_small_complex)) - (define non-functions-table diff --git a/testing/racket/paxmark.patch b/testing/racket/paxmark.patch deleted file mode 100644 index 6f70d086a5c..00000000000 --- a/testing/racket/paxmark.patch +++ /dev/null @@ -1,77 +0,0 @@ -This is nasty and quite desperate hack to make Racket built on system -with Grsecurity/PaX. Downstream patch only. - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -28,9 +28,9 @@ - # but it can also redirect to an existing Racket executable - # that is the same as the version being built (which is - # useful for cross-compilation, for example). --RUN_THIS_RACKET_CGC = racket/racket@CGC@ --RUN_THIS_RACKET_MMM = racket/racket@MMM@ --RUN_THIS_RACKET_MAIN_VARIANT = racket/racket@MAIN_VARIANT@ -+RUN_THIS_RACKET_CGC = paxmark m racket/racket@CGC@ && racket/racket@CGC@ -+RUN_THIS_RACKET_MMM = paxmark m racket/racket@MMM@ && racket/racket@MMM@ -+RUN_THIS_RACKET_MAIN_VARIANT = paxmark m racket/racket@MAIN_VARIANT@ && racket/racket@MAIN_VARIANT@ - - ALLDIRINFO = "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(collectsdir)" \ ---- a/src/racket/Makefile.in -+++ b/src/racket/Makefile.in -@@ -46,8 +46,8 @@ - - # See ../../Makefile about RUN_RACKET_<X>, which - # typically redirects to RUN_THIS_RACKET_<X>: --RUN_THIS_RACKET_CGC = ./racket@CGC@ --RUN_THIS_RACKET_MMM = ./racket@MMM@ -+RUN_THIS_RACKET_CGC = paxmark m ./racket@CGC@; ./racket@CGC@ -+RUN_THIS_RACKET_MMM = paxmark m ./racket@MMM@; ./racket@MMM@ - - MZSRC = $(srcdir)/src - -@@ -199,6 +199,7 @@ - - racket@CGC@@NOT_OSX@@NOT_MINGW@: libracket.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ $(LIBRKTIO_FOR_LIB) $(SPECIALIZINGOBJECTS) - @MZLINKER@ -o racket@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ $(LIBRKTIO_FOR_LIB) @LDFLAGS@ @LIBS@ -+ paxmark m racket@CGC@ - - mzcom@CGC@@NOT_MINGW@: - $(NOOP) -@@ -402,6 +403,7 @@ - $(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs-cgc - cd ..; $(ICP) racket/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" - cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" -+ cd ..; paxmark m "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" - cd ..; cp racket/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o" - @RUN_RACKET_CGC@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@@EXE_SUFFIX@" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ - -@@ -420,6 +422,7 @@ - unix-install-3m: - cd ..; $(ICP) racket/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" - cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" -+ cd ..; paxmark m "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" - $(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs-3m - cd ..; $(ICP) racket/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o" - @RUN_RACKET_MMM@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@@EXE_SUFFIX@" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ ---- a/src/racket/gc2/Makefile.in -+++ b/src/racket/gc2/Makefile.in -@@ -522,6 +522,7 @@ - - ../racket@MMM@@NOT_OSX@@NOT_MINGW@: main.@LTO@ ../libracket3m.@LIBSFX@ $(LIBRKTIO_FOR_LIB) - cd ..; @MZLINKER@ -o racket@MMM@ @PROFFLAGS@ gc2/main.@LTO@ libracket3m.@LIBSFX@ $(LIBRKTIO_UP_FOR_LIB) @LDFLAGS@ $(LIBS) -+ paxmark m ../racket@MMM@ - - # The above "cd .." prevents a problem with libtool's generated script in --enable-shared mode, - # at least for Mac OS X. Beware of changing LIBS or LDFLAGS to inclucde something with a relative - ---- a/src/lt/ltmain.sh -+++ b/src/lt/ltmain.sh -@@ -5453,6 +5453,7 @@ - - *) - $echo >> $output "\ -+ paxmark m \"\$progdir/\$program\" - exec \"\$progdir/\$program\" \${1+\"\$@\"} - " - ;; - ;; |