From 8c296d2da73c51c17e374a944ed2d573644ec4d4 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 4 Jul 2024 08:46:00 +0000
Subject: [PATCH] rar2fs: update to 1.29.7

---
 .../network-tools-depends/rar2fs/package.mk   |  7 ++---
 .../patches/001-remove-man-pages-1.29.3.patch | 12 ---------
 .../rar2fs/patches/002-fix-configure.patch    | 27 +++++++++++++++++++
 3 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 packages/addons/addon-depends/network-tools-depends/rar2fs/patches/002-fix-configure.patch

diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk
index e3d0f3660d..38f3696309 100644
--- a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk
@@ -2,14 +2,15 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rar2fs"
-PKG_VERSION="1.29.6"
-PKG_SHA256="ba3a0b649f2322498d54168f03d2e8bca9b1c96d70d0d97d83ea336a7525d4cb"
+PKG_VERSION="1.29.7"
+PKG_SHA256="a875d138b7ed7e3353b5de2f0c5ec02ef6a32c310fe3b07886bc95314d7875ba"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/hasse69/rar2fs"
-PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/hasse69/rar2fs/archive/refs/tags/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse unrar"
 PKG_LONGDESC="FUSE file system for reading RAR archives"
 PKG_BUILD_FLAGS="-sysroot"
+PKG_TOOLCHAIN="autotools"
 
 pre_configure_target() {
   PKG_CONFIGURE_OPTS_TARGET="--with-unrar=${PKG_BUILD}/unrar \
diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/patches/001-remove-man-pages-1.29.3.patch b/packages/addons/addon-depends/network-tools-depends/rar2fs/patches/001-remove-man-pages-1.29.3.patch
index dbba1bc5e9..10d0598c9d 100644
--- a/packages/addons/addon-depends/network-tools-depends/rar2fs/patches/001-remove-man-pages-1.29.3.patch
+++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/patches/001-remove-man-pages-1.29.3.patch
@@ -7,15 +7,3 @@ diff -Nur rar2fs-1.29.3.orig/Makefile.am rar2fs-1.29.3/Makefile.am
 +SUBDIRS = src
  
  EXTRA_DIST = get-version.sh rarconfig.example
-diff -Nur rar2fs-1.29.3.orig/Makefile.in rar2fs-1.29.3/Makefile.in
---- rar2fs-1.29.3.orig/Makefile.in	2020-12-15 13:06:30.000000000 +0000
-+++ rar2fs-1.29.3/Makefile.in	2021-01-01 11:34:20.496533359 +0000
-@@ -233,7 +233,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = src man
-+SUBDIRS = src
- EXTRA_DIST = get-version.sh rarconfig.example
- all: all-recursive
- 
diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/patches/002-fix-configure.patch b/packages/addons/addon-depends/network-tools-depends/rar2fs/patches/002-fix-configure.patch
new file mode 100644
index 0000000000..be43c5a01e
--- /dev/null
+++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/patches/002-fix-configure.patch
@@ -0,0 +1,27 @@
+From 80ebe4efb52ca2d51c62f3cdef8855e1356b35b7 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Thu, 4 Jul 2024 19:35:58 +1000
+Subject: [PATCH] Update configure.ac to support newer autotools
+
+Fixes:
+- configure.ac:506: error: required file 'config/config.rpath' not found
+
+explicitly require GETTEXT version
+This is required by `autopoint` executed by `autoreconf`
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index bee9255..80f77cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -504,6 +504,8 @@ fi
+ ########################################################
+ 
+ AM_ICONV
++AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.14.4])
+ 
+ AC_MSG_CHECKING(for commit hash in git repo)
+ GITHEAD=$BUILDDIR/.git/$(cat $BUILDDIR/.git/HEAD 2>/dev/null | cut -d" " -f2)