From e2af1a44f5037986acee378d02d379477fc5cb96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sun, 28 Mar 2021 23:36:27 +0100
Subject: [PATCH] GNU Autoconf 2.69

---
 SHA256SUMS.sources                  |  1 +
 parts.rst                           |  6 ++++++
 rootfs.sh                           |  3 +++
 sysa/autoconf-2.69/autoconf-2.69.sh | 29 +++++++++++++++++++++++++++++
 sysa/run2.sh                        |  2 ++
 sysa/xz-5.0.5/checksums             | 10 +++++-----
 6 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100755 sysa/autoconf-2.69/autoconf-2.69.sh

diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index 6c93a3d..a7f6b09 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -8,6 +8,7 @@ e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489  autoconf-2.57.
 f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7  autoconf-2.59.tar.bz2
 93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1  autoconf-2.61.tar.bz2
 db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b  autoconf-2.65.tar.bz2
+64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684  autoconf-2.69.tar.xz
 e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc  automake-1.10.3.tar.bz2
 4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718  automake-1.11.2.tar.bz2
 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f  automake-1.4-p6.tar.gz
diff --git a/parts.rst b/parts.rst
index ce1757f..ede7e6b 100644
--- a/parts.rst
+++ b/parts.rst
@@ -573,3 +573,9 @@ automake 1.11.2
 
 GNU Automake from 1.11 series. This is not the latest point release as newer ones
 need Autoconf 2.68.
+
+autoconf 2.69
+=============
+
+This the final version of GNU Autoconf that we will require. There are some newer
+versions but we won't need them.
diff --git a/rootfs.sh b/rootfs.sh
index a56e827..dca1aeb 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -285,6 +285,9 @@ get_file https://tukaani.org/xz/xz-5.0.5.tar.bz2
 # automake 1.11.2
 get_file https://ftp.gnu.org/gnu/automake/automake-1.11.2.tar.bz2
 
+# autoconf 2.69
+get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz
+
 # General cleanup
 find tmp -name .git -exec rm -rf \;
 
diff --git a/sysa/autoconf-2.69/autoconf-2.69.sh b/sysa/autoconf-2.69/autoconf-2.69.sh
new file mode 100755
index 0000000..f6e80ef
--- /dev/null
+++ b/sysa/autoconf-2.69/autoconf-2.69.sh
@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    autoreconf-2.65 -f
+
+    # Install autoconf data files into versioned directory
+    for file in */*/Makefile.in */Makefile.in Makefile.in; do
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+    done
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" --program-suffix=-2.69
+}
+
+src_compile() {
+    make MAKEINFO=true
+}
+
+src_install() {
+    make install MAKEINFO=true
+
+    ln -sf "${PREFIX}/bin/autoconf-2.69" "${PREFIX}/bin/autoconf"
+    ln -sf "${PREFIX}/bin/autoheader-2.69" "${PREFIX}/bin/autoheader"
+    ln -sf "${PREFIX}/bin/autom4te-2.69" "${PREFIX}/bin/autom4te"
+    ln -sf "${PREFIX}/bin/autoreconf-2.69" "${PREFIX}/bin/autoreconf"
+}
diff --git a/sysa/run2.sh b/sysa/run2.sh
index 398759d..522f6c8 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -14,6 +14,8 @@ build xz-5.0.5
 
 build automake-1.11.2
 
+build autoconf-2.69
+
 echo "Bootstrapping completed."
 
 exec env - PATH=/after/bin PS1="\w # " bash -i
diff --git a/sysa/xz-5.0.5/checksums b/sysa/xz-5.0.5/checksums
index e2cd02a..90910bd 100644
--- a/sysa/xz-5.0.5/checksums
+++ b/sysa/xz-5.0.5/checksums
@@ -1,10 +1,10 @@
-4059df79a032a49e91f93a74a69695b63fdbf8bca07a3db694a11e55306f68cb  /after/bin/lzmadec
-5d659d1117c86e8e4c3a9008c6864fb2b9fe1957e88744212bf18881117cb650  /after/bin/lzmainfo
-324136feea5a7c5b4d618ad098c3cd80233aa45077d6a1de54608683b5ee2268  /after/bin/xz
-79eedbc8cce14e5a9baf71a9b81c7ab3c0fa24e28ff32067b2ee0bd72492583b  /after/bin/xzdec
+31f473893f7b8edaa074de22405742fe4e2d263b57279459e27d6287e9872be1  /after/bin/lzmadec
+48f48260090d70b627a63961e63f3f55e2808f2081b295e2c1da5b37d5a9ea77  /after/bin/lzmainfo
+924e7aec8451799049ae7e60550c09d160949dfb4a29a5e26bfb2a574d2cad0d  /after/bin/xz
+cd6a6721d6a434d93f28e170391057abd88f772e01094b8f2addf1eaa599f7b7  /after/bin/xzdec
 104548a69cb9ced78dd4fd08f5e8a1b6b07230ada5e6554a07368ed84191da86  /after/bin/xzdiff
 34db9e45f4ca4bc96b8280ac438ac6c4fab95e44e812e20cf86a2248bf2f7579  /after/bin/xzgrep
 2ce262d47007d17dc668e9a9a3263f7fe3f145d61971f189c21f59b25498a4e3  /after/bin/xzless
 a050699ff5484e063154d11bf05a9a4eb6c2d38bac09a975a96b42c8b45a72ef  /after/bin/xzmore
-6a75c21815666ea72ee0cace326edddf04840096425da2a8936bccc026233292  /after/lib/liblzma.a
+b2cc6cd3a4b497ec0d6e443ba99a5507aa335755e4327e3831f52dfccd4dfd53  /after/lib/liblzma.a
 7691b11f60a825f9556bc213997a011400ae06a812d02f67b39438b8bdba8212  /after/lib/liblzma.la