diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 722de67022..186034d122 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -287,7 +287,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`stress-ng`](stress-ng/) | stress-ng | 0.14.03 | https://github.com/ColinIanKing/stress-ng | | [`Super-Mario`](Super-Mario/) | Super-Mario Clone | | https://github.com/Bennyhwanggggg/Super-Mario-Clone-Cpp | | [`SuperTuxKart`](SuperTuxKart/) | Super Tux Kart | 1.4 | https://supertuxkart.net/ | -| [`tar`](tar/) | GNU tar | 1.34 | https://www.gnu.org/software/tar/ | +| [`tar`](tar/) | GNU tar | 1.35 | https://www.gnu.org/software/tar/ | | [`taskwarrior`](taskwarrior/) | TODO list manager | 2.6.2 | https://taskwarrior.org/ | | [`tcl`](tcl/) | Tcl | 8.6.12 | https://www.tcl-lang.org/ | | [`termcap`](termcap/) | GNU termcap | 1.3.1 | https://www.gnu.org/software/termutils/ | diff --git a/Ports/tar/package.sh b/Ports/tar/package.sh index a83047c3cf..846661a4c7 100755 --- a/Ports/tar/package.sh +++ b/Ports/tar/package.sh @@ -1,11 +1,14 @@ #!/usr/bin/env -S bash ../.port_include.sh port='tar' -version='1.34' +version='1.35' useconfigure='true' use_fresh_config_sub='true' config_sub_paths=('build-aux/config.sub') files=( - "https://ftpmirror.gnu.org/gnu/tar/tar-${version}.tar.gz 03d908cf5768cfe6b7ad588c921c6ed21acabfb2b79b788d1330453507647aed" + "https://ftpmirror.gnu.org/gnu/tar/tar-${version}.tar.gz 14d55e32063ea9526e057fbf35fcabd53378e769787eff7919c3755b02d2b57e" +) +depends=( + 'gettext' ) configopts=( "--without-selinux" diff --git a/Ports/tar/patches/0001-Fix-savannah-bug-64441.patch b/Ports/tar/patches/0001-Fix-savannah-bug-64441.patch new file mode 100644 index 0000000000..928a95e035 --- /dev/null +++ b/Ports/tar/patches/0001-Fix-savannah-bug-64441.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Tue, 18 Jul 2023 17:02:23 +0300 +Subject: [PATCH] Fix savannah bug #64441 + +Release 1.35 has a bug in which it doesn't include libintl and libiconv +properly. Add the libiconv libraries to the build system. +--- + src/Makefile.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 4ff186d6c005419f8cfd70addceb440127e5f4a6..751d5054ea05d5e718c58b5c570b275dddc4e5be 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -1793,7 +1793,8 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) + tar_LDADD = $(LIBS) ../lib/libtar.a ../gnu/libgnu.a\ + $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\ + $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\ +- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) ++ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \ ++ $(LIBINTL) $(LIBICONV) + + all: all-am + diff --git a/Ports/tar/patches/ReadMe.md b/Ports/tar/patches/ReadMe.md new file mode 100644 index 0000000000..9e62d9c27c --- /dev/null +++ b/Ports/tar/patches/ReadMe.md @@ -0,0 +1,6 @@ +# Patches for tar on SerenityOS + +## `0001-Fix-savannah-bug-64441.patch` + +Release 1.35 has a bug in which it doesn't include libintl and libiconv +properly. Add the libiconv libraries to the build system.