From e77241ff38f54dea845463f8bbb5391932795adf8f5a15952028d8e842409791 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 28 May 2019 09:11:09 +0000 Subject: [PATCH] Accepting request 705710 from home:dmdiss:libevent_2.1.10 - Update to 2.1.10 stable - rename python2-shebang.patch -> python3-shebang.patch following port OBS-URL: https://build.opensuse.org/request/show/705710 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libevent?expand=0&rev=39 --- baselibs.conf | 2 +- libevent-2.1.10-stable.tar.gz | 3 ++ libevent-2.1.10-stable.tar.gz.asc | 11 ++++ libevent-2.1.8-stable.tar.gz | 3 -- libevent-2.1.8-stable.tar.gz.asc | 11 ---- libevent.changes | 54 +++++++++++++++++++ libevent.spec | 8 +-- ...on2-shebang.patch => python3-shebang.patch | 22 ++++---- 8 files changed, 85 insertions(+), 29 deletions(-) create mode 100644 libevent-2.1.10-stable.tar.gz create mode 100644 libevent-2.1.10-stable.tar.gz.asc delete mode 100644 libevent-2.1.8-stable.tar.gz delete mode 100644 libevent-2.1.8-stable.tar.gz.asc rename python2-shebang.patch => python3-shebang.patch (54%) diff --git a/baselibs.conf b/baselibs.conf index 5625877..79d10fc 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libevent-2_1-8 +libevent-2_1-10 diff --git a/libevent-2.1.10-stable.tar.gz b/libevent-2.1.10-stable.tar.gz new file mode 100644 index 0000000..527f0e2 --- /dev/null +++ b/libevent-2.1.10-stable.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e864af41a336bb11dab1a23f32993afe963c1f69618bd9292b89ecf6904845b0 +size 1074897 diff --git a/libevent-2.1.10-stable.tar.gz.asc b/libevent-2.1.10-stable.tar.gz.asc new file mode 100644 index 0000000..7060968 --- /dev/null +++ b/libevent-2.1.10-stable.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEnjrIOieXS4TRs0AduGCGhI74aG0FAlzpsLcACgkQuGCGhI74 +aG3kIwgAhHPbAWf0JTLZWGin/om10nA7dvS8+JB5tUNBcN5rWeo7vR7o6rFvhe1e +Trtx90U99qzhjRhGU64IVp/AhaSBmE52Rar1nBu/zbAejmxUEz57FYwlBgSrtZbm +gKX+xTaTEyTUU4c82iM2EnJRtDN7rf5ygrYPgqaQ3QXt9gaf9mWAbTs/XMLptRYi +/PLlndXCPYa7PVExQKDwehebWD3+W6Y4HZCugHi/IjKumVtD3uGluU68U1tW/0WJ +aUUF2AFW+ftvqs9VKfqbiqR8XreiA2+NRnpnbB5cJxHjBybG4HttiTE9OF/ENSRO +dkKV7k94N+DRbFZn1QIHAt11tolt4A== +=LcaB +-----END PGP SIGNATURE----- diff --git a/libevent-2.1.8-stable.tar.gz b/libevent-2.1.8-stable.tar.gz deleted file mode 100644 index e0edc49..0000000 --- a/libevent-2.1.8-stable.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2 -size 1026485 diff --git a/libevent-2.1.8-stable.tar.gz.asc b/libevent-2.1.8-stable.tar.gz.asc deleted file mode 100644 index 7af6586..0000000 --- a/libevent-2.1.8-stable.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEnjrIOieXS4TRs0AduGCGhI74aG0FAliON3sACgkQuGCGhI74 -aG3xjAf9HAOYjCEfqzHFsEmycNOJ7QJRmd7yN+erfP07ftMFOMePXfhRCbFXqooP -hqZC2pErS8cHaqG3CVWXO6HeQy9f7Eazp/ssO69NW71XEdynSMAxNYi9nY+zGUjS -oecSx2fZmH8+yN4ZdXvtA6UvWoOEFw8jBQShHSHvz6Hk3kBK5aAKuogtmHe3Yp9K -ihKKm3SNBJK8nkf+U/6Qa5KSlMZmhagpiXnN/jMiYlCGcHSdj7OFr5pezdTRlLrp -EO/dTQW4x9M/gqA2KO+jbCgGsyF1yKPYTKo9BKhkmiQledrnL4Emky4inI+XvKDe -tY/5jjUxATojzOKDsYqJWliZH6NjMA== -=aV3q ------END PGP SIGNATURE----- diff --git a/libevent.changes b/libevent.changes index aa75a6f..e07dc2d 100644 --- a/libevent.changes +++ b/libevent.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Mon May 27 16:37:28 UTC 2019 - David Disseldorp + +- Update to 2.1.10 stable + * evdns: add DNS_OPTION_NAMESERVERS_NO_DEFAULT / + EVDNS_BASE_NAMESERVERS_NO_DEFAULT + * Add support for EV_TIMEOUT to event_base_active_by_fd + * kqueue: Avoid undefined behaviour. + * Prevent integer overflow in kq_build_changes_list. + * evdns: fix lock/unlock mismatch in evdns_close_server_port() + * Protect min_heap_push_ against integer overflow. + * le-proxy: initiate use of the Winsock DLL + * Fix leaks in error path of the bufferevent_init_common_() + * buffer: make evbuffer_prepend() of zero-length array no-op + * Don't loose top error in SSL + * Remove needless check for arc4_seeded_ok + * Cleanup __func__ detection + * Add convenience macros for user-triggered events + * Notify event base if there are no more events, so it can exit without + delay + * Fix base unlocking in event_del() if event_base_set() runned in another + thread + * If precise_time is false, we should not set EVENT_BASE_FLAG_PRECISE_TIMER + * Fix race in access to ev_res from event loop with event_active() + * Return from event_del() after the last event callback termination + * Preserve socket error from listen across closesocket cleanup + * fix connection retries when there more then one request for connection + * improve error path for bufferevent_{setfd,enable,disable}() + * Fix conceivable UAF of the bufferevent in evhttp_connection_free() + * Fix evhttp_connection_get_addr() fox incomming http connections + * fix leaks in evhttp_uriencode() + * CONNECT method only takes an authority + * Allow bodies for GET/DELETE/OPTIONS/CONNECT + * Do not crash when evhttp_send_reply_start() is called after a timeout. + * Fix crashing http server when callback do not reply in place + * fix handling of close_notify (ssl) in http with openssl bufferevents + * use *_new_with_arg() to match function prototype + * avoid NULL dereference on request is not EVHTTP_REQ_POST + * bufferevent_socket_connect{,_hostname}() missing event callback and use + ret code + * don't fail be_null_filter if bytes are copied + * Call underlying bev ctrl GET_FD on filtered bufferevents + * be_openssl: avoid leaking of SSL structure + * Add missing includes into openssl-compat.h + * Explicitly call SSL_clear when reseting the fd. + * sample/https-client: use host SSL certificate store by default + * ipv6only socket bind support + * evdns: handle NULL filename explicitly + * Fix assert() condition in evbuffer_drain() for IOCP + * fix incorrect unlock of the buffer mutex (for deferred callbacks) + * Fix wrong assert in evbuffer_drain() + * Port `event_rpcgen.py` and `test/check-dumpevents.py` to Python 3. +- rename python2-shebang.patch -> python3-shebang.patch following port + ------------------------------------------------------------------- Tue Jul 10 16:19:03 UTC 2018 - mrostecki@suse.com diff --git a/libevent.spec b/libevent.spec index 7fdeaf3..b4c5634 100644 --- a/libevent.spec +++ b/libevent.spec @@ -1,7 +1,7 @@ # # spec file for package libevent # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libevent %define version_base 2 %define version_minor 1 -%define version_release 8 +%define version_release 10 %define abi_release 6 %define version_suffix stable %define libsoname %{name}-%{version_base}_%{version_minor}-%{version_release} @@ -35,7 +35,7 @@ Source1: https://github.com/%{name}/%{name}/releases/download/release-%{v Source2: %{name}.keyring Source3: libevent-rpmlintrc Source99: baselibs.conf -Patch0: python2-shebang.patch +Patch0: python3-shebang.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool diff --git a/python2-shebang.patch b/python3-shebang.patch similarity index 54% rename from python2-shebang.patch rename to python3-shebang.patch index ae6a765..ddbb009 100644 --- a/python2-shebang.patch +++ b/python3-shebang.patch @@ -1,27 +1,29 @@ From 293f2e5274ff62edcc1d49ba5439af3d986dfe3b Mon Sep 17 00:00:00 2001 From: Michal Rostecki Date: Tue, 12 Jun 2018 16:41:36 +0200 -Subject: [PATCH] Use python2 instead of env as an interpreter +Subject: [PATCH] Use python3 instead of env as an interpreter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the rpm runtime dependency detection to work, the shebang -`#!/usr/bin/env python2` needs to be patched into -´#!/usr/bin/python2`, otherwise the package dependency generator +`#!/usr/bin/env python3` needs to be patched into +´#!/usr/bin/python3`, otherwise the package dependency generator merely adds a dependency on /usr/bin/env rather than the actual -interpreter /usr/bin/python2. +interpreter /usr/bin/python3. + +[ddiss@suse.de: python2 -> python3] --- event_rpcgen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/event_rpcgen.py b/event_rpcgen.py -index 9baf73026..0cf34f08a 100755 ---- a/event_rpcgen.py -+++ b/event_rpcgen.py +Index: libevent-2.1.10-stable/event_rpcgen.py +=================================================================== +--- libevent-2.1.10-stable.orig/event_rpcgen.py ++++ libevent-2.1.10-stable/event_rpcgen.py @@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/python2 +-#!/usr/bin/env python ++#!/usr/bin/python3 # # Copyright (c) 2005-2007 Niels Provos # Copyright (c) 2007-2012 Niels Provos and Nick Mathewson