!3 Update to 1.1.20
From: @lyn1001 Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
0b95a6d3d5
50
273.patch
50
273.patch
@ -1,50 +0,0 @@
|
|||||||
From d6507e52adcf851d8888b93f9905f0fad1052af2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Robin Lee <cheeselee@fedoraproject.org>
|
|
||||||
Date: Sun, 16 Feb 2020 02:37:42 +0800
|
|
||||||
Subject: [PATCH] Fix crashing of tests when '-Wp,-D_GLIBCXX_ASSERTIONS' is
|
|
||||||
given
|
|
||||||
|
|
||||||
If 'vec' is a vector, calling 'vec[0]' will crash the program if
|
|
||||||
'vec' is empty and '-Wp,-D_GLIBCXX_ASSERTIONS' given in CXXFLAGS.
|
|
||||||
|
|
||||||
Fixes https://github.com/gearman/gearmand/issues/272
|
|
||||||
---
|
|
||||||
libtest/cmdline.h | 4 ++--
|
|
||||||
tests/hostile.cc | 2 +-
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/libtest/cmdline.h b/libtest/cmdline.h
|
|
||||||
index 692363f6..3503bada 100644
|
|
||||||
--- a/libtest/cmdline.h
|
|
||||||
+++ b/libtest/cmdline.h
|
|
||||||
@@ -153,7 +153,7 @@ class Application {
|
|
||||||
|
|
||||||
const char* stdout_c_str() const
|
|
||||||
{
|
|
||||||
- return &_stdout_buffer[0];
|
|
||||||
+ return _stdout_buffer.size() ? &_stdout_buffer[0] : NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
libtest::vchar_t stderr_result() const
|
|
||||||
@@ -163,7 +163,7 @@ class Application {
|
|
||||||
|
|
||||||
const char* stderr_c_str() const
|
|
||||||
{
|
|
||||||
- return &_stderr_buffer[0];
|
|
||||||
+ return _stderr_buffer.size() ? &_stderr_buffer[0] : NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t stderr_result_length() const
|
|
||||||
diff --git a/tests/hostile.cc b/tests/hostile.cc
|
|
||||||
index c4c0487d..c7686206 100644
|
|
||||||
--- a/tests/hostile.cc
|
|
||||||
+++ b/tests/hostile.cc
|
|
||||||
@@ -136,7 +136,7 @@ extern "C" {
|
|
||||||
gearman_return_t rc;
|
|
||||||
void *value= gearman_client_do(&client, WORKER_FUNCTION_NAME,
|
|
||||||
NULL,
|
|
||||||
- &payload[0],
|
|
||||||
+ payload.size() ? &payload[0] : NULL,
|
|
||||||
payload.size() ? random() % payload.size() : 0,
|
|
||||||
NULL, &rc);
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
gearmand-1.1.20.tar.gz
Normal file
BIN
gearmand-1.1.20.tar.gz
Normal file
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
Name: gearmand
|
Name: gearmand
|
||||||
Version: 1.1.19.1
|
Version: 1.1.20
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: A distributed job system
|
Summary: A distributed job system
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -9,7 +9,6 @@ Source1: gearmand.init
|
|||||||
Source2: gearmand.sysconfig
|
Source2: gearmand.sysconfig
|
||||||
Source3: gearmand.service
|
Source3: gearmand.service
|
||||||
Patch0: gearmand-1.1.12-ppc64le.patch
|
Patch0: gearmand-1.1.12-ppc64le.patch
|
||||||
Patch1: https://github.com/gearman/gearmand/pull/273.patch
|
|
||||||
ExcludeArch: ppc
|
ExcludeArch: ppc
|
||||||
BuildRequires: gcc-c++ chrpath libuuid-devel boost-devel >= 1.37.0, boost-thread sqlite-devel
|
BuildRequires: gcc-c++ chrpath libuuid-devel boost-devel >= 1.37.0, boost-thread sqlite-devel
|
||||||
BuildRequires: tokyocabinet-devel libevent-devel libmemcached-devel, memcached hiredis-devel
|
BuildRequires: tokyocabinet-devel libevent-devel libmemcached-devel, memcached hiredis-devel
|
||||||
@ -45,9 +44,7 @@ Obsoletes: libgearman-1.0-devel < %{version}-%{release}
|
|||||||
Development headers for %{name}.
|
Development headers for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static --disable-silent-rules --enable-ssl
|
%configure --disable-static --disable-silent-rules --enable-ssl
|
||||||
@ -82,7 +79,7 @@ exit 0
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc AUTHORS ChangeLog HACKING THANKS
|
%doc AUTHORS ChangeLog CONTRIBUTING.md README.md THANKS
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/gearmand
|
%config(noreplace) %{_sysconfdir}/sysconfig/gearmand
|
||||||
%{_sbindir}/gearmand
|
%{_sbindir}/gearmand
|
||||||
%{_bindir}/gearman
|
%{_bindir}/gearman
|
||||||
@ -98,8 +95,7 @@ exit 0
|
|||||||
|
|
||||||
%files -n libgearman-devel
|
%files -n libgearman-devel
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc AUTHORS ChangeLog HACKING THANKS
|
%doc AUTHORS ChangeLog CONTRIBUTING.md README.md THANKS
|
||||||
%dir %{_includedir}/libgearman
|
|
||||||
%{_includedir}/libgearman/
|
%{_includedir}/libgearman/
|
||||||
%{_libdir}/pkgconfig/gearmand.pc
|
%{_libdir}/pkgconfig/gearmand.pc
|
||||||
%{_libdir}/libgearman.so
|
%{_libdir}/libgearman.so
|
||||||
@ -107,5 +103,8 @@ exit 0
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 14 2023 liyanan <thistleslyn@163.com> - 1.1.20-1
|
||||||
|
- Update to 1.1.20
|
||||||
|
|
||||||
* Tue Sep 7 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.1.19.1-1
|
* Tue Sep 7 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.1.19.1-1
|
||||||
- package init
|
- package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user