From patchwork Mon Oct 12 20:18:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1381130 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=m6WVeOeW; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C994c4VMmz9sTK for ; Tue, 13 Oct 2020 07:19:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2EED785E9B; Mon, 12 Oct 2020 20:19:09 +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 PvQ6r1LcOIuW; Mon, 12 Oct 2020 20:19:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 19A7885B18; Mon, 12 Oct 2020 20:19:05 +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 B54BA1BF304 for ; Mon, 12 Oct 2020 20:19:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B229C85B18 for ; Mon, 12 Oct 2020 20:19:03 +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 lFRYIq9NQNx3 for ; Mon, 12 Oct 2020 20:19:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id F31C5853D9 for ; Mon, 12 Oct 2020 20:19:01 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id q5so18872723wmq.0 for ; Mon, 12 Oct 2020 13:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8znnTtV1BL65b03dBChAgpI5ynYxJhjYJ2kxlitel/w=; b=m6WVeOeWHWLZvEbawazugGI3Y8PoM73gTmAYmScyojesnY+DkVDTEC4/SHsQC+bCzO UsAvqplF0FQTP3Mx0GO2SrSTiO45xx8mYOpF7A2880JlPtcwKF6fRKCaji+Pi6f/EYfe sxGenCCUQolQYPiMKeb4r9oWEBg4fm39rmjAZhdCyfokUne4rRPyggeVu7X6rWqKk3ue ThyZ1hSMITG/jUNgsHV6rjJ8KbBt9dRu85UUPzas/uEWnVL7fcPRRh6CvXfqZs/gbL+N bpMk1ZaSIEZ9dO4bb6Yg4FCo2IPRfioTOkAUOlim5rFsGToJVyULPRR1u9REumoQa+d2 TD8Q== 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:mime-version :content-transfer-encoding; bh=8znnTtV1BL65b03dBChAgpI5ynYxJhjYJ2kxlitel/w=; b=Doob6s8CNJKROJXS6BtIVeHYrDr0SabsAkPz/BAWGsjsL+2WIjA7Xqfx6BILqzkDGl vgmRDRkzQThGi6iS4blV/7oaazv7V3LXQEswC4BWkEzBHNmmWGuyh5Cpq6qeNA7JuB8i DiTd78OHJ1TeOfPfNAPzdiXIFS3XZHBA/M3CSHP07QY9JRdsXIwItp/46mh7tM/mwxmT SwS1GWk+wVzBgSeqHrjb3sCWg05DDvMbgs8dhCjjFKXQSHnn2y/FiYpb17XmUWZo56QY 1zm+PEB0n/ToS7GJFEPdSznE9416pd7i//aX9waBoIC7A8RWo7QyKHfyfTo/f6Eq/4OL JbzA== X-Gm-Message-State: AOAM531Sf6z8HwAQwgreMq50dyR4d2g49N9w0oit++FUZM2xzIRRtnD1 o5JSC5QbyMRo9CajKoY2bZsTa8we/g6orw== X-Google-Smtp-Source: ABdhPJyPy5gcxe+QugnN4fKqv/W9zqlNnGcTaaTD1tWLbMQNb1qA6i3yVXGsmiIkT6acllhVnrypDg== X-Received: by 2002:a1c:4d01:: with SMTP id o1mr12762697wmh.39.1602533940237; Mon, 12 Oct 2020 13:19:00 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id s185sm23928208wmf.3.2020.10.12.13.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 13:18:59 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 12 Oct 2020 22:18:48 +0200 Message-Id: <20201012201849.3040707-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/sslh: drop C++ dependency 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: David Bachelart , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" sslh is written in plain C so drop C++ dependency Signed-off-by: Fabrice Fontaine --- package/sslh/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/sslh/Config.in b/package/sslh/Config.in index 21bd65f165..e490c8c837 100644 --- a/package/sslh/Config.in +++ b/package/sslh/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SSLH bool "sslh" - depends on BR2_INSTALL_LIBSTDCPP # uses fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCONFIG @@ -8,7 +7,3 @@ config BR2_PACKAGE_SSLH Applicative protocol multiplexer http://www.rutschle.net/tech/sslh.shtml - -comment "sslh needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP From patchwork Mon Oct 12 20:18:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1381131 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=orJFBFOq; 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 4C994d1Fnxz9sSn for ; Tue, 13 Oct 2020 07:19:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 52BD586A46; Mon, 12 Oct 2020 20:19:11 +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 zwqBoYW2rybb; Mon, 12 Oct 2020 20:19:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0BFE786A35; Mon, 12 Oct 2020 20:19:09 +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 8B1171BF304 for ; Mon, 12 Oct 2020 20:19:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8379B2026D for ; Mon, 12 Oct 2020 20:19:07 +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 IVGtjvXZYlnv for ; Mon, 12 Oct 2020 20:19:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by silver.osuosl.org (Postfix) with ESMTPS id 69E602010D for ; Mon, 12 Oct 2020 20:19:05 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id p15so18324777wmi.4 for ; Mon, 12 Oct 2020 13:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M9N4WcNDIPvarTjf7hrFqOf6GI8sw17n4aNIBBfZJlk=; b=orJFBFOqbiae8fC+DBTvCFRcwJ2al3GsL3IV8IOJ/UE1c0SQDI4U82h8tDP0O5SNpZ WT+xY3INUe0a6MiHMbeRgIcZ8RLmCkYnojevxjD5suswEvW4BQQklIZOZ4NCqeNEJUL2 zYErzVjEgJ5asE/STGJY3AyUk4srxwKAQmXR9hb2xGg20A4eCvSLzybHab131r/wG/gC G1k0VoJFAkwpX5ugq4LKQh4XTAvxKwekLqq+kV7C1Zr7NUK504J0D0F7/Bw0GTAsG88c bfObGspnDs1Vh1e0JzRiI+N3tcRQuT2igO7JxD5FtPTOW2nEk41gxj52groCX/QOjafh xXhA== 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=M9N4WcNDIPvarTjf7hrFqOf6GI8sw17n4aNIBBfZJlk=; b=BS+vwxvK25bx0zRhgQC1R6IgwsLYwuDKPlo2zaW4GsGOdPOYGEVLgmdV8NIOXhCOA/ PZwfnPE+umLaWCRluAXEmFD8s5G/JksZF+i9KVPn9KX7mRe8dH4hTByBOykhoUDgqqky kyDQnXz+GP9uxjtYf7b8TC4bNJ4U/qBAxyptcC+J0DEog0CVuXm0uKM5SrqeQVd2ow7g p4H9ARmy4FDHB0d90tQB9FLoRxB9YOq3bGBYX3LVCIAnf8bgUlqRvsgOAcosVJxqzGZC CYtdMHqYu/kfOzv+6+7aKZjxlDWR5gY1cGBgVjX8LmqN1ENzkYaaYCoFtDdWTG4WO+Fv MbFw== X-Gm-Message-State: AOAM530iDINWxTyLoMoFUd7IJdQGrMBirjjK1pgL7E8DMnjaIVvVdjcF xLbLdU9LO7gYEpgJQq/od3PxspE+GBirCQ== X-Google-Smtp-Source: ABdhPJz2GizNfiq0tR5COnJH5IKBEojlaUTByuP/G0kkdDe1NSd/tL8TAsdbI59WtORNRYOpUlb2fA== X-Received: by 2002:a1c:4909:: with SMTP id w9mr12969337wma.133.1602533943561; Mon, 12 Oct 2020 13:19:03 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id s185sm23928208wmf.3.2020.10.12.13.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 13:19:02 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 12 Oct 2020 22:18:49 +0200 Message-Id: <20201012201849.3040707-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012201849.3040707-1-fontaine.fabrice@gmail.com> References: <20201012201849.3040707-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/sslh: bump to version 1.21c 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: David Bachelart , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Drop patch (already in version) - libbsd is an optional dependency since version 1.21b and https://github.com/yrutschle/sslh/commit/0380a4309f826062a4ab772e65077c0566d8fbd4 - libconfig is optional since version 1.21c and https://github.com/yrutschle/sslh/commit/2c93a015ea1d261a934df00285691522e6a6d211 - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...hile-building-sslh-in-a-larger-git-t.patch | 45 ------------------- package/sslh/Config.in | 1 - package/sslh/sslh.hash | 4 +- package/sslh/sslh.mk | 18 ++++++-- 4 files changed, 17 insertions(+), 51 deletions(-) delete mode 100644 package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch diff --git a/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch b/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch deleted file mode 100644 index d23bc9fae6..0000000000 --- a/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0c39699da9a3d6534b6d26e7c9686ee76d81b64a Mon Sep 17 00:00:00 2001 -From: David Bachelart -Date: Thu, 26 Jan 2017 10:07:47 +0100 -Subject: [PATCH] fix version extraction when building in a larger git tree - -sslh uses host git to extract its own version number. In buildroot, this -is an issue since extracted information is conflicting with buildroot git -status if we use git as VCS for buildroot. - -Since these git calls are legitimate only if git is used for the sslh -subtree only, this patch adds a check : a .git directory has to exist at -the root of the project to enable git-extracted version string. - -Signed-off-by: David Bachelart -[yann.morin.1998@free.fr: fix troll character U+c2a0] -Signed-off-by: "Yann E. MORIN" ---- - genver.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/genver.sh b/genver.sh -index 79fd0a0..051e57b 100755 ---- a/genver.sh -+++ b/genver.sh -@@ -7,7 +7,7 @@ else - QUIET=0 - fi - --if ! `(git status | grep -q "On branch") 2> /dev/null`; then -+if [ ! -d .git ] || ! `(git status | grep -q "On branch") 2> /dev/null`; then - # If we don't have git, we can't work out what - # version this is. It must have been downloaded as a - # zip file. -@@ -25,7 +25,7 @@ if ! `(git status | grep -q "On branch") 2> /dev/null`; then - fi - fi - --if head=`git rev-parse --verify HEAD 2>/dev/null`; then -+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then - # generate the version info based on the tag - release=`(git describe --tags || git --describe || git describe --all --long) \ - 2>/dev/null | tr -d '\n'` --- -2.1.4 - diff --git a/package/sslh/Config.in b/package/sslh/Config.in index e490c8c837..e608586c27 100644 --- a/package/sslh/Config.in +++ b/package/sslh/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_SSLH bool "sslh" # uses fork() depends on BR2_USE_MMU - select BR2_PACKAGE_LIBCONFIG help Applicative protocol multiplexer diff --git a/package/sslh/sslh.hash b/package/sslh/sslh.hash index c25b37b8ab..00e5c12d77 100644 --- a/package/sslh/sslh.hash +++ b/package/sslh/sslh.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7f49b0a1cfcb7bb9d97f5ffa932bff11c5f65d9a9bd8fe1812481dee5855116 sslh-v1.20.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 sslh-v1.21c.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index ba91f8c4d6..4bde143cd8 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -4,16 +4,21 @@ # ################################################################################ -SSLH_VERSION = 1.20 +SSLH_VERSION = 1.21c SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz SSLH_SITE = http://www.rutschle.net/tech/sslh SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING -SSLH_DEPENDENCIES = libconfig - SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) +ifeq ($(BR2_PACKAGE_LIBBSD),y) +SSLH_DEPENDENCIES += libbsd +SSLH_MAKE_OPTS += USELIBBSD=1 +else +SSLH_MAKE_OPTS += USELIBBSD= +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) SSLH_DEPENDENCIES += libcap SSLH_MAKE_OPTS += USELIBCAP=1 @@ -21,6 +26,13 @@ else SSLH_MAKE_OPTS += USELIBCAP= endif +ifeq ($(BR2_PACKAGE_LIBCONFIG),y) +SSLH_DEPENDENCIES += libconfig +SSLH_MAKE_OPTS += USELIBCONFIG=1 +else +SSLH_MAKE_OPTS += USELIBCONFIG= +endif + ifeq ($(BR2_PACKAGE_PCRE),y) SSLH_DEPENDENCIES += pcre SSLH_MAKE_OPTS += USELIBPCRE=1