* [Buildroot] [PATCH 1/1] package/memcached: bump to version 1.6.17
@ 2022-12-23 15:42 Fabrice Fontaine
2022-12-23 15:56 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-12-23 15:42 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
- Refresh second patch
- Drop fourth patch (already in version)
https://github.com/memcached/memcached/wiki/ReleaseNotes1617
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.../memcached/0002-check-for-sys-auxv.h.patch | 10 +-
...c-use-pkg-config-to-retrieve-openssl.patch | 181 ------------------
package/memcached/memcached.hash | 6 +-
package/memcached/memcached.mk | 2 +-
4 files changed, 9 insertions(+), 190 deletions(-)
delete mode 100644 package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch
diff --git a/package/memcached/0002-check-for-sys-auxv.h.patch b/package/memcached/0002-check-for-sys-auxv.h.patch
index 8c41bb4f01..a7d0dfdd00 100644
--- a/package/memcached/0002-check-for-sys-auxv.h.patch
+++ b/package/memcached/0002-check-for-sys-auxv.h.patch
@@ -37,14 +37,14 @@ index 26df879..05e61ff 100644
--- a/crc32c.c
+++ b/crc32c.c
@@ -273,7 +273,7 @@ void crc32c_init(void) {
- }
}
--#elif defined(__aarch64__) && defined(__linux__)
-+#elif defined(__aarch64__) && defined(__linux__) && defined(HAVE_SYS_AUX_H)
+ #elif defined(__aarch64__) && (defined(__linux__) || defined(__APPLE__))
+-#if defined(__linux__)
++#if defined(__linux__) && defined(HAVE_SYS_AUX_H)
#include <sys/auxv.h>
-
- #if defined(HWCAP_CRC32)
+ #elif defined(__APPLE__)
+ #include <sys/sysctl.h>
--
2.35.1
diff --git a/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch b/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch
deleted file mode 100644
index 402fa03b3b..0000000000
--- a/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 656dedad48c81541060448d008b90290196263c5 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 6 Sep 2020 23:38:19 +0200
-Subject: [PATCH] configure.ac: use pkg-config to retrieve openssl
-
-Use pkg-config to retrieve openssl dependencies such as -latomic or -lz
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/memcached/memcached/commit/656dedad48c81541060448d008b90290196263c5]
----
- README.md | 2 +-
- configure.ac | 133 ++++++++++++++++++++++++++-------------------------
- 2 files changed, 69 insertions(+), 66 deletions(-)
-
-diff --git a/README.md b/README.md
-index 3ce1bc2156..8fe067b767 100644
---- a/README.md
-+++ b/README.md
-@@ -21,7 +21,7 @@ list to ask questions, github issues aren't seen by everyone!
- * libseccomp (optional, experimental, linux) - enables process restrictions for
- better security. Tested only on x86-64 architectures.
- * openssl (optional) - enables TLS support. need relatively up to date
-- version.
-+ version. pkg-config is needed to find openssl dependencies (such as -lz).
-
- ## Environment
-
-diff --git a/configure.ac b/configure.ac
-index a0851f2131..2959a86c89 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -437,80 +437,83 @@ AC_ARG_WITH(libssl,
- dnl ----------------------------------------------------------------------------
- dnl libssl detection. swiped from libevent. modified for openssl detection.
-
-+PKG_PROG_PKG_CONFIG
- OPENSSL_URL=https://www.openssl.org/
- if test "x$enable_tls" = "xyes"; then
-- AC_CACHE_CHECK([for libssl directory], ac_cv_libssl_dir, [
-- saved_LIBS="$LIBS"
-- saved_LDFLAGS="$LDFLAGS"
-- saved_CPPFLAGS="$CPPFLAGS"
-- le_found=no
-- for ledir in $trylibssldir "" $prefix /usr/local ; do
-+ PKG_CHECK_MODULES(OPENSSL, openssl, [LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"], [
-+ AC_CACHE_CHECK([for libssl directory], ac_cv_libssl_dir, [
-+ saved_LIBS="$LIBS"
-+ saved_LDFLAGS="$LDFLAGS"
-+ saved_CPPFLAGS="$CPPFLAGS"
-+ le_found=no
-+ for ledir in $trylibssldir "" $prefix /usr/local ; do
-+ LDFLAGS="$saved_LDFLAGS"
-+ LIBS="-lssl -lcrypto $saved_LIBS"
-+
-+ # Skip the directory if it isn't there.
-+ if test ! -z "$ledir" -a ! -d "$ledir" ; then
-+ continue;
-+ fi
-+ if test ! -z "$ledir" ; then
-+ if test -d "$ledir/lib" ; then
-+ LDFLAGS="-L$ledir/lib $LDFLAGS"
-+ else
-+ LDFLAGS="-L$ledir $LDFLAGS"
-+ fi
-+ if test -d "$ledir/include" ; then
-+ CPPFLAGS="-I$ledir/include $CPPFLAGS"
-+ else
-+ CPPFLAGS="-I$ledir $CPPFLAGS"
-+ fi
-+ fi
-+ # Can I compile and link it?
-+ AC_TRY_LINK([#include <sys/time.h>
-+ #include <sys/types.h>
-+ #include <assert.h>
-+ #include <openssl/ssl.h>], [ SSL_CTX* ssl_ctx = SSL_CTX_new(TLS_server_method());
-+ assert(OPENSSL_VERSION_NUMBER >= 0x10100000L);],
-+ [ libssl_linked=yes ], [ libssl_linked=no ])
-+ if test $libssl_linked = yes; then
-+ if test ! -z "$ledir" ; then
-+ ac_cv_libssl_dir=$ledir
-+ _myos=`echo $target_os | cut -f 1 -d .`
-+ AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2",
-+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"],
-+ [AS_IF(test "$GCC" = "yes",
-+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])])
-+ else
-+ ac_cv_libssl_dir="(system)"
-+ fi
-+ le_found=yes
-+ break
-+ fi
-+ done
-+ LIBS="$saved_LIBS"
- LDFLAGS="$saved_LDFLAGS"
-- LIBS="-lssl -lcrypto $saved_LIBS"
-+ CPPFLAGS="$saved_CPPFLAGS"
-+ if test $le_found = no ; then
-+ AC_MSG_ERROR([libssl (at least version 1.1.0) is required. You can get it from $OPENSSL_URL
-
-- # Skip the directory if it isn't there.
-- if test ! -z "$ledir" -a ! -d "$ledir" ; then
-- continue;
-+ If it's already installed, specify its path using --with-libssl=/dir/
-+ ])
- fi
-- if test ! -z "$ledir" ; then
-- if test -d "$ledir/lib" ; then
-- LDFLAGS="-L$ledir/lib $LDFLAGS"
-- else
-- LDFLAGS="-L$ledir $LDFLAGS"
-- fi
-- if test -d "$ledir/include" ; then
-- CPPFLAGS="-I$ledir/include $CPPFLAGS"
-- else
-- CPPFLAGS="-I$ledir $CPPFLAGS"
-- fi
-+ ])
-+ LIBS="-lssl -lcrypto $LIBS"
-+ if test $ac_cv_libssl_dir != "(system)"; then
-+ if test -d "$ac_cv_libssl_dir/lib" ; then
-+ LDFLAGS="-L$ac_cv_libssl_dir/lib $LDFLAGS"
-+ le_libdir="$ac_cv_libssl_dir/lib"
-+ else
-+ LDFLAGS="-L$ac_cv_libssl_dir $LDFLAGS"
-+ le_libdir="$ac_cv_libssl_dir"
- fi
-- # Can I compile and link it?
-- AC_TRY_LINK([#include <sys/time.h>
-- #include <sys/types.h>
-- #include <assert.h>
-- #include <openssl/ssl.h>], [ SSL_CTX* ssl_ctx = SSL_CTX_new(TLS_server_method());
-- assert(OPENSSL_VERSION_NUMBER >= 0x10100000L);],
-- [ libssl_linked=yes ], [ libssl_linked=no ])
-- if test $libssl_linked = yes; then
-- if test ! -z "$ledir" ; then
-- ac_cv_libssl_dir=$ledir
-- _myos=`echo $target_os | cut -f 1 -d .`
-- AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2",
-- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"],
-- [AS_IF(test "$GCC" = "yes",
-- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])])
-- else
-- ac_cv_libssl_dir="(system)"
-- fi
-- le_found=yes
-- break
-+ if test -d "$ac_cv_libssl_dir/include" ; then
-+ CPPFLAGS="-I$ac_cv_libssl_dir/include $CPPFLAGS"
-+ else
-+ CPPFLAGS="-I$ac_cv_libssl_dir $CPPFLAGS"
- fi
-- done
-- LIBS="$saved_LIBS"
-- LDFLAGS="$saved_LDFLAGS"
-- CPPFLAGS="$saved_CPPFLAGS"
-- if test $le_found = no ; then
-- AC_MSG_ERROR([libssl (at least version 1.1.0) is required. You can get it from $OPENSSL_URL
--
-- If it's already installed, specify its path using --with-libssl=/dir/
-- ])
- fi
- ])
-- LIBS="-lssl -lcrypto $LIBS"
-- if test $ac_cv_libssl_dir != "(system)"; then
-- if test -d "$ac_cv_libssl_dir/lib" ; then
-- LDFLAGS="-L$ac_cv_libssl_dir/lib $LDFLAGS"
-- le_libdir="$ac_cv_libssl_dir/lib"
-- else
-- LDFLAGS="-L$ac_cv_libssl_dir $LDFLAGS"
-- le_libdir="$ac_cv_libssl_dir"
-- fi
-- if test -d "$ac_cv_libssl_dir/include" ; then
-- CPPFLAGS="-I$ac_cv_libssl_dir/include $CPPFLAGS"
-- else
-- CPPFLAGS="-I$ac_cv_libssl_dir $CPPFLAGS"
-- fi
-- fi
- fi
-
- if test "x$enable_static" = "xyes"; then
diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash
index 3bdd1e5e33..78875dde66 100644
--- a/package/memcached/memcached.hash
+++ b/package/memcached/memcached.hash
@@ -1,6 +1,6 @@
-# From http://www.memcached.org/files/memcached-1.6.16.tar.gz.sha1
-sha1 724f31c3462fb6b07264d72d0043fd65545fd84a memcached-1.6.16.tar.gz
+# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1
+sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz
# Locally computed
-sha256 3051a93bf1dd0c3af2d0e589ff6ef6511f876385a35b18e9ff8741e4a1ab34da memcached-1.6.16.tar.gz
+sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz
sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING
diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk
index 7b4069e820..7183da6c14 100644
--- a/package/memcached/memcached.mk
+++ b/package/memcached/memcached.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MEMCACHED_VERSION = 1.6.16
+MEMCACHED_VERSION = 1.6.17
MEMCACHED_SITE = http://www.memcached.org/files
MEMCACHED_DEPENDENCIES = libevent
MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/memcached: bump to version 1.6.17
2022-12-23 15:42 [Buildroot] [PATCH 1/1] package/memcached: bump to version 1.6.17 Fabrice Fontaine
@ 2022-12-23 15:56 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2022-12-23 15:56 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> - Refresh second patch
> - Drop fourth patch (already in version)
> https://github.com/memcached/memcached/wiki/ReleaseNotes1617
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-23 15:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-23 15:42 [Buildroot] [PATCH 1/1] package/memcached: bump to version 1.6.17 Fabrice Fontaine
2022-12-23 15:56 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.