diff --git a/.libunwind.metadata b/.libunwind.metadata index 3d1c687..cb7a7cc 100644 --- a/.libunwind.metadata +++ b/.libunwind.metadata @@ -1 +1 @@ -a33e52d7ecd18b9375508369b566eeb2cc6eec3b SOURCES/libunwind-1.2.tar.gz +6bb7726f9f7440319bf8efc55e32281e2e39e7f4 SOURCES/libunwind-1.4.0.tar.gz diff --git a/SOURCES/libunwind-1.3.1-multilib-fix.patch b/SOURCES/libunwind-1.3.1-multilib-fix.patch new file mode 100644 index 0000000..f7e90fc --- /dev/null +++ b/SOURCES/libunwind-1.3.1-multilib-fix.patch @@ -0,0 +1,22 @@ +diff -up libunwind-1.3.1/include/libunwind.h.in.multilibfix libunwind-1.3.1/include/libunwind.h.in +--- libunwind-1.3.1/include/libunwind.h.in.multilibfix 2020-08-13 10:06:03.275601460 -0400 ++++ libunwind-1.3.1/include/libunwind.h.in 2020-08-13 10:06:29.579522623 -0400 +@@ -1,8 +1,6 @@ + /* Provide a real file - not a symlink - as it would cause multiarch conflicts + when multiple different arch releases are installed simultaneously. */ + +-#ifndef UNW_REMOTE_ONLY +- + #if defined __aarch64__ + #include "libunwind-aarch64.h" + #elif defined __arm__ +@@ -28,9 +26,3 @@ + #else + # error "Unsupported arch" + #endif +- +-#else /* UNW_REMOTE_ONLY */ +- +-# include "libunwind-@arch@.h" +- +-#endif /* UNW_REMOTE_ONLY */ diff --git a/SOURCES/libunwind-arm-default-to-exidx.patch b/SOURCES/libunwind-arm-default-to-exidx.patch new file mode 100644 index 0000000..e19c51e --- /dev/null +++ b/SOURCES/libunwind-arm-default-to-exidx.patch @@ -0,0 +1,15 @@ +diff -up libunwind-1.1/src/arm/Gglobal.c.default-to-exidx libunwind-1.1/src/arm/Gglobal.c +--- libunwind-1.1/src/arm/Gglobal.c.default-to-exidx 2015-06-02 10:38:39.733587918 -0400 ++++ libunwind-1.1/src/arm/Gglobal.c 2015-06-02 10:38:53.086500142 -0400 +@@ -29,7 +29,10 @@ HIDDEN define_lock (arm_lock); + HIDDEN int tdep_init_done; + + /* Unwinding methods to use. See UNW_METHOD_ enums */ +-HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_ALL; ++/* UNW_ARM_METHOD_ALL starts with UNW_ARM_METHOD_DWARF */ ++/* which is never right on Fedora ARM. Default instead */ ++/* to UNW_ARM_METHOD_EXIDX. */ ++HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_EXIDX; + + HIDDEN void + tdep_init (void) diff --git a/SPECS/libunwind.spec b/SPECS/libunwind.spec index 31d05a2..37abc34 100644 --- a/SPECS/libunwind.spec +++ b/SPECS/libunwind.spec @@ -3,19 +3,21 @@ Summary: An unwinding library Name: libunwind -Epoch: 2 -Version: 1.2 -Release: 2%{?dist} +Version: 1.4.0 +Release: 5%{?dist} License: BSD -Group: Development/Debuggers -Source: http://download.savannah.gnu.org/releases/libunwind/libunwind-%{version}.tar.gz +URL: http://savannah.nongnu.org/projects/libunwind +Source: http://download-mirror.savannah.gnu.org/releases/libunwind/libunwind-%{version}.tar.gz -Patch2: 0002-Fix-rpmdiff-failure.patch +#Fedora specific patch +Patch1: libunwind-arm-default-to-exidx.patch +# Make libunwind.h multilib friendly +Patch2: libunwind-1.3.1-multilib-fix.patch -URL: http://savannah.nongnu.org/projects/libunwind -ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{power64} +ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 -BuildRequires: automake libtool autoconf +BuildRequires: automake libtool autoconf texlive-latex2man +BuildRequires: make # host != target would cause REMOTE_ONLY build even if building i386 on x86_64. %global _host %{_target_platform} @@ -25,8 +27,7 @@ Libunwind provides a C ABI to determine the call-chain of a program. %package devel Summary: Development package for libunwind -Group: Development/Debuggers -Requires: libunwind = %{epoch}:%{version}-%{release} +Requires: libunwind = %{version}-%{release} %description devel The libunwind-devel package includes the libraries and header files for @@ -34,16 +35,17 @@ libunwind. %prep %setup -q - -%patch2 -p1 +%patch1 -p1 -b .default-to-exidx +%patch2 -p1 -b .multilib-fix %build +%global optflags %{optflags} -fcommon aclocal libtoolize --force autoheader automake --add-missing autoconf -%configure --enable-static --enable-shared --disable-setjmp +%configure --enable-static --enable-shared --enable-setjmp=no make %{?_smp_mflags} %install @@ -58,13 +60,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libunwind*.a mv -f $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace.a-save $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace.a rm -f $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace*.so* -#Copy doc files manually as we do not have latex2man in Red Hat Enterprise Linux -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 -cd doc -for fn in *.man; do - install -c -m 644 $fn $RPM_BUILD_ROOT%{_mandir}/man3/${fn%.man}.3 -done -cd .. +# fix multilib conflicts +touch -r NEWS $RPM_BUILD_ROOT%{_includedir}/libunwind.h %check %if 0%{?_with_check:1} || 0%{?_with_testsuite:1} @@ -75,48 +72,270 @@ echo ====================TESTING END===================== echo ====================TESTSUITE DISABLED========================= %endif -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%defattr(-,root,root,-) -%doc COPYING README NEWS +%license COPYING +%doc README NEWS %{_libdir}/libunwind*.so.* %files devel -%defattr(-,root,root,-) %{_libdir}/libunwind*.so %{_libdir}/libunwind-ptrace.a %{_libdir}/pkgconfig/libunwind*.pc -%{_mandir}/man3/* +%{_mandir}/*/* # does not get installed for REMOTE_ONLY targets - check it. %{_includedir}/unwind.h %{_includedir}/libunwind*.h %changelog -* Mon Feb 27 2017 Miroslav Rezanina 1.2-2.el7 -- Rebase to 1.2 [bz#1384435] -- Resolves: bz#1384435 - (Rebase libunwind package (and add for ppc64le): libunwind) - -* Thu Jan 28 2016 Miroslav Rezanina 1.1-6.el7 -- Fix update from EPEL version [bz#1289950] -- Resolves: bz#1289950 - (libunwind in RHEL 7.2 has a smaller release than the last libunwind package in EPEL-7) - -* Wed Jul 29 2015 Miroslav Rezanina 1.1-5 -- Version bumped [bz#1238864] -- Resolves: bz#1238864 - libunwind: bump version to win against existing branches - -* Fri Jun 19 2015 Miroslav Rezanina 1.1-2 -- lu-Fix-rpmdiff-failure.patch [bz#1229359] -- lu-Fix-buffer-overflow-reported-by-Coverity.patch [bz#1233114] -- Resolves: bz#1229359 - (Fix multilib support) -- Resolves: bz#1233114 - (fix off-by-one in dwarf_to_unw_regnum (CVE-2015-3239)) - -* Tue Jun 02 2015 Miroslav Rezanina 1.1-1 -- Import to RHEL +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Aug 13 2020 Tom Callaway - 1.4.0-4 +- revert previous change +- fix it properly + +* Mon Aug 10 2020 Tom Callaway - 1.4.0-3 +- fix multilib issues with libunwind.h (bz1866512) + +* Tue Jul 28 2020 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Apr 14 2020 Dan Horák - 1.4.0-1 +- Update to 1.4.0 with s390x support + +* Fri Jan 31 2020 Tom Callaway - 1.3.1-5 +- backport change from upstream to fix reported test failures (bz1795896) + +* Wed Jan 29 2020 Fedora Release Engineering - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Jan 13 2019 Ankur Sinha - 1.3.1-1 +- Update to 1.3.1 +- Remove no longer needed patch (builds on all arches without it) + +* Fri Jul 13 2018 Fedora Release Engineering - 1.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Igor Gnatenko - 1.2.1-5 +- Escape macros in %%changelog + +* Wed Feb 07 2018 Fedora Release Engineering - 1.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Oct 29 2017 Tom Callaway - 1.2.1-3 +- fix multilib conflicts + +* Sat Oct 14 2017 Peter Robinson 1.2.1-2 +- Add patch to fix ARM issues + +* Fri Sep 1 2017 Tom Callaway - 1.2.1-1 +- update to 1.2.1 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jun 1 2017 Jes Sorensen - 1.2-1 +- Update to libunwind-1.2 (#1439962) +- Disable setjmp the correct way and get rid of messy patch + +* Fri Feb 10 2017 Fedora Release Engineering - 1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jul 10 2015 Tom Callaway - 1.1-10 +- fix CVE-2015-3239 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 2 2015 Tom Callaway - 1.1-8 +- default arm unwinding method to exidx, old default of dwarf never works on Fedora + (#1226806) + +* Sun Aug 17 2014 Fedora Release Engineering - 1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 13 2014 Jaromir Capik - 1.1-5 +- Replacing ppc64 with the power64 macro (#1051641) + +* Mon Jan 20 2014 Kyle McMartin 1.1-4 +- Link test_ppc64_altivec against libunwind in tests/Makefile.am to fix build + on ppc64. + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jun 03 2013 Kyle McMartin 1.1-2 +- Add aarch64 support from backported ac6c0a65. (Mark Salter) + (rhbz#969689) + +* Mon Feb 18 2013 Kyle McMartin 1.1-1 +- Update to upstream v1.1 +- libunwind-install-ptrace.patch: drop upstream patch +- libunwind-arm-register-rename.patch: fixed upstream +- Add pkg-config files to libunwind-devel + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Feb 15 2012 Peter Robinson - 1.0.1-3 +- Add patch to fix build on ARM + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Sep 15 2011 Jan Kratochvil - 1.0.1-1.fc17 +- Upgrade to the upstream release. (BZ 738595). +- Use official distribution URL for %%{source}. + +* Thu Jun 02 2011 Paul Whalen - 0.99-3.20110424git1e10c293 +- Added arm macro to ExclusiveArch + +* Mon May 9 2011 Jan Kratochvil - 0.99-2.20110424git1e10c293 +- Install static libunwind-ptrace library into system (for ltrace, BZ 703159). + +* Sun Apr 24 2011 Jan Kratochvil - 0.99-1.20110424git1e10c293 +- Rebase to the upstream post-0.99 snapshot (BZ 697453). + +* Tue Feb 08 2011 Fedora Release Engineering - 0.99-0.16.20090430betagit4b8404d1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Sep 29 2010 jkeating - 0.99-0.15.20090430betagit4b8404d1 +- Rebuilt for gcc bug 634757 + +* Sat Sep 11 2010 Parag Nemade 0.99-0.14.20090430betagit4b8404d1.fc15 +- Merge-review cleanup (#226052) + +* Fri Dec 4 2009 Fedora Release Engineering - 0.99-0.13.20090430betagit4b8404d1 +- The devel package now requires also base package's %%{release}. +- Update the obsolete macro %%{package_version}. + +* Sat Jul 25 2009 Fedora Release Engineering - 0.99-0.12.20090430betagit4b8404d1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 15 2009 Jan Kratochvil - 0.99-0.11.20090430betagit4b8404d1 +- Disable the libunwind-setjmp library as no longer compatible with glibc and + no Fedora dependencies on it (FTBSFS BZ 511562). + +* Thu Apr 30 2009 Jan Kratochvil - 0.99-0.10.20090430betagit4b8404d1 +- Fix the ia64 variant of GetIPInfo() (BZ 480412). + +* Mon Apr 13 2009 Jan Kratochvil - 0.99-0.9.20090413betagitb483ea3f +- Rebase the package on the upstream variant: http://www.nongnu.org/libunwind/ + - Drop the patch libunwind-snap-070224-frysk20070405cvs.patch + as even frysk-0.4-8.fc11 still has this library bundled statically. +- Disable the testsuite by default during the build. + - It should be run separately as it crashes some ia64 kernels. + - Drop the patch libunwind-snap-070224-orphanripper.patch. +- Drop the patch libunwind-snap-070224-dprintf-vs-stdio.h as no longer needed. +- Drop libunwind-snap-070224-multilib-rh342451.patch as accepted upstream. +- Fix and enable ppc (ppc32) arch. + +* Tue Mar 3 2009 Jan Kratochvil - 0.99-0.8.frysk20070405cvs +- Fix .spec ExclusiveArch from i386 to %%{ix86}. +- Remove `BuildRequires: glibc gcc make tar gzip' - minimum build environment. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.99-0.7.frysk20070405cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Sep 22 2008 Jan Kratochvil - 0.99-0.6.frysk20070405cvs +- Fix build error due to a `dprintf' conflict on recent glibc. +- New rpmbuild parameter: --without check + +* Sun Feb 24 2008 Jan Kratochvil - 0.99-0.5.frysk20070405cvs +- Fix the multilib conflicts (BZ 342451). + +* Sun Feb 24 2008 Jan Kratochvil - 0.99-0.4.frysk20070405cvs +- Abort the possibly hung up testcases after 120 seconds (BZ 427850, BZ 434147). + +* Tue Feb 19 2008 Fedora Release Engineering - 0.99-0.3.frysk20070405cvs +- Autorebuild for GCC 4.3 + +* Sun Apr 22 2007 Jan Kratochvil - 0.99-0.2.frysk20070405cvs +- Require conflict with gdb < gdb-6.6-9 as it would not find `libunwind.so'. +- Fixed (unused - commented) rule for a RPM build with embedded debug info. + +* Thu Apr 5 2007 Jan Kratochvil - 0.99-0.1.frysk20070405cvs +- Update to the upstream snapshot snap-070224. +- Use the Frysk's modified version, currently snapshot 20070405cvs. +- Extend the supported architectures from ia64 also to x86_64, i386 and ppc64. +- Spec file fixups. +- Split the package to its base and the `devel' part. +- Drop the statically built libraries. + +* Sun Oct 01 2006 Jesse Keating - 0.98.5-3 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Fri Sep 22 2006 Jan Kratochvil - 0.98.5-2 +- SELinux compatibility fix - stack is now non-exec (Jakub Jelinek suggestion). + +* Wed Jul 12 2006 Jesse Keating - 0.98.5-1.1 +- rebuild + +* Sat May 27 2006 Alexandre Oliva - 0.98.5-1 +- Import version 0.98.5. + +* Thu Feb 09 2006 Florian La Roche +- remove empty scripts + +* Tue Feb 07 2006 Jesse Keating - 0.98.2-3.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Mar 01 2005 Jeff Johnston 0.98.2.3 +- Bump up release number + +* Thu Nov 11 2004 Jeff Johnston 0.98.2.2 +- Import version 0.98.2. + +* Wed Nov 10 2004 Jeff Johnston 0.97.6 +- Bump up release number + +* Thu Aug 19 2004 Jeff Johnston 0.97.3 +- Remove debug file from files list. + +* Fri Aug 13 2004 Jeff Johnston 0.97.2 +- Import version 0.97. + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Jun 09 2004 Elena Zannoni 0.96.4 +- Bump release number. + +* Mon Feb 23 2004 Elena Zannoni 0.96.3 +- Bump release number. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Jeff Johnston 0.96.1 +- Import version 0.96. + +* Tue Jan 06 2004 Jeff Johnston 0.92.2 +- Bump release number. + +* Mon Oct 06 2003 Jeff Johnston 0.92.1 +- Initial release +