From patchwork Wed Mar 25 09:38:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 1261268 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=WND6lDtQ; 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 48nNMN5xgYz9sRY for ; Wed, 25 Mar 2020 20:37:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6EE8B86CDB; Wed, 25 Mar 2020 09:37:49 +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 fenOaaRBGlOp; Wed, 25 Mar 2020 09:37:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BCEC184E24; Wed, 25 Mar 2020 09:37:45 +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 020DF1BF37C for ; Wed, 25 Mar 2020 09:37:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F25A022803 for ; Wed, 25 Mar 2020 09:37:44 +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 DuP65Kfe449Q for ; Wed, 25 Mar 2020 09:37:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ot1-f66.google.com (mail-ot1-f66.google.com [209.85.210.66]) by silver.osuosl.org (Postfix) with ESMTPS id 7B839227F7 for ; Wed, 25 Mar 2020 09:37:42 +0000 (UTC) Received: by mail-ot1-f66.google.com with SMTP id t28so1303070ott.5 for ; Wed, 25 Mar 2020 02:37:42 -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=KsqkFMeVmWp7lJwgq7qSYZVIvntVCsIjwOx5ATdKwCU=; b=WND6lDtQNb1ZLcaLK/9l41SO+5Y1vnc9kY4JvMUVn5SPIevUx/3yoweKoADNPPnTeS fKRdjd0MQeVfElWIGqyU0MdrvB2SkvMiZ96nnQjsKazv0/odv4lLaG2utoMaXgW4SDaX PmIZvU6ahlaLvwlduQdsbSJxtGBNejqa21vU7i/ufLYjuyLEaAsgmukDYIHXtxGrmE7B 4o70/741c7iGY1pwEybpzwjPDIq3fu9pxIJKmSuna3r7uiwzseJNbVu0VKNy8SIjJlpA 5N+sc4ZJAnKJGgd6bvpWlxpyxYRkeNV+uRXoiYb/Bc9QSX8waiV3JjamMG57gxmyAKkj R/nA== 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=KsqkFMeVmWp7lJwgq7qSYZVIvntVCsIjwOx5ATdKwCU=; b=ewEavoSY39JjPMo6Xad2db8lavI9UZmVTlUlMdsW8fBK2tGb/bayDa50f5mw0RhQES bdHZyTZ+VhUSk9qdQnxfFevdbvQYwOsbxNOUSXFYvoBrYEyLA90FcshbbOtD14yfxPuk QxUzUh7OIAFLqJhZ1vF8e+ikkakMfMsZr924XdIextBOptmUX/XLgMgSSNmexzHjPt5q Bn3YRDr6hwE2XG2/6v97DQzxn4Ra9ps9yWPGnLcJgO4pyQm3w+QG6XAy39NkXx/IGwbb mfMxQCuZaxunh/XliI/9CF1mla+ZODhOPSfQ6A1/N9GB6bH9+ZNz+pfP+B0Px3gPZ10w Q5MA== X-Gm-Message-State: ANhLgQ2FOOawlt4NBlDAlpTBsmiBCqyIflYXkI3mDiP/GJErIJ0BVl7r aOVrv7qtUcK0Jq8kE+WkyYR/0SbX7yk= X-Google-Smtp-Source: ADFU+vsSbD4yrnF6ryzD6MLtGYqQTBBivI8hRxkxJU3IonbNCdF+a0uc7CIEZweGZUgQLngOLCEPiQ== X-Received: by 2002:a9d:4e3:: with SMTP id 90mr1825563otm.261.1585129061361; Wed, 25 Mar 2020 02:37:41 -0700 (PDT) Received: from localhost ([131.228.32.166]) by smtp.gmail.com with ESMTPSA id w15sm488587ooq.24.2020.03.25.02.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 02:37:40 -0700 (PDT) From: Thomas De Schampheleire To: buildroot@buildroot.org Date: Wed, 25 Mar 2020 10:38:26 +0100 Message-Id: <20200325093826.26221-1-patrickdepinguin@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/syslog-ng: update patch that fixes --with-net-snmp 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: Chris Packham , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas De Schampheleire The final solution accepted upstream differs from the local patch applied earlier in Buildroot (commit 4ff6e5239240a4e1bdf73c41d6e9bff9473ec62c). Update the local code accordingly. Signed-off-by: Thomas De Schampheleire --- .../0002-configure.ac-fix-with-netsnmp.patch | 44 +++++++++++-------- package/syslog-ng/syslog-ng.mk | 2 +- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch b/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch index f5b2a39bba..4d531aedd0 100644 --- a/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch +++ b/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch @@ -1,7 +1,7 @@ -From 39ab118a7e79b223941b50b372c8ed51f0e21f4b Mon Sep 17 00:00:00 2001 +From bc327e4deb44f6b7a380a85d0b344647ea162ea9 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Mon, 16 Mar 2020 15:41:03 +0100 -Subject: [PATCH] configure.ac: fix --with-netsnmp +Subject: [PATCH] configure.ac: fix --with-net-snmp The option '--with-net-snmp' did not work, because later checks were using the variable '$with_netsnmp' rather than '$with_net_snmp'. @@ -10,32 +10,40 @@ There are two possible solutions: - make the option '--with-netsnmp' - change the internal variables -Taking into account that latest upstream has moved away from autotools and -towards cmake, we opt for the first option that has the least amount of -changes. +Opt for the second option so the user-visible options remain the same. Signed-off-by: Thomas De Schampheleire -Upstream-status: not applicable (latest upstream moved to cmake) - +Upstream-status: backport --- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index bfc85c32d..392ab8bf3 100644 +index 75901bd98..6e8462c37 100644 --- a/configure.ac +++ b/configure.ac -@@ -148,8 +148,8 @@ AC_ARG_WITH(libnet, +@@ -151,7 +151,7 @@ AC_ARG_WITH(libnet, + AC_ARG_WITH(net-snmp, + [ --with-net-snmp=path use path to net-snmp-config script], , - [with_libnet=""]) +- [with_netsnmp=""]) ++ [with_net_snmp=""]) --AC_ARG_WITH(net-snmp, -- [ --with-net-snmp=path use path to net-snmp-config script], -+AC_ARG_WITH(netsnmp, -+ [ --with-netsnmp=path use path to net-snmp-config script], - , - [with_netsnmp=""]) + AC_ARG_WITH(pidfile-dir, + [ --with-pidfile-dir=path Use path as the directory for storing pidfiles], +@@ -1104,10 +1104,10 @@ dnl afsnmp module & net-snmp headers/libraries + dnl *************************************************************************** + AC_MSG_CHECKING(whether to enable snmp destination driver) + +-if test "x$with_netsnmp" = "x"; then ++if test "x$with_net_snmp" = "x"; then + NETSNMP_CONFIG="`which net-snmp-config`" + else +- NETSNMP_CONFIG="$with_netsnmp/net-snmp-config" ++ NETSNMP_CONFIG="$with_net_snmp/net-snmp-config" + fi + if test "x$enable_afsnmp" = "xyes"; then -- 2.24.1 diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 203f2c96b6..a0c21a8907 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -100,7 +100,7 @@ endif ifeq ($(BR2_PACKAGE_NETSNMP),y) SYSLOG_NG_DEPENDENCIES += netsnmp SYSLOG_NG_CONF_OPTS += --enable-snmp-dest -SYSLOG_NG_CONF_OPTS += --with-netsnmp="$(STAGING_DIR)/usr/bin" +SYSLOG_NG_CONF_OPTS += --with-net-snmp="$(STAGING_DIR)/usr/bin" else SYSLOG_NG_CONF_OPTS += --disable-snmp-dest endif