From nobody@FreeBSD.org  Sun Mar 23 17:20:53 2014
Return-Path: <nobody@FreeBSD.org>
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 B24049DB
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 23 Mar 2014 17:20:53 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.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 8477BEFA
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 23 Mar 2014 17:20:53 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NHKrjH045321
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 23 Mar 2014 17:20:53 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s2NHKrL5045317;
	Sun, 23 Mar 2014 17:20:53 GMT
	(envelope-from nobody)
Message-Id: <201403231720.s2NHKrL5045317@cgiserv.freebsd.org>
Date: Sun, 23 Mar 2014 17:20:53 GMT
From: Jonathan Price <freebsd@jonathanprice.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] games/xonotic: add new optional dependency
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         187855
>Category:       ports
>Synopsis:       [PATCH] games/xonotic: add new optional dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 23 17:30:00 UTC 2014
>Closed-Date:    Wed Mar 26 23:23:38 UTC 2014
>Last-Modified:  Wed Mar 26 23:30:00 UTC 2014
>Originator:     Jonathan Price
>Release:        10.0-RELEASE
>Organization:
>Environment:
FreeBSD bravo.pricetx.org 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
I have modified the games/xonotic port to add optional support for encryption using security/d0_blind_id.

This encryption library is used by Xonotic by both the server and client to submit weapon and player statistics, as well as to optionally encrypt the traffic between the client and the server.

Being that this provides statistics to the Xonotic community I have enabled this new optional dependency by default. However, as it is a cryptographic library, I am unsure whether this is suitable for certain countries (I know there are some restrictions on cryptography in the US etc). If somebody feels that this option should be disabled by default, then by all means do so.

I contacted the port maintainer about this potential modification to the port over a week ago, and have not heard back from them sadly. However, you may want to CC them on this PR nonetheless.

The diff has a .txt extension appended to allow it to be uploaded via firefox.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2014-03-23 17:02:43.944551242 +0000
+++ Makefile	2014-03-23 17:04:29.765544110 +0000
@@ -3,7 +3,7 @@
 
 PORTNAME=	xonotic
 PORTVERSION=	0.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://nl.dl.xonotic.org/ \
 		http://mirror.bitmissile.com/xonotic/releases/
@@ -32,17 +32,20 @@
 PORTDATA=	*
 
 OPTIONS_MULTI=	COMPONENTS
-OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED
-OPTIONS_DEFAULT=CLIENT DEDICATED
+OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED ENCRYPTION
+OPTIONS_DEFAULT=CLIENT DEDICATED ENCRYPTION
 
 CLIENT_DESC=	Build client
 DEDICATED_DESC=	Build dedicated server
+ENCRYPTION_DESC=Build encryption (required for stats submission)
 
 CLIENT_LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug \
 			libtheora.so:${PORTSDIR}/multimedia/libtheora \
 			libvorbis.so:${PORTSDIR}/audio/libvorbis \
 			libogg.so:${PORTSDIR}/audio/libogg
 
+ENCRYPTION_LIB_DEPENDS=	libd0_rijndael.so:${PORTSDIR}/security/d0_blind_id
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
@@ -84,6 +87,9 @@
 	${FIND} ${STAGEDIR}${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \
 		${XARGS} ${CHMOD} +x
 .endif
+.if ${PORT_OPTIONS:MENCRYPTION}
+	${INSTALL_DATA} ${WRKDIR}/Xonotic/key_0.d0pk ${STAGEDIR}${PREFIX}/share/${PORTNAME}
+.endif
 	${MKDIR} ${STAGEDIR}${DATADIR}/data
 	${INSTALL_DATA} ${WRKDIR}/Xonotic/data/*.pk3 ${STAGEDIR}${DATADIR}/data/
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 23 17:30:05 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187855 
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Wed Mar 26 23:23:37 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187855 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187855: commit references a PR
Date: Wed, 26 Mar 2014 23:23:40 +0000 (UTC)

 Author: amdmi3
 Date: Wed Mar 26 23:23:27 2014
 New Revision: 349306
 URL: http://svnweb.freebsd.org/changeset/ports/349306
 QAT: https://qat.redports.org/buildarchive/r349306/
 
 Log:
   - Add encryption support
   
   PR:		187855
   Submitted by:	Jonathan Price <freebsd@jonathanprice.org>
 
 Modified:
   head/games/xonotic/Makefile
 
 Modified: head/games/xonotic/Makefile
 ==============================================================================
 --- head/games/xonotic/Makefile	Wed Mar 26 23:16:09 2014	(r349305)
 +++ head/games/xonotic/Makefile	Wed Mar 26 23:23:27 2014	(r349306)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	xonotic
  PORTVERSION=	0.7.0
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	games
  MASTER_SITES=	http://nl.dl.xonotic.org/ \
  		http://mirror.bitmissile.com/xonotic/releases/
 @@ -32,17 +32,20 @@ USE_GCC=	yes
  PORTDATA=	*
  
  OPTIONS_MULTI=	COMPONENTS
 -OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED
 -OPTIONS_DEFAULT=CLIENT DEDICATED
 +OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED ENCRYPTION
 +OPTIONS_DEFAULT=CLIENT DEDICATED ENCRYPTION
  
  CLIENT_DESC=	Build client
  DEDICATED_DESC=	Build dedicated server
 +ENCRYPTION_DESC=Build encryption (required for stats submission)
  
  CLIENT_LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug \
  			libtheora.so:${PORTSDIR}/multimedia/libtheora \
  			libvorbis.so:${PORTSDIR}/audio/libvorbis \
  			libogg.so:${PORTSDIR}/audio/libogg
  
 +ENCRYPTION_LIB_DEPENDS=	libd0_rijndael.so:${PORTSDIR}/security/d0_blind_id
 +
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MCLIENT}
 @@ -84,6 +87,9 @@ do-install:
  	${FIND} ${STAGEDIR}${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \
  		${XARGS} ${CHMOD} +x
  .endif
 +.if ${PORT_OPTIONS:MENCRYPTION}
 +	${INSTALL_DATA} ${WRKDIR}/Xonotic/key_0.d0pk ${STAGEDIR}${PREFIX}/share/${PORTNAME}
 +.endif
  	${MKDIR} ${STAGEDIR}${DATADIR}/data
  	${INSTALL_DATA} ${WRKDIR}/Xonotic/data/*.pk3 ${STAGEDIR}${DATADIR}/data/
  
 _______________________________________________
 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"
 
>Unformatted:
