Skip to content

Commit

Permalink
package/memcached: bump to version 1.6.21
Browse files Browse the repository at this point in the history
- Send first patch upstream
- Drop second and third patches (already in version) and so drop
  autoreconf

https://github.com/memcached/memcached/wiki/ReleaseNotes1618
https://github.com/memcached/memcached/wiki/ReleaseNotes1619
https://github.com/memcached/memcached/wiki/ReleaseNotes1620
https://github.com/memcached/memcached/wiki/ReleaseNotes1621

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 6ce55ab)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  • Loading branch information
ffontaine authored and jacmet committed Nov 30, 2023
1 parent 8b0ba84 commit 1cdd069
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 125 deletions.
3 changes: 0 additions & 3 deletions .checkpackageignore
Original file line number Diff line number Diff line change
Expand Up @@ -901,9 +901,6 @@ package/matchbox/0001-defaulttheme.patch Upstream
package/matchbox/0002-src-Fix-build-with-gcc-10.patch Upstream
package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch Upstream
package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch Upstream
package/memcached/0001-logger.c-initialize-rport.patch Upstream
package/memcached/0002-check-for-sys-auxv.h.patch Upstream
package/memcached/0003-configure.ac-add-disable-werror.patch Upstream
package/memstat/0001-PATH_MAX.patch Upstream
package/mender-connect/S43mender-connect Shellcheck
package/menu-cache/0001-Support-gcc10-compilation.patch Upstream
Expand Down
2 changes: 1 addition & 1 deletion package/memcached/0001-logger.c-initialize-rport.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Fixes:
- http://autobuild.buildroot.org/results/7a46ac38d10b1859034017e0294961daa8f48dd2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not sent yet]
Upstream: https://github.com/memcached/memcached/pull/1077
---
logger.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Expand Down
50 changes: 0 additions & 50 deletions package/memcached/0002-check-for-sys-auxv.h.patch

This file was deleted.

65 changes: 0 additions & 65 deletions package/memcached/0003-configure.ac-add-disable-werror.patch

This file was deleted.

6 changes: 3 additions & 3 deletions package/memcached/memcached.hash
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1
sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz
# From http://www.memcached.org/files/memcached-1.6.21.tar.gz.sha1
sha1 6d899680b4ba4b76b6c92120143cf87630ee984a memcached-1.6.21.tar.gz

# Locally computed
sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz
sha256 c788980efc417dd5d93c442b1c8b8769fb2018896c29de3887d22a2f143da2ee memcached-1.6.21.tar.gz
sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING
4 changes: 1 addition & 3 deletions package/memcached/memcached.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

MEMCACHED_VERSION = 1.6.17
MEMCACHED_VERSION = 1.6.21
MEMCACHED_SITE = http://www.memcached.org/files
MEMCACHED_DEPENDENCIES = libevent
MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
Expand All @@ -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
Expand Down

0 comments on commit 1cdd069

Please sign in to comment.