Accepting request 839657 from network:utilities

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/839657
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/memcached?expand=0&rev=49

memcached-1.6.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:908f0eecfa559129c9e44edc46f02e73afe8faca355b4efc5c86d902fc3e32f7
-size 543661

memcached-1.6.7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bbdac9b031d8cfca4a1207f28df598b90ee2e9b44667f7eabd0fe1a59ca5173
+size 547791

memcached.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Sep 28 20:29:25 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- update to 1.6.7:
+  * Dockerfile - allow override of config opts
+  * Improve page balancing when writes are bursty
+  * main: split binary protocol into proto_bin.c
+  * main: split text protocol into proto_text.c
+  * add openssl errors to SSL certificate loading error messages
+  * skip setting the resource limits in debug builds
+  * Use signal function instead of sigignore
+  * fixing the basic tls test so it exits correctly when fails
+  * net: remove most response obj cache related code
+  * net: carve response buffers from read buffers
+  * Do not join lru and slab maintainer threads if they do not exist
+  * Restore SAN entries in testing TLS certificates
+  * Changed code using strtol to use safe_strtol wrapper
+  * Fix TCP failure under OS X. 
+- drop use-signal-function-instead-of-sigignore.patch (upstream)
+
 -------------------------------------------------------------------
 Tue Sep  1 19:24:14 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 

memcached.spec

@@ -28,7 +28,7 @@
 %endif
 
 Name:           memcached
-Version:        1.6.6
+Version:        1.6.7
 Release:        0
 Summary:        A high-performance, distributed memory object caching system
 License:        BSD-3-Clause
@@ -39,8 +39,6 @@ Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Source3:        memcached-rpmlintrc
 Source4:        memcached.service
-# PATCH-FIX-UPSTREAM gh#memcached/memcached#691
-Patch:          use-signal-function-instead-of-sigignore.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cyrus-sasl-devel
@@ -90,7 +88,6 @@ This package contains development files
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 autoreconf -fi

use-signal-function-instead-of-sigignore.patch

@@ -1,85 +0,0 @@
-From c6821a866e50754181bcf14533e3d4c31be36b79 Mon Sep 17 00:00:00 2001
-From: Tomas Korbar <tkorbar@redhat.com>
-Date: Mon, 29 Jun 2020 08:56:09 +0200
-Subject: [PATCH] Use signal function instead of sigignore
-
-Sigignore has been marked as deprecated on Fedora rawhide and
-signal function is used already on multiple places in memcached.c
-
-fix #690
----
- configure.ac |  5 ++---
- memcached.c  | 16 ++--------------
- 2 files changed, 4 insertions(+), 17 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ffc98b24e..a7be211e0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -630,7 +630,6 @@ AC_CHECK_FUNCS(mlockall)
- AC_CHECK_FUNCS(getpagesizes)
- AC_CHECK_FUNCS(sysconf)
- AC_CHECK_FUNCS(memcntl)
--AC_CHECK_FUNCS(sigignore)
- AC_CHECK_FUNCS(clock_gettime)
- AC_CHECK_FUNCS(preadv)
- AC_CHECK_FUNCS(pread)
-@@ -779,7 +778,7 @@ if test "$ICC" = "yes"
- then
-    dnl ICC trying to be gcc.
-    CFLAGS="$CFLAGS -diag-disable 187 -Wall -Werror"
--   AC_DEFINE([_GNU_SOURCE],[1],[find sigignore on Linux])
-+   AC_DEFINE([_GNU_SOURCE],[1],[make sure IOV_MAX is defined])
- elif test "$GCC" = "yes"
- then
-   GCC_VERSION=`$CC -dumpversion`
-@@ -792,7 +791,7 @@ then
-     CFLAGS="$CFLAGS -fno-strict-aliasing"
-     ;;
-   esac
--  AC_DEFINE([_GNU_SOURCE],[1],[find sigignore on Linux])
-+  AC_DEFINE([_GNU_SOURCE],[1],[make sure IOV_MAX is defined])
- elif test "$SUNCC" = "yes"
- then
-   CFLAGS="$CFLAGS -errfmt=error -errwarn -errshort=tags"
-diff --git a/memcached.c b/memcached.c
-index d796abb4b..dc67267c4 100644
---- a/memcached.c
-+++ b/memcached.c
-@@ -8400,18 +8400,6 @@ static void sig_usrhandler(const int sig) {
-     stop_main_loop = GRACE_STOP;
- }
- 
--#ifndef HAVE_SIGIGNORE
--static int sigignore(int sig) {
--    struct sigaction sa = { .sa_handler = SIG_IGN, .sa_flags = 0 };
--
--    if (sigemptyset(&sa.sa_mask) == -1 || sigaction(sig, &sa, 0) == -1) {
--        return -1;
--    }
--    return 0;
--}
--#endif
--
--
- /*
-  * On systems that supports multiple page sizes we may reduce the
-  * number of TLB-misses by using the biggest available page size
-@@ -10097,7 +10085,7 @@ int main (int argc, char **argv) {
-     /* daemonize if requested */
-     /* if we want to ensure our ability to dump core, don't chdir to / */
-     if (do_daemonize) {
--        if (sigignore(SIGHUP) == -1) {
-+        if (signal(SIGHUP, SIG_IGN) == SIG_ERR) {
-             perror("Failed to ignore SIGHUP");
-         }
-         if (daemonize(maxcore, settings.verbose) == -1) {
-@@ -10247,7 +10235,7 @@ int main (int argc, char **argv) {
-      * ignore SIGPIPE signals; we can use errno == EPIPE if we
-      * need that information
-      */
--    if (sigignore(SIGPIPE) == -1) {
-+    if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
-         perror("failed to ignore SIGPIPE; sigaction");
-         exit(EX_OSERR);
-     }