!6 update from 0.3.111 to 0.3.112

Merge pull request !6 from linfeilong835/master

0000-libaio-install-to-destdir-slash-usr.patch

@@ -1,20 +1,22 @@
-diff -up libaio-0.3.111/src/Makefile.orig libaio-0.3.111/src/Makefile
+diff --git a/src/Makefile b/src/Makefile
---- libaio-0.3.111/src/Makefile.orig	2018-03-06 17:24:47.000000000 -0500
+index 3325ec3..f0ee30d 100644
-+++ libaio-0.3.111/src/Makefile	2018-03-07 10:44:49.148004447 -0500
+--- a/src/Makefile
-@@ -53,11 +53,11 @@ $(libname): $(libaio_sobjs) libaio.map
++++ b/src/Makefile
+@@ -58,12 +58,12 @@ $(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 644 libaio.h $(destdir)$(includedir)/libaio.h
++	install -D -m 644 libaio.a $(destdir)$(usrlibdir)/libaio.a
+ ifeq ($(ENABLE_SHARED),1)
 -	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
+ endif
  
  $(libaio_objs): libaio.h
- 

0001-libaio-arm64-ilp32.patch

@@ -1,6 +1,8 @@
---- libaio-0.3.111_old/src/libaio.h	2019-01-26 10:54:53.202000000 +0800
+diff --git a/src/libaio.h b/src/libaio.h
-+++ libaio-0.3.111/src/libaio.h	2019-01-26 12:51:37.150000000 +0800
+index 2bc24e0..f44034d 100644
-@@ -53,6 +53,7 @@
+--- a/src/libaio.h
++++ b/src/libaio.h
+@@ -54,6 +54,7 @@ typedef enum io_iocb_cmd {
  #if defined(__i386__) || (defined(__arm__) && !defined(__ARMEB__)) || \
      defined(__sh__) || defined(__bfin__) || defined(__MIPSEL__) || \
      defined(__cris__) || (defined(__riscv) && __riscv_xlen == 32) || \
@@ -8,7 +10,7 @@
      (defined(__GNUC__) && defined(__BYTE_ORDER__) && \
           __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_LONG__ == 4)
  #define PADDED(x, y)	x; unsigned y
-@@ -84,6 +85,7 @@
+@@ -85,6 +86,7 @@ typedef enum io_iocb_cmd {
        (defined(__arm__) && defined(__ARMEB__)) || \
        defined(__sparc__) || defined(__MIPSEB__) || defined(__m68k__) || \
        defined(__hppa__) || defined(__frv__) || defined(__avr32__) || \

0002-libaio-makefile-cflags.patch

@@ -1,11 +1,13 @@
---- libaio-0.3.111_old/src/Makefile	2019-01-26 10:54:53.200000000 +0800
+diff --git a/src/Makefile b/src/Makefile
-+++ libaio-0.3.111/src/Makefile	2019-01-26 11:20:44.106000000 +0800
+index 37ae219..3325ec3 100644
-@@ -3,7 +3,7 @@
+--- a/src/Makefile
++++ b/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
-+CFLAGS += $(RPM_OPT_FLAGS) -nostdlib -nostartfiles -Wall -I. -fPIC
++CFLAGS += $(RPM_OPT_FLAGS) -Wall -I. -fPIC
  SO_CFLAGS=-shared $(CFLAGS)
  L_CFLAGS=$(CFLAGS)
  LINK_FLAGS=

0003-destdir.patch

@@ -1,11 +0,0 @@
---- libaio-0.3.111_old/Makefile	2019-02-14 04:09:48.697926020 -0500
-+++ libaio-0.3.111/Makefile	2019-02-14 04:10:10.715926272 -0500
-@@ -14,7 +14,7 @@
- 	@$(MAKE) -C src
- 
- install:
--	@$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
-+	@$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(includedir) libdir=$(libdir)
- 
- check:
- 	@$(MAKE) -C harness check

0003-libaio-fix-for-x32.patch

@@ -1,6 +1,8 @@
---- libaio-0.3.111_old/src/syscall-x86_64.h	2019-02-14 04:09:48.632926019 -0500
+diff --git a/src/syscall-x86_64.h b/src/syscall-x86_64.h
-+++ libaio-0.3.111/src/syscall-x86_64.h	2019-02-14 04:14:05.585928959 -0500
+index 0eccef3..fd71da9 100644
-@@ -1,5 +1,15 @@
+--- a/src/syscall-x86_64.h
++++ b/src/syscall-x86_64.h
+@@ -1,6 +1,16 @@
 +#ifndef __NR_io_setup
  #define __NR_io_setup		206
 +#endif
@@ -16,3 +18,4 @@
 +#ifndef __NR_io_cancel
  #define __NR_io_cancel		210
 +#endif
+ #define __NR_io_pgetevents	333

libaio.spec

@@ -1,18 +1,17 @@
 Name:           libaio
-Version:        0.3.111
+Version:        0.3.112
-Release:        6
+Release:        1
 Summary:        Linux-native asynchronous I/O access library
 License:        LGPLv2+
 URL:            https://pagure.io/libaio
-Source:         http://releases.pagure.org/libaio/libaio-0.3.111.tar.gz
+Source:         https://releases.pagure.org/libaio/libaio-%{version}.tar.gz
 
 Patch0:         0000-libaio-install-to-destdir-slash-usr.patch
 Patch1:         0001-libaio-arm64-ilp32.patch
 %ifarch aarch64 aarch64_ilp32 x86_64
 Patch2:         0002-libaio-makefile-cflags.patch
 %endif
-Patch3:         0003-destdir.patch
+Patch3:         0003-libaio-fix-for-x32.patch
-Patch4:         0004-libaio-fix-for-x32.patch
 
 BuildRequires:  gcc
 
@@ -33,19 +32,12 @@ Files for libaio development
 
 %prep
 %setup -q -a 0
-%patch0   -p0 -b .install-to-destdir-slash-usr
 %patch0   -p1 -b .install-to-destdir-slash-usr
-
-%patch1   -p0 -b .arm64-ilp32
 %patch1   -p1 -b .arm64-ilp32
 %ifarch aarch64 aarch64_ilp32 x86_64
-%patch2   -p0 -b .makefile-cflags
 %patch2   -p1 -b .makefile-cflags
 %endif
-%patch3   -p0 -b .makefile-destdir
+%patch3   -p1 -b .fix-x32
-%patch3   -p1 -b .makefile-destdir
-%patch4   -p0 -b .fix-x32
-%patch4   -p1 -b .fix-x32
 
 mv %{name}-%{version} setup-%{name}-%{version}
 
@@ -74,6 +66,9 @@ rm -rf %{buildroot}%{_usr}/%{_lib}/libaio.a
 %attr(0755,root,root) %{_libdir}/libaio.so
 
 %changelog
+* Sat Jul 18 2020 volcanodragon <linfeilong@huawei.com> - 0.3.112-1
+- update from 0.3.111 to 0.3.112
+
 * Wed Jul 1 2020 Wu Bo <wubo009@163.com> - 0.3.111-6
 - rebuild package