mirror of https://github.com/OpenIPC/firmware.git
Merge branch 'master' of github:OpenIPC/firmware
commit
f93cdd1d10
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -12,9 +12,9 @@ load_majestic() {
|
|||
printf 'Starting %s: ' "$DAEMON"
|
||||
[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
if [ $(grep ^savedumps /etc/coredump.config | cut -d= -f2) == "true" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
if [ -f /etc/coredump.conf ] && [ "true" = "$(grep ^savedumps /etc/coredump.conf | cut -d= -f2)" ]; then
|
||||
ulimit -c unlimited && echo "| /usr/sbin/sendcoredump.sh" > /proc/sys/kernel/core_pattern
|
||||
fi
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
|
||||
-- $DAEMON_ARGS
|
||||
status=$?
|
||||
|
|
|
@ -11,19 +11,3 @@ index 822d97a5..646763b4 100644
|
|||
PROT_READ,
|
||||
#ifdef MAP_NOCACHE
|
||||
MAP_NOCACHE | /* ??? */
|
||||
diff --git a/bufferevent_mbedtls.c b/bufferevent_mbedtls.c
|
||||
index f42da2ae..61f448a2 100644
|
||||
--- a/bufferevent_mbedtls.c
|
||||
+++ b/bufferevent_mbedtls.c
|
||||
@@ -57,8 +57,10 @@ static void
|
||||
mbedtls_context_free(void *ssl, int flags)
|
||||
{
|
||||
struct mbedtls_context *ctx = ssl;
|
||||
- if (flags & BEV_OPT_CLOSE_ON_FREE)
|
||||
+ if (flags & BEV_OPT_CLOSE_ON_FREE) {
|
||||
mbedtls_ssl_free(ctx->ssl);
|
||||
+ free(ctx->ssl);
|
||||
+ }
|
||||
mm_free(ctx);
|
||||
}
|
||||
static int
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
LIBEVENT_OPENIPC_VERSION = 2db55e43cffd2fb6a34b5c997f2b8d043ca0ece5
|
||||
LIBEVENT_OPENIPC_VERSION = bf3ce77f6cf113839defa70b30e183d471a0dab5
|
||||
LIBEVENT_OPENIPC_SITE = $(call github,libevent,libevent,$(LIBEVENT_OPENIPC_VERSION))
|
||||
LIBEVENT_OPENIPC_INSTALL_STAGING = YES
|
||||
LIBEVENT_OPENIPC_LICENSE = BSD-3-Clause, OpenBSD
|
||||
|
@ -54,7 +54,7 @@ endif
|
|||
|
||||
ifeq ($(BR2_PACKAGE_MBEDTLS_OPENIPC),y)
|
||||
LIBEVENT_OPENIPC_DEPENDENCIES += host-pkgconf mbedtls-openipc
|
||||
LIBEVENT_OPENIPC_CONF_OPTS += --enable-embedtls
|
||||
LIBEVENT_OPENIPC_CONF_OPTS += --enable-mbedtls
|
||||
else
|
||||
LIBEVENT_OPENIPC_CONF_OPTS += --disable-mbedtls
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue