From owner-freebsd-bugs@FreeBSD.ORG Fri Jan 3 12:00:00 2014 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9758EE3 for ; Fri, 3 Jan 2014 12:00:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 728CA154A for ; Fri, 3 Jan 2014 12:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s03C00m8091635 for ; Fri, 3 Jan 2014 12:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s03C00fO091634; Fri, 3 Jan 2014 12:00:00 GMT (envelope-from gnats) Resent-Date: Fri, 3 Jan 2014 12:00:00 GMT Resent-Message-Id: <201401031200.s03C00fO091634@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bernhard Froehlich Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9360CD1 for ; Fri, 3 Jan 2014 11:59:24 +0000 (UTC) Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7ED5F153E for ; Fri, 3 Jan 2014 11:59:24 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s03BxOrY097331 for ; Fri, 3 Jan 2014 11:59:24 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s03BxOdP097330; Fri, 3 Jan 2014 11:59:24 GMT (envelope-from nobody) Message-Id: <201401031159.s03BxOdP097330@oldred.freebsd.org> Date: Fri, 3 Jan 2014 11:59:24 GMT From: Bernhard Froehlich To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: misc/185441: [PATCH] sysutils/tarsnap: relax RESTRICTED X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 12:00:00 -0000 >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 + +# 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 +.include >Release-Note: >Audit-Trail: >Unformatted: