[gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/files/

[Robin H. Johnson]

commit:     27a1811ec6e1d20bc0835105a157e757f2a74dec
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 00:30:39 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 00:30:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27a1811e

net-misc/memcached: fix bashism in memcached initd

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 net-misc/memcached/files/memcached.init2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/memcached/files/memcached.init2 b/net-misc/memcached/files/memcached.init2
index 4bdfec6b945..412e8e0a953 100644
--- a/net-misc/memcached/files/memcached.init2
+++ b/net-misc/memcached/files/memcached.init2
@@ -10,7 +10,7 @@ if [ -n "${CONF}" ]; then
     PIDFILE="${PIDBASE}.${CONF}.pid"
     CONFSRC="${CONFBASE}.${CONF}"
     if [ -f "${CONFSRC}" ]; then
-        source "${CONFSRC}"
+        . "${CONFSRC}"
     else
         eerror "The configuration file $CONFSRC was not found!"
     fi

[gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/files/

[Aaron Bauman]

commit:     d766603ba4c7e66fb838445f6bdc8ab46a878aac
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 10 18:07:14 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 22:40:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d766603b

net-misc/memcached: remove unused patches

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16169
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../memcached/files/memcached-1.6.0-gcc10.patch    | 34 ---------------
 .../memcached/files/memcached-1.6.5-ia64.patch     | 51 ----------------------
 2 files changed, 85 deletions(-)

diff --git a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch b/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
deleted file mode 100644
index d250b31e912..00000000000
--- a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Subject: [PATCH] crc32c: fix multiple definitions
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-By: Toralf Förster <toralf@gentoo.org>
-Bug: https://bugs.gentoo.org/711982
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.c memcached-1.6.0/crc32c.c
---- memcached-1.6.0.orig/crc32c.c	2019-10-21 01:48:04.000000000 -0700
-+++ memcached-1.6.0/crc32c.c	2020-03-10 22:19:07.610247164 -0700
-@@ -390,6 +390,7 @@
- #endif
- /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
-    version.  Otherwise, use the software version. */
-+crc_func crc32c;
- void crc32c_init(void) {
-     #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-     int sse42;
-diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.h memcached-1.6.0/crc32c.h
---- memcached-1.6.0.orig/crc32c.h	2019-10-21 01:48:04.000000000 -0700
-+++ memcached-1.6.0/crc32c.h	2020-03-10 22:17:12.086974212 -0700
-@@ -2,7 +2,7 @@
- #define    CRC32C_H
- 
- typedef uint32_t (*crc_func)(uint32_t crc, const void *buf, size_t len);
--crc_func crc32c;
-+extern crc_func crc32c;
- 
- void crc32c_init(void);
- 

diff --git a/net-misc/memcached/files/memcached-1.6.5-ia64.patch b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
deleted file mode 100644
index 5a73913b92e..00000000000
--- a/net-misc/memcached/files/memcached-1.6.5-ia64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/memcached/memcached/commit/73633d31b22068dfda5ef969c08139c083d96d71.patch
-
-From 73633d31b22068dfda5ef969c08139c083d96d71 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 19 Apr 2020 10:08:19 +0100
-Subject: [PATCH] crc32c.c: don't attempt to enable hardware crc32 on ia64
-
-Itanium has no hardware crc32 implementation and build fails as:
-
-```
-ia64-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I.  -DNDEBUG   -g -O2 -pthread \
-    ... -c -o memcached-crc32c.o `test -f 'crc32c.c' || echo './'`crc32c.c
-crc32c.c: In function 'crc32c_init':
-crc32c.c:385:9: error: unknown register name '%edx' in 'asm'
-  385 |         __asm__("cpuid" \
-      |         ^~~~~~~
-```
-
-The change removes ia64 from crc32 paths.
-
-Bug: https://bugs.gentoo.org/718136
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- crc32c.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/crc32c.c
-+++ b/crc32c.c
-@@ -167,7 +167,7 @@ static uint32_t crc32c_hw_aarch64(uint32_t crc, const void* buf, size_t len)
- #endif
- 
- /* Apply if the platform is intel */
--#if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-+#if defined(__X86_64__)||defined(__x86_64__)
- 
- /* Multiply a matrix times a vector over the Galois field of two elements,
-    GF(2).  Each element is a bit in an unsigned integer.  mat must have at
-@@ -388,12 +388,11 @@ static uint32_t crc32c_hw(uint32_t crc, const void *buf, size_t len)
-                 : "%ebx", "%edx"); \
-         (have) = (ecx >> 20) & 1; \
-     } while (0)
--
- #endif
- /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
-    version.  Otherwise, use the software version. */
- void crc32c_init(void) {
--    #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-+    #if defined(__X86_64__)||defined(__x86_64__)
-     int sse42;
-     SSE42(sse42);
- 

[gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/files/

[Conrad Kostecki]

commit:     89c3f8595f9ff13308caa5f56d43117295d2660a
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb  2 16:58:11 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 21:38:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c3f859

net-misc/memcached: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19307
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ....21-hash-fix-build-failure-against-gcc-10.patch | 56 ----------------------
 1 file changed, 56 deletions(-)

diff --git a/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch b/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch
deleted file mode 100644
index 527d4607316..00000000000
--- a/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 63b8e76067523a02a3e0215db1aef0b34edcf708 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 23 Jan 2020 22:16:36 +0000
-Subject: [PATCH] hash: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-gcc  -g -O2 -pthread -pthread -Wall -Werror -pedantic -Wmissing-prototypes \
-  -Wmissing-declarations -Wredundant-decls   -o memcached ... -levent
-ld: memcached-hash.o:memcached/hash.h:5:
-  multiple definition of `hash'; memcached-memcached.o:memcached/hash.h:5: first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Brian Evans
-Bug: https://bugs.gentoo.org/706196
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- hash.c | 2 ++
- hash.h | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/hash.c b/hash.c
-index a0c3036..b5ff28a 100644
---- a/hash.c
-+++ b/hash.c
-@@ -4,6 +4,8 @@
- #include "jenkins_hash.h"
- #include "murmur3_hash.h"
- 
-+hash_func hash;
-+
- int hash_init(enum hashfunc_type type) {
-     switch(type) {
-         case JENKINS_HASH:
-diff --git a/hash.h b/hash.h
-index 059d1e2..3b2a984 100644
---- a/hash.h
-+++ b/hash.h
-@@ -2,7 +2,7 @@
- #define    HASH_H
- 
- typedef uint32_t (*hash_func)(const void *key, size_t length);
--hash_func hash;
-+extern hash_func hash;
- 
- enum hashfunc_type {
-     JENKINS_HASH=0, MURMUR3_HASH
--- 
-2.25.0
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/files/

[Conrad Kostecki]

commit:     783ae1e02d9596513cdddabb6801746370decf63
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 19 18:50:16 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 23:00:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783ae1e0

net-misc/memcached: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34373
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../memcached/files/memcached-1.2.2-fbsd.patch     | 12 ---------
 .../files/memcached-1.4.4-as-needed.patch          | 31 ----------------------
 2 files changed, 43 deletions(-)

diff --git a/net-misc/memcached/files/memcached-1.2.2-fbsd.patch b/net-misc/memcached/files/memcached-1.2.2-fbsd.patch
deleted file mode 100644
index 76f237698cf7..000000000000
--- a/net-misc/memcached/files/memcached-1.2.2-fbsd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: memcached-1.2.2/memcached.h
-===================================================================
---- memcached-1.2.2.orig/memcached.h
-+++ memcached-1.2.2/memcached.h
-@@ -4,6 +4,7 @@
- #include "config.h"
- #include <sys/types.h>
- #include <sys/time.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #include <event.h>
- 

diff --git a/net-misc/memcached/files/memcached-1.4.4-as-needed.patch b/net-misc/memcached/files/memcached-1.4.4-as-needed.patch
deleted file mode 100644
index f6e5cde11057..000000000000
--- a/net-misc/memcached/files/memcached-1.4.4-as-needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nuar memcached-1.4.4.orig/configure.ac memcached-1.4.4/configure.ac
---- memcached-1.4.4.orig/configure.ac	2009-11-24 16:40:29.000000000 -0800
-+++ memcached-1.4.4/configure.ac	2009-11-27 15:20:38.000000000 -0800
-@@ -115,6 +115,14 @@
- AC_SUBST(ENABLE_SASL)
- AC_SUBST(PROFILER_LDFLAGS)
- 
-+dnl Check whether the user's system supports pthread before adding -pthread to CFLAGS
-+dnl otherwise we won't get -l{threads} in LIBS
-+dnl AFAIK -pthread should be added to LDFLAGS on BSD systems
-+AC_SEARCH_LIBS(pthread_create, [pthread pthreads thread threads] )
-+if test "x$ac_cv_search_pthread_create" == "xno"; then
-+  AC_MSG_ERROR([Can't enable threads without the POSIX thread library.])
-+fi
-+
- AC_ARG_ENABLE(coverage,
-   [AS_HELP_STRING([--disable-coverage],[Disable code coverage])])
- 
-@@ -376,12 +384,6 @@
- 
- AC_C_HTONLL
- 
--dnl Check whether the user's system supports pthread
--AC_SEARCH_LIBS(pthread_create, pthread)
--if test "x$ac_cv_search_pthread_create" = "xno"; then
--  AC_MSG_ERROR([Can't enable threads without the POSIX thread library.])
--fi
--
- AC_CHECK_FUNCS(mlockall)
- AC_CHECK_FUNCS(getpagesizes)
- AC_CHECK_FUNCS(memcntl)