From patchwork Wed Apr 20 02:13:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 2375 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id SG56C0n5X2KgOAAAqwncew (envelope-from ) for ; Wed, 20 Apr 2022 08:15:05 -0400 Received: from proxy1.mail.ord1d.rsapps.net ([172.30.191.6]) by director13.mail.ord1d.rsapps.net with LMTP id WMXuIEn5X2JqVQAA91zNiA (envelope-from ) for ; Wed, 20 Apr 2022 08:15:05 -0400 Received: from smtp21.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.ord1d.rsapps.net with LMTPS id mMqfIEn5X2KCQAAAasrz9Q (envelope-from ) for ; Wed, 20 Apr 2022 08:15:05 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp21.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=sf.lists.topphemmelig.net; dmarc=fail (p=none; dis=none) header.from=sf.lists.topphemmelig.net X-Suspicious-Flag: YES X-Classification-ID: 82c5dcba-c0a3-11ec-ac8d-a0369f0d8808-1-1 Received: from [216.105.38.7] ([216.105.38.7:52756] helo=lists.sourceforge.net) by smtp21.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 81/B3-27606-949FF526; Wed, 20 Apr 2022 08:15:05 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nh9DW-0006oE-9K; Wed, 20 Apr 2022 12:13:52 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nh9DU-0006o4-Oz for openvpn-devel@lists.sourceforge.net; Wed, 20 Apr 2022 12:13:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0mahJYXQ1pMH/NF6HwpwvSUbke5HS+pFRTCBPXUI7tk=; b=DZrUgvqwsxWwJ/DRpibDemELXw sAzb4niFmE5rynfdoaMB1vb3BE/t+VHNzm+O3613tUSGb3x0E01EZPVItWvOhtGIyCjNwSgLOIZgt EYaOYZ6x1AXNl8n1ysylVXjYD+GjYvc5t/dJzGh0ZN226QC+dqUeXdBRBikypSYh7QKg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=0mahJYXQ1pMH/NF6HwpwvSUbke5HS+pFRTCBPXUI7tk=; b=K FnqxxAcezV4WQ2pdWJwrS2AL3VHRTL9x9DqZQh855OoOChOfuwyFu7FpPfbIFLd4UPcnkkabQ1YwT mDcxIZmqXID/45/l6M5ktDdEh27+os0zelV0lC49+xO0YGRrPniUdR4pIzfEwXQs1irgEpdkgJtrq dSjqc0qlGvSjU6Eg=; Received: from mx1.basenordic.cloud ([217.170.196.134]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nh9DQ-0004yj-IC for openvpn-devel@lists.sourceforge.net; Wed, 20 Apr 2022 12:13:51 +0000 Received: from localhost (unknown [127.0.0.1]) by mx1.basenordic.cloud (Postfix) with ESMTP id B20C0E715; Wed, 20 Apr 2022 12:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sf.lists.topphemmelig.net; s=inouz9eefah2too5; t=1650456816; bh=0mahJYXQ1pMH/NF6HwpwvSUbke5HS+pFRTCBPXUI7tk=; h=From:To:Cc:Subject:Date:From; b=LNZCwM3y+zTVf6Z3uQlLz92fXCyT/Y+Vp7XK3sWeYttiGYS2H12bpGwN/YujikjFn +iBQebh5q7OcAgkVKCKK4CUHkYoROob5RJkcQ+vjaQ4o2mxBCEItJF6lkpGw/za5i6 fmr7LUxKRi4EY9rVJ1rdX05X+HfL4nmO7B93IfZSYUrLMPV/x1dQ/hajdrPAMqgN/n sOc+65oWPtJh/VHCgcmYpWQM6+iaiCUO8Hgke2as2Faxwhx13eLP7lIgTKSzCrhI9d o1dmF2VJF7wEdL+ZKrRgvVu1tEzHRDPdoiEoJH++DkSskDT4GkZ7BiW2qq6y73sltV OX9Qk0sekubuw== Received: from mx1.basenordic.cloud ([127.0.0.1]) by localhost (mx1.basenordic.cloud [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wANLlAQxg9jy; Wed, 20 Apr 2022 14:13:36 +0200 (CEST) Received: from xplorer.net (xplorer.sommerseth.xyz [10.35.7.11]) by mx1.basenordic.cloud (Postfix) with ESMTP id 031F1E712; Wed, 20 Apr 2022 14:13:36 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Wed, 20 Apr 2022 14:13:20 +0200 Message-Id: <20220420121322.42732-1-openvpn@sf.lists.topphemmelig.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: David Sommerseth The bug in uncrustify 0.64 is no longer causing us issues as we now require at least v0.72. This workaround was added as part of the initial reformat-all inclusion, in commit 2417d55c4945d491e. Content analysis details: (-2.4 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [217.170.196.134 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-Headers-End: 1nh9DQ-0004yj-IC Subject: [Openvpn-devel] [PATCH 1/3] dev-tools: Remove no longer needed openvpn-plugin.h.in patching X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Sommerseth Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: David Sommerseth The bug in uncrustify 0.64 is no longer causing us issues as we now require at least v0.72. This workaround was added as part of the initial reformat-all inclusion, in commit 2417d55c4945d491e. Signed-off-by: David Sommerseth Acked-by: Gert Doering --- .../after_include_openvpn-plugin.h.in.patch | 13 ------------- .../before_include_openvpn-plugin.h.in.patch | 13 ------------- dev-tools/special-files.lst | 1 - 3 files changed, 27 deletions(-) delete mode 100644 dev-tools/reformat-patches/after_include_openvpn-plugin.h.in.patch delete mode 100644 dev-tools/reformat-patches/before_include_openvpn-plugin.h.in.patch diff --git a/dev-tools/reformat-patches/after_include_openvpn-plugin.h.in.patch b/dev-tools/reformat-patches/after_include_openvpn-plugin.h.in.patch deleted file mode 100644 index 100da078..00000000 --- a/dev-tools/reformat-patches/after_include_openvpn-plugin.h.in.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/openvpn-plugin.h.in b/include/openvpn-plugin.h.in -index 05bffab..05b4b6a 100644 ---- a/include/openvpn-plugin.h.in -+++ b/include/openvpn-plugin.h.in -@@ -169,7 +169,7 @@ typedef void *openvpn_plugin_handle_t; - /* - * We are compiling OpenVPN. - */ --/* #define OPENVPN_PLUGIN_DEF typedef */ -+#define OPENVPN_PLUGIN_DEF typedef - #define OPENVPN_PLUGIN_FUNC(name) (*name) - - #else /* ifdef OPENVPN_PLUGIN_H */ diff --git a/dev-tools/reformat-patches/before_include_openvpn-plugin.h.in.patch b/dev-tools/reformat-patches/before_include_openvpn-plugin.h.in.patch deleted file mode 100644 index 679c4149..00000000 --- a/dev-tools/reformat-patches/before_include_openvpn-plugin.h.in.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/openvpn-plugin.h.in b/include/openvpn-plugin.h.in -index 34ad18b..f4c5472 100644 ---- a/include/openvpn-plugin.h.in -+++ b/include/openvpn-plugin.h.in -@@ -169,7 +169,7 @@ typedef void *openvpn_plugin_handle_t; - /* - * We are compiling OpenVPN. - */ --#define OPENVPN_PLUGIN_DEF typedef -+// #define OPENVPN_PLUGIN_DEF typedef - #define OPENVPN_PLUGIN_FUNC(name) (*name) - - #else diff --git a/dev-tools/special-files.lst b/dev-tools/special-files.lst index f3f77ea3..64ee9e1a 100644 --- a/dev-tools/special-files.lst +++ b/dev-tools/special-files.lst @@ -1,4 +1,3 @@ E:doc/doxygen/doc_key_generation.h # @verbatim section gets mistreated, exclude it E:src/compat/compat-lz4.c # Preserve LZ4 upstream formatting E:src/compat/compat-lz4.h # Preserve LZ4 upstream formatting -P:include/openvpn-plugin.h.in # uncrustify segfaults, patch it before+after From patchwork Wed Apr 20 02:13:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 2377 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.28.255.1]) by backend41.mail.ord1d.rsapps.net with LMTP id 2GbdAUr5X2IIOQAAqwncew (envelope-from ) for ; Wed, 20 Apr 2022 08:15:06 -0400 Received: from proxy4.mail.ord1c.rsapps.net ([172.28.255.1]) by director10.mail.ord1d.rsapps.net with LMTP id ELxsF0r5X2KLfQAApN4f7A (envelope-from ) for ; Wed, 20 Apr 2022 08:15:06 -0400 Received: from smtp25.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.ord1c.rsapps.net with LMTPS id SCrLMEj5X2KYNwAAjcXvpA (envelope-from ) for ; Wed, 20 Apr 2022 08:15:04 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp25.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=sf.lists.topphemmelig.net; dmarc=fail (p=none; dis=none) header.from=sf.lists.topphemmelig.net X-Suspicious-Flag: YES X-Classification-ID: 82e7ae76-c0a3-11ec-aede-b8ca3a673c88-1-1 Received: from [216.105.38.7] ([216.105.38.7:48864] helo=lists.sourceforge.net) by smtp25.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id F0/28-03477-949FF526; Wed, 20 Apr 2022 08:15:05 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nh9DT-0002cA-G5; Wed, 20 Apr 2022 12:13:52 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nh9DR-0002c4-Qz for openvpn-devel@lists.sourceforge.net; Wed, 20 Apr 2022 12:13:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8nvceIVpEFpNkQAKMeuqoWO0ptqLyFeeYYUdDr1EdAU=; b=DPmMytOzy0KHc0ULSX9CQYpCY1 8VJEQ5I5Q1qjoV+mLkwAUPTwalK+SijZfkKi1Kzi9i5txDSkq2kguH8pfrZZp191PkuNN7Xe0ZbRX 5lGDrtnaBael4/YZC6PIZe+MCunWx6k9Rvp9PKcK9iAa9oqJbHHG0PBXplVdcs8P8Lts=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=8nvceIVpEFpNkQAKMeuqoWO0ptqLyFeeYYUdDr1EdAU=; b=X7wrrg2mq7U039j18HR1rl+NtQ t4MB07N5ZpCggCjRy0uQbA7X7+gyw5Yhsr0i6TKDFtyXvdyeDIXpJTLSp8H5iM/nnS+LtXD2bI3WS Yg6pBgOje7aPz4cjG3TxeNTG0HcYMfj+jdLbAPuBqX1NeyeoQ/Yk52TQ29B9ZFzsj9YY=; Received: from mx1.basenordic.cloud ([217.170.196.134]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nh9DP-0004yk-GR for openvpn-devel@lists.sourceforge.net; Wed, 20 Apr 2022 12:13:50 +0000 Received: from localhost (unknown [127.0.0.1]) by mx1.basenordic.cloud (Postfix) with ESMTP id 8EF28E712; Wed, 20 Apr 2022 12:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sf.lists.topphemmelig.net; s=inouz9eefah2too5; t=1650456817; bh=8nvceIVpEFpNkQAKMeuqoWO0ptqLyFeeYYUdDr1EdAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bmwNWwmJRHOZfiY0NVHb5HJHpXT6j6ifDp0w7JK8CaPjBSvApBKMTCWJDeNqfEwN9 AiV3yhJu3zxLjbyZ/tcaKBUG53g8631Luw0dElHhqqUNSYpmzFlc/8LXrvD4rAVoo9 WEmNZl7qHWG1YJcTWANi0NOU7Eqaj8D2pwLM+oUv1ekmdPny0F9zsVxGBa7Ub4jW62 Ecp8mJv0zLqCQVO1+76fc7kIU41+icUxOAtjvGhSKdpWzHB/xJjiqJoZB5sMPVBjyb WJIWlt1pFmK6qeHra/g5HUo0T+as3PpGTqSVbaU5k7Bpia7k5i4gS72l8VENnJ42t0 7RtAxKZuW4Jkg== Received: from mx1.basenordic.cloud ([127.0.0.1]) by localhost (mx1.basenordic.cloud [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ftrka2wkBnfc; Wed, 20 Apr 2022 14:13:36 +0200 (CEST) Received: from xplorer.net (xplorer.sommerseth.xyz [10.35.7.11]) by mx1.basenordic.cloud (Postfix) with ESMTP id CCD14E716; Wed, 20 Apr 2022 14:13:36 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Wed, 20 Apr 2022 14:13:21 +0200 Message-Id: <20220420121322.42732-2-openvpn@sf.lists.topphemmelig.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220420121322.42732-1-openvpn@sf.lists.topphemmelig.net> References: <20220420121322.42732-1-openvpn@sf.lists.topphemmelig.net> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: David Sommerseth The -p option to uncrustify was providing debug information about decisions done by uncrustify. This was useful when debugging why certain formatting choices. Content analysis details: (-2.4 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [217.170.196.134 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-Headers-End: 1nh9DP-0004yk-GR Subject: [Openvpn-devel] [PATCH 2/3] dev-tools: Remove uncrusify -p X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Sommerseth Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: David Sommerseth The -p option to uncrustify was providing debug information about decisions done by uncrustify. This was useful when debugging why certain formatting choices. With newer versions of uncrusitfy the -p option can only be used on individual files and not a list of files. Since still supporting this would require a bigger rewrite of reformat-all.sh, it was chosen to instead remove the usage of this option. If certain behaviours needs to be debugged, running uncrusity on individual files directly will work fine anyhow. Signed-off-by: David Sommerseth Acked-by: Gert Doering --- dev-tools/reformat-all.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/reformat-all.sh b/dev-tools/reformat-all.sh index dc2bfc4e..ff126b0f 100755 --- a/dev-tools/reformat-all.sh +++ b/dev-tools/reformat-all.sh @@ -80,8 +80,8 @@ cd "$srcroot" # Kick off uncrustify echo - echo "** INFO ** Running: uncrustify -c $cfg --no-backup -l C -p debug.uncr -F $files" - uncrustify -c "$cfg" --no-backup -l C -p debug.uncr -F "$files" 2>&1 + echo "** INFO ** Running: uncrustify -c $cfg --no-backup -l C -F $files" + uncrustify -c "$cfg" --no-backup -l C -F "$files" 2>&1 res=$? echo "** INFO ** Uncrustify completed (exit code $res)" } | tee "${log}-1" # Log needs to be closed here, to be processed in next block From patchwork Wed Apr 20 02:13:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 2376 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.28.255.1]) by backend41.mail.ord1d.rsapps.net with LMTP id sLzhOEn5X2KgOAAAqwncew (envelope-from ) for ; Wed, 20 Apr 2022 08:15:05 -0400 Received: from proxy7.mail.ord1c.rsapps.net ([172.28.255.1]) by director13.mail.ord1d.rsapps.net with LMTP id UBTAEkr5X2JqVQAA91zNiA (envelope-from ) for ; Wed, 20 Apr 2022 08:15:06 -0400 Received: from smtp16.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1c.rsapps.net with LMTPS id uJBjEkr5X2K3BAAAknS3pQ (envelope-from ) for ; Wed, 20 Apr 2022 08:15:06 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp16.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=sf.lists.topphemmelig.net; dmarc=fail (p=none; dis=none) header.from=sf.lists.topphemmelig.net X-Suspicious-Flag: YES X-Classification-ID: 8343303e-c0a3-11ec-a495-bc305bf036a4-1-1 Received: from [216.105.38.7] ([216.105.38.7:41148] helo=lists.sourceforge.net) by smtp16.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 76/96-17756-949FF526; Wed, 20 Apr 2022 08:15:06 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nh9DU-0001Pt-JW; Wed, 20 Apr 2022 12:13:51 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nh9DT-0001Pg-Lr for openvpn-devel@lists.sourceforge.net; Wed, 20 Apr 2022 12:13:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uJ4n9aW5siRDcFJn1lM5aHYLFdaM027oz7mXn1TLf4Y=; b=Z088SVY67rCtLXUyHlJllsG+db zaCWDMe5MZepWvN70HDR7aQi0kZJvEBDvavyTV49IuXATz2wyvjaeVXeheSark9aqNOFQCnV9xIwU VGF9zxyxWorXE4bR+I7a/sTgMT19KVc5qAZQyT7tCHilX10Un1tKxdiXx5jDt4gspW+0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=uJ4n9aW5siRDcFJn1lM5aHYLFdaM027oz7mXn1TLf4Y=; b=hnEMSxdqfBnX4/YjE1EUlFpk01 2eZflQP9uQQx5OgPkDIY0NKYlK9a/QMDBWHM5iyEnTZ5Yt/izQZtiTTNkaViRsOsQbzWnu7UUeyT0 aLiiSI0AzMRDjqTHZO+4u5ICMIq3PPgwgbSNJ9xtGZoK+2HppNtHALGEC9lJMOPi/mQo=; Received: from mx1.basenordic.cloud ([217.170.196.134]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nh9DP-0004ym-GF for openvpn-devel@lists.sourceforge.net; Wed, 20 Apr 2022 12:13:50 +0000 Received: from localhost (unknown [127.0.0.1]) by mx1.basenordic.cloud (Postfix) with ESMTP id 6CFDEE717; Wed, 20 Apr 2022 12:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sf.lists.topphemmelig.net; s=inouz9eefah2too5; t=1650456818; bh=uJ4n9aW5siRDcFJn1lM5aHYLFdaM027oz7mXn1TLf4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c75grFUjLcnikkXwvFYvJM7oSYagoN0BBtxm2ddYknQM4ZRsHnvHRMPeC1W2JpBzt XnnI6nqTa1S76fGP3VoUJyTlVHVLcF+eL/pS2fk+rtcR08WTFi5XHoJ/tcbMwlXF5X I8g90W2isUDKuAY5AMI3iM/Fi7WylEtnkeI42IPj9lBsmHAcXpldeQ3wW/4PdlofY+ n0deA43zSlhg0zRp+eS7EbaRCrNQRr+s2aQIJIXGoeZz1YyHNd1mzLiA2T6OujWa/O R/K47hOcycikBFGicc96c+Z8929oE8tKBnPH1KdCS//Kwu3/EKeBmce5MpYKZ/wsqO wnQzglpoBFtCQ== Received: from mx1.basenordic.cloud ([127.0.0.1]) by localhost (mx1.basenordic.cloud [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YS92De3ppZ5E; Wed, 20 Apr 2022 14:13:37 +0200 (CEST) Received: from xplorer.net (xplorer.sommerseth.xyz [10.35.7.11]) by mx1.basenordic.cloud (Postfix) with ESMTP id DAB04E716; Wed, 20 Apr 2022 14:13:37 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Wed, 20 Apr 2022 14:13:22 +0200 Message-Id: <20220420121322.42732-3-openvpn@sf.lists.topphemmelig.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220420121322.42732-1-openvpn@sf.lists.topphemmelig.net> References: <20220420121322.42732-1-openvpn@sf.lists.topphemmelig.net> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: David Sommerseth The MAC_FMT in src/openvpn/misc.h need to be formatted strictly, and uncrustify does not fully grasp the current code. So we tell it to not touch it. Signed-off-by: David Sommerseth --- src/openvpn/misc.h | 2 ++ 1 file changed, 2 insertions(+) Content analysis details: (-2.4 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [217.170.196.134 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-Headers-End: 1nh9DP-0004ym-GF Subject: [Openvpn-devel] [PATCH 3/3] dev-tools: Avoid uncrustify mangling MAC_FMT macro X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Sommerseth Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: David Sommerseth The MAC_FMT in src/openvpn/misc.h need to be formatted strictly, and uncrustify does not fully grasp the current code. So we tell it to not touch it. Signed-off-by: David Sommerseth Acked-by: Gert Doering --- src/openvpn/misc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h index 7970b60d..d8a15650 100644 --- a/src/openvpn/misc.h +++ b/src/openvpn/misc.h @@ -212,7 +212,9 @@ struct buffer prepend_dir(const char *dir, const char *path, struct gc_arena *gc); #define _STRINGIFY(S) #S +/* *INDENT-OFF* - uncrustify need to ignore this macro */ #define MAC_FMT _STRINGIFY(%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx) +/* *INDENT-ON* */ #define MAC_PRINT_ARG(_mac) _mac[0], _mac[1], _mac[2], \ _mac[3], _mac[4], _mac[5] #define MAC_SCAN_ARG(_mac) &_mac[0], &_mac[1], &_mac[2], \