public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/tree-pkg] rawhide: Update tree-pkg to 2.3.2 (rhbz#2448297)
@ 2026-09-07 12:16 Vincent Mihalkovic
0 siblings, 0 replies; only message in thread
From: Vincent Mihalkovic @ 2026-09-07 12:16 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/tree-pkg
Branch : rawhide
Commit : 39646acf042e43f80d789cc6a6285db64c99e3f6
Author : Vincent Mihalkovic <vmihalko@redhat.com>
Date : 2026-09-07T14:04:04+02:00
Stats : +26/-39 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/tree-pkg/c/39646acf042e43f80d789cc6a6285db64c99e3f6?branch=rawhide
Log:
Update tree-pkg to 2.3.2 (rhbz#2448297)
Drop the path allocation patch hunk included upstream and refresh FSF contact references in LICENSE.
Resolves: rhbz#2448297
---
diff --git a/.gitignore b/.gitignore
index fb58b94..bbe33cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/tree-[1-9].*.*.tgz
/tree-2.2.1.tar.gz
/2.3.1.tar.gz
+/2.3.2.tar.gz
diff --git a/sources b/sources
index 71ba19b..c346951 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (2.3.1.tar.gz) = 5d1da71cf488b9262d8c5c4508b5c2d415aebf1c539ebfcbc83815df9e9e0802b70439000f8dbad639c77bb4af7472a5c119c26852aa93a764501404f68d11ca
+SHA512 (2.3.2.tar.gz) = b39e6d6b2ed49a83ca057a3c47980318226558e69d2ac095fb852898f9acd48bb014224c3ed3c6f51d0c505b69be67535c057593fdad7052e36eed4b08a8bbe8
diff --git a/tree-license-fsf-addr.patch b/tree-license-fsf-addr.patch
index 9daa0fc..e03aedd 100644
--- a/tree-license-fsf-addr.patch
+++ b/tree-license-fsf-addr.patch
@@ -1,14 +1,11 @@
-From cbfbad2607e99dc856ff82394a19ef489b135351 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 20 Sep 2021 09:36:04 +0200
-Subject: [PATCH] tree: use correct FSF address in LICENSE
+From: Vincent Mihalkovic <vmihalko@redhat.com>
+Subject: [PATCH] tree: update FSF contact references in LICENSE
----
- LICENSE | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+Use the contact references from the current GNU GPLv2 text:
+https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+The license terms are unchanged.
-diff --git a/LICENSE b/LICENSE
-index 5b6e7c6..3c9f912 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@
@@ -16,19 +13,19 @@ index 5b6e7c6..3c9f912 100644
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
-@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
+@@ -308,9 +308,8 @@
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
+- You should have received a copy of the GNU General Public License
+- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
---
-2.31.1
-
diff --git a/tree-pkg.spec b/tree-pkg.spec
index 73a9e5a..d0cca42 100644
--- a/tree-pkg.spec
+++ b/tree-pkg.spec
@@ -1,9 +1,9 @@
Summary: File system tree viewer
Name: tree-pkg
-Version: 2.3.1
-Release: 2%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
-# The entire source code is LGPL-2.1-or-later except strverscmp.c
+# The entire source code is GPL-2.0-or-later except strverscmp.c
# which is LGPL-2.1-or-later.
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -15,7 +15,7 @@ BuildRequires: git-core
BuildRequires: make
# prevent rpmlint from reporting incorrect-fsf-address
-# Sent upstream via email 20210920
+# Use the contact URLs from the current GNU GPLv2 text
Patch1: tree-license-fsf-addr.patch
# Keep file size field length constant regardless of whether SI units
@@ -28,7 +28,6 @@ Patch2: tree-size-field-len.patch
Patch3: tree-static-analysis.patch
# fix programming mistakes detected by static analysis
-# Upstream is not active
Patch4: tree-static-analysis-2.patch
%description
@@ -63,6 +62,11 @@ sed -e 's/LINUX/__linux__/' -i tree.c
%doc README
%changelog
+* Mon Sep 07 2026 Vincent Mihalkovic <vmihalko@redhat.com> - 2.3.2-1
+- Update to 2.3.2 (rhbz#2448297)
+- Drop the path allocation fix included upstream
+- Refresh FSF contact references in LICENSE
+
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/tree-static-analysis.patch b/tree-static-analysis.patch
index e7bdae0..28b8922 100644
--- a/tree-static-analysis.patch
+++ b/tree-static-analysis.patch
@@ -5,8 +5,7 @@ Subject: [PATCH] tree: fix programming mistakes detected by static analysis
---
list.c | 2 +-
- tree.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/list.c b/list.c
index 4db6e6e..0fd36a0 100644
@@ -21,19 +20,5 @@ index 4db6e6e..0fd36a0 100644
ssize_t n;
int i, needsclosed;
size_t j;
-diff --git a/tree.c b/tree.c
-index 4b30786..cc0f3fa 100644
---- a/tree.c
-+++ b/tree.c
-@@ -1107,7 +1107,7 @@ struct _info **unix_getfulltree(char *d, u_long lev, dev_t dev, off_t *size, cha
- if (*(*dir)->lnk == '/')
- (*dir)->child = unix_getfulltree((*dir)->lnk,lev+1,dev,&((*dir)->size),&((*dir)->err));
- else {
-- if (strlen(d)+strlen((*dir)->lnk)+2 > pathsize) path=xrealloc(path,pathsize=(strlen(d)+strlen((*dir)->name)+1024));
-+ if (strlen(d)+strlen((*dir)->lnk)+2 > pathsize) path=xrealloc(path,pathsize=(strlen(d)+strlen((*dir)->lnk)+1024));
- if (flag.f && !strcmp(d,"/")) sprintf(path,"%s%s",d,(*dir)->lnk);
- else sprintf(path,"%s/%s",d,(*dir)->lnk);
- (*dir)->child = unix_getfulltree(path,lev+1,dev,&((*dir)->size),&((*dir)->err));
--
2.47.0
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-07 12:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-07 12:16 [rpms/tree-pkg] rawhide: Update tree-pkg to 2.3.2 (rhbz#2448297) Vincent Mihalkovic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox