Download raw body.
memcached update
On 7/4/25 8:57 PM, Stuart Henderson wrote:
> I've occasionally been trying new versions of this to see if they
> fix the existing SIGABRT during tests, and I see that the current
> release does indeed fix that. Some test failures but it does a lot
> better than before. Many other stability fixes, memory use
> improvements, and other cleanup in the meantime.
> https://github.com/memcached/memcached/wiki/ReleaseNotes
>
> ok to update?
ok giovanni@
Thanks
Giovanni
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/misc/memcached/Makefile,v
> diff -u -p -r1.55 Makefile
> --- Makefile 27 Dec 2023 15:48:30 -0000 1.55
> +++ Makefile 4 Jul 2025 18:52:45 -0000
> @@ -1,8 +1,9 @@
> COMMENT= distributed memory object caching system
>
> -DISTNAME= memcached-1.6.22
> +DISTNAME= memcached-1.6.38
> CATEGORIES= misc
>
> +#https://github.com/memcached/memcached
> HOMEPAGE= https://www.memcached.org/
>
> MAINTAINER= Giovanni Bechis<giovanni@openbsd.org>
> @@ -16,7 +17,7 @@ WANTLIB += c crypto event pthread ssl ev
> FLAVOR?=
> FLAVORS= sasl
>
> -SITES= http://memcached.org/files/
> +SITES= https://memcached.org/files/
>
> CONFIGURE_STYLE= gnu
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> @@ -25,8 +26,8 @@ CONFIGURE_ARGS= --disable-coverage \
> --disable-docs \
> --disable-werror \
> --enable-tls
> +# binary.t very slow on some systems (after printing "# Some chunked item tests")
> TEST_TARGET= test
> -TEST_DEPENDS= devel/p5-Test-MockSleep
> LIB_DEPENDS= devel/libevent2
>
> .if ${FLAVOR:Msasl}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/misc/memcached/distinfo,v
> diff -u -p -r1.33 distinfo
> --- distinfo 27 Dec 2023 15:48:30 -0000 1.33
> +++ distinfo 4 Jul 2025 18:52:45 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (memcached-1.6.22.tar.gz) = NHg6kKTM90xBBwhf2Stoh0nSOyds/a2fBOT3JaBdHKc=
> -SIZE (memcached-1.6.22.tar.gz) = 1135926
> +SHA256 (memcached-1.6.38.tar.gz) = M015IpTjdzh5a1sDN1xHu22yg7EVLi6kzLcgFS3RfGY=
> +SIZE (memcached-1.6.38.tar.gz) = 1282099
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/misc/memcached/patches/patch-configure,v
> diff -u -p -r1.16 patch-configure
> --- patches/patch-configure 27 Dec 2023 15:48:30 -0000 1.16
> +++ patches/patch-configure 4 Jul 2025 18:52:45 -0000
> @@ -1,7 +1,7 @@
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -6559,7 +6559,7 @@ else $as_nop
> +@@ -6588,7 +6588,7 @@ else $as_nop
> le_found=no
> for ledir in $trylibeventdir "" $prefix /usr/local ; do
> LDFLAGS="$saved_LDFLAGS" @@ -10,7 +10,7 @@ Index: configure # Skip the directory if it isn't there. if test ! -z "$ledir" -a ! -d "$ledir" ; then
> -@@ -6582,7 +6582,7 @@ else $as_nop
> +@@ -6611,7 +6611,7 @@ else $as_nop
> /* end confdefs.h. */
> #include <sys/time.h>
> #include <sys/types.h>
> @@ -19,7 +19,7 @@ Index: configure
> int
> main (void)
> {
> -@@ -6632,7 +6632,7 @@ fi
> +@@ -6661,7 +6661,7 @@ fi
> fi
> { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libevent_dir" >&5
> printf "%s\n" "$ac_cv_libevent_dir" >&6; }
> @@ -28,7 +28,7 @@ Index: configure
> if test $ac_cv_libevent_dir != "(system)"; then
> if test -d "$ac_cv_libevent_dir/lib" ; then
> LDFLAGS="-L$ac_cv_libevent_dir/lib $LDFLAGS"
> -@@ -6656,7 +6656,7 @@ else $as_nop
> +@@ -6685,7 +6685,7 @@ else $as_nop
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> @@ -37,7 +37,7 @@ Index: configure
>
> int
> main (void)
> -@@ -8467,7 +8467,7 @@ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
> +@@ -8509,7 +8509,7 @@ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
> elif test "$GCC" = "yes"
> then
> GCC_VERSION=`$CC -dumpversion`
> Index: patches/patch-memcached_c
> ===================================================================
> RCS file: /cvs/ports/misc/memcached/patches/patch-memcached_c,v
> diff -u -p -r1.20 patch-memcached_c
> --- patches/patch-memcached_c 27 Dec 2023 15:48:30 -0000 1.20
> +++ patches/patch-memcached_c 4 Jul 2025 18:52:45 -0000
> @@ -1,7 +1,7 @@
> Index: memcached.c
> --- memcached.c.orig
> +++ memcached.c
> -@@ -5632,8 +5632,8 @@ int main (int argc, char **argv) {
> +@@ -5537,8 +5537,8 @@ int main (int argc, char **argv) {
> start_lru_maintainer = false;
> break;
> case NO_DROP_PRIVILEGES:
> Index: patches/patch-t_issue_192_t
> ===================================================================
> RCS file: patches/patch-t_issue_192_t
> diff -N patches/patch-t_issue_192_t
> --- patches/patch-t_issue_192_t 11 Mar 2022 19:38:12 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,20 +0,0 @@
> -Test case for CVE-2011-4971
> -https://github.com/memcached/memcached/commit/6695ccbc525c36d693aaa3e8337b36aa0c784424
> -
> ---- t/issue_192.t.orig Mon Apr 28 07:51:18 2014
> -+++ t/issue_192.t Mon Jul 14 11:38:18 2014
> -@@ -2,6 +2,7 @@
> -
> - use strict;
> - use Test::More tests => 2;
> -+use Test::MockSleep;
> - use FindBin qw($Bin);
> - use lib "$Bin/lib";
> - use MemcachedTest;
> -@@ -15,6 +16,3 @@ print $sock "\x80\x12\x00\x01\x08\x00\x00\x00\xff\xff\
> -
> - sleep 0.5;
> - ok($server->new_sock, "failed to open new socket");
> --
> --
> --
memcached update