From c154f58b8922cfb0c6aa4f25cab017ea9eda71a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 18:51:16 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/lzo#aa0d7aa27347822d8da1e9fb24ca79f55d4ea967 --- .gitignore | 1 + lzo-2.02-configure.patch | 35 ++++++ lzo-2.06-configure.patch | 24 ++++ lzo-2.08-configure.patch | 24 ++++ lzo-2.08-rhbz1309225.patch | 14 +++ lzo.spec | 233 +++++++++++++++++++++++++++++++++++++ sources | 1 + 7 files changed, 332 insertions(+) create mode 100644 lzo-2.02-configure.patch create mode 100644 lzo-2.06-configure.patch create mode 100644 lzo-2.08-configure.patch create mode 100644 lzo-2.08-rhbz1309225.patch create mode 100644 lzo.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..6f3b8b8 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/lzo-*.tar.gz diff --git a/lzo-2.02-configure.patch b/lzo-2.02-configure.patch new file mode 100644 index 0000000..0d471c1 --- /dev/null +++ b/lzo-2.02-configure.patch @@ -0,0 +1,35 @@ +diff -up lzo-2.02/configure.configure lzo-2.02/configure +--- lzo-2.02/configure.configure 2005-10-17 18:10:50.000000000 +0200 ++++ lzo-2.02/configure 2008-04-02 12:51:50.000000000 +0200 +@@ -5096,8 +5096,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return (2); ++ return (0); + } + _ACEOF + rm -f conftest$ac_exeext +@@ -19994,7 +19994,7 @@ asm_dir= + asm_msg_amd64=no + asm_msg_i386=no + +-case $host_cpu in ++case $target_cpu in + amd64 | x86_64) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64" ;; + i?86) asm_arch="i386"; asm_dir="asm/i386/src_gas" ;; + *) enable_asm=no ;; +diff -up lzo-2.02/configure.ac.configure lzo-2.02/configure.ac +--- lzo-2.02/configure.ac.configure 2005-10-17 18:10:50.000000000 +0200 ++++ lzo-2.02/configure.ac 2008-04-02 11:53:37.000000000 +0200 +@@ -79,7 +79,7 @@ asm_dir= + asm_msg_amd64=no + asm_msg_i386=no + +-case $host_cpu in ++case $target_cpu in + amd64 | x86_64) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64" ;; + i?86) asm_arch="i386"; asm_dir="asm/i386/src_gas" ;; + *) enable_asm=no ;; diff --git a/lzo-2.06-configure.patch b/lzo-2.06-configure.patch new file mode 100644 index 0000000..44ae20d --- /dev/null +++ b/lzo-2.06-configure.patch @@ -0,0 +1,24 @@ +diff -Naur lzo-2.06/configure lzo-2.06.configure/configure +--- lzo-2.06/configure 2011-08-12 21:32:59.000000000 +0530 ++++ lzo-2.06.configure/configure 2011-09-14 12:33:41.151087816 +0530 +@@ -12964,7 +12964,7 @@ + asm_msg_amd64=no + asm_msg_i386=no + +-case "$host_cpu-$ac_cv_sizeof_void_p" in ++case "$target_cpu-$ac_cv_sizeof_void_p" in + amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;; + i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;; + *) enable_asm=no ;; +diff -Naur lzo-2.06/configure.ac lzo-2.06.configure/configure.ac +--- lzo-2.06/configure.ac 2011-08-12 21:32:59.000000000 +0530 ++++ lzo-2.06.configure/configure.ac 2011-09-14 12:33:31.851087334 +0530 +@@ -123,7 +123,7 @@ + asm_msg_amd64=no + asm_msg_i386=no + +-case "$host_cpu-$ac_cv_sizeof_void_p" in ++case "$target_cpu-$ac_cv_sizeof_void_p" in + amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;; + i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;; + *) enable_asm=no ;; diff --git a/lzo-2.08-configure.patch b/lzo-2.08-configure.patch new file mode 100644 index 0000000..78f2282 --- /dev/null +++ b/lzo-2.08-configure.patch @@ -0,0 +1,24 @@ +diff -Naur lzo-2.08/configure lzo-2.08.configure/configure +--- lzo-2.08/configure 2014-06-29 15:08:49.000000000 +0530 ++++ lzo-2.08.configure/configure 2014-06-30 10:38:08.344604418 +0530 +@@ -13875,7 +13875,7 @@ + asm_msg_amd64=no + asm_msg_i386=no + +-case "$host_cpu-$ac_cv_sizeof_void_p" in ++case "$target_cpu-$ac_cv_sizeof_void_p" in + amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;; + i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;; + *) enable_asm=no ;; +diff -Naur lzo-2.08/configure.ac lzo-2.08.configure/configure.ac +--- lzo-2.08/configure.ac 2014-06-29 15:08:49.000000000 +0530 ++++ lzo-2.08.configure/configure.ac 2014-06-30 10:38:38.706603340 +0530 +@@ -123,7 +123,7 @@ + asm_msg_amd64=no + asm_msg_i386=no + +-case "$host_cpu-$ac_cv_sizeof_void_p" in ++case "$target_cpu-$ac_cv_sizeof_void_p" in + amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;; + i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;; + *) enable_asm=no ;; diff --git a/lzo-2.08-rhbz1309225.patch b/lzo-2.08-rhbz1309225.patch new file mode 100644 index 0000000..a4b9de8 --- /dev/null +++ b/lzo-2.08-rhbz1309225.patch @@ -0,0 +1,14 @@ +diff -up lzo-2.08/include/lzo/lzodefs.h.rhbz1309225 lzo-2.08/include/lzo/lzodefs.h +--- lzo-2.08/include/lzo/lzodefs.h.rhbz1309225 2016-02-19 13:38:02.604220910 +0100 ++++ lzo-2.08/include/lzo/lzodefs.h 2016-02-19 13:37:30.619073085 +0100 +@@ -1686,6 +1686,10 @@ extern "C" { + # define __lzo_byte_struct_ma(s,n) struct s { unsigned char a[n]; } __lzo_may_alias __attribute__((__packed__)); + #endif + #endif ++#if (LZO_CC_GNUC >= 0x060000ul) && defined(__lzo_byte_struct_ma) ++# undef __lzo_byte_struct ++# define __lzo_byte_struct(s,n) __lzo_byte_struct_ma(s,n) ++#endif + #if defined(__lzo_byte_struct) && !defined(__lzo_byte_struct_ma) + # define __lzo_byte_struct_ma(s,n) __lzo_byte_struct(s,n) + #endif diff --git a/lzo.spec b/lzo.spec new file mode 100644 index 0000000..0817878 --- /dev/null +++ b/lzo.spec @@ -0,0 +1,233 @@ +Name: lzo +Version: 2.10 +Release: 3%{?dist} +Summary: Data compression library with very fast (de)compression +License: GPLv2+ +URL: http://www.oberhumer.com/opensource/lzo/ + +Source0: http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz +Patch0: lzo-2.08-configure.patch +Patch1: lzo-2.08-rhbz1309225.patch + +BuildRequires: gcc +BuildRequires: zlib-devel + +%description +LZO is a portable lossless data compression library written in ANSI C. +It offers pretty fast compression and very fast decompression. +Decompression requires no memory. In addition there are slower +compression levels achieving a quite competitive compression ratio +while still decompressing at this very high speed. + + +%package minilzo +Summary: Mini version of lzo for apps which don't need the full version + +%description minilzo +A small (mini) version of lzo for embedding into applications which don't need +full blown lzo compression support. + + +%package devel +Summary: Development files for the lzo library +Requires: %{name} = %{version}-%{release} +Requires: %{name}-minilzo = %{version}-%{release} +Requires: zlib-devel + +%description devel +LZO is a portable lossless data compression library written in ANSI C. +It offers pretty fast compression and very fast decompression. +This package contains development files needed for lzo. + + +%prep +%autosetup -p1 +# mark asm files as NOT needing execstack +for i in asm/i386/src_gas/*.S; do + echo '.section .note.GNU-stack,"",@progbits' >> $i +done + + +%build +%configure --disable-dependency-tracking --disable-static --enable-shared +%{make_build} CFLAGS+=-fno-strict-aliasing + +# build minilzo too (bz 439979) +gcc %{optflags} -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c +gcc -g -shared -Wl,-z,now -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o + + +%install +%{make_install} +find $RPM_BUILD_ROOT -name '*.la' -delete + +install -m 755 libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir} +ln -s libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir}/libminilzo.so +install -p -m 644 minilzo/minilzo.h $RPM_BUILD_ROOT%{_includedir}/lzo + +#Remove doc +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/lzo + +%check +make check test + + +%ldconfig_scriptlets +%ldconfig_scriptlets minilzo + + +%files +%license COPYING +%doc AUTHORS THANKS NEWS +%{_libdir}/liblzo2.so.* + +%files minilzo +%license COPYING +%doc minilzo/README.LZO +%{_libdir}/libminilzo.so.0 + +%files devel +%doc doc/LZOAPI.TXT doc/LZO.FAQ doc/LZO.TXT +%{_includedir}/lzo +%{_libdir}/lib*lzo*.so +%{_libdir}/pkgconfig/lzo2.pc + + +%changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Mar 02 2020 Michael Cronenworth - 2.10-2 +- Disable -fno-strict-aliasing (RHBZ#1807737) + +* Sun Feb 9 2020 Peter Robinson 2.10-1 +- Update to 2.10 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.08-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.08-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.08-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.08-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 2.08-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 03 2018 Igor Gnatenko - 2.08-12 +- Switch to %%ldconfig_scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 2.08-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.08-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.08-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 19 2016 Karsten Hopp - 2.08-8 +- remove -O1 workaround, add patch by Jakub Jelinek instead (bug #1309225) + +* Wed Feb 17 2016 Karsten Hopp - 2.08-7 +- use -O1 compiler optimizations on ppc64le (bug #1309225) + +* Thu Feb 04 2016 Fedora Release Engineering - 2.08-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Aug 14 2015 Adam Jackson 2.08-5 +- Link libminilzo with -z now + +* Wed Jun 17 2015 Fedora Release Engineering - 2.08-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 2.08-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 18 2014 Tom Callaway - 2.08-2 +- fix license handling + +* Mon Jun 30 2014 Huzaifa Sidhpurwala - 2.08-1 +- New upstream +- Fix CVE-2014-4607 + +* Sat Jun 07 2014 Fedora Release Engineering - 2.06-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 2.06-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.06-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 2.06-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 2.06-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Sep 14 2011 Huzaifa Sidhpurwala - 2.06-1 +- Upgrade to latest upstream +- Apply patch from Nicolas Chauvet + +* Tue Feb 08 2011 Fedora Release Engineering - 2.03-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jul 25 2009 Fedora Release Engineering - 2.03-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2.03-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu May 1 2008 Lubomir Rintel 2.03-1 +- New upstream release +- Changed the license to GPLv2+ + +* Wed Apr 2 2008 Hans de Goede 2.02-5 +- Fix configure failure with -Werror-implicit-function-declaration in CFLAGS +- Add a minilzo subpackage which contains a shared version of minilzo, to be + used by all applications which ship with their own copy of it (bz 439979) + +* Tue Feb 19 2008 Fedora Release Engineering - 2.02-4 +- Autorebuild for GCC 4.3 + +* Wed Aug 15 2007 Hans de Goede 2.02-3 +- Update License tag for new Licensing Guidelines compliance + +* Mon Aug 28 2006 Hans de Goede 2.02-2 +- FE6 Rebuild + +* Wed Jul 26 2006 Hans de Goede 2.02-1 +- New upstream release 2.02, soname change! + +* Mon Jul 24 2006 Hans de Goede 1.08-7 +- Taking over as maintainer since Anvil has other priorities +- Add a patch to fix asm detection on i386 (bug 145882, 145893). Thanks to + Carlo Marcelo Arenas Belon for the initial patch. +- Removed unused build dependency on nasm +- Remove static lib +- Cleanup %%doc a bit + +* Thu Mar 16 2006 Dams - 1.08-6.fc5 +- Rebuild for new gcc + +* Tue Jan 17 2006 Dams - 1.08-5.fc5 +- Bumped release for gcc 4.1 rebuild + +* Sun May 22 2005 Jeremy Katz - 1.08-4 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Sun Apr 27 2003 Dams 0:1.08-0.fdr.2 +- Typo un devel description +- Added post and postun scriptlets +- Added URL in Source0 + +* Fri Apr 25 2003 Dams +- Initial build. diff --git a/sources b/sources new file mode 100644 index 0000000..b049a95 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lzo-2.10.tar.gz) = a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4