app-arch/sharutils: Sync with Gentoo

It's from Gentoo commit 319c1a011cc04637dc556b3a80d5173a6a01abb0.
This commit is contained in:
Flatcar Buildbot 2025-01-27 07:04:32 +00:00 committed by Krzesimir Nowak
parent 5eb943cb89
commit c19e716d10
3 changed files with 98 additions and 6 deletions

View File

@ -0,0 +1,50 @@
https://bugs.gentoo.org/900248
https://bugs.gentoo.org/894322
missing include for textdomain and bindtextdomain
This is only one place we can put include, else weird
macro dance messes with it or we use gettext before we
mark it for assembly operations.
--- a/src/shar-opts.h
+++ b/src/shar-opts.h
@@ -373,6 +373,8 @@
# include <libintl.h>
# endif
+#include "gettext.h"
+
# ifndef ATTRIBUTE_FORMAT_ARG
# define ATTRIBUTE_FORMAT_ARG(_a)
# endif
--- a/src/unshar-opts.h
+++ b/src/unshar-opts.h
@@ -210,6 +210,8 @@
# include <libintl.h>
# endif
+#include "gettext.h"
+
# ifndef ATTRIBUTE_FORMAT_ARG
# define ATTRIBUTE_FORMAT_ARG(_a)
# endif
--- a/src/uudecode-opts.h
+++ b/src/uudecode-opts.h
@@ -188,6 +188,8 @@
# include <libintl.h>
# endif
+#include "gettext.h"
+
# ifndef ATTRIBUTE_FORMAT_ARG
# define ATTRIBUTE_FORMAT_ARG(_a)
# endif
--- a/src/uuencode-opts.h
+++ b/src/uuencode-opts.h
@@ -184,6 +184,8 @@
# include <libintl.h>
# endif
+#include "gettext.h"
+
# ifndef ATTRIBUTE_FORMAT_ARG
# define ATTRIBUTE_FORMAT_ARG(_a)
# endif

View File

@ -0,0 +1,32 @@
https://bugs.gentoo.org/941724
which-hunt
diff '--color=auto' -ru sharutils-4.15.2.old/libopts/m4/libopts.m4 sharutils-4.15.2/libopts/m4/libopts.m4
--- sharutils-4.15.2.old/libopts/m4/libopts.m4 2025-01-22 13:17:52.302369061 +0000
+++ sharutils-4.15.2/libopts/m4/libopts.m4 2025-01-22 13:19:46.096362975 +0000
@@ -114,9 +114,9 @@
AC_PROG_SED
[while :
do
- POSIX_SHELL=`which bash`
+ POSIX_SHELL=`command -v bash`
test -x "$POSIX_SHELL" && break
- POSIX_SHELL=`which dash`
+ POSIX_SHELL=`command -v dash`
test -x "$POSIX_SHELL" && break
POSIX_SHELL=/usr/xpg4/bin/sh
test -x "$POSIX_SHELL" && break
diff '--color=auto' -ru sharutils-4.15.2.old/m4/libopts.m4 sharutils-4.15.2/m4/libopts.m4
--- sharutils-4.15.2.old/m4/libopts.m4 2025-01-22 13:17:52.365018511 +0000
+++ sharutils-4.15.2/m4/libopts.m4 2025-01-22 13:19:17.856525747 +0000
@@ -114,9 +114,9 @@
AC_PROG_SED
[while :
do
- POSIX_SHELL=`which bash`
+ POSIX_SHELL=`command -v bash`
test -x "$POSIX_SHELL" && break
- POSIX_SHELL=`which dash`
+ POSIX_SHELL=`command -v dash`
test -x "$POSIX_SHELL" && break
POSIX_SHELL=/usr/xpg4/bin/sh
test -x "$POSIX_SHELL" && break

View File

@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
EAPI=8
inherit flag-o-matic strip-linguas
inherit flag-o-matic strip-linguas autotools
MY_P="${P/_/-}"
DESCRIPTION="Tools to deal with shar archives"
@ -21,9 +21,15 @@ DEPEND="app-arch/xz-utils
nls? ( >=sys-devel/gettext-0.10.35 )"
PATCHES=(
"${FILESDIR}"/${PN}-4.15.2-glibc228.patch
"${FILESDIR}"/${PN}-4.15.2-CVE-2018-1000097.patch
"${FILESDIR}"/${PN}-4.15.2-gcc-10.patch
"${FILESDIR}"/${P}-glibc228.patch
"${FILESDIR}"/${P}-CVE-2018-1000097.patch
"${FILESDIR}"/${P}-gcc-10.patch
"${FILESDIR}"/${P}-dewhich.patch
"${FILESDIR}"/${P}-C23.patch
)
QA_CONFIG_IMPL_DECL_SKIP=(
pathfind
)
src_prepare() {
@ -35,6 +41,10 @@ src_prepare() {
# bug #943901
append-cflags -std=gnu17
# bug https://bugs.gentoo.org/941724
# regenerate config after which removal
eautoreconf
}
src_configure() {