Bug 185441 - [PATCH] sysutils/tarsnap: relax RESTRICTED
Summary: [PATCH] sysutils/tarsnap: relax RESTRICTED
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-03 12:00 UTC by Bernhard Froehlich
Modified: 2014-01-04 21:40 UTC (History)
0 users

See Also:


Attachments
file.diff (938 bytes, patch)
2014-01-03 12:00 UTC, Bernhard Froehlich
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Bernhard Froehlich freebsd_committer 2014-01-03 12:00:00 UTC
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.

Fix: Patch attached with submission follows:
Comment 1 Colin Percival 2014-01-03 13:11:45 UTC
Looks great, please commit!

Thanks,
-- 
Colin Percival
Security Officer Emeritus, FreeBSD | The power to serve
Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid
Comment 2 dfilter service freebsd_committer 2014-01-03 13:51:57 UTC
Author: decke
Date: Fri Jan  3 13:51:50 2014
New Revision: 338539
URL: http://svnweb.freebsd.org/changeset/ports/338539

Log:
  - Relax RESTRICTED setting to only avoid that people
  accidentally commit patches to this port. Redistribution
  in _UNMODIFIED_ form as binary and source is allowed.
  
  PR:		misc/185441
  Submitted by:	myself
  Approved by:	Colin Percival <cperciva@tarsnap.com> (maintainer)

Modified:
  head/sysutils/tarsnap/Makefile

Modified: head/sysutils/tarsnap/Makefile
==============================================================================
--- head/sysutils/tarsnap/Makefile	Fri Jan  3 13:37:21 2014	(r338538)
+++ head/sysutils/tarsnap/Makefile	Fri Jan  3 13:51:50 2014	(r338539)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tarsnap
 PORTVERSION=	1.0.35
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tarsnap.com/download-http/
 DISTNAME=	${PORTNAME}-autoconf-${PORTVERSION}
@@ -11,8 +12,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	cperciva@tarsnap.com
 COMMENT=	Online encrypted backup service (client)
 
-RESTRICTED=	license restricts redistribution of source and binaries
-
 GNU_CONFIGURE=	yes
 USES=		gmake
 
@@ -27,10 +26,18 @@ SSE2_CONFIGURE_ENABLE=	sse2
 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 ; \
 	fi
 	@${CAT} ${PKGDIR}/pkg-message
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Bernhard Froehlich freebsd_committer 2014-01-03 13:52:19 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer 2014-01-04 21:30:22 UTC
Author: decke
Date: Sat Jan  4 21:30:15 2014
New Revision: 338679
URL: http://svnweb.freebsd.org/changeset/ports/338679

Log:
  MFH: r338539
  
  - Relax RESTRICTED setting to only avoid that people
  accidentally commit patches to this port. Redistribution
  in _UNMODIFIED_ form as binary and source is allowed.
  
  PR:		misc/185441
  Submitted by:	myself
  Approved by:	Colin Percival <cperciva@tarsnap.com> (maintainer)
  With hat:	portmgr

Modified:
  branches/2014Q1/sysutils/tarsnap/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/sysutils/tarsnap/Makefile
==============================================================================
--- branches/2014Q1/sysutils/tarsnap/Makefile	Sat Jan  4 21:28:19 2014	(r338678)
+++ branches/2014Q1/sysutils/tarsnap/Makefile	Sat Jan  4 21:30:15 2014	(r338679)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tarsnap
 PORTVERSION=	1.0.35
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tarsnap.com/download-http/
 DISTNAME=	${PORTNAME}-autoconf-${PORTVERSION}
@@ -11,8 +12,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	cperciva@tarsnap.com
 COMMENT=	Online encrypted backup service (client)
 
-RESTRICTED=	license restricts redistribution of source and binaries
-
 GNU_CONFIGURE=	yes
 USES=		gmake
 
@@ -27,10 +26,18 @@ SSE2_CONFIGURE_ENABLE=	sse2
 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 ; \
 	fi
 	@${CAT} ${PKGDIR}/pkg-message
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"