openeuler-ci-bot
Gitee
commit
67285ef743
@ -1,37 +0,0 @@
|
||||
From 3761d42e4fe563ad893f14468e98bd1f5a807604 Mon Sep 17 00:00:00 2001
|
||||
From: Ralph Boehme <slow@samba.org>
|
||||
Date: Tue, 17 Jul 2018 12:54:29 +0200
|
||||
Subject: [PATCH 03/27] tevent: fix CID 1437976 dereference before null check
|
||||
|
||||
Signed-off-by: Ralph Boehme <slow@samba.org>
|
||||
Reviewed-by: Volker Lendecke <vl@samba.org>
|
||||
Signed-off-by: root <root@localhost.localdomain>
|
||||
---
|
||||
tevent_threads.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tevent_threads.c b/tevent_threads.c
|
||||
index 21a9b686ba9..a89990f231a 100644
|
||||
--- a/tevent_threads.c
|
||||
+++ b/tevent_threads.c
|
||||
@@ -473,7 +473,7 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx,
|
||||
#ifdef HAVE_PTHREAD
|
||||
const char *create_location = im->create_location;
|
||||
struct tevent_context *main_ev = NULL;
|
||||
- struct tevent_wrapper_glue *glue = tctx->event_ctx->wrapper.glue;
|
||||
+ struct tevent_wrapper_glue *glue = NULL;
|
||||
int ret, wakeup_fd;
|
||||
|
||||
ret = pthread_mutex_lock(&tctx->event_ctx_mutex);
|
||||
@@ -492,6 +492,8 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx,
|
||||
return;
|
||||
}
|
||||
|
||||
+ glue = tctx->event_ctx->wrapper.glue;
|
||||
+
|
||||
if ((im->event_ctx != NULL) || (handler == NULL)) {
|
||||
abort();
|
||||
}
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 0da2e9c215f882ea4c331ac4f17738913beb7404 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@samba.org>
|
||||
Date: Mon, 14 Jan 2019 11:59:59 +0100
|
||||
Subject: [PATCH 21/27] lib:tevent: Use correct C99 initializer for tevent_req
|
||||
|
||||
Signed-off-by: Andreas Schneider <asn@samba.org>
|
||||
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
||||
Signed-off-by: root <root@localhost.localdomain>
|
||||
---
|
||||
tevent_req.c | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tevent_req.c b/tevent_req.c
|
||||
index 76e27b8f7e9..7821d9ae734 100644
|
||||
--- a/tevent_req.c
|
||||
+++ b/tevent_req.c
|
||||
@@ -84,10 +84,12 @@ struct tevent_req *_tevent_req_create(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
*req = (struct tevent_req) {
|
||||
- .internal.private_type = type,
|
||||
- .internal.create_location = location,
|
||||
- .internal.state = TEVENT_REQ_IN_PROGRESS,
|
||||
- .internal.trigger = tevent_create_immediate(req)
|
||||
+ .internal = {
|
||||
+ .private_type = type,
|
||||
+ .create_location = location,
|
||||
+ .state = TEVENT_REQ_IN_PROGRESS,
|
||||
+ .trigger = tevent_create_immediate(req),
|
||||
+ },
|
||||
};
|
||||
|
||||
data = talloc_zero_size(req, data_size);
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -1,22 +1,20 @@
|
||||
%{!?python3_sitearch: %define python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
|
||||
Name: libtevent
|
||||
Version: 0.9.37
|
||||
Release: 4
|
||||
Summary: Tevent is an event system based on the talloc memory management library.
|
||||
License: LGPLv3+
|
||||
URL: http://tevent.samba.org
|
||||
Source0: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
|
||||
Name: libtevent
|
||||
Version: 0.10.1
|
||||
Release: 1
|
||||
Summary: Tevent is an event system based on the talloc memory management library.
|
||||
License: LGPLv3+
|
||||
URL: http://tevent.samba.org
|
||||
Source0: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
|
||||
|
||||
Patch6000: 6000-tevent-fix-CID-1437976-dereference-before-null-check.patch
|
||||
Patch6001: 6001-tevent-fix-CID-1437974-dereference-after-null-check.patch
|
||||
Patch6002: 6002-lib-tevent-Use-correct-C99-initializer-for-tevent_re.patch
|
||||
Patch0: tevent-fix-CID-1437974-dereference-after-null-check.patch
|
||||
|
||||
BuildRequires: gcc libtirpc-devel docbook-style-xsl doxygen libxslt git
|
||||
BuildRequires: python2-devel python2-talloc-devel >= 2.1.0 libtalloc-devel >= 2.1.0
|
||||
BuildRequires: python3-devel python3-talloc-devel >= 2.0.7
|
||||
BuildRequires: libtalloc-devel >= 2.2.0
|
||||
BuildRequires: python3-devel python3-talloc-devel >= 2.2.0
|
||||
|
||||
Provides: bundled(libreplace)
|
||||
Provides: bundled(libreplace)
|
||||
|
||||
|
||||
%description
|
||||
@ -32,15 +30,6 @@ Requires: libtalloc-devel%{?_isa} >= 2.0.7 pkgconfig
|
||||
%description devel
|
||||
Libraries and header files for tevent
|
||||
|
||||
%package -n python2-tevent
|
||||
Summary: Python 2 libraries files for tevent
|
||||
Requires: libtevent%{?_isa} = %{version}-%{release}
|
||||
|
||||
%{?python_provide:%python_provide python2-tevent}
|
||||
|
||||
%description -n python2-tevent
|
||||
Python2 libraries files for tevent
|
||||
|
||||
%package -n python3-tevent
|
||||
Summary: Python 3 libraries files for tevent
|
||||
Requires: libtevent%{?_isa} = %{version}-%{release}
|
||||
@ -61,10 +50,7 @@ Man for tevent
|
||||
%autosetup -n tevent-%{version} -p1 -Sgit
|
||||
|
||||
%build
|
||||
|
||||
pathfix.py -npi %{__python2} buildtools/bin/waf
|
||||
|
||||
%configure --disable-rpath --bundled-libraries=NONE --builtin-libraries=replace --extra-python=%{__python3}
|
||||
%configure --disable-rpath --bundled-libraries=NONE --builtin-libraries=replace
|
||||
|
||||
%make_build V=1
|
||||
doxygen doxy.config
|
||||
@ -79,9 +65,6 @@ cp -a ./doc/man/* $RPM_BUILD_ROOT/%{_mandir}/
|
||||
%check
|
||||
%make_build check
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%{_libdir}/libtevent.so.*
|
||||
|
||||
@ -90,9 +73,6 @@ cp -a ./doc/man/* $RPM_BUILD_ROOT/%{_mandir}/
|
||||
%{_libdir}/libtevent.so
|
||||
%{_libdir}/pkgconfig/tevent.pc
|
||||
|
||||
%files -n python2-tevent
|
||||
%{python2_sitearch}/*
|
||||
|
||||
%files -n python3-tevent
|
||||
%{python3_sitearch}/*
|
||||
|
||||
@ -102,5 +82,11 @@ cp -a ./doc/man/* $RPM_BUILD_ROOT/%{_mandir}/
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 17 2020 sunshihao <sunshihao@huawei.com> - 0.10.1-1
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:update tevent to 0.10.1
|
||||
|
||||
* Tue Sep 3 2019 wubo<wubo40@huawei.com> - 0.9.37-4
|
||||
- Package init
|
||||
|
||||
BIN
tevent-0.10.1.tar.gz
Normal file
BIN
tevent-0.10.1.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -19,18 +19,18 @@ Signed-off-by: root <root@localhost.localdomain>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tevent_wrapper.c b/tevent_wrapper.c
|
||||
index 05c4c06968a..a07696af0a4 100644
|
||||
index a0e915f..f431e8f 100644
|
||||
--- a/tevent_wrapper.c
|
||||
+++ b/tevent_wrapper.c
|
||||
@@ -347,7 +347,7 @@ struct tevent_context *_tevent_context_wrapper_create(struct tevent_context *mai
|
||||
@@ -339,7 +339,7 @@ struct tevent_context *_tevent_context_wrapper_create(struct tevent_context *mai
|
||||
/*
|
||||
* wrappers conflict with nesting
|
||||
* stacking of wrappers is not supported
|
||||
*/
|
||||
- tevent_debug(main_ev->wrapper.glue->main_ev, TEVENT_DEBUG_FATAL,
|
||||
+ tevent_debug(main_ev, TEVENT_DEBUG_FATAL,
|
||||
"%s: %s() conflicts with nesting\n",
|
||||
"%s: %s() stacking not allowed\n",
|
||||
__func__, location);
|
||||
errno = EINVAL;
|
||||
--
|
||||
2.19.1
|
||||
1.8.3.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user