Date: Fri, 3 Jan 2014 11:59:24 GMT From: Bernhard Froehlich <decke@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/185441: [PATCH] sysutils/tarsnap: relax RESTRICTED Message-ID: <201401031159.s03BxOdP097330@oldred.freebsd.org> Resent-Message-ID: <201401031200.s03C00fO091634@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185441
>Category: misc
>Synopsis: [PATCH] sysutils/tarsnap: relax RESTRICTED
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 03 12:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Bernhard Froehlich
>Release:
>Organization:
>Environment:
FreeBSD dev.bluelife.at 10.0-RC4 FreeBSD 10.0-RC4 #0 r260130: Tue Dec 31 17:10:01 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
The tarsnap license says:
"You may only access the service using unmodified Tarsnap client code which I have distributed. Compiling the source code to produce binaries does not constitute "modification" for the purpose of this clause."
and Colin Percival confirmed that RESTRICTED is only set in the port to be safe against accidental patching of the port.
The attached patch removes the RESTRICTED setting and adds a check that enables RESTRICTED again if someone accidentally adds patches to this port.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: sysutils/tarsnap/Makefile
===================================================================
--- sysutils/tarsnap/Makefile (revision 338537)
+++ sysutils/tarsnap/Makefile (working copy)
@@ -11,8 +11,6 @@
MAINTAINER= cperciva@tarsnap.com
COMMENT= Online encrypted backup service (client)
-RESTRICTED= license restricts redistribution of source and binaries
-
GNU_CONFIGURE= yes
USES= gmake
@@ -27,6 +25,14 @@
SSE2_CFLAGS= -msse2
NO_STAGE= yes
+
+.include <bsd.port.pre.mk>
+
+# safety check to ensure that we don't violate the license
+.if exists(${PATCHDIR})
+RESTRICTED= license only allows redistribution and use of unmodified source and binaries
+.endif
+
post-install:
@if [ ! -f ${PREFIX}/etc/tarsnap.conf ]; then \
${CP} -p ${PREFIX}/etc/tarsnap.conf.sample ${PREFIX}/etc/tarsnap.conf ; \
@@ -33,4 +39,4 @@
fi
@${CAT} ${PKGDIR}/pkg-message
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401031159.s03BxOdP097330>