From nobody Wed Mar 29 15:32:00 2023 X-Original-To: dev-commits-ports-all@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 4PmrBm2XfRz42j5R; Wed, 29 Mar 2023 15:32:00 +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 4PmrBm1wqLz4T4X; Wed, 29 Mar 2023 15:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680103920; 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=/SCd67IK1A27EuPvku/F2Bhy+CHi2LzXzuCdVFXvaqE=; b=CXtNPhdhrfvvZGwJizaTO6gi5hL+IJVxVQOS3dhfv4PIj2WNkusmd0YXvbIj79dxDpga+x tygKpeQUwJG7G1TasRSbIo92Y2LeoJqTkIt3dFZQx/Y0F8qQDZOOSoif48GJ0Esks5ZDOE 25aBc6ZWGjztvPcv5v4rB96PYQc6iHVFPAYiNJr8cMXAYPteGrhRmtmmTItyacpL9c1ZNV iNIbl+jz6FoK7gJWJo1MilU8GOGved0TkTbgwtopWm/ZgW32umD0pZKLvNS0fvXgrdLfaJ noe8x8CH8jc6Rwpa99gffS7ud4zpiY3CXIEwmbBU7sxNwE45G4FMM4gSU4pobA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680103920; 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=/SCd67IK1A27EuPvku/F2Bhy+CHi2LzXzuCdVFXvaqE=; b=s8Wzbx+kfQdcQCA27f1DnoPjf3H6MvX/dGP9HZWKEZoAe3rq5oBrEtlUTuo3p1HIcPgbzR SBs5CXH3sp+upGN5nf9UQ0wKX0W7z2E5r6MTqStcRrxC82bgsLfTGKWlnmni8zD8dVSqEi yweZqLfBbPeBF6tp25Llu9ND6W/e4CED1usWzAKFXTKWZGTzSFdZ8g+IT/i66WSoeFN1iY aOmhK9M2Rsy6YL9kjhhQ0KO6ArTMuPbHVCDMXq/7FiAyFg+PSKcaPqxDF4/wQMIykEu7qj VLxWme7idvNKDo5h2UJeSNio8CThCMnFXjoeE/tw5pfg/wOjftYPlDZ0kzudrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680103920; a=rsa-sha256; cv=none; b=owdI18eMzNXj3sOjuR8GCFUziPoDO5w1UqLaFV57/J9P9X42y1Pp0o9y7MEyVJnHb+NR5E tWbhP4V8XJSH8G7uX3d6LoMjggW7ep/K6lk48StzABe9V9Hu58AJlVcHf+4Ali/VPYKv8Z r+EfFFQBTtnJnABZ/+ssjZldysLY0+QPU+X5AorTRtk/6BDqBqBdz1hfWYxdy0FQr7z5oo F49xbvNV+LLialjZWq2CBPRJnW5pWuOQ8+OCb6K+Zyn45hsf5sbQR5pf4rO6haZiqlHWF4 nUoKW53rnTFAl51eoAOV5V0gT9SpOZtBpZaYv8yW5MBorZOrG065tTHSdM+4PA== 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 4PmrBm0zhFzbXV; Wed, 29 Mar 2023 15:32:00 +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 32TFW0mv007776; Wed, 29 Mar 2023 15:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TFW04t007775; Wed, 29 Mar 2023 15:32:00 GMT (envelope-from git) Date: Wed, 29 Mar 2023 15:32:00 GMT Message-Id: <202303291532.32TFW04t007775@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 6beae54c3050 - main - security/pam_howdy: Simplify the patch even more. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6beae54c30507193b68157af034532d855502150 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6beae54c30507193b68157af034532d855502150 commit 6beae54c30507193b68157af034532d855502150 Author: Gleb Popov AuthorDate: 2023-03-29 15:11:33 +0000 Commit: Gleb Popov CommitDate: 2023-03-29 15:31:55 +0000 security/pam_howdy: Simplify the patch even more. Obtained from: jbeich --- security/pam_howdy/files/patch-meson.build | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/security/pam_howdy/files/patch-meson.build b/security/pam_howdy/files/patch-meson.build index 2c5da7b61cc3..534d964c98a3 100644 --- a/security/pam_howdy/files/patch-meson.build +++ b/security/pam_howdy/files/patch-meson.build @@ -1,23 +1,21 @@ --- meson.build.orig 2023-03-08 16:41:32 UTC +++ meson.build -@@ -5,6 +5,11 @@ threads = dependency('threads') +@@ -4,6 +4,9 @@ threads = dependency('threads') + libevdev = dependency('libevdev') libpam = meson.get_compiler('cpp').find_library('pam') threads = dependency('threads') - +# On FreeBSD, libepoll-shim library is required for signalfd.h +epoll_shim = dependency('epoll-shim', required : false) -+# On FreeBSD libintl library is required for gettext -+libintl_dep = dependency('intl', required: false) -+ ++libintl = dependency('intl') + # Translations subdir('po') - -@@ -17,6 +22,8 @@ shared_library( +@@ -17,6 +20,8 @@ shared_library( inih_cpp, threads, libevdev, + epoll_shim, -+ libintl_dep, ++ libintl, ], install: true, install_dir: '/lib/security',