From ab1a44d086572ecae15c93578f7e2e99c9e4c082 Mon Sep 17 00:00:00 2001 From: Paul Bredbury Date: Thu, 22 Oct 2020 11:38:58 +0100 Subject: [PATCH] testing/lout: prevent segfault in musl's catgets $ gdb --args lout --help Program received signal SIGSEGV, Segmentation fault. 0x00007ffff7f88899 in catgets () from /lib/ld-musl-x86_64.so.1 --- testing/lout/APKBUILD | 4 ++-- testing/lout/lout-3.40-makefile.patch | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/testing/lout/APKBUILD b/testing/lout/APKBUILD index 242e81f906..7ba0b9b5fb 100644 --- a/testing/lout/APKBUILD +++ b/testing/lout/APKBUILD @@ -1,6 +1,6 @@ pkgname=lout pkgver=3.40 -pkgrel=0 +pkgrel=1 pkgdesc="Lightweight typesetting and document formatting system" url="https://savannah.nongnu.org/projects/lout" arch="all" @@ -37,4 +37,4 @@ package() { sha512sums="adffbb44b9328f0d64b1c8f08fe0217307b1cca870827ca54e0aaae5a2258f519e3e6f0adc715ba6d192dd731ab26c2cc86aa8611d991d5665503842e599c061 lout-3.40.tar.gz -a4aa624c6134354e7d26bf70a618bc7f2ad4304eb2c551c124815e8153f0ee554b85ee3537c965e58c4de084716a4a4b7b1faf4ec5a9e58d682a92a52d69b0e6 lout-3.40-makefile.patch" +0f4afa7cef7cc53b687d4a9a1f795a4c9e64a9cdbdc492a5e8af47f4ec6bf66320d5dfe828b6122ccf6a3862c9a6b28800f36a16e841861a9213ef7cc1538826 lout-3.40-makefile.patch" diff --git a/testing/lout/lout-3.40-makefile.patch b/testing/lout/lout-3.40-makefile.patch index c9bcbfade4..695b271b68 100644 --- a/testing/lout/lout-3.40-makefile.patch +++ b/testing/lout/lout-3.40-makefile.patch @@ -1,6 +1,6 @@ diff -Naur a/makefile b/makefile --- a/makefile 2012-02-08 07:28:03.000000000 +0000 -+++ b/makefile 2019-01-06 23:12:11.464068094 +0000 ++++ b/makefile 2020-10-22 11:22:29.053732761 +0100 @@ -269,11 +269,11 @@ # DEBUGGING = 1 # TRACING = -g @@ -17,6 +17,15 @@ diff -Naur a/makefile b/makefile LIBFONT = font LIBMAPS = maps +@@ -285,7 +285,7 @@ + CHARIN = 1 + CHAROUT = 0 + +-USELOC = 1 ++USELOC = 0 + LOC_FR = fr + LOC_DE = de + @@ -295,11 +295,9 @@ ZLIB = ZLIBPATH = -- GitLab