iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

bump version to 2022.02.9

Browse Source 
add miyoo_defconfig
This commit is contained in:
tiopex
2023-01-31 13:11:45 +01:00
parent 1fa746c353
commit dcdaa3599c
8423 changed files with 184305 additions and 91107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
package/memcached/0001-logger.c-initialize-rport.patch Normal file
View File

@@ -0,0 +1,55 @@
From b3431c4fcaf65e66fda80ef89b79ff3da1912b4f Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
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 <fontaine.fabrice@gmail.com>
[Upstream status: not sent yet]
---
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

50
package/memcached/0002-check-for-sys-auxv.h.patch Normal file
View File

@@ -0,0 +1,50 @@
From 58b6de2135c10b64918f25c48f69f144d08a9c0d Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 3 Jun 2022 19:10:15 +0200
Subject: [PATCH] check for sys/auxv.h
Check for sys/auxv.h to avoid the following uclibc build failure on
aarch64:
crc32c.c:277:10: fatal error: sys/auxv.h: No such file or directory
277 | #include <sys/auxv.h>
| ^~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/08591fbf9677ff126492c50c15170c641bcab56a
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not sent yet]
---
configure.ac | 1 +
crc32c.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 0985f07..3337fe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -516,6 +516,7 @@ AH_BOTTOM([#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
])
+AC_CHECK_HEADERS([sys/auxv.h])
dnl **********************************************************************
dnl Figure out if this system has the stupid sasl_callback_ft
diff --git a/crc32c.c b/crc32c.c
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)
#include <sys/auxv.h>
#if defined(HWCAP_CRC32)
--
2.35.1

181
package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch Normal file
View File

@@ -0,0 +1,181 @@
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

6
package/memcached/memcached.hash
View File

@@ -1,6 +1,6 @@
# From http://www.memcached.org/files/memcached-1.6.7.tar.gz.sha1
sha1 49336bb0a4b7ad296422b08148581ed54edf32d0 memcached-1.6.7.tar.gz
# From http://www.memcached.org/files/memcached-1.6.12.tar.gz.sha1
sha1 40d43e98f149e13e6c81eee813e6734f23413a01 memcached-1.6.12.tar.gz
# Locally computed
sha256 7bbdac9b031d8cfca4a1207f28df598b90ee2e9b44667f7eabd0fe1a59ca5173 memcached-1.6.7.tar.gz
sha256 f291a35f82ef9756ed1d952879ef5f4be870f932bdfcb2ab61356609abf82346 memcached-1.6.12.tar.gz
sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING

17
package/memcached/memcached.mk
View File

@@ -4,13 +4,17 @@
#
################################################################################
MEMCACHED_VERSION = 1.6.7
MEMCACHED_VERSION = 1.6.12
MEMCACHED_SITE = http://www.memcached.org/files
MEMCACHED_DEPENDENCIES = libevent
MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
MEMCACHED_CONF_OPTS = --disable-coverage
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
@@ -18,4 +22,15 @@ else
MEMCACHED_CONF_ENV += ac_cv_c_endian=little
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
MEMCACHED_CONF_OPTS += --enable-tls
MEMCACHED_DEPENDENCIES += host-pkgconf openssl
else
MEMCACHED_CONF_OPTS += --disable-tls
endif
ifeq ($(BR2_STATIC_LIBS),)
MEMCACHED_CONF_OPTS += --disable-static
endif
$(eval $(autotools-package))