diff --git a/.gitignore b/.gitignore index 224f4c2..1e7032a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/libaio-0.3.112.tar.gz -/libaio-0.3.112.tar.gz +libaio-0.3.111.tar.gz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 19980d4..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.openstack-tier1-gating.functional} diff --git a/libaio-install-to-destdir-slash-usr.patch b/libaio-install-to-destdir-slash-usr.patch new file mode 100644 index 0000000..aebc175 --- /dev/null +++ b/libaio-install-to-destdir-slash-usr.patch @@ -0,0 +1,20 @@ +diff -up libaio-0.3.111/src/Makefile.orig libaio-0.3.111/src/Makefile +--- libaio-0.3.111/src/Makefile.orig 2018-03-06 17:24:47.000000000 -0500 ++++ libaio-0.3.111/src/Makefile 2018-03-07 10:44:49.148004447 -0500 +@@ -53,11 +53,11 @@ $(libname): $(libaio_sobjs) libaio.map + $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) + + install: $(all_targets) +- install -D -m 644 libaio.h $(includedir)/libaio.h +- install -D -m 644 libaio.a $(libdir)/libaio.a +- install -D -m 755 $(libname) $(libdir)/$(libname) +- ln -sf $(libname) $(libdir)/$(soname) +- ln -sf $(libname) $(libdir)/libaio.so ++ install -D -m 644 libaio.h $(destdir)$(includedir)/libaio.h ++ install -D -m 644 libaio.a $(destdir)$(usrlibdir)/libaio.a ++ install -D -m 755 $(libname) $(destdir)$(usrlibdir)/$(libname) ++ ln -sf $(libname) $(destdir)$(usrlibdir)/$(soname) ++ ln -sf $(libname) $(destdir)$(usrlibdir)/libaio.so + + $(libaio_objs): libaio.h + diff --git a/libaio-remove-nostartfiles-nostdlib-from-build-flags.patch b/libaio-remove-nostartfiles-nostdlib-from-build-flags.patch new file mode 100644 index 0000000..2f79681 --- /dev/null +++ b/libaio-remove-nostartfiles-nostdlib-from-build-flags.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile b/src/Makefile +index eadb336..5911c81 100644 +--- libaio-0.3.111/src/Makefile ++++ libaio-0.3.111/src/Makefile +@@ -3,7 +3,7 @@ includedir=$(prefix)/include + libdir=$(prefix)/lib + + CFLAGS ?= -g -fomit-frame-pointer -O2 +-CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC ++CFLAGS += -Wall -I. -fPIC + SO_CFLAGS=-shared $(CFLAGS) + L_CFLAGS=$(CFLAGS) + LINK_FLAGS= diff --git a/libaio.spec b/libaio.spec index 770efdd..eeb691e 100644 --- a/libaio.spec +++ b/libaio.spec @@ -1,10 +1,15 @@ Name: libaio -Version: 0.3.112 -Release: 1%{?dist} +Version: 0.3.111 +Release: 22%{?dist} Summary: Linux-native asynchronous I/O access library -License: LGPLv2+ -Group: System Environment/Libraries -Source: https://releases.pagure.org/libaio/%{name}-%{version}.tar.gz +License: LGPL-2.0-or-later +Source: http://releases.pagure.org/libaio/libaio-0.3.111.tar.gz + +Patch1: libaio-install-to-destdir-slash-usr.patch +Patch2: libaio-remove-nostartfiles-nostdlib-from-build-flags.patch + +BuildRequires: gcc +BuildRequires: make %description The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a @@ -19,8 +24,7 @@ require the Linux-native async I/O API. %package devel Summary: Development files for Linux-native asynchronous I/O access -Group: Development/System -Requires: libaio +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides header files to include and libraries to link with @@ -28,9 +32,17 @@ for the Linux-native asynchronous I/O facility ("async I/O", or "aio"). %prep %setup -q -a 0 +%patch1 -p0 -b .install-to-destdir-slash-usr +%patch1 -p1 -b .install-to-destdir-slash-usr +%patch2 -p0 -b .nostdlib +%patch2 -p1 -b .nostdlib mv %{name}-%{version} compat-%{name}-%{version} %build +# This package uses ASMs to implement symbol versioning and is thus +# incompatible with LTO +%define _lto_cflags %{nil} + # A library with a soname of 1.0.0 was inadvertantly released. This # build process builds a version of the library with the broken soname in # the compat-libaio-0.3.103 directory, and then builds the library again @@ -42,37 +54,97 @@ cd .. make %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT cd compat-%{name}-%{version} install -D -m 755 src/libaio.so.1.0.0 \ $RPM_BUILD_ROOT/%{usrlibdir}/libaio.so.1.0.0 cd .. -make install DESTDIR=$RPM_BUILD_ROOT prefix=/usr libdir=/%{_libdir} \ - includedir=%{_includedir} +make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{libdir} usrlibdir=%{usrlibdir} \ + includedir=%{_includedir} install -find %{buildroot} -name '*.a' -exec rm -f {} ';' +find %{buildroot} -name '*.a' -delete %ldconfig_scriptlets %files +%license COPYING %attr(0755,root,root) %{usrlibdir}/libaio.so.* -%doc COPYING TODO %files devel %attr(0644,root,root) %{_includedir}/* %attr(0755,root,root) %{usrlibdir}/libaio.so %changelog -* Mon Jun 3 2019 Jeff Moyer - 0.3.112-1.el8 -- rebase to 0.3.112 - - main feature: async poll support -- Resolves: rhbz#1645556 +* Wed Dec 11 2024 Jeff Moyer - 0.3.111-22 +- Bump release to trigger new test run. +- Resolves: RHEL-70741 -* Wed Sep 26 2018 Jeff Moyer - 0.3.110-12.el8 +* Tue Oct 29 2024 Troy Dawson - 0.3.111-21 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 0.3.111-20 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.3.111-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.3.111-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Oct 13 2023 Jeff Moyer - 0.3.111-17 +- migrated to SPDX license (Jeff Moyer) + +* Thu Jul 20 2023 Fedora Release Engineering - 0.3.111-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.3.111-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.3.111-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.3.111-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.3.111-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.3.111-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Aug 07 2020 Jeff Law - 0.3.111-10 +- Disable LTO + +* Sat Aug 01 2020 Fedora Release Engineering - 0.3.111-9 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.3.111-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.3.111-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.3.111-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Mar 13 2019 Paolo Bonzini - 0.3.111-5 - Pass in the distro-provided CFLAGS and LFLAGS. (Jeff Moyer) - Get rid of -nostartfiles -nostdlib (Jeff Moyer) - Resolves: rhbz#1630578 +* Fri Feb 01 2019 Fedora Release Engineering - 0.3.111-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 17 2018 Peter Robinson 0.3.111-3 +- Spec cleanup + +* Fri Jul 13 2018 Fedora Release Engineering - 0.3.111-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Mar 07 2018 Jeff Moyer - 0.3.111-1 +- import 0.3.111, which adds support for preadv2,pwritev2, riscv (Jeff Moyer) + * Wed Feb 07 2018 Fedora Release Engineering - 0.3.110-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -242,7 +314,7 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' - change a #include from to . Fixes a build issue on s390. -* Wed Jul 7 2003 Bill Nottingham 0.3.96-3 +* Wed Jul 9 2003 Bill Nottingham 0.3.96-3 - fix paths on lib64 arches * Wed Jun 18 2003 Michael K. Johnson 0.3.96-2 @@ -263,7 +335,7 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' - add powerpc support from Gianni Tedesco - add s/390 support from Arnd Bergmann -* Fri Sep 12 2002 Benjamin LaHaise +* Fri Sep 13 2002 Benjamin LaHaise - libaio 0.3.92 test release - build on x86-64 @@ -286,7 +358,7 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' * Mon Apr 15 2002 Tim Powers - make the post scriptlet not use /bin/sh -* Sat Apr 12 2002 Benjamin LaHaise +* Fri Apr 12 2002 Benjamin LaHaise - add /lib/libredhat-kernel* to %%files. * Fri Apr 12 2002 Benjamin LaHaise diff --git a/sources b/sources index ba9cc9f..95f97e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libaio-0.3.112.tar.gz) = 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa +SHA512 (libaio-0.3.111.tar.gz) = 440f2b62f99ca2e72ffc8c2c04b4779a1a7cf24a8ba2a30b34d18b4ee77630a2078610fe8c435559f81a5c3bfa93049bd53d77464a0da8267833fbde3f40ceeb