From cb4404029d509a43000bf0d0f42f042ceed52f8c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 27 Jan 2024 12:24:06 +1100
Subject: [PATCH] Add gzip 1.13

Closes #369
---
 parts.rst                        |  9 +++++
 steps/SHA256SUMS.pkgs            |  1 +
 steps/gzip-1.13/import-gnulib.sh | 64 ++++++++++++++++++++++++++++++++
 steps/gzip-1.13/pass1.sh         | 14 +++++++
 steps/gzip-1.13/sources          |  2 +
 steps/manifest                   |  1 +
 6 files changed, 91 insertions(+)
 create mode 100644 steps/gzip-1.13/import-gnulib.sh
 create mode 100755 steps/gzip-1.13/pass1.sh
 create mode 100644 steps/gzip-1.13/sources

diff --git a/parts.rst b/parts.rst
index 7eec72e..c6b5c22 100644
--- a/parts.rst
+++ b/parts.rst
@@ -1225,6 +1225,7 @@ to ensure the compiler is suitable for downstream consumption;
 * LTO now fully functions correctly, despite both the linker and the compiler
   being static binaries.
 
+<<<<<<< HEAD
 libmd 1.1.0
 ===========
 
@@ -1252,3 +1253,11 @@ opendoas is a port of 'doas' from OpenBSD to Linux. It has all functions of sudo
 that could be conceivably needed in live-bootstrap, and is much simpler to
 build. This allows build systems that expect sudo after live-bootstrap to use
 it.
+
+gzip 1.13
+=========
+
+The version of gzip we have been using up until now is really old, all the way
+back from mes libc era! Somehow we've managed not to have any problems with it,
+though. This builds a gzip that is properly packaged and can be handled by all
+modern build systems.
diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
index c8c05aa..c3fbf5a 100644
--- a/steps/SHA256SUMS.pkgs
+++ b/steps/SHA256SUMS.pkgs
@@ -60,6 +60,7 @@ dc67fc1b132fa3945349efe74c5b2197bd0b6babf4d29d2deddd04f09d9af680  gettext-0.21_0
 276e073496931ff7d4caaabb53079412b88de953def88aec966c1f8506293e88  grep-2.4_0.tar.bz2
 8e612afb9a439aa8bf5db0fc2589eec890a6017690412d5c8e88a5838730b42c  grep-3.7_0.tar.bz2
 e2a85aad6d51e52c9a30afeed058f95172fde1215f77243549274672990f6237  guile-3.0.9_0.tar.bz2
+6585ae3bc8149ec0e3fba766278fa30e2d7f0e7d1b9a9a4a457e0afa15b109c9  gzip-1.13_0.tar.bz2
 8d2015b87337abbf287f7a39ee4cf53514120b5d3e90a93fe7d533dcc43f14fa  help2man-1.36.4_0.tar.bz2
 f650c3b24de6edd49cd662c9e9ce11f7b0b5ea6df66d561b46a032b08fc34faa  kbd-1.15_0.tar.bz2
 50a0f881161c68fe7c9ec6836b11a905b0d54e08e99b2476e8d1f5ac3212769e  kexec-linux-1.0.0_0.tar.bz2
diff --git a/steps/gzip-1.13/import-gnulib.sh b/steps/gzip-1.13/import-gnulib.sh
new file mode 100644
index 0000000..f7a7164
--- /dev/null
+++ b/steps/gzip-1.13/import-gnulib.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+../gnulib-5651802/gnulib-tool --import --local-dir=gl \
+ --lib=libgzip \
+ --source-base=lib \
+ --m4-base=m4 \
+ --doc-base=doc \
+ --tests-base=tests \
+ --aux-dir=build-aux \
+ --makefile-name=gnulib.mk \
+ --no-conditional-dependencies \
+ --no-libtool \
+ --macro-prefix=gl \
+ --avoid=getline \
+ --avoid=rpmatch \
+ announce-gen \
+ calloc-gnu \
+ close \
+ dirname-lgpl \
+ fclose \
+ fcntl \
+ fcntl-safer \
+ fdatasync \
+ fdopendir \
+ filename \
+ fprintf-posix \
+ fsync \
+ getopt-gnu \
+ git-version-gen \
+ gitlog-to-changelog \
+ gnu-make \
+ gnu-web-doc-update \
+ gnumakefile \
+ gnupload \
+ ignore-value \
+ intprops \
+ largefile \
+ lib-ignore \
+ lstat \
+ maintainer-makefile \
+ malloc-gnu \
+ manywarnings \
+ openat-safer \
+ printf-posix \
+ readme-release \
+ realloc-gnu \
+ savedir \
+ sigaction \
+ stat-time \
+ strerror \
+ sys_stat \
+ time \
+ unistd-safer \
+ unlinkat \
+ update-copyright \
+ utimens \
+ verify \
+ xalloc \
+ year2038 \
+ yesno
diff --git a/steps/gzip-1.13/pass1.sh b/steps/gzip-1.13/pass1.sh
new file mode 100755
index 0000000..b1553e7
--- /dev/null
+++ b/steps/gzip-1.13/pass1.sh
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    default
+    autoreconf-2.71 -fi
+
+    . ../../import-gnulib.sh
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}"
+}
diff --git a/steps/gzip-1.13/sources b/steps/gzip-1.13/sources
new file mode 100644
index 0000000..e249af4
--- /dev/null
+++ b/steps/gzip-1.13/sources
@@ -0,0 +1,2 @@
+https://mirrors.kernel.org/gnu/gzip/gzip-1.13.tar.xz 7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057
+http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-5651802.tar.gz 56f1221eb682c3502ee097f583f44673570753cb452346ad4806d94560c3fac9
diff --git a/steps/manifest b/steps/manifest
index feda0ea..8d04698 100644
--- a/steps/manifest
+++ b/steps/manifest
@@ -198,6 +198,7 @@ build: libmd-1.1.0
 build: libbsd-0.11.8
 build: shadow-4.14.3
 build: opendoas-6.8.2
+build: gzip-1.13
 improve: cleanup_filesystem
 improve: null_time ( FORCE_TIMESTAMPS == True )
 improve: update_checksums ( UPDATE_CHECKSUMS == True )