Accepting request 817947 from home:AndreasStieger:branches:server:http

libev 4.33

OBS-URL: https://build.opensuse.org/request/show/817947
OBS-URL: https://build.opensuse.org/package/show/server:http/libev?expand=0&rev=31

libev-4.15_compiler_warnings.patch

@@ -2,7 +2,16 @@ Index: ev.c
 ===================================================================
 --- ev.c.orig
 +++ ev.c
-@@ -3845,7 +3845,7 @@ ev_io_start (EV_P_ ev_io *w) EV_THROW
+@@ -577,7 +577,7 @@ struct signalfd_siginfo
+  * This value is good at least till the year 4000.
+  */
+ #define MIN_INTERVAL  0.0001220703125 /* 1/2**13, good till 4000 */
+-/*#define MIN_INTERVAL  0.00000095367431640625 /* 1/2**20, good till 2200 */
++/*#define MIN_INTERVAL  0.00000095367431640625 *//* 1/2**20, good till 2200 */
+ 
+ #define MIN_TIMEJUMP   1. /* minimum timejump that gets detected (if monotonic clock available) */
+ #define MAX_BLOCKTIME  59.743 /* never wait longer than this time (to detect time jumps) */
+@@ -4351,7 +4351,7 @@ ev_io_start (EV_P_ ev_io *w) EV_NOEXCEPT
    /* common bug, apparently */
    assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
  
@@ -11,7 +20,7 @@ Index: ev.c
    w->events &= ~EV__IOFDSET;
  
    EV_FREQUENT_CHECK;
-@@ -5086,8 +5086,8 @@ ev_walk (EV_P_ int types, void (*cb)(EV_
+@@ -5616,8 +5616,8 @@ ev_walk (EV_P_ int types, void (*cb)(EV_
            wl = wn;
          }
  #endif
@@ -22,3 +31,16 @@ Index: ev.c
  }
  #endif
  
+Index: ev_iouring.c
+===================================================================
+--- ev_iouring.c.orig
++++ ev_iouring.c
+@@ -295,7 +295,7 @@ iouring_sqe_submit (EV_P_ struct io_urin
+   EV_SQ_ARRAY [idx] = idx;
+   ECB_MEMORY_FENCE_RELEASE;
+   ++EV_SQ_VAR (tail);
+-  /*ECB_MEMORY_FENCE_RELEASE; /* for the time being we assume this is not needed */
++  /*ECB_MEMORY_FENCE_RELEASE; *//* for the time being we assume this is not needed */
+   ++iouring_to_submit;
+ }
+ 

libev-4.27.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e
-size 556658

libev-4.33-nonvoid-return.patch

@@ -0,0 +1,22 @@
+Index: libev-4.33/ev_iouring.c
+===================================================================
+--- libev-4.33.orig/ev_iouring.c
++++ libev-4.33/ev_iouring.c
+@@ -287,7 +287,7 @@ iouring_sqe_get (EV_P)
+ }
+ 
+ inline_size
+-struct io_uring_sqe *
++void
+ iouring_sqe_submit (EV_P_ struct io_uring_sqe *sqe)
+ {
+   unsigned idx = sqe - EV_SQES;
+@@ -313,7 +313,7 @@ iouring_tfd_cb (EV_P_ struct ev_io *w, i
+ 
+ /* called for full and partial cleanup */
+ ecb_cold
+-static int
++static void
+ iouring_internal_destroy (EV_P)
+ {
+   close (iouring_tfd);

libev-4.33.tar.gz.sig

@@ -0,0 +1,2 @@
+untrusted comment: verify with dist.schmorp.de.pub
+RWSUBDizLm/GKUmIcR8BOw/6a/jcHO2l5Nz/fiZjqfL9B6GWcU3sHGCzBCclRe47gMd0xWvaGmIcxaXL8XVNA1/9qpLPJQ9Z9Q8=

libev.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jun 30 21:30:24 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 4.33:
+  * New feature ev_io_modify can modify the event watch mask in
+    I/O watchers without incurring overhead from changed fd
+- includes changes from 4.31:
+  * new backend iouring using new event polling mechanism in
+    Linux 4.18
+  * take advantage of timerfds to detect time jumps
+- add libev-4.33-nonvoid-return.patch to fix build
+- add signify (bsd) based source verification
+
 -------------------------------------------------------------------
 Wed Jul 17 18:10:28 UTC 2019 - pgajdos@suse.com
 

libev.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libev
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,24 @@
 
 %define library_name libev4
 Name:           libev
-Version:        4.27
+Version:        4.33
 Release:        0
 Summary:        An event loop library
 License:        BSD-2-Clause
 Group:          Development/Libraries/C and C++
-Url:            http://software.schmorp.de/pkg/libev.html
-Source:         http://dist.schmorp.de/%{name}/%{name}-%{version}.tar.gz
+URL:            http://software.schmorp.de/pkg/libev.html
+Source:         http://dist.schmorp.de/%{name}/Attic/%{name}-%{version}.tar.gz
 # Upstream has received patches to add pkg-config support for years but it always ignored them (yes, no answer at all). But since every distribution creates it we just follow.
 Source1:        libev.pc
+Source2:        http://dist.schmorp.de/%{name}/Attic/%{name}-%{version}.tar.gz.sig
+Source3:        http://dist.schmorp.de/signing-key.pub
 Source99:       baselibs.conf
 Patch0:         libev-4.15_compiler_warnings.patch
+Patch1:         libev-4.33-nonvoid-return.patch
 BuildRequires:  pkgconfig
+%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500
+BuildRequires:  signify
+%endif
 
 %description
 An event loop that is loosely modeled after libevent.
@@ -66,8 +72,12 @@ available.
 This package holds the development files for libev.
 
 %prep
+%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500
+signify -V -p %{SOURCE3} -m %{SOURCE0}
+%endif
 %setup -q
 %patch0
+%patch1 -p1
 
 %build
 CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused"
@@ -93,12 +103,13 @@ cp %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/libev.pc
 %postun -n %{library_name} -p /sbin/ldconfig
 
 %files devel
-%doc LICENSE README ev.pod Changes
+%license LICENSE
+%doc README ev.pod Changes
 %{_includedir}/ev++.h
 %{_includedir}/ev.h
 %{_includedir}/event.h
 %{_libdir}/libev.so
-%{_mandir}/man3/ev.3*
+%{_mandir}/man3/ev.3%{?ext_man}
 %{_libdir}/pkgconfig/libev.pc
 
 %files -n %{library_name}

signing-key.pub

@@ -0,0 +1,2 @@
+untrusted comment: openbsd signify key for dist.schmorp.de, data.schmorp.de
+RWSUBDizLm/GKdlJp8Fr7pMD3pQbONEk+IqVldf+mQn0pYmkiCRDa22s