From nobody Fri Oct 3 16:53:53 2025 X-Original-To: dev-commits-src-branches@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 4cdZW61VFtz6BBmq; Fri, 03 Oct 2025 16:53:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cdZW56R7hz3Hc1; Fri, 03 Oct 2025 16:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510433; 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=6hM29kRSGtBMPmnjZF9T4iUGkli5ny1P8eSj06ta4qQ=; b=Q0vjSiU+czGpk7Xa+f0pLSIPTsBEKoPxiPXeXurp1oel1wZUfL0l5vplZZNCb3Rw85QXfV PCXO5d0M+NNe2w6p2HlT/x42Jt3wxcZ/gsWgFnbYUrgTgTEvcD3JbnV4/6J/szYv96cnzS 2dmpymyJLakvD0+boXU7nwAe1a37ZuRIciuznz/wjFUC0KRZYA4Gixc65tztXmO+daxbr8 JE7cLe3F4mlBi3/tyConIaZ4fciFhMVP68lXQB5rxFUF7GfbnWMjRPSUMWFb0GXWb1PQN2 ZUefFNF26TYzZADa8kPptPLc5BzLZhMwPPrNmLG5s78IBZD8YKygofCYXOA/Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510433; 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=6hM29kRSGtBMPmnjZF9T4iUGkli5ny1P8eSj06ta4qQ=; b=n0V0iilFLZ4aNEG8NV9CsoMxzma0vQbZRN+AeNAOf0kUNi76PensBkLtGVYONTTBspYAD4 stO5+tn6PObGSzI5qz+EF6HoWb3aPc4ghDzbdFZ1a+t4BAGoDC/cXnPj8mQXuFFYmDcDI8 D0fbv7Ol1rwEo7a7aryQMLtAhYQ2XbZPX41dflcL/L6Axy5oBJTfJa/2o7H55zh3cIUXLQ OkumtuDR/cJxacb247eta4pTY3yQ5HYa3/DJsuEwwxNu5Wzi1VuTmjWV5Lx3Rj22x+j7Az 6jmdVmN6koTeGyE68Sjjsi4DhKrQBw4Z2CXtPoQT/63YUFWYghyxZ5qFMY9IMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759510433; a=rsa-sha256; cv=none; b=PcaCPm55bEK0wxjT+EQkuMrJlmAk7GOCCrQZE88dTSMNj88ZUsjze8s0KKF5IR39dn9mve GGlZ29rp3VsP5EqoD966nwlVylT1HCwXSg20TB1i42IC+6s3szay6y5BtGx/XEoz5W/UYY J1m6f4iCZB8hlrswVADcEBuh/ZkMP3+MOlV/AogWv7PnFtm33hc+QcIo834nw2Va5b642N eGF2+TKaHhN2tqrDCt7XmlfuaRzKSCVCvjBXudm4JLboJGIIAMM6jebnJl5RczVjKlPFyi aa4lvutpgAGq/FWlRy0+JoGt9dRkjmPd/aCxdd9Kdk25Cn2um553eauRJQ0AHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cdZW55zMVz138m; Fri, 03 Oct 2025 16:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 593GrrD2064553; Fri, 3 Oct 2025 16:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593GrrC4064550; Fri, 3 Oct 2025 16:53:53 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:53:53 GMT Message-Id: <202510031653.593GrrC4064550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 77bec6e492b7 - stable/15 - diff3: Move to own package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 77bec6e492b7da7a60fc4e9461c7caba9f8d3ddc Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=77bec6e492b7da7a60fc4e9461c7caba9f8d3ddc commit 77bec6e492b7da7a60fc4e9461c7caba9f8d3ddc Author: Ed Maste AuthorDate: 2025-10-01 09:28:56 +0000 Commit: Colin Percival CommitDate: 2025-10-03 16:52:43 +0000 diff3: Move to own package diff3 is the last remaining GPL-licensed userland component. Move it to its own package, so that it may be excluded if desired. Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52810 (cherry picked from commit e7258c42520c18c034f644b97377d8d2a0ad8b7c) --- gnu/usr.bin/diff3/Makefile | 3 ++- release/packages/ucl/diff3-all.ucl | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile index 4d7bb8a82e1c..568733801a6b 100644 --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -1,8 +1,9 @@ +PACKAGE= diff3 + DIFFSRC=${SRCTOP}/contrib/diff/src .PATH: ${DIFFSRC} \ ${SRCTOP}/contrib/diff/lib \ ${SRCTOP}/contrib/diff/man - PROG= diff3 SRCS= diff3.c version-etc.c \ xmalloc.c error.c c-stack.c exitfail.c cmpbuf.c diff --git a/release/packages/ucl/diff3-all.ucl b/release/packages/ucl/diff3-all.ucl new file mode 100644 index 000000000000..b4e53e63c67f --- /dev/null +++ b/release/packages/ucl/diff3-all.ucl @@ -0,0 +1,15 @@ +/* + * SPDX-License-Identifier: ISC + */ + +comment = "GNU 3-way file comparison and merge utility" + +desc = <