From nobody Thu May 07 12:11:10 2026 X-Original-To: dev-commits-src-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 4gBB1B5w2Nz6cB1b for ; Thu, 07 May 2026 12:11:10 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBB1B4HD4z3vpr for ; Thu, 07 May 2026 12:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zw8pH8CyhjPR4Lpvtdres0uZgwET3Fex5JD++0nzwY0=; b=ZE40Cx3J8Q4VgborKGN97Gq7VqHsAD2S6la5jKwW+uaep3jzfjk4cxhVw0LgVM/ZEIlgYI oJOJhYWC2Mgo/IiDo2D5GosLg9DYqTF3/hb2f/LbVYULWRw9RC7PpET+WqHyeGWM4ifR2y 3xkt8yRfDyXm7LQ3Y/Ejt3KAHFcTwR7RvcgnKVN2fsW5KKYOmia8fnBI/+x8ZEfQ+zpZoH z5X45IZvI63jT8W53jB4Kl3ys+cI/+wz/nTgZxFX9FWHxmH4ObmpOPk7EJnEsOnjR/qb07 o2PlVwN9D10yw29gRgahh4OAnZeOcrC4eUGYiHyw+Ax0BqLpp9rSRM3Ffo746g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778155870; a=rsa-sha256; cv=none; b=iZkXKOLkjbI11hnurF5uPwElyOYZvR83D2iPJFnuTQZG6smRDihxfRtNxdSG46zUSh0/OA RWcDWHjiIBJ0s8hUjamedymo9AcL9lJia3KG7oMs1OMoWBfqCatoJqnhpMuftzoV/b6q9Z gXa4J8npQ+MQtlVGtOmarTiePIiCGDGzytfsyULs9pue52Tr4/8gH4J0iKtoK+xN18mrJg jAUu7OkWZPKiIKlZFhLrPWgCh6grTETvpepMnalywl4w+uouczJvPQMN42cOHZS5ZS8gYO +ab5YDB2lhHm+jYbF+jyCTCDPFV1QOZDs1si56TWEM+ZaKIzPfFbg4q02ULZ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zw8pH8CyhjPR4Lpvtdres0uZgwET3Fex5JD++0nzwY0=; b=OpdWYZP3U+s06vDp0LppSHXWqkuOdbw3WMejNsl9m6lRQKZuVIzqvke34eqzOW8UeSopbJ ngWAHh0X7/lvbgt9zK6PvwHvLppMwBeh0Ocd8TMkKf4hlXxapgduFLioJDDH7ZGLRN7mB1 /Joq0EZRobRBRQYQaJdLiGjcBlVkPK686SikmuvWn2YG/3TNcNuM40e3rqp61QQm5cPgQT krJbQmz5KPdfeMf6xReRr3JgHVZxMTaalmaLwEyjixoRAW2gDH0AcnPtuVbRvwq+aTgtOT XVnqjattXOSrMMDrKGyMSBJf/KE5doNcDzhRbHvXFP1/ow8+bOBhlLOESi8gNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBB1B1Nv0z8nD for ; Thu, 07 May 2026 12:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b257 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 12:11:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Boris Lytochkin From: Andrey V. Elsukov Subject: git: 81df9a1045c3 - stable/14 - etcupdate: fix arguments order of diff command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 81df9a1045c3e1778c551fcd62125e0b5d2b76f2 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 12:11:10 +0000 Message-Id: <69fc815e.3b257.27996b85@gitrepo.freebsd.org> The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=81df9a1045c3e1778c551fcd62125e0b5d2b76f2 commit 81df9a1045c3e1778c551fcd62125e0b5d2b76f2 Author: Boris Lytochkin AuthorDate: 2026-04-30 11:31:34 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-05-07 12:09:41 +0000 etcupdate: fix arguments order of diff command Due to misplacement of the second -L argument of diff command, it is treated by getopt_long as an error. Also add -l option for a diff command that alters the way it shows differences. Instead of printing full diff, it reports changed file the same way as added/removed files are reported. Reviewed by: imp Obtained from: Yandex LLC Differential Revision: https://reviews.freebsd.org/D56708 (cherry picked from commit 6d65c91b9a4743bbffc3508bf754e68b65bbd494) --- usr.sbin/etcupdate/etcupdate.8 | 7 ++++++- usr.sbin/etcupdate/etcupdate.sh | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8 index 5eb2aa644037..3c546b324311 100644 --- a/usr.sbin/etcupdate/etcupdate.8 +++ b/usr.sbin/etcupdate/etcupdate.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 9, 2022 +.Dd April 30, 2026 .Dt ETCUPDATE 8 .Os .Sh NAME @@ -51,6 +51,7 @@ .Ar tarball .Nm .Cm diff +.Op Fl l .Op Fl d Ar workdir .Op Fl D Ar destdir .Op Fl I Ar patterns @@ -468,6 +469,10 @@ shell pattern. This option may be specified multiple times to specify multiple patterns. Multiple space-separated patterns may also be specified in a single option. +.It Fl l +In +.Cm diff +mode list files that are changed locally, omit printing content difference. .It Fl L Ar logfile Specify an alternate path for the log file. The diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 7bddd6593b56..f62343a24eee 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -531,9 +531,15 @@ diffnode() echo ;; $COMPARE_DIFFFILES) + if [ -n "$difflistonly" ]; then + echo + echo "Changed: $3" + echo + break; + fi echo "Index: $3" rule "=" - diff -u $diffargs -L "$3 ($4)" $1/$3 -L "$3 ($5)" $2/$3 + diff -u $diffargs -L "$3 ($4)" -L "$3 ($5)" $1/$3 $2/$3 ;; esac } @@ -1791,11 +1797,15 @@ ignore= nobuild= preworld= noroot= -while getopts "d:m:nprs:t:A:BD:FI:L:M:N" option; do +difflistonly= +while getopts "d:lm:nprs:t:A:BD:FI:L:M:N" option; do case "$option" in d) WORKDIR=$OPTARG ;; + l) + difflistonly=YES + ;; m) MAKE_CMD=$OPTARG ;;