Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Mar 2014 17:20:53 GMT
From:      Jonathan Price <freebsd@jonathanprice.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/187855: [PATCH] games/xonotic: add new optional dependency
Message-ID:  <201403231720.s2NHKrL5045317@cgiserv.freebsd.org>
Resent-Message-ID: <201403231730.s2NHU0Ur057138@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         187855
>Category:       ports
>Synopsis:       [PATCH] games/xonotic: add new optional dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 23 17:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403231720.s2NHKrL5045317>