Merge pull request #428 from fosslinux/diffutils

Diffutils 3.10

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
 <<<<<<< HEAD
 libmd 1.1.0
 ===========
@@ -1261,3 +1262,10 @@ 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.
+
+diffutils 3.10
+==============
+
+We already have a perfectly functional diffutils, but some core modern software
+does require newer diffutils (understandably, given our diffutils is from 1994).
+This also gives the additional diffutils commands ``diff3`` and ``sdiff``.

steps/SHA256SUMS.pkgs

@@ -39,6 +39,7 @@ c95fd8c51c3bfbd4d08a4a50d0033ee85394e6efe4ff82703c050e4dbc4347bf  coreutils-6.10
 f9efd6600ceb91918078078ff44a33f2a4fb4a59edb804866aebd288c2cfb24e  curl-8.5.0_1.tar.bz2
 1d4dec2d1885a6b5499a0f0d55e9c2c65dab532c4c593d848b6a542f67789627  dhcpcd-10.0.1_0.tar.bz2
 abb9f6fe46c57ea809100b71497e04905deaad345d64485532bf6ef7f2a07f2c  diffutils-2.7_0.tar.bz2
+07fe574370b3006494145378c17a64fbd3713f47be159f70f06782f56d680f89  diffutils-3.10_0.tar.bz2
 bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1  dist-3.5-236_0.tar.bz2
 3a4c5143a241364019afd39af067f1e8433bab78b04096870d9bf2c70ec6ded8  e2fsprogs-1.45.7_0.tar.bz2
 9c6f7e156f299f1d0948537e28f00d40e727a3debae3cce158e9bce827136214  ed-1.4_0.tar.bz2

steps/diffutils-3.10/import-gnulib.sh

@@ -0,0 +1,99 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+../gnulib-5d2fe24/gnulib-tool --import --local-dir=gl \
+ --lib=libdiffutils \
+ --source-base=lib \
+ --m4-base=m4 \
+ --doc-base=doc \
+ --tests-base=gnulib-tests \
+ --aux-dir=build-aux \
+ --with-tests \
+ --makefile-name=gnulib.mk \
+ --no-conditional-dependencies \
+ --no-libtool \
+ --macro-prefix=gl \
+ --avoid=localename \
+ --avoid=lock-tests \
+ --avoid=setlocale \
+ announce-gen \
+ argmatch \
+ attribute \
+ binary-io \
+ c-stack \
+ config-h \
+ diffseq \
+ dirname \
+ do-release-commit-and-tag \
+ dup2 \
+ error \
+ exclude \
+ exitfail \
+ extensions \
+ extern-inline \
+ fcntl \
+ file-type \
+ filenamecat \
+ flexmember \
+ fnmatch-gnu \
+ getopt-gnu \
+ gettext-h \
+ gettime \
+ git-version-gen \
+ gitlog-to-changelog \
+ gnu-make \
+ gnu-web-doc-update \
+ gnumakefile \
+ gnupload \
+ hard-locale \
+ inttostr \
+ inttypes \
+ isblank \
+ largefile \
+ lstat \
+ maintainer-makefile \
+ manywarnings \
+ mbrtowc \
+ mempcpy \
+ mkstemp \
+ mktime \
+ nstrftime \
+ nullptr \
+ perl \
+ progname \
+ propername \
+ raise \
+ rawmemchr \
+ readme-release \
+ regex \
+ sh-quote \
+ signal \
+ sigprocmask \
+ stat \
+ stat-macros \
+ stat-time \
+ stdbool \
+ stdint \
+ stpcpy \
+ strcase \
+ strptime \
+ strtoimax \
+ sys_wait \
+ system-quote \
+ time_rz \
+ unistd \
+ unlocked-io \
+ update-copyright \
+ verify \
+ version-etc \
+ version-etc-fsf \
+ wcwidth \
+ xalloc \
+ xfreopen \
+ xmalloca \
+ xreadlink \
+ xstdopen \
+ xstrtoimax \
+ year2038

steps/diffutils-3.10/pass1.sh

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    default
+
+    autoreconf-2.71 -fi
+    rm man/*.1
+
+    # gperf
+    rm lib/iconv_open*.h
+
+    . ../../import-gnulib.sh
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}"
+}

steps/diffutils-3.10/sources

@@ -0,0 +1,2 @@
+https://mirrors.kernel.org/gnu/diffutils/diffutils-3.10.tar.xz 90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e
+http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-5d2fe24.tar.gz 72e7bb2d1d75e63d1c46d33b8dd22e8eb60afdba4af3e7251151b5c2a6f00bfb

steps/manifest

@@ -199,6 +199,7 @@ build: libbsd-0.11.8
 build: shadow-4.14.3
 build: opendoas-6.8.2
 build: gzip-1.13
+build: diffutils-3.10
 improve: cleanup_filesystem
 improve: null_time ( FORCE_TIMESTAMPS == True )
 improve: update_checksums ( UPDATE_CHECKSUMS == True )