From nobody Mon Jan 12 17:11:46 2026 X-Original-To: dev-commits-src-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 4dqf766NbYz6Nr9R for ; Mon, 12 Jan 2026 17:11:46 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dqf765Y22z3wf2 for ; Mon, 12 Jan 2026 17:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768237906; 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=6VnH+57bXaRVnh/6rBrHtqjE2s/OAz3iTh8PIvr2VkU=; b=JGkNK8UcOMnFNWKoa6cRZV+y7SivGafnHeF2d1bka4Pu1NglG3buGuAzpUtcUXNN/p+4bD Btj4PxiN35e9ifi5Sc4JZsDjcnLY4/wTNmVEpMLdUTieAY2yXqZIG8n1Aucc9ds9wiFqgN E32FxSt6MiXcVbAjViYFnhbBq0vfoaMm9fFPsTOj0PBxZpJCJZ9v4nmWKSKvUGNuuKt52l +hR+P3mruho3KwEH/klPWzWMjac0eMZc+m6tJpdLOoc8Z+Mt8ELSH4v8cPtibE9wnxMTYF kfWL+qYNp95xzSdE3h4giw3mh8+oFsbAjsyAgh6NZT6UzeTeDfIu+R9t5I/DoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768237906; 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=6VnH+57bXaRVnh/6rBrHtqjE2s/OAz3iTh8PIvr2VkU=; b=BtbhUVtCVhhQS6v9WIsrQ20rMuya3GjlNE46h+7YEsCOAd2kspVKjdB+x5C0LcK7zZnMeY cHaCY7sRuxpcuMq2qmX6C8Oii6ZYQ5AErGB+BZS2k+Biec8BWpDetR4A+ZFnjJAZMD+v3+ zUQsX8w5JqvEB/oRfJtbT56Dylnz3yGkItkV+L/7zRNuzyU2Mj0JInroya6cRALYtEmqS+ Oy+Jx+tbj70pOTkymOfsyLENjOIbGv8JwJIMNXTdfskQa4SitG61lA5htENDhynMM1xzWQ 20PI300Ksz9WtRo69ISSAp6KuYPWJ5BMbZ8hUdie/oyHkvzM9g3B7GKy+urv4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768237906; a=rsa-sha256; cv=none; b=JbnQh0aVuORiECaPuEd7Chy/f5B9XsgVCjqxL7qiu+UJAZQ8PFclUBOrem7rTGgd1dv1u0 B2Q1q9llI20zII/SfdFSGdhabdk/2oq0qvpawpyLhhrVb5YkDT3x+NEKY5uu0OTdmmLU93 uVxrRNiiW37wubfU1krb4xTmAd+TI1c4nln3GQm/vgsB6thXGcWx+Udhfwda4GyjgCYRXC CjIQcB8aCxbo4W4Ki4CNZngADA/qyCP+5OOlGrzak8DQlEmUcQ5U5CYefLhe9J+OyUjUlV 535ao3dJS0yx3khcsYjm5mwinruQADMBhm+qVm/strbCXgip8qcdGCFP/jBY2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dqf7656mMzbT1 for ; Mon, 12 Jan 2026 17:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ea1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:11:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: b0c2236f0390 - main - etcupdate: tests: Fix tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0c2236f0390ac4a04da2c4b9cd5ecd6bd80d53c Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:11:46 +0000 Message-Id: <69652b52.37ea1.247a03d6@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=b0c2236f0390ac4a04da2c4b9cd5ecd6bd80d53c commit b0c2236f0390ac4a04da2c4b9cd5ecd6bd80d53c Author: Jose Luis Duran AuthorDate: 2026-01-12 05:09:28 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-12 17:10:48 +0000 etcupdate: tests: Fix tests Fix test login.conf files and update their MD5 checksums. PR: 291649 Reviewed by: imp Fixes: 54ce6b2c4c16 ("login.conf.5: Remove mention of login copyright setting") Pull Request: https://github.com/freebsd/freebsd-src/pull/1962 --- usr.sbin/etcupdate/tests/conflicts_test.sh | 5 +++-- usr.sbin/etcupdate/tests/tests_test.sh | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.sbin/etcupdate/tests/conflicts_test.sh b/usr.sbin/etcupdate/tests/conflicts_test.sh index a2ccabaa17ee..ea59ac7a8485 100644 --- a/usr.sbin/etcupdate/tests/conflicts_test.sh +++ b/usr.sbin/etcupdate/tests/conflicts_test.sh @@ -80,6 +80,7 @@ EOF cat > $NEW/etc/login.conf < $TEST/etc/login.conf </dev/null -file /etc/login.conf "" 7774a0f9a3a372c7c109c32fd31c4b6b +file /etc/login.conf "" b139b1ab44a6933659246ac4401fcbe4 file /etc/login.conf.db resolved /etc/login.conf @@ -251,7 +252,7 @@ EOF echo 'r' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null -file /etc/login.conf "" 966e25984b9b63da8eaac8479dcb0d4d +file /etc/login.conf "" 95de92ea3f1bb1bf4f612a8b5908cddd file /etc/login.conf.db resolved /etc/login.conf diff --git a/usr.sbin/etcupdate/tests/tests_test.sh b/usr.sbin/etcupdate/tests/tests_test.sh index 71c78869e89e..37ad901e5b9d 100644 --- a/usr.sbin/etcupdate/tests/tests_test.sh +++ b/usr.sbin/etcupdate/tests/tests_test.sh @@ -596,6 +596,7 @@ EOF cat > $NEW/etc/login.conf <