package/memcached: update to 1.6.29
PATCH 1/1 package/memcached: update to 1.6.29
See the release notes for 1.6.29 here:
https://github.com/memcached/memcached/wiki/ReleaseNotes1629
Older release notes are also available.
Patch 0001 is upstream since commitaceefca9bc7635eab4893f626aec78e9966db93c.
Patch 0002 is upstream since commitd9bf02f6331fc0098af8997d2a571fc4525696fc.
Autoreconf of package is no longer needed.
--- .../0001-logger.c-initialize-rport.patch | 55 ---------------- .../0002-fix-build-on-uclibc-ng.patch | 64 ------------------- package/memcached/memcached.hash | 6 +- package/memcached/memcached.mk | 4 +- 4 files changed, 4 insertions(+), 125 deletions(-) delete mode 100644 package/memcached/0001-logger.c-initialize-rport.patch delete mode 100644 package/memcached/0002-fix-build-on-uclibc-ng.patch
package/memcached/0001-logger.c-initialize-rport.patch deleted +0 -55
@@ -1,55 +0,0 @@ -From b3431c4fcaf65e66fda80ef89b79ff3da1912b4f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Sat, 25 Dec 2021 20:05:29 +0100 -Subject: [PATCH] logger.c: initialize rport - -Fix the following build failure raised since version 1.6.11 and -https://github.com/memcached/memcached/commit/617d7cd64d04698b76fee74882627690017e20ad: - -logger.c: In function '_logger_parse_cce': -logger.c:297:13: error: 'rport' may be used uninitialized in this function [-Werror=maybe-uninitialized] - 297 | total = snprintf(scratch, LOGGER_PARSE_SCRATCH, - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 298 | "ts=%d.%d gid=%llu type=conn_close rip=%s rport=%hu transport=%s reason=%s cfd=%d\n", - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 299 | (int) e->tv.tv_sec, (int) e->tv.tv_usec, (unsigned long long) e->gid, - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 300 | rip, rport, transport_map[le->transport], - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 301 | reason_map[le->reason], le->sfd); - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/7a46ac38d10b1859034017e0294961daa8f48dd2 - -Signed-off-by: Fabrice Fontaine <[email protected]> -Upstream: https://github.com/memcached/memcached/pull/1077 ---- - logger.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/logger.c b/logger.c -index 667f3c7..394adae 100644 ---- a/logger.c -+++ b/logger.c -@@ -269,7 +269,7 @@ static int _logger_parse_extw(logentry *e, char *scratch) { - - static int _logger_parse_cne(logentry *e, char *scratch) { - int total; -- unsigned short rport; -+ unsigned short rport = 0; - char rip[64]; - struct logentry_conn_event *le = (struct logentry_conn_event *) e->data; - const char * const transport_map[] = { "local", "tcp", "udp" }; -@@ -286,7 +286,7 @@ static int _logger_parse_cne(logentry *e, char *scratch) { - - static int _logger_parse_cce(logentry *e, char *scratch) { - int total; -- unsigned short rport; -+ unsigned short rport = 0; - char rip[64]; - struct logentry_conn_event *le = (struct logentry_conn_event *) e->data; - const char * const transport_map[] = { "local", "tcp", "udp" }; --- -2.33.0 -
package/memcached/0002-fix-build-on-uclibc-ng.patch deleted +0 -64
64 lines not on this page · raw message
package/memcached/memcached.hash +3 -3
@@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.22.tar.gz.sha1 -sha1 7a691f390d59616dbebfc9e2e4942d499c39a338 memcached-1.6.22.tar.gz +# From http://www.memcached.org/files/memcached-1.6.29.tar.gz.sha1 +sha1 a9699aed111d86b6e37b3ce5e6ef4e7539582d5f memcached-1.6.29.tar.gz # Locally computed -sha256 34783a90a4ccf74c4107085fd92b688749d23b276cfdad9f04e4f725a05d1ca7 memcached-1.6.22.tar.gz +sha256 269643d518b7ba2033c7a1f66fdfc560d72725a2822194d90c8235408c443a49 memcached-1.6.29.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING
package/memcached/memcached.mk +1 -3
@@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.22 +MEMCACHED_VERSION = 1.6.29 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
@@ -13,8 +13,6 @@ MEMCACHED_LICENSE = BSD-3-Clause MEMCACHED_LICENSE_FILES = COPYING MEMCACHED_CPE_ID_VENDOR = memcached MEMCACHED_SELINUX_MODULES = memcached -# We're patching configure.ac -MEMCACHED_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") MEMCACHED_CONF_ENV += ac_cv_c_endian=big
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedQuoted 13 lines · On Mon, 19 Aug 2024 23:23:13 +0200 Waldemar Brodkorb <[email protected]> wrote:
See the release notes for 1.6.29 here:
https://github.com/memcached/memcached/wiki/ReleaseNotes1629
Older release notes are also available.Patch 0001 is upstream since commit
aceefca9bc7635eab4893f626aec78e9966db93c.Patch 0002 is upstream since commit
d9bf02f6331fc0098af8997d2a571fc4525696fc.Autoreconf of package is no longer needed.
Signed-off-by Waldemar Brodkorb <[email protected]>
Quoted 8 lines
--- .../0001-logger.c-initialize-rport.patch | 55 ---------------- .../0002-fix-build-on-uclibc-ng.patch | 64 ------------------- package/memcached/memcached.hash | 6 +- package/memcached/memcached.mk | 4 +- 4 files changed, 4 insertions(+), 125 deletions(-) delete mode 100644 package/memcached/0001-logger.c-initialize-rport.patch delete mode 100644 package/memcached/0002-fix-build-on-uclibc-ng.patch
Applied to master, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot