Compare commits

...

No commits in common. "c8s" and "c10s" have entirely different histories.
c8s ... c10s

9 changed files with 189 additions and 37 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

3
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/lzo-2.08.tar.gz
/lzo-2.08.tar.gz
/lzo-*.tar.gz

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

View File

@ -1,6 +1,25 @@
--- !Policy
product_versions:
- rhel-8
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

35
lzo-2.02-configure.patch Normal file
View File

@ -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 ;;

24
lzo-2.06-configure.patch Normal file
View File

@ -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 ;;

101
lzo.spec
View File

@ -1,14 +1,16 @@
Name: lzo
Version: 2.08
Version: 2.10
Release: 14%{?dist}
Summary: Data compression library with very fast (de)compression
Group: System Environment/Libraries
License: GPLv2+
License: gpl-2.0-or-later
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: make
BuildRequires: gcc
BuildRequires: zlib-devel
%description
@ -21,7 +23,6 @@ while still decompressing at this very high speed.
%package minilzo
Summary: Mini version of lzo for apps which don't need the full version
Group: System Environment/Libraries
%description minilzo
A small (mini) version of lzo for embedding into applications which don't need
@ -30,7 +31,6 @@ full blown lzo compression support.
%package devel
Summary: Development files for the lzo library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-minilzo = %{version}-%{release}
Requires: zlib-devel
@ -42,32 +42,26 @@ This package contains development files needed for lzo.
%prep
%setup -q
%patch0 -p1 -z .configure
%patch1 -p1 -z .rhbz1309225
%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
# remove objects
rm -rf asm/i386/obj
%build
# workaround for annocheck
export CCASFLAGS="--generate-missing-build-notes=yes"
%configure --disable-dependency-tracking --disable-static --enable-shared
make %{?_smp_mflags}
%{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
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{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
@ -79,42 +73,85 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/lzo
make check test
%clean
rm -rf $RPM_BUILD_ROOT
%ldconfig_scriptlets
%ldconfig_scriptlets minilzo
%files
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc AUTHORS THANKS NEWS
%{_libdir}/liblzo2.so.*
%files minilzo
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc minilzo/README.LZO
%{_libdir}/libminilzo.so.0
%files devel
%defattr(-,root,root,-)
%doc doc/LZOAPI.TXT doc/LZO.FAQ doc/LZO.TXT
%{_includedir}/lzo
%{_libdir}/lib*lzo*.so
%{_libdir}/pkgconfig/lzo2.pc
%changelog
* Tue Oct 9 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.08-14
- Added build notes to AS generated objects
Resolves: rhbz#1630594
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.10-14
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Jul 27 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.08-13
- Dropped unused patches
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.10-13
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Dec 12 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2.10-11
- Converted license tag to SPDX
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Mar 02 2020 Michael Cronenworth <mike@cchtml.com> - 2.10-2
- Disable -fno-strict-aliasing (RHBZ#1807737)
* Sun Feb 9 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2.10-1
- Update to 2.10
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.08-12
- Switch to %%ldconfig_scriptlets

36
plans.fmf Normal file
View File

@ -0,0 +1,36 @@
/tier1-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/lzo.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://src.fedoraproject.org/tests/lzo.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/lzo.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://src.fedoraproject.org/tests/lzo.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/lzo.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://src.fedoraproject.org/tests/lzo.git
name: /plans/others/public

View File

@ -1 +1 @@
SHA512 (lzo-2.08.tar.gz) = d03ae521000d69dd1fc92112a7b6e642c388b2898d7fb6ac4168e947a895e8d5e77199f78f05e036cefe02f346ea242bca694522f3c7959ab6ca19de956162dd
SHA512 (lzo-2.10.tar.gz) = a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4