From 83cbe6731cd4d0ff44b66a2b53b9af90843fa874 Mon Sep 17 00:00:00 2001
From: Paul Dersey <pdersey@gmail.com>
Date: Mon, 15 Mar 2021 09:22:27 -0400
Subject: [PATCH] gzip: remove build dependency on sed

---
 sysa/gzip-1.2.4/checksums       |  6 +++---
 sysa/gzip-1.2.4/gzip-1.2.4.kaem | 11 ++++-------
 sysa/pre-sha.sha256sums         |  6 +++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/sysa/gzip-1.2.4/checksums b/sysa/gzip-1.2.4/checksums
index 048e759..9c900cf 100644
--- a/sysa/gzip-1.2.4/checksums
+++ b/sysa/gzip-1.2.4/checksums
@@ -1,3 +1,3 @@
-39142 /after/bin/gzip
-39142 /after/bin/gunzip
-39142 /after/bin/zcat
+47018 /after/bin/gzip
+47018 /after/bin/gunzip
+47018 /after/bin/zcat
diff --git a/sysa/gzip-1.2.4/gzip-1.2.4.kaem b/sysa/gzip-1.2.4/gzip-1.2.4.kaem
index a1f312b..1568dec 100755
--- a/sysa/gzip-1.2.4/gzip-1.2.4.kaem
+++ b/sysa/gzip-1.2.4/gzip-1.2.4.kaem
@@ -2,6 +2,7 @@
 
 # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -13,11 +14,6 @@ cd build
 tar xf ../src/${pkg}.tar
 cd ${pkg}
 
-# Patch
-# Remove strlwr, it does not build with mes libc
-cp util.c util_patched.c
-sed -i 165,174d util_patched.c
-
 # Compile
 tcc -c -DNO_UTIME gzip.c
 tcc -c bits.c
@@ -31,11 +27,12 @@ tcc -c unlzh.c
 tcc -c unlzw.c
 tcc -c unpack.c
 tcc -c unzip.c
-tcc -c util_patched.c
+# strlwr is already defined in mes libc
+tcc -c -Dstrlwr=unused util.c
 tcc -c zip.c
 
 # Link
-tcc -static -o ${bindir}/gzip gzip.o zip.o deflate.o trees.o bits.o unzip.o inflate.o util_patched.o crypt.o lzw.o unlzw.o unpack.o unlzh.o getopt.o
+tcc -static -o ${bindir}/gzip gzip.o zip.o deflate.o trees.o bits.o unzip.o inflate.o util.o crypt.o lzw.o unlzw.o unpack.o unlzh.o getopt.o
 
 # Install
 cp ${bindir}/gzip ${bindir}/gunzip
diff --git a/sysa/pre-sha.sha256sums b/sysa/pre-sha.sha256sums
index 2360b23..e81c0d1 100644
--- a/sysa/pre-sha.sha256sums
+++ b/sysa/pre-sha.sha256sums
@@ -7,8 +7,8 @@ cacc2cda3ce6c2cc0cb761b8aa2115a003e166c94d1039974fc0221263897c52  /after/bin/boo
 773eae17b7f347526f8033afc9d1f06af116dfbcd0a26cbde7e29ab47e77850d  /after/bin/chmod
 764881d80efac5509aa85fd4683a20beffa831442f57815d43ee030fb8f9f486  /after/bin/cp
 e1481ecf337fb657f3949af0b45bb620c1886cd1a1b003fe27338832c250f41d  /after/bin/fletcher16
-bbad3c53d86df800088146ef3b65b755786557ab11f04fe9706503e9f9c241b3  /after/bin/gunzip
-bbad3c53d86df800088146ef3b65b755786557ab11f04fe9706503e9f9c241b3  /after/bin/gzip
+fc2d3f6a7227836526d278d4e4b642a72c1a83c03c3363f3376100798e0eb145  /after/bin/gunzip
+fc2d3f6a7227836526d278d4e4b642a72c1a83c03c3363f3376100798e0eb145  /after/bin/gzip
 d41067670562f87c6e43af0b461c4070c19a8ffc15c455cb075d98419ae76c73  /after/bin/mes
 b91c81e543b878ead4cc975df75e3d211f7bd2dcdd4c90e42df99d44311ce71e  /after/bin/mescc.scm
 e94a2468c045582cfd13df51acd0932afdc834fa60139f7bfb7a2d65afa39a65  /after/bin/mes-tcc
@@ -18,7 +18,7 @@ bc9ddf9854bd954c71bb1cf5b0af77fd65b8fa7f290b42c75020fb8893deb53c  /after/bin/sha
 9f83aae8cee866b3af409bb6d28e32d0a04db0e7b64680af4e38b5f43b5ece96  /after/bin/tar
 690c2a941c444ba761076f6b8ef1ba2b634ebe2e63ea44c8f3789f6e3df6d2a9  /after/bin/tcc
 cacc2cda3ce6c2cc0cb761b8aa2115a003e166c94d1039974fc0221263897c52  /after/bin/tcc-0.9.26
-bbad3c53d86df800088146ef3b65b755786557ab11f04fe9706503e9f9c241b3  /after/bin/zcat
+fc2d3f6a7227836526d278d4e4b642a72c1a83c03c3363f3376100798e0eb145  /after/bin/zcat
 44b5f15e1f015685fe4c3d66eda5ba52aac77b94f2edd98b764cec05ca350d49  /after/lib/crt1.o
 90811dafd33ad56b8e4b0adcc04263f9329b9047b7cc337abe8151a75017172c  /after/lib/crt1.s
 09d4f9821a2566f7e56381a19259c41bd97f3c5ed83f490705acbfd1139a7736  /after/lib/crti.o