public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/which] rawhide: Fix rhbz#2480548, update to 2.25
@ 2026-05-29 16:02 Than Ngo
2026-05-29 16:07 ` [rpms/which] f44: " Than Ngo
0 siblings, 1 reply; 2+ messages in thread
From: Than Ngo @ 2026-05-29 16:02 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/which
Branch : rawhide
Commit : f57b70df61128cb1410c7da71d1d4efa98c91a29
Author : Than Ngo <than@redhat.com>
Date : 2026-05-29T18:02:38+02:00
Stats : +25/-17 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/which/c/f57b70df61128cb1410c7da71d1d4efa98c91a29?branch=rawhide
Log:
Fix rhbz#2480548, update to 2.25
---
diff --git a/which-2.21-warning.patch b/which-2.21-warning.patch
deleted file mode 100644
index 6031014..0000000
--- a/which-2.21-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up which-2.22/tilde.c.me which-2.22/tilde.c
---- which-2.22/tilde.c.me 2025-01-27 10:30:39.731725763 +0100
-+++ which-2.22/tilde.c 2025-01-27 10:32:11.158379146 +0100
-@@ -189,7 +189,8 @@ char *tilde_expand(const char *string)
- int result_size, result_index;
-
- result_index = result_size = 0;
-- if (result = strchr(string, '~'))
-+ result = strchr(string, '~');
-+ if (result)
- result = (char *) xmalloc(result_size = (strlen(string) + 16));
- else
- result = (char *) xmalloc(result_size = (strlen(string) + 1));
diff --git a/which-2.25-warning.patch b/which-2.25-warning.patch
new file mode 100644
index 0000000..a4c0f7f
--- /dev/null
+++ b/which-2.25-warning.patch
@@ -0,0 +1,18 @@
+Fix a warning:
+
+which.c:584:55: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
+ 584 | if (homelen == 0 || !IS_DIRSEP(home[homelen - 1]) && homelen < sizeof(home) - 1)
+ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+diff -up which-2.25/which.c.me which-2.25/which.c
+--- which-2.25/which.c.me 2026-05-29 17:17:12.948224801 +0200
++++ which-2.25/which.c 2026-05-29 17:16:36.106870955 +0200
+@@ -581,7 +581,7 @@ int main(int argc, char *argv[])
+ strncpy(home, h, sizeof(home));
+ home[sizeof(home) - 1] = 0;
+ homelen = strlen(home);
+- if (homelen == 0 || !IS_DIRSEP(home[homelen - 1]) && homelen < sizeof(home) - 1)
++ if (homelen == 0 || (!IS_DIRSEP(home[homelen - 1]) && homelen < sizeof(home) - 1))
+ {
+ home[homelen] = DIR_SEPARATOR;
+ home[homelen + 1] = '\0';
diff --git a/which.spec b/which.spec
index 0af4f77..fa8e438 100644
--- a/which.spec
+++ b/which.spec
@@ -2,14 +2,14 @@
Summary: Displays where a particular program in your path is located
Name: which
-Version: 2.23
-Release: 4%{?dist}
+Version: 2.25
+Release: 1%{?dist}
License: GPL-3.0-only
+Url: https://savannah.gnu.org/projects/which/
Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
Source1: which2.sh
Source2: which2.csh
-Patch0: which-2.21-warning.patch
-Url: https://savannah.gnu.org/projects/which/
+Patch0: which-2.25-warning.patch
Requires: coreutils
BuildRequires: make
BuildRequires: gcc gcc-c++
@@ -46,6 +46,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%{_mandir}/man1/which.1*
%changelog
+* Fri May 29 2026 Than Ngo <than@redhat.com> - 2.25-1
+- Fix rhbz#2480548, update to 2.25
+
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.23-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [rpms/which] f44: Fix rhbz#2480548, update to 2.25
2026-05-29 16:02 [rpms/which] rawhide: Fix rhbz#2480548, update to 2.25 Than Ngo
@ 2026-05-29 16:07 ` Than Ngo
0 siblings, 0 replies; 2+ messages in thread
From: Than Ngo @ 2026-05-29 16:07 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/which
Branch : f44
Commit : f57b70df61128cb1410c7da71d1d4efa98c91a29
Author : Than Ngo <than@redhat.com>
Date : 2026-05-29T18:02:38+02:00
Stats : +25/-17 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/which/c/f57b70df61128cb1410c7da71d1d4efa98c91a29?branch=f44
Log:
Fix rhbz#2480548, update to 2.25
---
diff --git a/which-2.21-warning.patch b/which-2.21-warning.patch
deleted file mode 100644
index 6031014..0000000
--- a/which-2.21-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up which-2.22/tilde.c.me which-2.22/tilde.c
---- which-2.22/tilde.c.me 2025-01-27 10:30:39.731725763 +0100
-+++ which-2.22/tilde.c 2025-01-27 10:32:11.158379146 +0100
-@@ -189,7 +189,8 @@ char *tilde_expand(const char *string)
- int result_size, result_index;
-
- result_index = result_size = 0;
-- if (result = strchr(string, '~'))
-+ result = strchr(string, '~');
-+ if (result)
- result = (char *) xmalloc(result_size = (strlen(string) + 16));
- else
- result = (char *) xmalloc(result_size = (strlen(string) + 1));
diff --git a/which-2.25-warning.patch b/which-2.25-warning.patch
new file mode 100644
index 0000000..a4c0f7f
--- /dev/null
+++ b/which-2.25-warning.patch
@@ -0,0 +1,18 @@
+Fix a warning:
+
+which.c:584:55: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
+ 584 | if (homelen == 0 || !IS_DIRSEP(home[homelen - 1]) && homelen < sizeof(home) - 1)
+ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+diff -up which-2.25/which.c.me which-2.25/which.c
+--- which-2.25/which.c.me 2026-05-29 17:17:12.948224801 +0200
++++ which-2.25/which.c 2026-05-29 17:16:36.106870955 +0200
+@@ -581,7 +581,7 @@ int main(int argc, char *argv[])
+ strncpy(home, h, sizeof(home));
+ home[sizeof(home) - 1] = 0;
+ homelen = strlen(home);
+- if (homelen == 0 || !IS_DIRSEP(home[homelen - 1]) && homelen < sizeof(home) - 1)
++ if (homelen == 0 || (!IS_DIRSEP(home[homelen - 1]) && homelen < sizeof(home) - 1))
+ {
+ home[homelen] = DIR_SEPARATOR;
+ home[homelen + 1] = '\0';
diff --git a/which.spec b/which.spec
index 0af4f77..fa8e438 100644
--- a/which.spec
+++ b/which.spec
@@ -2,14 +2,14 @@
Summary: Displays where a particular program in your path is located
Name: which
-Version: 2.23
-Release: 4%{?dist}
+Version: 2.25
+Release: 1%{?dist}
License: GPL-3.0-only
+Url: https://savannah.gnu.org/projects/which/
Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
Source1: which2.sh
Source2: which2.csh
-Patch0: which-2.21-warning.patch
-Url: https://savannah.gnu.org/projects/which/
+Patch0: which-2.25-warning.patch
Requires: coreutils
BuildRequires: make
BuildRequires: gcc gcc-c++
@@ -46,6 +46,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%{_mandir}/man1/which.1*
%changelog
+* Fri May 29 2026 Than Ngo <than@redhat.com> - 2.25-1
+- Fix rhbz#2480548, update to 2.25
+
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.23-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-29 16:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-29 16:02 [rpms/which] rawhide: Fix rhbz#2480548, update to 2.25 Than Ngo
2026-05-29 16:07 ` [rpms/which] f44: " Than Ngo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox