From patchwork Thu Aug 4 05:03:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 2629 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 6ExDGfbf62JjUAAAIUCqbw (envelope-from ) for ; Thu, 04 Aug 2022 11:04:22 -0400 Received: from proxy15.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id YCDfGPbf62LlLwAAIasKDg (envelope-from ) for ; Thu, 04 Aug 2022 11:04:22 -0400 Received: from smtp3.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.ord1d.rsapps.net with LMTPS id 8BKKGPbf62JvHAAAAY1PeQ (envelope-from ) for ; Thu, 04 Aug 2022 11:04:22 -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: smtp3.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; dmarc=none (p=nil; dis=none) header.from=lichtenheld.com X-Suspicious-Flag: YES X-Classification-ID: b867d682-1406-11ed-8cbd-842b2b47481a-1-1 Received: from [216.105.38.7] ([216.105.38.7:44854] helo=lists.sourceforge.net) by smtp3.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6F/E8-28333-5FFDBE26; Thu, 04 Aug 2022 11:04:22 -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 1oJcNZ-0003G7-OF; Thu, 04 Aug 2022 15:03:18 +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 1oJcNX-0003Fw-Hr for openvpn-devel@lists.sourceforge.net; Thu, 04 Aug 2022 15:03:16 +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:To:From:Sender:Reply-To:Cc: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=uaKSw553b2FExxRj4h9UJ70/JhGbVFFE1Wbux9WEtAI=; b=kTBU9N7WnFRyhiEsvb3F38hP4H L6wxgqPAePeY89Wyi49fkkIvrsGygYvkORvD8fGT/7eqkPAkGfbsmg0OqdOMjwMUwqD1TRWDVvmRj nh5GLN9x0o/6TXy4qUpZAmPGdM2/q7visRV0mY7y3lr/4DVyX032W4tszHI0//dMUTrw=; 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:To:From:Sender:Reply-To:Cc: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=uaKSw553b2FExxRj4h9UJ70/JhGbVFFE1Wbux9WEtAI=; b=LkfwY8lYwgcZoJBqcXlBW2mYyo NW09vfHP2+HAkzliS2ZrBngf7OGwMKcRvQXW9cxEEAHQTEu3XjdxWc2PtwWSQmUbX682xoDNKU2po 39A5vqiRY7sWag69Uj3M8ZDBydRaqyP0QP81iIqW9qRgyzd0w3EOBdKsI8sPVn7M7apY=; Received: from mout-p-103.mailbox.org ([80.241.56.161]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1oJcNT-0003l4-8f for openvpn-devel@lists.sourceforge.net; Thu, 04 Aug 2022 15:03:15 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4LzBmk2vBxz9sQl for ; Thu, 4 Aug 2022 17:03:02 +0200 (CEST) From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Thu, 4 Aug 2022 17:03:00 +0200 Message-Id: <20220804150301.62856-1-frank@lichtenheld.com> In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4LzBmk2vBxz9sQl 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: We only need to include this when we want the git version. This is currently only the case in options.c Signed-off-by: Frank Lichtenheld --- src/openvpn/block_dns.c | 3 --- src/openvpn/plugin.c | 3 --- src/tapctl/main.c | 3 --- 3 files changed, 9 deletions(-) Content analysis details: (-0.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.161 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1oJcNT-0003l4-8f Subject: [Openvpn-devel] [PATCH 1/2] config-version.h: remove unused includes 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox We only need to include this when we want the git version. This is currently only the case in options.c Signed-off-by: Frank Lichtenheld --- src/openvpn/block_dns.c | 3 --- src/openvpn/plugin.c | 3 --- src/tapctl/main.c | 3 --- 3 files changed, 9 deletions(-) diff --git a/src/openvpn/block_dns.c b/src/openvpn/block_dns.c index 88e933fb..7849ec53 100644 --- a/src/openvpn/block_dns.c +++ b/src/openvpn/block_dns.c @@ -28,9 +28,6 @@ #elif defined(_MSC_VER) #include "config-msvc.h" #endif -#ifdef HAVE_CONFIG_VERSION_H -#include "config-version.h" -#endif #include "syshead.h" diff --git a/src/openvpn/plugin.c b/src/openvpn/plugin.c index 51136fea..dc7fd459 100644 --- a/src/openvpn/plugin.c +++ b/src/openvpn/plugin.c @@ -26,9 +26,6 @@ #elif defined(_MSC_VER) #include "config-msvc.h" #endif -#ifdef HAVE_CONFIG_VERSION_H -#include "config-version.h" -#endif #include "syshead.h" diff --git a/src/tapctl/main.c b/src/tapctl/main.c index df73a965..e13549bf 100644 --- a/src/tapctl/main.c +++ b/src/tapctl/main.c @@ -24,9 +24,6 @@ #elif defined(_MSC_VER) #include #endif -#ifdef HAVE_CONFIG_VERSION_H -#include -#endif #include "tap.h" #include "error.h" From patchwork Thu Aug 4 05:03:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 2628 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id gOQBF/Df62JSTwAAIUCqbw (envelope-from ) for ; Thu, 04 Aug 2022 11:04:16 -0400 Received: from proxy8.mail.ord1c.rsapps.net ([172.28.255.1]) by director13.mail.ord1d.rsapps.net with LMTP id aBW8FvDf62IUBAAA91zNiA (envelope-from ) for ; Thu, 04 Aug 2022 11:04:16 -0400 Received: from smtp2.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1c.rsapps.net with LMTPS id ICVoFvDf62JzcwAAHz/atg (envelope-from ) for ; Thu, 04 Aug 2022 11:04:16 -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: smtp2.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; dmarc=none (p=nil; dis=none) header.from=lichtenheld.com X-Suspicious-Flag: YES X-Classification-ID: b4c029a8-1406-11ed-a866-842b2b4e7063-1-1 Received: from [216.105.38.7] ([216.105.38.7:52672] helo=lists.sourceforge.net) by smtp2.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id F3/64-11140-FEFDBE26; Thu, 04 Aug 2022 11:04:15 -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 1oJcNW-0002Uh-Qu; Thu, 04 Aug 2022 15:03:14 +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 1oJcNV-0002UW-Pf for openvpn-devel@lists.sourceforge.net; Thu, 04 Aug 2022 15:03:13 +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:To:From:Sender:Reply-To:Cc: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=2Z6zmZpiyJiWZkur6dSqzqVGCoFzdZgtnvM+u/sL8MY=; b=hGiO7x/7mpgJPACPG43OeowgaX lG0Qobyw+zf4865CR96U7kTBcO43azEX9VZFCOC7XHXOzZr/3LfJL8wHEzKeED61RqbPl5VFX+rri Go2oLvpQ9+Ydf+Tg0qbWHwPyiuErNnGm38RidBBGqFTfNXNuJUfPqlEWgdCr6ksAth+w=; 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:To:From:Sender:Reply-To:Cc: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=2Z6zmZpiyJiWZkur6dSqzqVGCoFzdZgtnvM+u/sL8MY=; b=Ja83JoxTR245iztVjG0UoC49Kz wOOI3o6VqfTnB9l6ktj6GgsI2PCz3O3C0o2Sr63aMsHB71y9bml9I7OtP/fbn9rMdpQCBQMY5KSDj tZc2YN/VqlkHlp5T8raeWhJRT40RSoTEtE8gJHgIU3bcZDOHehxw1kMwn59tcWK+Kf9g=; Received: from mout-p-202.mailbox.org ([80.241.56.172]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1oJcNT-003J8r-Nd for openvpn-devel@lists.sourceforge.net; Thu, 04 Aug 2022 15:03:13 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4LzBmk5QfHz9sb7 for ; Thu, 4 Aug 2022 17:03:02 +0200 (CEST) From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Thu, 4 Aug 2022 17:03:01 +0200 Message-Id: <20220804150301.62856-2-frank@lichtenheld.com> In-Reply-To: <20220804150301.62856-1-frank@lichtenheld.com> References: <20220804150301.62856-1-frank@lichtenheld.com> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: To increase the reproducibility of builds we shouldn't use __DATE__. However, for the development builds there is some demand for leaving this in. So as suggested by Gert Doering go for a compromise where we only use __DATE__ if we also include the git information. This will remove this information from release builds, but not from builds done d [...] Content analysis details: (-0.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.172 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1oJcNT-003J8r-Nd Subject: [Openvpn-devel] [PATCH 2/2] Reduce usage of __DATE__ 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox To increase the reproducibility of builds we shouldn't use __DATE__. However, for the development builds there is some demand for leaving this in. So as suggested by Gert Doering go for a compromise where we only use __DATE__ if we also include the git information. This will remove this information from release builds, but not from builds done directly from the git checkout. Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- src/openvpn/options.c | 2 ++ src/tapctl/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 3eae14a7..0ce3158b 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -110,7 +110,9 @@ const char title_string[] = #ifdef ENABLE_DCO " [DCO]" #endif +#ifdef CONFIGURE_GIT_REVISION " built on " __DATE__ +#endif ; #ifndef ENABLE_SMALL diff --git a/src/tapctl/main.c b/src/tapctl/main.c index e13549bf..0724cc4d 100644 --- a/src/tapctl/main.c +++ b/src/tapctl/main.c @@ -41,7 +41,6 @@ const TCHAR title_string[] = TEXT(PACKAGE_NAME) TEXT(" ") TEXT(PACKAGE_VERSION) - TEXT(" built on ") TEXT(__DATE__) ; static const TCHAR usage_message[] =