diff -urN /usr/ports/sysutils/tdir/Makefile tdir/Makefile --- /usr/ports/sysutils/tdir/Makefile 2018-02-19 08:01:41.000000000 -0600 +++ tdir/Makefile 2018-05-11 18:17:03.261957000 -0500 @@ -2,24 +2,22 @@ # $FreeBSD: head/sysutils/tdir/Makefile 462320 2018-02-19 14:01:41Z amdmi3 $ PORTNAME= tdir -PORTVERSION= 1.71 -PORTREVISION= 2 +PORTVERSION= 1.72 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.tundraware.com/Software/tdir/ MAINTAINER= tdir@tundraware.com COMMENT= Advanced file directory display utility -BROKEN= license forbids modification, but the port cannot be used without it - LICENSE= TundraWare LICENSE_NAME= TundraWare license LICENSE_FILE= ${WRKSRC}/tdir-license.txt LICENSE_PERMS= dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept -USES= python:2.7,run shebangfix +USES= python SHEBANG_FILES= tdir -python_OLD_CMD= "/usr//bin/env python" +python_OLD_CMD= "/usr/bin/env python" NO_ARCH= yes PLIST_FILES= bin/tdir \ diff -urN /usr/ports/sysutils/tdir/distinfo tdir/distinfo --- /usr/ports/sysutils/tdir/distinfo 2014-02-13 01:44:19.000000000 -0600 +++ tdir/distinfo 2018-05-11 18:15:04.013371000 -0500 @@ -1,2 +1,3 @@ -SHA256 (tdir-1.71.tar.gz) = 7c851e3425fdbb63772d162f72f31f2f2c6d91f2854ebb114d9444c097cf6763 -SIZE (tdir-1.71.tar.gz) = 7513 +TIMESTAMP = 1526080504 +SHA256 (tdir-1.72.tar.gz) = d43b437d2fe51b01846a1c972b759106a859eac7b26c2263140759238a0360bd +SIZE (tdir-1.72.tar.gz) = 9350
Created attachment 194334 [details] Bump to V 1.73 Sorry, there's been another version bump due to a bug recently discovered: diff -urN /usr/ports/sysutils/tdir/Makefile tdir/Makefile --- /usr/ports/sysutils/tdir/Makefile 2018-02-19 08:01:41.000000000 -0600 +++ tdir/Makefile 2018-06-17 09:30:06.052196000 -0500 @@ -2,24 +2,22 @@ # $FreeBSD: head/sysutils/tdir/Makefile 462320 2018-02-19 14:01:41Z amdmi3 $ PORTNAME= tdir -PORTVERSION= 1.71 -PORTREVISION= 2 +PORTVERSION= 1.73 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.tundraware.com/Software/tdir/ MAINTAINER= tdir@tundraware.com COMMENT= Advanced file directory display utility -BROKEN= license forbids modification, but the port cannot be used without it - LICENSE= TundraWare LICENSE_NAME= TundraWare license LICENSE_FILE= ${WRKSRC}/tdir-license.txt LICENSE_PERMS= dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept -USES= python:2.7,run shebangfix +USES= python SHEBANG_FILES= tdir -python_OLD_CMD= "/usr//bin/env python" +python_OLD_CMD= "/usr/bin/env python" NO_ARCH= yes PLIST_FILES= bin/tdir \ diff -urN /usr/ports/sysutils/tdir/distinfo tdir/distinfo --- /usr/ports/sysutils/tdir/distinfo 2014-02-13 01:44:19.000000000 -0600 +++ tdir/distinfo 2018-06-17 09:30:15.566740000 -0500 @@ -1,2 +1,3 @@ -SHA256 (tdir-1.71.tar.gz) = 7c851e3425fdbb63772d162f72f31f2f2c6d91f2854ebb114d9444c097cf6763 -SIZE (tdir-1.71.tar.gz) = 7513 +TIMESTAMP = 1529245815 +SHA256 (tdir-1.73.tar.gz) = e4725062e3d99714362aee8ccfa1beb1589c78270074f6aefec25558c5bccf71 +SIZE (tdir-1.73.tar.gz) = 9425
Sorry, we won't be able to push this update and unbreak this port. We need a shebang fix and it's license does not permit any changes. Try talking with the author, and any changes upstream, just reopen this PR. Regards.
Well. Tim, are you the author? If yes, this is the issue: 6) No modification of tdir, its documentation, or its licensing information is permitted. Shebangfix changes tdir to include the right version of Python on FreeBSD.
Fixed: diff -urN /usr/ports/sysutils/tdir/Makefile tdir/Makefile --- /usr/ports/sysutils/tdir/Makefile 2018-07-17 03:56:32.000000000 -0500 +++ tdir/Makefile 2018-06-17 09:30:06.052196000 -0500 @@ -1,27 +1,23 @@ # Created by: tundra -# $FreeBSD: head/sysutils/tdir/Makefile 474787 2018-07-17 08:56:32Z antoine $ +# $FreeBSD: head/sysutils/tdir/Makefile 462320 2018-02-19 14:01:41Z amdmi3 $ PORTNAME= tdir -PORTVERSION= 1.71 -PORTREVISION= 2 +PORTVERSION= 1.73 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.tundraware.com/Software/tdir/ MAINTAINER= tdir@tundraware.com COMMENT= Advanced file directory display utility -BROKEN= license forbids modification, but the port cannot be used without it -DEPRECATED= Broken for more than 5 months -EXPIRATION_DATE= 2018-08-20 - LICENSE= TundraWare LICENSE_NAME= TundraWare license LICENSE_FILE= ${WRKSRC}/tdir-license.txt LICENSE_PERMS= dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept -USES= python:2.7,run shebangfix +USES= python SHEBANG_FILES= tdir -python_OLD_CMD= "/usr//bin/env python" +python_OLD_CMD= "/usr/bin/env python" NO_ARCH= yes PLIST_FILES= bin/tdir \
Thanks for your feedback. In your vision, how the LICENSE_PERMS should be configured here in FreeBSD? https://www.freebsd.org/doc/en/books/porters-handbook/licenses.html 5.7.2 LICENSE= TundraWare LICENSE_NAME= TundraWare license LICENSE_FILE= ${WRKSRC}/tdir-license.txt LICENSE_PERMS= dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept Just a reminder, if the shebang is changed, 'tdir' package will be distributed with this modification. Regards.
That license taxonomy sort of doesn't make room for custom license terms such as our own, so I am not sure how to respond. The modified shebang line is fine with us.
Please pick any license type that makes sense to you and release the update.
Hi Tim. Here is what I understood. =============================================================================== tdir - Copyright (c) 2001-2018 TundraWare Inc., All Rights Reserved Permission is hereby granted for the duplication and use of tdir so long as ALL the following conditions are met: 1) The user of tdir understands and agrees that this is experimental software which is provided "AS-IS" with no warranties expressed or implied by TundraWare Inc. 2) The user acknowledges tdir has NOT been tested for: a) Correct operation b) Freedom from unintended consequences c) Any operation or condition which might cause damage to the user's machine, software, network, or data, or which might cause any breach of system security of the user's system(s) or any other systems. 3) By using tdir, the user does so at their own risk and agrees to hold TundraWare Inc. harmless for any damage, direct or indirect, that this software may or does cause to the user's computational environment, including, but not limited to, the user's hardware, software, network, or data. The user further agrees to hold TundraWare Inc. harmless for any economic damage or any other adverse consequence, direct or indirect, caused by the use of tdir. 4) If duplicated and/or distributed, no fee beyond reasonable duplication charges may be charged for tdir. --> no-dist-sell (OK) --> no-pkg-sell (OK) 5) Any distributed copies of tdir must include all the originally provided software, documentation, and licensing information --> here is my doubt [1] If you do not understand, or cannot abide by any of these conditions, DO NOT USE tdir. --> reinforce item 5 =============================================================================== [1] As we are changing shebang line, we won't distribute tdir with "all the originally provided software", unless we copy tdir to a documentation directory (to satisfy your license) before applying the shebang patch. In my understanding that's what looks like tdir license permissions in version 1.73: LICENSE= TundraWare LICENSE_NAME= TundraWare license LICENSE_FILE= ${WRKSRC}/tdir-license.txt LICENSE_PERMS= auto-accept dist-mirror no-dist-sell no-pkg-sell pkg-mirror More info here: https://www.freebsd.org/doc/en/books/porters-handbook/licenses.html#licenses-license_perms Now it can be built and distributed, the only concern is the item 5 of the license. And sorry for the delay, I want to push this update ASAP as you, and I need your help on it to clarify things.
Changing the shebang line does not violate our license agreement. You are hereby given permission to do what is needed in that regard and proceed with the release.
A commit references this bug: Author: dbaio Date: Tue Aug 14 01:12:49 UTC 2018 New revision: 477127 URL: https://svnweb.freebsd.org/changeset/ports/477127 Log: sysutils/tdir: Update to 1.73 - Change license permissions License reworked upstream, now `tdir` can be built and distributed in the FreeBSD package cluster. Changing the shebang line does not violate the license. The author gave explicit approval about this in PR 228180. Following the license change, this port can be released again. - It nows supports Python2 and Python3. PR: 228180 Submitted by: Tim Daneliuk <tdir@tundraware.com> (maintainer) Changes: head/sysutils/tdir/Makefile head/sysutils/tdir/distinfo
Committed, thank you!