From nobody Fri Feb 24 08:52:32 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PNNv50xkwz3tjHT; Fri, 24 Feb 2023 08:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PNNv50RB9z3McW; Fri, 24 Feb 2023 08:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677228753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=psB98TF4r8EVmVSMOd29mmz8vjYMPcVpqp/9ldtzR2Q=; b=bs/n1FrtNY6VC3pVVQFeFQStDgH98RIzA9UKJ9TDFVQQBvpB6frmaFqMtk1u/lJhbQgg7f OSg358z2h9iTZ1eH12wVYeTz+d7PGDNvMOxU3CE3SUUA5Ld+dZsN1MiLRgdrZQnBngQbnI eY+BXDku/FjJx5kXcn4he9quZG/yJxxqBII4a4R9bIMH1foCbG95IAI4AyCexVqlFyzK5G 2qpmPW0V2emxBJ74Ebvug8BVnjXWO8syrZHGNkebucwn7Cm6wPuFK4ekHoUwMlkt5R9m+B YyN3RiBzF+RKIlqo/wXWaYx1TURs4+isBhCMJZicYy6l1m6SJyAvcxk/8Q/jbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677228753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=psB98TF4r8EVmVSMOd29mmz8vjYMPcVpqp/9ldtzR2Q=; b=Iiv6eJla2/EWcF2HORGEnARRzp7rvo3cSadfa2xzVBpDWRN7eUqZmrR22gWARpSntdvqRe vq4ChvV68FhRoEZtNQB8viH8nvnlM5O0xhWAspyEFQsBg9vTIwLaWRlLJDf+1umlM9RJL7 TT8odUX+IA1dIDtQhZlTfxNdD5hzG7sjgTsRHjalUMGDDKj3f3NjP9UE8q09pp8Yy3iL3l HHZo2c7zdOjM2x53dnl9ji4AoUm+YYCq4vhkYYFsEYzwLi6mhH4J89IJPPCbF31U05+U00 ZSaUa7Inqy/7sw6wFBSKCSjou0fb5TsZo+jY0DkdohkOVAeCK/n/xJmQSvc1dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677228753; a=rsa-sha256; cv=none; b=rb6BR1chuxlr4uHOY0piwDe26ol85/rG0E6lgHboJTTMOvqn9l6OtvdF0I4C5uxJmTjoNX Y6nF62vOGtL48JQczga2PRpycDQQbKTayMVmJInRdO7yB9dsQJlO8zgdLCcy/EUadW5kzC i4GJpKJ71O6ulJsH0GgoFmKOv/pALsL1UZOCMV0o/D9H+M3W0UTHYtFHa8HknEjL57gXPb iYfQjJs3idAkykbFGcxJ/HmidQ4+jpvnJVSltVO9eLFb5NLpFeRtinzK/62X0bnASvFFtd QpedQpbCJJ6mpBfgQzII/ObjYNiPsjybvgPYWpOi3iBfEr6NJQ7IGI+0Iw/C/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PNNv46J6szHcL; Fri, 24 Feb 2023 08:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31O8qWOb061338; Fri, 24 Feb 2023 08:52:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31O8qWhX061337; Fri, 24 Feb 2023 08:52:32 GMT (envelope-from git) Date: Fri, 24 Feb 2023 08:52:32 GMT Message-Id: <202302240852.31O8qWhX061337@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 3a9acb2b4dc5 - main - security/libpki: unbreak (again) on armv7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a9acb2b4dc5022bd564b13b652caf03676629fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a9acb2b4dc5022bd564b13b652caf03676629fc commit 3a9acb2b4dc5022bd564b13b652caf03676629fc Author: Robert Clausecker AuthorDate: 2023-02-21 00:05:38 +0000 Commit: Robert Clausecker CommitDate: 2023-02-24 08:50:34 +0000 security/libpki: unbreak (again) on armv7 Apparently both arm and armv? are now needed to correctly handle arm targets. Fixes: fae3c318a10e6fc9870fd1f2a41611ceafe11cc4 Approved by: flo (mentor) Differential Revision: https://reviews.freebsd.org/D38726 --- security/libpki/files/patch-configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/security/libpki/files/patch-configure.ac b/security/libpki/files/patch-configure.ac index 6e5aea3a88f2..3950cc7afc45 100644 --- a/security/libpki/files/patch-configure.ac +++ b/security/libpki/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2022-10-16 21:47:40 UTC -+++ configure.ac -@@ -23,7 +23,7 @@ is_aix="no" +--- configure.ac.orig 2023-02-21 00:50:13.111304000 +0100 ++++ configure.ac 2023-02-21 00:56:17.195099000 +0100 +@@ -23,7 +23,7 @@ mybits_install="" is_sparc="no" is_aix="no" @@ -9,12 +9,12 @@ case "$my_arch" in *i686) -@@ -40,7 +40,13 @@ case "$my_arch" in +@@ -40,7 +40,13 @@ mybits="64" mybits_install="64" ;; - *aarch64) -+ *arm) ++ *arm|*armv?) + mybits="32" + ;; + *powerpc) @@ -24,7 +24,7 @@ mybits="64" mybits_install="64" ;; -@@ -57,7 +63,6 @@ case "$my_arch" in +@@ -57,7 +63,6 @@ *powerpc*) mybits="64" mybits_install="64"