From e5a7e0081ef0d4677af5faf77cca4e610804a2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= Date: Wed, 21 Dec 2022 13:33:27 +0100 Subject: [PATCH 1/8] tests: fix grep warning leading to test failure Recent grep version emits a warning when \ is found before /. This leads to a test failure in libtool. Patch sent upstream: https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg00004.html Reviewed-by: Carlos O'Donell --- ...-Fix-grep-warning-about-stray-before.patch | 35 +++++++++++++++++++ libtool.spec | 9 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-tests-Fix-grep-warning-about-stray-before.patch diff --git a/0001-tests-Fix-grep-warning-about-stray-before.patch b/0001-tests-Fix-grep-warning-about-stray-before.patch new file mode 100644 index 0000000..481dd42 --- /dev/null +++ b/0001-tests-Fix-grep-warning-about-stray-before.patch @@ -0,0 +1,35 @@ +From 414deacee0f564afdf2d7750450274c581330a59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= +Date: Wed, 21 Dec 2022 13:14:03 +0100 +Subject: [PATCH] tests: Fix grep warning about stray \ before / + +Recent version of grep emit a warning if stray \ is found before /. +This leads to the link-order test failure. + + * tests/link-order.at: Remove unneeded \ before / +--- + tests/link-order.at | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/link-order.at b/tests/link-order.at +index 3f01a00d..a145347f 100644 +--- a/tests/link-order.at ++++ b/tests/link-order.at +@@ -99,12 +99,12 @@ aix* | interix*) ;; # These systems have different path syntax + case $hardcode_direct$hardcode_direct_absolute in + yesno) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout ++ $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + *) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout ++ $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + esac +-- +2.38.1 + diff --git a/libtool.spec b/libtool.spec index 546b08b..dcc842e 100644 --- a/libtool.spec +++ b/libtool.spec @@ -8,7 +8,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: 2.4.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ @@ -39,6 +39,10 @@ Patch3: libtool-2.4.6-disable_non-pic_arm.patch # https://lists.gnu.org/archive/html/libtool-patches/2022-02/msg00000.html Patch4: libtool-2.4.6-keep-compiler-deps.patch +# Patch sent upstream +# https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg00004.html +Patch5: 0001-tests-Fix-grep-warning-about-stray-before.patch + %if ! 0%{?_module_build} Patch100: libtool-nodocs.patch %endif @@ -165,6 +169,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la} %changelog +* Wed Dec 21 2022 Frederic Berat - 2.4.7-3 +- Fix test failure due to grep update + * Thu Jul 21 2022 Fedora Release Engineering - 2.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 07f4318bf849deb86d9f17bc4f088b98305e3a65 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 10 Jan 2023 11:13:44 +0100 Subject: [PATCH 2/8] C99 compatibility fix in the testsuite Related to: --- libtool-c99.patch | 20 ++++++++++++++++++++ libtool.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 libtool-c99.patch diff --git a/libtool-c99.patch b/libtool-c99.patch new file mode 100644 index 0000000..ffc437a --- /dev/null +++ b/libtool-c99.patch @@ -0,0 +1,20 @@ +Include for the strcmp function. This improves C99 +compiler compatibility because it avoids an implicit function +declaration. + +Submitted upstream: + + + +diff --git a/tests/lt_dlopen_a.at b/tests/lt_dlopen_a.at +index 95f18a0df165d41d..d3948738e4199cc6 100644 +--- a/tests/lt_dlopen_a.at ++++ b/tests/lt_dlopen_a.at +@@ -27,6 +27,7 @@ AT_KEYWORDS([libltdl lt_dlopen_a]) + AT_DATA([main.c], + [[#include + #include ++#include + + /* This dlopen() in the main executable should override any dlopen()s in + shared libraries etc. diff --git a/libtool.spec b/libtool.spec index dcc842e..bc2bd07 100644 --- a/libtool.spec +++ b/libtool.spec @@ -8,7 +8,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: 2.4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ @@ -47,6 +47,8 @@ Patch5: 0001-tests-Fix-grep-warning-about-stray-before.patch Patch100: libtool-nodocs.patch %endif +Patch101: libtool-c99.patch + # /usr/bin/libtool includes paths within gcc's versioned directories # Libtool must be rebuilt whenever a new upstream gcc is built # Starting with gcc 7 gcc in Fedora is packaged so that only major @@ -169,6 +171,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la} %changelog +* Tue Jan 10 2023 Florian Weimer - 2.4.7-4 +- C99 compatibility fix in the testsuite + * Wed Dec 21 2022 Frederic Berat - 2.4.7-3 - Fix test failure due to grep update From 02d40d45564ecb92fdb1c587b2fa60ef6bc08240 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 16 Jan 2023 13:08:49 +0100 Subject: [PATCH 3/8] 2.4.7-5 --- libtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtool.spec b/libtool.spec index bc2bd07..525a3e8 100644 --- a/libtool.spec +++ b/libtool.spec @@ -8,7 +8,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: 2.4.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ @@ -171,6 +171,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la} %changelog +* Mon Jan 16 2023 Jakub Jelinek - 2.4.7-5 +- bump: for gcc 13.* in rawhide + * Tue Jan 10 2023 Florian Weimer - 2.4.7-4 - C99 compatibility fix in the testsuite From 72a6738eee215996492a8c6890b230c11afb15ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 17:37:46 +0000 Subject: [PATCH 4/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtool.spec b/libtool.spec index 525a3e8..cc4ad6b 100644 --- a/libtool.spec +++ b/libtool.spec @@ -8,7 +8,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: 2.4.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ @@ -171,6 +171,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Jakub Jelinek - 2.4.7-5 - bump: for gcc 13.* in rawhide From 71f74ae17c0e56b66fb8024d5e1c3559acb7912f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:19:01 +0000 Subject: [PATCH 5/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtool.spec b/libtool.spec index cc4ad6b..f9fa7c4 100644 --- a/libtool.spec +++ b/libtool.spec @@ -8,7 +8,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: 2.4.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ @@ -171,6 +171,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la} %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.4.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 2.4.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 93ce89c4c4ef879d26f3046c223da0a72fad7b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= Date: Tue, 8 Aug 2023 13:26:43 +0200 Subject: [PATCH 6/8] Migrate to SPDX license The LicenseRef-Fedora-Public-Domain entry as been reported through: https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/314 License scanning done on the binary RPM itself, cross-checked with source RPM for non-text based files. --- libtool.spec | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/libtool.spec b/libtool.spec index f9fa7c4..7965956 100644 --- a/libtool.spec +++ b/libtool.spec @@ -8,8 +8,41 @@ Summary: The GNU Portable Library Tool Name: libtool Version: 2.4.7 -Release: 7%{?dist} -License: GPLv2+ and LGPLv2+ and GFDL +Release: 8%{?dist} + +# To help future rebase, the following licenses were seen in the following files/folders: +# '*' is anything that was not explicitly listed earlier in the folder +# +# From libtool package: +# usr/bin/: +# libtool - GPL-2.0-or-later WITH Libtool-exception AND MIT +# libtoolize - GPL-2.0-or-later AND MIT +# usr/share/: +# aclocal/* - FSFULLR +# doc/libtool: +# AUTHORS - GPL-2.0-or-later +# * - FSFAP +# info/* - GFDL-1.3-or-later +# libtool/build-aux/: +# {compile,depcomp,missing} - GPL-2.0-or-later WITH Autoconf-exception-generic +# config.{guess,sub} - GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 +# install-sh - X11 AND LicenseRef-Fedora-public-domain +# ltmain.sh - GPL-2.0-or-later WITH Libtool-exception AND MIT +# usr/share/man/man1/*: generated from usr/bin/libtool{,ize} using help2man +# +# From libtool-ltdl package: +# usr/lib64/ +# * - LGPL-2.0-or-later WITH Libtool-exception +# +# From libtool-ltdl-devel package: +# usr/include/* - LGPL-2.0-or-later WITH Libtool-exception +# usr/share/: +# README - FSFAP +# {*.c,*.h,Makefile.am,configure.ac,ltdl.mk} - LGPL-2.0-or-later WITH Libtool-exception +# Makefile.in - FSFULLRWD +# aclocal.m4 - FSFULLR AND FSFULLRWD +# configure - FSFUL +License: GPL-2.0-or-later AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-2.0-or-later WITH Libtool-exception AND LGPL-2.0-or-later WITH Libtool-exception AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND MIT AND FSFAP AND FSFULLR AND FSFULLRWD AND GFDL-1.3-or-later AND X11 AND LicenseRef-Fedora-public-domain URL: http://www.gnu.org/software/libtool/ Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz @@ -171,6 +204,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la} %changelog +* Tue Aug 08 2023 Frederic Berat - 2.4.7-8 +- Migrate to SPDX licenses (#2222091). + * Thu Jul 20 2023 Fedora Release Engineering - 2.4.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c9b17ee0351a9c25b03ac7b39418455ac331eecd Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 15 Jan 2024 12:29:57 +0100 Subject: [PATCH 7/8] 2.4.7-9 --- libtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtool.spec b/libtool.spec index 7965956..fa4427e 100644 --- a/libtool.spec +++ b/libtool.spec @@ -8,7 +8,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: 2.4.7 -Release: 8%{?dist} +Release: 9%{?dist} # To help future rebase, the following licenses were seen in the following files/folders: # '*' is anything that was not explicitly listed earlier in the folder @@ -204,6 +204,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la} %changelog +* Mon Jan 15 2024 Jakub Jelinek - 2.4.7-9 +- bump: for gcc 14.* in rawhide + * Tue Aug 08 2023 Frederic Berat - 2.4.7-8 - Migrate to SPDX licenses (#2222091). From 770440b2733c3e1c584512194399c857733c432b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:32:06 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtool.spec b/libtool.spec index fa4427e..5476fca 100644 --- a/libtool.spec +++ b/libtool.spec @@ -8,7 +8,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: 2.4.7 -Release: 9%{?dist} +Release: 10%{?dist} # To help future rebase, the following licenses were seen in the following files/folders: # '*' is anything that was not explicitly listed earlier in the folder @@ -204,6 +204,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la} %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.4.7-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 15 2024 Jakub Jelinek - 2.4.7-9 - bump: for gcc 14.* in rawhide