Add e2fsprogs 1.45.7

Additionally, fix downloading in chunks for some files.
2026-03-18 17:25:24 +01:00 · 2022-05-22 09:56:18 +10:00 · 2022-05-22 09:56:18 +10:00 · 6ea1b8e295
commit 6ea1b8e295
parent 8008de8e73
7 changed files with 181 additions and 4 deletions
--- a/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh
+++ b/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh
@ -0,0 +1,49 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_unpack() {
+    default
+
+    # Get remaining utf files
+    cp ${DISTFILES}/*.txt ${pkg}/
+}
+
+src_prepare() {
+    default
+
+    # Rebuild libtool files
+    rm config/config.guess config/config.sub config/ltmain.sh
+    libtoolize -i
+
+    autoreconf -fi
+
+    # Remove bison parser generated
+    rm intl/plural.y
+
+    # Setup for regeneratation of lib/ext2fs/utf8data.h
+    rm lib/ext2fs/utf8data.h
+
+    # Fix compile_et
+    sed -r -i "s/ > ?outfile//" lib/et/et_c.awk lib/et/et_h.awk lib/ss/ct_c.awk
+
+    # Disable int
+    sed -i "s/@LIBINTL@//" MCONFIG.in
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" \
+        --sbindir="${PREFIX}/bin" \
+        with_udev_rules_dir=no \
+        with_systemd_unit_dir=no
+}
+
+src_compile() {
+    # Regen utf8data
+    make -C util mkutf8data
+    util/mkutf8data -o lib/ext2fs/utf8data.h
+    # Why does mkutf8data generate something not usable by build?
+    sed -i "s/nfkdi/nfdi/g" lib/ext2fs/utf8data.h
+
+    default
+}
--- a/sysa/e2fsprogs-1.45.7/patches/gawk-fix.patch
+++ b/sysa/e2fsprogs-1.45.7/patches/gawk-fix.patch
@ -0,0 +1,30 @@
+--- lib/et/compile_et.sh.in	2022-05-18 19:26:17.182054784 +1000
+++ lib/et/compile_et.sh.in	2022-05-18 19:30:16.489294776 +1000
+@@ -44,14 +44,14 @@
+     exit 1;
+ fi
+ 
+-$AWK -f "${DIR}/et_h.awk" "outfile=${BASE}.h.$$" "outfn=${BASE}.h" "$ROOT.et"
+$AWK -f "${DIR}/et_h.awk" "$ROOT.et" > ${BASE}.h
+ if test -f ${BASE}.h && cmp -s ${BASE}.h.$$ ${BASE}.h ; then
+     rm -f ${BASE}.h.$$
+ else
+     mv -f ${BASE}.h.$$ ${BASE}.h
+     chmod a-w ${BASE}.h
+ fi
+-$AWK -f "${DIR}/et_c.awk" "outfile=${BASE}.c.$$" "outfn=${BASE}.c" "$ROOT.et"
+$AWK -f "${DIR}/et_c.awk" "$ROOT.et" > ${BASE}.c
+ if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then
+     rm -f ${BASE}.c.$$
+ else
+--- lib/ss/mk_cmds.sh.in	2022-05-18 19:33:16.024962919 +1000
+++ lib/ss/mk_cmds.sh.in	2022-05-18 19:33:39.650576476 +1000
+@@ -43,7 +43,7 @@
+ fi
+ 
+ ${SED} -f "${DIR}/ct_c.sed"  "${FILE}" \
+-	| ${AWK} -f "${DIR}/ct_c.awk" "rootname=${ROOT}" "outfile=${TMP}" -
+	| ${AWK} -f "${DIR}/ct_c.awk" "rootname=${ROOT}" - > "${TMP}"
+ 
+ if grep "^#__ERROR_IN_FILE" "${TMP}" > /dev/null; then
+ 	rm "${TMP}"
--- a/sysa/e2fsprogs-1.45.7/patches/remove-intl.patch
+++ b/sysa/e2fsprogs-1.45.7/patches/remove-intl.patch
@ -0,0 +1,76 @@
+--- configure.ac	2022-05-18 15:12:53.633061872 +1000
+++ configure.ac	2022-05-18 19:09:13.351790066 +1000
+@@ -860,20 +860,7 @@
+ dnl
+ MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
+ AC_SUBST_FILE(MAKEFILE_LIBRARY)
+-dnl
+-dnl Add internationalization support, using gettext.
+-dnl
+-GETTEXT_PACKAGE=e2fsprogs
+-PACKAGE=e2fsprogs
+-VERSION="$E2FSPROGS_VERSION"
+-VERSION=0.14.1
+-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [package name for gettext])
+-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [version for gettext])
+-AC_SUBST(GETTEXT_PACKAGE)
+-AC_SUBST(PACKAGE)
+-AC_SUBST(VERSION)
+ 
+-AM_GNU_GETTEXT
+ dnl
+ dnl End of configuration options
+ dnl
+@@ -1637,15 +1624,6 @@
+   [with_udev_rules_dir=yes])
+ AS_IF([test "x${with_udev_rules_dir}" != "xno"],
+   [
+-	AS_IF([test "x${with_udev_rules_dir}" = "xyes"],
+-	  [
+-		PKG_CHECK_MODULES([udev], [udev],
+-		  [
+-			with_udev_rules_dir="$($PKG_CONFIG --variable=udevdir udev)/rules.d"
+-		  ], [
+-			with_udev_rules_dir=""
+-		  ])
+-	  ])
+ 	AC_MSG_CHECKING([for udev rules dir])
+ 	pkg_udev_rules_dir="${with_udev_rules_dir}"
+ 	AS_IF([test -n "${pkg_udev_rules_dir}"],
+@@ -1708,16 +1686,6 @@
+   [with_systemd_unit_dir=yes])
+ AS_IF([test "x${with_systemd_unit_dir}" != "xno"],
+   [
+-	AS_IF([test "x${with_systemd_unit_dir}" = "xyes"],
+-	  [
+-		PKG_CHECK_MODULES([systemd], [systemd],
+-		  [
+-			with_systemd_unit_dir="$($PKG_CONFIG --variable=systemdsystemunitdir systemd)"
+-		  ], [
+-			with_systemd_unit_dir=""
+-		  ])
+-		m4_pattern_allow([^PKG_(MAJOR|MINOR|BUILD|REVISION)$])
+-	  ])
+ 	AC_MSG_CHECKING([for systemd system unit dir])
+ 	systemd_system_unit_dir="${with_systemd_unit_dir}"
+ 	AS_IF([test -n "${systemd_system_unit_dir}"],
+--- Makefile.in	2022-05-18 19:41:37.596959349 +1000
+++ Makefile.in	2022-05-18 19:41:41.109050161 +1000
+@@ -20,7 +20,7 @@
+ @ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs
+ 
+ LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
+-	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl
+	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR)
+ 
+ PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
+ 	$(E2SCRUB_DIR)
+@@ -22,7 +22,7 @@
+ LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
+ 	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR)
+ 
+-PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs \
+ 	$(E2SCRUB_DIR)
+ 
+ SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests