From nobody Sun May 15 08:22:25 2022 X-Original-To: dev-commits-doc-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 E6BFE1AE28C6 for ; Sun, 15 May 2022 08:22:25 +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 4L1Fjs626tz3L8M; Sun, 15 May 2022 08:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652602945; 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=GOG2RdvnQtC1L5qJ0RF0jnIdRIWWq5LLChMlrga8Pcs=; b=EzgE9f+mPeG+P770OCK+R7EDkk0Pky+/WfxjW4AFuYQotPWdrOPg0WzUHYDa8eK70KMS1J Fh8s1PXy2vg3R7ZMbd1sCrb/6S+rkG/jsfujSCf6CmTDiSwJ479aZDaG7tCPs3oCJYhbcW NIcx2nLhBIDNRVwh6XTJgiEnZV/utiZNCoEGKUxQCUinHqCVrxNUseij1bLcSiao7chJ9j axgvCsf9YE4EMTsvdn7Dl3AB2ZKEgFR7KUGfDXaGsB+QzJoeICM6UgjQ1XIhz6xoowCHIn oDCFVythZkKZZuzq3gouGOf5hjzExJol3dpq08TBaYURA5UxK/s9MZoN0rW88w== 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 B0A3C27FBF; Sun, 15 May 2022 08:22:25 +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 24F8MPpa086675; Sun, 15 May 2022 08:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24F8MPs6086674; Sun, 15 May 2022 08:22:25 GMT (envelope-from git) Date: Sun, 15 May 2022 08:22:25 GMT Message-Id: <202205150822.24F8MPs6086674@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Lorenzo Salvadore Subject: git: e3f1471c22 - main - Porter's handbook: GPL licenses installation List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3f1471c227dfc4a557286072a020e62856bf0d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652602945; 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=GOG2RdvnQtC1L5qJ0RF0jnIdRIWWq5LLChMlrga8Pcs=; b=m7kFIwkVtn11V8tkH8AqqRrcjXlkg/Mh9j6vfXXyo+16ijOFZF+JmA/HDZ+uRYXNHMpHDz mFigLoX0tTjiH0VtIPOygekzY3FzIC7WOjRc+/3Y9kvjPhZ3QMpX7dGm1HRJhmfZJUUmtn Rr5ShT0MAD5bpchutLffmV73ioob8lgGlV9M3DlZMCyNuNL6XI/2NRFysjhSvDJauKPTFF DNL2Qdm6w56lJyEiMEZIYs583Bh27AY5whbKD3w8dhxv3jS9ypbDUfjQTEkW/a8SI7YSDa 8FY+dijbGtuEpWQZjttl3uEwB7gHW4ozwFQvSsKsqgtfXI5tazf63C6YzKvUMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652602945; a=rsa-sha256; cv=none; b=n5qsLjEbShDqQbhZbqvpzZbzfD3BZ9QuNPmvIN4KOMh8zKXf21SPF8neZ83cGSv5wPo2rW N8lWlw4RQrLqZXQ2QGSEaimAk1Vu+GmK8hcjiMVuBL/De4aLb+BSogIUdWumDYDRaI19YR yl0FQoEoYl+b/bCeGgiAes6FNJnUJMP1ONJWiXK1y4rZstfPOHaMzxHJmy95IiwHxGncwv HYqja+Arco1PFww0WqH0P2kDMmLg8CiQKvH7LjZtDF6jIiGN8xk5SCkcNCMVxOFC5OKg1G 0xPCrtYYUuNZT+33xqdJQ4TVlIQe7cfz8Q37k0d0njwNUFLmz4SbNmp1jpNcpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=e3f1471c227dfc4a557286072a020e62856bf0d9 commit e3f1471c227dfc4a557286072a020e62856bf0d9 Author: Lorenzo Salvadore AuthorDate: 2022-05-12 15:58:59 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-05-15 08:21:59 +0000 Porter's handbook: GPL licenses installation - Revert commit bf9dfed44fd3ea2903e3fc732603a9b43eadf33a. - Remove note about avoiding installing GPL licenses from 13.20. Approved by: portmgr (mat), doc (carlavilla), gerald (mentor) Differential Revision: https://reviews.freebsd.org/D35127 --- .../content/en/books/porters-handbook/makefiles/_index.adoc | 11 ++++------- .../en/books/porters-handbook/porting-dads/_index.adoc | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc index e0168a2792..10a76f01da 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc @@ -2554,8 +2554,6 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING .... -However, please do not use `LICENSE_FILE` for the GNU General Public License (`GPLv1`, `GPLv1+`, `GPL2`, `GPLv2+`, `GPLv3`, `GPLv3+`) to avoid installing on our systems multiple copies of the same identical files. - ==== For the predefined licenses, the default permissions are `dist-mirror dist-sell pkg-mirror pkg-sell auto-accept`. @@ -3205,7 +3203,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept Full path to the file containing the license text, usually [.filename]#${WRKSRC}/some/file#. If the file is not in the distfile, and its content is too long to be put in <>, put it in a new file in [.filename]#${FILESDIR}#. -Please do not use `LICENSE_FILE` for the GNU General Public License (`GPLv1`, `GPLv1+`, `GPL2`, `GPLv2+`, `GPLv3`, `GPLv3+`) to avoid installing on our systems multiple copies of the same identical files. [[licenses-license_file-ex1]] .`LICENSE_FILE` @@ -3214,8 +3211,8 @@ Please do not use `LICENSE_FILE` for the GNU General Public License (`GPLv1`, `G [.programlisting] .... -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING .... ==== @@ -3297,10 +3294,10 @@ If license files are provided, use this: [.programlisting] .... -LICENSE= ART10 BSD2CLAUSE +LICENSE= ART10 GPLv1 LICENSE_COMB= dual LICENSE_FILE_ART10= ${WRKSRC}/Artistic -LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE +LICENSE_FILE_GPLv1= ${WRKSRC}/Copying .... ==== diff --git a/documentation/content/en/books/porters-handbook/porting-dads/_index.adoc b/documentation/content/en/books/porters-handbook/porting-dads/_index.adoc index f04dfbe22f..36b9691d31 100644 --- a/documentation/content/en/books/porters-handbook/porting-dads/_index.adoc +++ b/documentation/content/en/books/porters-handbook/porting-dads/_index.adoc @@ -547,6 +547,4 @@ For example, [.filename]#sys/types.h# is often forgotten, which is not as much o Always double-check [.filename]#pkg-descr# and [.filename]#pkg-plist#. If reviewing a port and a better wording can be achieved, do so. -Do not copy more copies of the GNU General Public License into our system, please. - Please be careful to note any legal issues! Do not let us illegally distribute software!