From b2034228a926419f0a6c4d7c49953dbb0abcdc76 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 20:42:16 +0000 Subject: [PATCH] import CS which-2.21-29.el9 --- SOURCES/which-2.21-path_max.patch | 46 +++++++++++++++++++++++++++++++ SPECS/which.spec | 8 +++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 SOURCES/which-2.21-path_max.patch diff --git a/SOURCES/which-2.21-path_max.patch b/SOURCES/which-2.21-path_max.patch new file mode 100644 index 0000000..eec9958 --- /dev/null +++ b/SOURCES/which-2.21-path_max.patch @@ -0,0 +1,46 @@ +diff -up which-2.21/which.c.me which-2.21/which.c +--- which-2.21/which.c.me 2022-11-07 13:11:03.580798950 +0100 ++++ which-2.21/which.c 2022-11-07 15:45:41.366085798 +0100 +@@ -19,10 +19,15 @@ + #include "sys.h" + #include + #include ++#include + #include "getopt.h" + #include "tilde/tilde.h" + #include "bash.h" + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + static const char *progname; + + static void print_usage(FILE *out) +@@ -63,7 +68,7 @@ static void print_fail(const char *name, + fprintf(stderr, "%s: no %s in (%s)\n", progname, name, path_list); + } + +-static char home[256]; ++static char home[PATH_MAX]; + static size_t homelen = 0; + + static int absolute_path_given; +@@ -163,7 +168,7 @@ static char *find_command_in_path(const + return (found); + } + +-static char cwd[256]; ++static char cwd[PATH_MAX]; + static size_t cwdlen; + + static void get_current_working_directory(void) +@@ -195,7 +200,7 @@ static void get_current_working_director + + static char *path_clean_up(const char *path) + { +- static char result[256]; ++ static char result[PATH_MAX]; + + const char *p1 = path; + char *p2 = result; diff --git a/SPECS/which.spec b/SPECS/which.spec index 89370c2..ab99c50 100644 --- a/SPECS/which.spec +++ b/SPECS/which.spec @@ -1,12 +1,14 @@ Summary: Displays where a particular program in your path is located Name: which Version: 2.21 -Release: 28%{?dist} +Release: 29%{?dist} License: GPLv3 Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz Source1: which2.sh Source2: which2.csh Patch0: which-2.21-coverity-fixes.patch +Patch1: which-2.21-path_max.patch + Url: https://savannah.gnu.org/projects/which/ BuildRequires: make BuildRequires: gcc @@ -19,6 +21,7 @@ the specified program is in your PATH. %prep %setup -q %patch0 -p1 -b .coverity +%patch1 -p1 -b .path_max %build %configure @@ -40,6 +43,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %{_mandir}/man1/which.1* %changelog +* Mon Mar 27 2023 Than Ngo - 2.21-29 +- Resolves: #2181974, which fails for long path + * Fri Apr 15 2022 Than Ngo - 2.21-28 - Resolves: #2050996, error on login when using ksh as the default shell