From patchwork Sat May 9 16:50:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1286742 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=kFY7Enb1; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49KCrg1Ny6z9sNH for ; Sun, 10 May 2020 02:51:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 40D3687766; Sat, 9 May 2020 16:51:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gpf8a57OAh58; Sat, 9 May 2020 16:51:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0099A877EA; Sat, 9 May 2020 16:51:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C8D261BF94B for ; Sat, 9 May 2020 16:50:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AE6BB203F1 for ; Sat, 9 May 2020 16:50:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1GcisYEtmo2d for ; Sat, 9 May 2020 16:50:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by silver.osuosl.org (Postfix) with ESMTPS id 7D23D203BA for ; Sat, 9 May 2020 16:50:53 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id x17so5598456wrt.5 for ; Sat, 09 May 2020 09:50:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yjRidAeCKhy0942TLThgMIVlbd6m9JNLqayjj+sS2aQ=; b=kFY7Enb1UHs/WQnPeyumQ75VUHu1YQ/n/f9r6msKlRJc8nvy136JyPwshu7AVJwXnJ 5Qc2M7aUjCxf2QXkMVLRxL751w1u32802aMjnrj1KIpkk1ECBI36HWLrEfwTvFVkAZtZ 9QJ/Dmx2n8R2fDhSaa/x3rT+8HSbE/es7FIMOv8uWGwzFv4X8DKr/onQV6FIqCA6DfRp OibLjaqjvpKMO7nS89fGZ/Unt2w0yQjp+zMxO/95fXxa5Mkeya9pq8wlMiLguYRrEMId puVMU2C8L43PXQV86z+30tDjqgOaHqAqWAuKZQ6WrW9020GPYn4uAN4VxFQh1X6T5jCh kWAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yjRidAeCKhy0942TLThgMIVlbd6m9JNLqayjj+sS2aQ=; b=b+8Tp8lpgPpjkggpu8aQM0hsJS+d/s9bWoA3OKMp9VtoNytqkLJr7GfoN0+3bSNAKv XwGdroLDB+RsmxprlFAliaZXKnyLimG7NowvSSbwYOEVtpi21xOJrRfJzfPukyjZkWRj dlUNMm0tHSWQuxL8atwt5/neM4swiPmxaxbYmVpNwuBwg7ZksVSUD1RQ+m6NKt6GZ6cy d83PdQvb03lVZgJ62icePz5Y3r8iqwXWg9rajcXLUFTahb86t6xwYdgZQz/tG9gOF77s 8Da0iCQHIMpxMaqoleItbriYcs2tKNP2LQOzOY7Qdx5ovCY9d0poeQq7Nd7Bl/tnMtls R97w== X-Gm-Message-State: AGi0Pub8uHHavNWr13oA7v4c8wvMYDf71J25AyBTk2wdFHbYUND3cvXw y628UNMk1Nn5YnZysokVNOtWdZjFS8Pr5Q== X-Google-Smtp-Source: APiQypLAgVE6hVTU4etUmSLUGnM0RBfsE1ekfwkYV3cN2DwirmiFluOqdVK6Z5jlWWDarYEgr2p2HQ== X-Received: by 2002:a5d:5682:: with SMTP id f2mr8904021wrv.382.1589043051485; Sat, 09 May 2020 09:50:51 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:cd2f:ad0c:9163:73be]) by smtp.gmail.com with ESMTPSA id u127sm18577787wme.8.2020.05.09.09.50.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 09:50:50 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sat, 9 May 2020 18:50:36 +0200 Message-Id: <20200509165039.10363-2-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200509165039.10363-1-titouan.christophe@railnova.eu> References: <20200509165039.10363-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/4] package/redis: bump to version 6.0.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Price , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Update dependencies in Config.in because of new requirements - Add patch for uclibc (accepted upstream, not released yet) - Update the help text in Config.in to a more recent wording - Update the hash file to the new 2 spaces convention Signed-off-by: Titouan Christophe --- ...ake-struct-user-anonymous-for-uclibc.patch | 30 +++++++++++++++++++ package/redis/Config.in | 15 ++++++---- package/redis/redis.hash | 4 +-- package/redis/redis.mk | 2 +- 4 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 package/redis/0004-make-struct-user-anonymous-for-uclibc.patch diff --git a/package/redis/0004-make-struct-user-anonymous-for-uclibc.patch b/package/redis/0004-make-struct-user-anonymous-for-uclibc.patch new file mode 100644 index 0000000000..944773bde7 --- /dev/null +++ b/package/redis/0004-make-struct-user-anonymous-for-uclibc.patch @@ -0,0 +1,30 @@ +From 1f246bfcc8fc2e55f05dd863f286a2057ad29ef7 Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Mon, 4 May 2020 14:11:43 +0200 +Subject: [PATCH] make struct user anonymous (only typedefed) + +This works because this struct is never referenced by its name, +but always by its type. + +This prevents a conflict with struct user from +when compiling against uclibc. + +Signed-off-by: Titouan Christophe +[upstream status: https://github.com/antirez/redis/pull/7200] +--- + src/server.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server.h b/src/server.h +index 9c2b761c417..59cf1370e52 100644 +--- a/src/server.h ++++ b/src/server.h +@@ -732,7 +732,7 @@ typedef struct readyList { + no AUTH is needed, and every + connection is immediately + authenticated. */ +-typedef struct user { ++typedef struct { + sds name; /* The username as an SDS string. */ + uint64_t flags; /* See USER_FLAG_* */ + diff --git a/package/redis/Config.in b/package/redis/Config.in index 2450ccdf7f..5c418da73c 100644 --- a/package/redis/Config.in +++ b/package/redis/Config.in @@ -2,16 +2,19 @@ config BR2_PACKAGE_REDIS bool "redis" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Atomic keyword depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() help - Redis is an open source, advanced key-value store. It is - often referred to as a data structure server since keys can - contain strings, hashes, lists, sets and sorted sets. + Redis is an open source (BSD licensed), in-memory data structure + store, used as a database, cache and message broker. It supports + data structures such as strings, hashes, lists, sets, sorted sets + with range queries, bitmaps, hyperloglogs, geospatial indexes with + radius queries and streams. http://www.redis.io -comment "redis needs a toolchain w/ dynamic library, threads" +comment "redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/redis/redis.hash b/package/redis/redis.hash index ee15b75e08..517c7c7330 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha256 f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7 redis-5.0.8.tar.gz +sha256 b8756e430479edc162ba9c44dc89ac394316cd482f2dc6b91bcd5fe12593f273 redis-6.0.1.tar.gz # Locally calculated -sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING +sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index d3954d87ca..bb7829522d 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 5.0.8 +REDIS_VERSION = 6.0.1 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From patchwork Sat May 9 16:50:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1286741 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=z3aCJF3F; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49KCrd2H03z9sSc for ; Sun, 10 May 2020 02:51:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4C2FE88778; Sat, 9 May 2020 16:51:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gv-j2dcskksb; Sat, 9 May 2020 16:51:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AD0AA8878B; Sat, 9 May 2020 16:51:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D2D931BF94D for ; Sat, 9 May 2020 16:50:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C90288878B for ; Sat, 9 May 2020 16:50:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DKegJeEcq4qy for ; Sat, 9 May 2020 16:50:55 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id CC8C188778 for ; Sat, 9 May 2020 16:50:54 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id k1so5595020wrx.4 for ; Sat, 09 May 2020 09:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=udD6Z0Vby5t2gU+9sn2iTADCqi+GOww7BV6ZlgdNhkg=; b=z3aCJF3F7kvhlbjZWRD4aYYtkGqcX3V856xgum/B7E0B1/DC9AloJ9ahkzOWXKkhO5 mxq1zYts7vL5Fvv5PIBqGRKTqJTGVifffHAEh0udkQaDOm/L7tW9TUQvN/COBbw+oqVw mO1/r8Sc97GCiEC1u8TsYzEYkMeAfsU61F5pSqRqkR99RvthbiZ1xFpPGn8JVPWz27G+ PNnjpLtIFuDcTzOgqE2mEJ+gY7J4qZXUa7uaKQHeXeIsjW+77pP22ZrcdepOtVYFanBe SAbs1b7+GGyzM+WsyZFtHuJRmqlhAgX2xZI4hd7kVC7GLyKNgXh34aDv5GDKEhqn61i5 sjIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=udD6Z0Vby5t2gU+9sn2iTADCqi+GOww7BV6ZlgdNhkg=; b=Arzwc4oV9j2+BxvRh4v9Pay/3Z+K2b9MlEvXTPCWjqb4qvwxk4eSutySv0H1RbAMGc G6FEqoA4j4+es02m/LTkxp7dS8L3W/xL+8g+FPsHskEG9R5p4BSnz1qMKxkgtiRwgERd zvBP+PlFg1qE/knKOADbIiwWQ49GQDaAltykBF/GPslC873XmYBgjVIUr94SXTMXse1G zoMSBfIonzFA+xGTiRFpWnIeIRJKT6mJddC3fOqx/RMXH8pBm00iIUtuwiPJzvS99BK7 GYgaQl967nkDiPzVgQxEs90HyGDcUol0uqZcDyouBhyLNObBOW9kyg0mioUaFUpxM2NX KJvQ== X-Gm-Message-State: AGi0Puau/WFQCDTbT2lSkcnLQ2RGZDiKx10comfkwxYYOgC7vzgIc62h +9Pt8YAhe6J8sD0IzfbdK+MNqr3fnhM9og== X-Google-Smtp-Source: APiQypIA2JOe0cdj7yxvPs/0tLzB6WYlUzHYV4T9WFeRNYIRDPDpgehU4oEmcFXYKN+TIpGjgc4YrQ== X-Received: by 2002:adf:de81:: with SMTP id w1mr8972109wrl.353.1589043053068; Sat, 09 May 2020 09:50:53 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:cd2f:ad0c:9163:73be]) by smtp.gmail.com with ESMTPSA id u127sm18577787wme.8.2020.05.09.09.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 09:50:52 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sat, 9 May 2020 18:50:37 +0200 Message-Id: <20200509165039.10363-3-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200509165039.10363-1-titouan.christophe@railnova.eu> References: <20200509165039.10363-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/4] support/testing: add runtime test for Redis X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Price , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Titouan Christophe --- .gitlab-ci.yml | 1 + DEVELOPERS | 1 + support/testing/tests/package/test_redis.py | 24 +++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 support/testing/tests/package/test_redis.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa8e077a07..a3800d4ba1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -513,6 +513,7 @@ tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: { extends: .runtime_te tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: { extends: .runtime_test } tests.package.test_python_ubjson.TestPythonPy2Ubjson: { extends: .runtime_test } tests.package.test_python_ubjson.TestPythonPy3Ubjson: { extends: .runtime_test } +tests.package.test_redis.TestRedis: { extends: .runtime_test } tests.package.test_rings.TestLuaRings: { extends: .runtime_test } tests.package.test_rings.TestLuajitRings: { extends: .runtime_test } tests.package.test_rust.TestRust: { extends: .runtime_test } diff --git a/DEVELOPERS b/DEVELOPERS index e427ab15d4..9bb23dd970 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2559,6 +2559,7 @@ F: package/python-avro/ F: package/redis/ F: package/waf/ F: support/testing/tests/package/test_crudini.py +F: support/testing/tests/package/test_redis.py N: Trent Piepho F: package/libp11/ diff --git a/support/testing/tests/package/test_redis.py b/support/testing/tests/package/test_redis.py new file mode 100644 index 0000000000..d79998514e --- /dev/null +++ b/support/testing/tests/package/test_redis.py @@ -0,0 +1,24 @@ +import os + +import infra.basetest + + +class TestRedis(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_PACKAGE_REDIS=y + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + _, exit_code = self.emulator.run("redis-cli SET hello world") + self.assertEqual(exit_code, 0) + + output, exit_code = self.emulator.run("redis-cli GET hello") + self.assertEqual(exit_code, 0) + self.assertEqual(output[0].strip(), '"world"') From patchwork Sat May 9 16:50:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1286744 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=DosnFbS2; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49KCrq1TYSz9sNH for ; Sun, 10 May 2020 02:51:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 598AF20425; Sat, 9 May 2020 16:51:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kpLF2YUUuQOJ; Sat, 9 May 2020 16:51:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 782DC20357; Sat, 9 May 2020 16:51:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id DA38F1BF335 for ; Sat, 9 May 2020 16:51:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D425586DB0 for ; Sat, 9 May 2020 16:51:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KVmxp99EapUj for ; Sat, 9 May 2020 16:51:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7694786D6E for ; Sat, 9 May 2020 16:50:56 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id h9so5608721wrt.0 for ; Sat, 09 May 2020 09:50:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yoFhj0bYkduqGICpajWcGGkTY3zbFtEfr/xpymywadE=; b=DosnFbS2N25iFptakalKKg7KPIxjyeyEVHX+8b4HbVk1jJMgO5iogWbMT1FG6aReZg 1Nlh4mi42gibI6JjFYJiWzBTTmwTZDV6bHRxTTecUq6tNyEfvsNSgddQ6QG81LG6Vu1g t1y9qE/kJvCaI9su2jjuiPmSnMw956/wsl971Um9cB1WhvtJVLefQHDymLOa5PT56Qi1 WGUYHa7abEHEEQHcp93De8HAySCK7mlpazF0LTlCI91mlc96hTFisgJaRL/AjzH+arjQ +Guus2Jit2FbpZo+ghMnvyuyPtsz4vAL26xX1heEh22I6DHSkk5QgZugDr23uuLquwC1 bq5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yoFhj0bYkduqGICpajWcGGkTY3zbFtEfr/xpymywadE=; b=Q7incMRlhoh1XWFpX6Po4z+UFgmoKc8qkt8pNfK21yqujwlNolB2Y9omXzgP8vUCf6 uFNts9FQlTIGi2HSVlzODC1NpgEfA+/Jd3o4GuMybjGlA63lfDS75VLIgzAGJM5FSVUO dEx+AYePtJAGw2IHyg+iKCyS/AayiT1oizVg+TAYj9CzqZ+bCZgJEFkMQitYU7ms8jmQ 4Zh/7w7w6z9bVR0HS2Ysz1/WhydX5uV+rSGhj0sdr+5kOgdbqv8/VXzLiB237uZt59LG 1kj43HFK0SCIhIhBVtg5lg9x2LxzUqbwdxLfpOHUEV5YVdGfNqV1Qnu4fStO73f+0/sR ZSOg== X-Gm-Message-State: AGi0PubHt5FHL+tkvWwNEsyl+Qbm9TSxgoa2/Ek0TkJE4yLN9JOO9M6a NnTa6tmxT1PGPtB+Ww17sd0LsBCzpMyAnw== X-Google-Smtp-Source: APiQypIFTIWZAuA/IsBCvxJiMF31jw/bmuzoodRvVx5v9mF52+dNupenl4bA9Qk4ckEVgprAeQ1w8g== X-Received: by 2002:a5d:654a:: with SMTP id z10mr8798953wrv.234.1589043054522; Sat, 09 May 2020 09:50:54 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:cd2f:ad0c:9163:73be]) by smtp.gmail.com with ESMTPSA id u127sm18577787wme.8.2020.05.09.09.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 09:50:54 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sat, 9 May 2020 18:50:38 +0200 Message-Id: <20200509165039.10363-4-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200509165039.10363-1-titouan.christophe@railnova.eu> References: <20200509165039.10363-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/4] package/redis: add optional support for TLS connections X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Price , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Titouan Christophe --- package/redis/redis.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/redis/redis.mk b/package/redis/redis.mk index bb7829522d..c83a3a0775 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -30,6 +30,11 @@ endif REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ PREFIX=$(TARGET_DIR)/usr MALLOC=libc +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +REDIS_DEPENDENCIES += libopenssl +REDIS_BUILDOPTS += BUILD_TLS=yes +endif + define REDIS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) endef From patchwork Sat May 9 16:50:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1286743 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=LRdPYAaL; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49KCrk2nvbz9sNH for ; Sun, 10 May 2020 02:51:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B70CB8878B; Sat, 9 May 2020 16:51:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MQuUJ+mNliJE; Sat, 9 May 2020 16:51:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 237B1887BF; Sat, 9 May 2020 16:51:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C9C211BF335 for ; Sat, 9 May 2020 16:51:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C677286D92 for ; Sat, 9 May 2020 16:51:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gUpnygSumBpE for ; Sat, 9 May 2020 16:51:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B2B4A86D78 for ; Sat, 9 May 2020 16:50:57 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id h4so13362589wmb.4 for ; Sat, 09 May 2020 09:50:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BgDbBjv7yAJBze65jORiZ9qn/t1eq5M2KNGrDH3M+00=; b=LRdPYAaL2jL1HHJyGkQjqqbvySQtqH/Jy16zzdPR52aTZM6c1YwwDzhaGCmdpG0304 IgKJ53jqfJU+9Z3HfcI2WAw5ENlw8MHi8Y2TS++3FxtI9vBVpTVj2Usr22l2mbkTDQK8 zDk1QZGmteRgR2uJqyGMkQtwyBubkRz9oI9AapPJ8Ww9Kh8rszsvwgPtzRN2NbbsnJ9p Wcp3W3fYBzmxaJ32iB4YfFeBeRDIuO6fq6o9YnZfMDsRO9P/JYNBJwnrBX3DwFoTUhRq KqrfiBGW9J7PYf0UAxao7wj/9cwyUiGIMMvtDyCsS3jSCzptm4CCB7T9YrFI/dqmbmwi ecIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BgDbBjv7yAJBze65jORiZ9qn/t1eq5M2KNGrDH3M+00=; b=UomiubTc9Tsjwh7Y6dVD0ZAVuV748GiyJpDyeJ+PcWVfw0/mhSaGQ0FsiNwPDW+sBU IIKY7AaIOwz//5GMpXZpBh06HTQGGb0eoM64KTIEGyCzTXDBcueqBjS0MQzJvbUhmWVu A4kHM2CB4ZIv2tIB5+px8VMgqqqTuytLsLx2Ds+354WZkiEikBO431lvTiIyr9SsuQkn zpCV5sREw/V4sSRHjWnVum6WrmERmceiLQoB5aDrZ7irOrycGpHx4LfioZpc3ej7C49G EziKaNMKDWF/I0IGc+DIhvPFAx0UWHzvQB1TaKVuBIZL1yJpkd2mdrtJqgB9c1Jl/dx3 0Hwg== X-Gm-Message-State: AGi0PuaCKNSnLaBREk3D+gjA1LhQLXhGBF71aRYDofk/X8WwKbQ1bXIj 0Sc3NZGc4CSD3+m1xMlaC+9gbS4UVtclTA== X-Google-Smtp-Source: APiQypJhwjgyhpizvMPjDY+D5cZLLZg/QkPeCEkkLvsblwgFF07dqY7YThcUnUWhXY3z7LHb9ea/og== X-Received: by 2002:a1c:5642:: with SMTP id k63mr21809305wmb.188.1589043055913; Sat, 09 May 2020 09:50:55 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:cd2f:ad0c:9163:73be]) by smtp.gmail.com with ESMTPSA id u127sm18577787wme.8.2020.05.09.09.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 09:50:55 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sat, 9 May 2020 18:50:39 +0200 Message-Id: <20200509165039.10363-5-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200509165039.10363-1-titouan.christophe@railnova.eu> References: <20200509165039.10363-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/4] package/redis: add optional support for systemd X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Price , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Use the unit type=notify (Redis contacts systemd when ready) - Start redis with the supervised option, so it knows it should talk to systemd Signed-off-by: Titouan Christophe --- package/redis/redis.mk | 4 ++++ package/redis/redis.service | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/redis/redis.mk b/package/redis/redis.mk index c83a3a0775..8d4c3947fc 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -30,6 +30,10 @@ endif REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ PREFIX=$(TARGET_DIR)/usr MALLOC=libc +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +REDIS_DEPENDENCIES += systemd +endif + ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) REDIS_DEPENDENCIES += libopenssl REDIS_BUILDOPTS += BUILD_TLS=yes diff --git a/package/redis/redis.service b/package/redis/redis.service index 0a8162b8ab..2cc82a1980 100644 --- a/package/redis/redis.service +++ b/package/redis/redis.service @@ -1,13 +1,15 @@ [Unit] -Description=Advanced key-value store +Description=Redis data structure server +Documentation=https://redis.io/documentation After=network.target [Service] -Type=simple +Type=notify User=redis Group=redis -ExecStart=/usr/bin/redis-server /etc/redis.conf -ExecStop=/usr/bin/redis-cli shutdown +ExecStart=/usr/bin/redis-server --supervised systemd --daemonize no +TimeoutStartSec=5 +TimeoutStopSec=5 CapabilityBoundingSet= PrivateTmp=true PrivateDevices=true