From patchwork Wed Oct 16 11:59:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3897 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:8059:b0:5b9:581e:f939 with SMTP id m25csp458806maf; Wed, 16 Oct 2024 04:59:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbmwTOf0mkw19rKrGxPeO30IRLQp1X3D10v8OcrFoCYGPnWnmBpy9bUn6YA+clPfgvGh6v4hXDbf8=@openvpn.net X-Google-Smtp-Source: AGHT+IH4H2olOD88lQKbbm0sBJkuh33NJ3B1/cTG7a11CDK6bIIvhckxlLbcCkVHY+9cRbPL3R1a X-Received: by 2002:a05:6e02:1786:b0:3a0:7687:8c2d with SMTP id e9e14a558f8ab-3a3dc5030b3mr31110325ab.26.1729079988698; Wed, 16 Oct 2024 04:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729079988; cv=none; d=google.com; s=arc-20240605; b=BanKCQ9dYSb5tmX1oQfFCKyYdarobHlIIXVi2DIe+R7ld1NgJTMm7Ch+mgL1d8V4YH vcDe5YXyyY6C4CWtDQwjctv9MOwtq0nVL8xNMYt1b2tlhAzQCQG+0GdXwdsFmM8MBfYR CSh3LVyoEteD5r3He1VXl0qegm8fNzRFSBsQKt7dP8d3/FN9uEkRqTIaPG/ODpvgAZdz vyNoBpICHI5UlG/KYEg+ZxYB3BT4bGAat/CZyiNDb7I+dK5i63+x8mrAuZ/G3FRxcAPj DfE5zl36PCE/4KVznXzU/tC7ZLNvWsPGw6nFYkSmPEUFGRNG254owvbIRKz+u5NPFV3Q 3Pmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=TRGBYWk+3qmlzJ1b90CfTqKJ/Vz3XG8lJTvkNm5tM4w=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=f5croCR3KhXw2c9s19yjEvguzz9U1q39ut0Fw6oj9UUghV/pHG5ZC6fzkZq6doVeNF cXxneKrWD6myYsENIiKxLoMKlnyBK12FMCE8NutCzmctfaDzxiF3RVY7qdZe01u7yje+ vib2qtEmBf3xtXI99d0n2p0oVIbwpin/ArBcH/X7SkqJtqkUih5whrl++D4n+EA2oXhC afPBy5P7tUYmk8lvDnJh22dTgIyGR8Sw2vrI3EzqYnW1Xx+sym3G4AM0hCZYmGrn3+yg +FLRy5qNPej/iW6xaWX6JObpj5rtY1uhv1etSB4LXZAqD3mTw+tQkt97/Pa2LMzncOaH FGHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=TnXwL3SS; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AFkrSsad; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id e9e14a558f8ab-3a3d70ff247si15671195ab.39.2024.10.16.04.59.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Oct 2024 04:59:48 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=TnXwL3SS; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AFkrSsad; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de 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.95) (envelope-from ) id 1t12gl-00075S-1b; Wed, 16 Oct 2024 11:59:39 +0000 Received: from [172.30.29.66] (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.95) (envelope-from ) id 1t12gj-00075A-7z for openvpn-devel@lists.sourceforge.net; Wed, 16 Oct 2024 11:59:37 +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=6FoVxbeHDr/5kKt/1hfTeha3IBugLMfuLKcHOS9iBZU=; b=TnXwL3SSqhd60hrQG1U3WCz0CM eo5dRIc6ERJzzT0EfDn0Fgbj2DMjPwP6ts1tutNZRUYzDjkSosxdU3UrTECV9REKc+sUCg0Bt2G8U wVLbq6tXGGxZmRxBh6gRldG7f4JAY7pe1qMS2D9ZTCaVqwnOBCMmb7nWrvL+FA1hcv4Y=; 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=6FoVxbeHDr/5kKt/1hfTeha3IBugLMfuLKcHOS9iBZU=; b=AFkrSsadKfMrwUwRUsuuC2NkyQ wy3kkj+H1RuR14R/9XUuJoFcBeQ4aMPcO8g7gzJDxhgum6utEO/VWxVxt+u8eaJFf1BBbna5c6RlJ VmUZoBlgA8DgKyQb4L47qtINqM144EB4rH20/F3+F2K9tjr4PMI3GF1JqDzat/w3zQdg=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1t12gU-0003OB-Fb for openvpn-devel@lists.sourceforge.net; Wed, 16 Oct 2024 11:59:23 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 49GBxGGA028108 for ; Wed, 16 Oct 2024 13:59:16 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 49GBxFUK028107 for openvpn-devel@lists.sourceforge.net; Wed, 16 Oct 2024 13:59:15 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 16 Oct 2024 13:59:14 +0200 Message-ID: <20241016115914.28098-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.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: From: Frank Lichtenheld Reduce redundant configuration. Change-Id: Ie922ce67685228eb7043749a7f1a61a33be678d2 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Acked-by: Yuriy Darnobyt List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1813071777913208255?= X-GMAIL-MSGID: =?utf-8?q?1813071777913208255?= From: Frank Lichtenheld Reduce redundant configuration. Change-Id: Ie922ce67685228eb7043749a7f1a61a33be678d2 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Acked-by: Yuriy Darnobyt Signed-off-by: Gert Doering Acked-by: Gert Doering (cherry picked from commit 33a700d61e5b1a724b00f17fa0ed75d694e2823a) --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/782 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e4959ba..d930197 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -192,18 +192,10 @@ strategy: fail-fast: false matrix: - ssllib: [ openssl11, openssl3, libressl] - build: [ normal, asan ] + ssllib: [openssl@1.1, openssl@3, libressl] + build: [normal, asan] os: [macos-13, macos-14, macos-15] include: - # macos14 and newer runners use ARM CPUs and homebrew uses /opt/homebrew/ - # on ARM instead of /usr/local/ - - os: macos-13 - homebrew: /usr/local/opt - - os: macos-14 - homebrew: /opt/homebrew/opt - - os: macos-15 - homebrew: /opt/homebrew/opt - build: asan cflags: "-fsanitize=address -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" ldflags: -fsanitize=address @@ -213,35 +205,30 @@ cflags: "-O2 -g" ldflags: "" configureflags: "" - - ssllib: openssl11 - libdir: openssl@1.1 - configuressllib: "" - - ssllib: openssl3 - libdir: openssl@3 - configuressllib: "" - - ssllib: libressl - libdir: libressl - configuressllib: "--with-openssl-engine=no" runs-on: ${{matrix.os}} - name: "${{matrix.os}} - ${{matrix.libdir}} - ${{matrix.build}}" + name: "${{matrix.os}} - ${{matrix.ssllib}} - ${{matrix.build}}" env: CFLAGS: ${{ matrix.cflags }} LDFLAGS: ${{ matrix.ldflags }} - OPENSSL_CFLAGS: "-I${{matrix.homebrew}}/${{matrix.libdir}}/include" - OPENSSL_LIBS: "-L${{matrix.homebrew}}/${{matrix.libdir}}/lib -lcrypto -lssl" - LZO_CFLAGS: "-I${{matrix.homebrew}}/lzo/include" - LZO_LIBS: "-L${{matrix.homebrew}}/lzo/lib -llzo2" UBSAN_OPTIONS: print_stacktrace=1 steps: - name: Install dependencies - run: brew install openssl@1.1 openssl@3 lzo lz4 man2html cmocka libtool automake autoconf libressl + run: brew install ${{matrix.ssllib}} lzo lz4 man2html cmocka libtool automake autoconf - name: Checkout OpenVPN uses: actions/checkout@v4 + - name: Set environment + run: | + cat >>$GITHUB_ENV <