From richard@wurd.dev001.net  Thu Apr  5 00:11:52 2012
Return-Path: <richard@wurd.dev001.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DC89106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2012 00:11:52 +0000 (UTC)
	(envelope-from richard@wurd.dev001.net)
Received: from wurd.dev001.net (wurd.dev001.net [IPv6:2a01:4f8:120:9162::2])
	by mx1.freebsd.org (Postfix) with ESMTP id A17678FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2012 00:11:51 +0000 (UTC)
Received: by wurd.dev001.net (Postfix, from userid 1001)
	id E6F0987C6; Thu,  5 Apr 2012 02:11:49 +0200 (CEST)
Message-Id: <20120405001149.E6F0987C6@wurd.dev001.net>
Date: Thu,  5 Apr 2012 02:11:49 +0200 (CEST)
From: Richard Hirner <hirner@bitfire.at>
Reply-To: Richard Hirner <hirner@bitfire.at>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] New version 3.0.3 from upstream
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166654
>Category:       ports
>Synopsis:       [maintainer update] audio/teamspeak3-server: New version 3.0.3 from upstream
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    scheidell
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 05 00:20:01 UTC 2012
>Closed-Date:    Fri May 04 18:27:08 UTC 2012
>Last-Modified:  Mon May  7 22:50:08 UTC 2012
>Originator:     Richard Hirner
>Release:        FreeBSD 8.1-RELEASE-p5 amd64
>Organization:
>Environment:
>Description:
TeamSpeak 3.0.3 from teamspeak.com
>How-To-Repeat:
>Fix:

--- ts3-3.0.3.diff begins here ---
diff -ruN /usr/ports/audio/teamspeak3-server/Makefile teamspeak3-server/Makefile
--- /usr/ports/audio/teamspeak3-server/Makefile	2011-11-19 09:42:47.000000000 +0100
+++ teamspeak3-server/Makefile	2012-04-05 01:58:45.469098386 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	teamspeak3-server
-PORTVERSION=	3.0.1
+PORTVERSION=	3.0.3
 PORTEPOCH=	1
 CATEGORIES=	audio net
 MASTER_SITES=	http://teamspeak.gameserver.gamed.de/ts3/releases/${PORTVERSION}/ \
@@ -16,6 +16,11 @@
 MAINTAINER=	hirner@bitfire.at
 COMMENT=	Server side of the TeamSpeak group voice chat system
 
+LICENSE=	teamspeak
+LICENSE_NAME=	TeamSpeak 3.x End User License Agreement
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
+
 USE_ICONV=	yes
 USE_LDCONFIG=	${PREFIX}/lib/teamspeak/server
 USE_RC_SUBR=	teamspeak
@@ -29,11 +34,6 @@
 USERS=	teamspeak
 GROUPS=	teamspeak
 
-LICENSE=	teamspeak
-LICENSE_NAME=	TeamSpeak 3.x End User License Agreement
-LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
 CONFLICTS=	teamspeak_server-[0-9]*
 
 .include <bsd.port.options.mk>
diff -ruN /usr/ports/audio/teamspeak3-server/distinfo teamspeak3-server/distinfo
--- /usr/ports/audio/teamspeak3-server/distinfo	2011-11-19 09:42:47.000000000 +0100
+++ teamspeak3-server/distinfo	2012-04-05 02:05:58.849901111 +0200
@@ -1,4 +1,4 @@
-SHA256 (teamspeak3-server_freebsd-x86-3.0.1.tar.gz) = 919165cd1a7660271b78ce244c380bd18d6e3037e53939e2915d02809fff5b5b
-SIZE (teamspeak3-server_freebsd-x86-3.0.1.tar.gz) = 4396259
-SHA256 (teamspeak3-server_freebsd-amd64-3.0.1.tar.gz) = d0fefb8bc7423a52e291b45cd02e8d3ec8e3a8f7f58c69c9a9fd9743d915d5e2
-SIZE (teamspeak3-server_freebsd-amd64-3.0.1.tar.gz) = 3902437
+SIZE (teamspeak3-server_freebsd-amd64-3.0.3.tar.gz) = 3972768
+SHA256 (teamspeak3-server_freebsd-amd64-3.0.3.tar.gz) = a6954eba16bbd2f8920f90e94ea5dbf7b7247918c7b3e7636956b7451d3e7717
+SIZE (teamspeak3-server_freebsd-x86-3.0.3.tar.gz) = 4480739
+SHA256 (teamspeak3-server_freebsd-x86-3.0.3.tar.gz) = f0f8f2d8bfe14ca58e12d8f1c9c766560ff6e9be09fe27129d775863d75c912e
diff -ruN /usr/ports/audio/teamspeak3-server/pkg-plist teamspeak3-server/pkg-plist
--- /usr/ports/audio/teamspeak3-server/pkg-plist	2011-11-19 09:42:47.000000000 +0100
+++ teamspeak3-server/pkg-plist	2012-04-05 01:55:48.222048943 +0200
@@ -215,6 +215,8 @@
 share/teamspeak/server/serverquerydocs/servergroupadd.txt
 share/teamspeak/server/serverquerydocs/servergroupaddclient.txt
 share/teamspeak/server/serverquerydocs/servergroupaddperm.txt
+share/teamspeak/server/serverquerydocs/servergroupautoaddperm.txt
+share/teamspeak/server/serverquerydocs/servergroupautodelperm.txt
 share/teamspeak/server/serverquerydocs/servergroupbyclientid.txt
 share/teamspeak/server/serverquerydocs/servergroupclientlist.txt
 share/teamspeak/server/serverquerydocs/servergroupcopy.txt
@@ -236,6 +238,9 @@
 share/teamspeak/server/serverquerydocs/serversnapshotdeploy.txt
 share/teamspeak/server/serverquerydocs/serverstart.txt
 share/teamspeak/server/serverquerydocs/serverstop.txt
+share/teamspeak/server/serverquerydocs/servertemppasswordadd.txt
+share/teamspeak/server/serverquerydocs/servertemppassworddel.txt
+share/teamspeak/server/serverquerydocs/servertemppasswordlist.txt
 share/teamspeak/server/serverquerydocs/setclientchannelgroup.txt
 share/teamspeak/server/serverquerydocs/tokenadd.txt
 share/teamspeak/server/serverquerydocs/tokendelete.txt
--- ts3-3.0.3.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Thu May 3 08:28:43 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166654 
State-Changed-From-To: open->feedback 
State-Changed-By: scheidell 
State-Changed-When: Thu May 3 09:51:06 UTC 2012 
State-Changed-Why:  
Ask for maintainer approval. 

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

From: Michael Scheidell <scheidell@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166654: [maintainer update]
 audio/teamspeak3-server: New version 3.0.3 from upstream
Date: Thu, 3 May 2012 05:50:31 -0400 (EDT)

 --ELM1336038631-76912-0_
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain; charset="US-ASCII"
 
 Richard:
 
 Thank you for stepping up and maintaing this port.  FreeBSD would not be the operating system of choice for discriminating 
 server operators without your help.
 
 I found a minor issue with port, maybe an old issue, but if you use pkg_add on this port it will not create the 
 /var/{db|log}/teamspeak directories.
 
 (yes, make install does, via Makefile:post-install, but interesting thing about that: it doesn't get executed with a pkg_add 
 ;-)
 
 Other issue, and it is more or less an internal cluster build issue, and I might change this later, is the .ifdef 
 (PACKAGE_BUILDING) conditional in the Makefile.  I needed it for tinderbox/pointyhat clusters to actually build the package)
 
 of course, I suppose both of these minor changes are not needed if you don't want the server OP to build a package with make 
 package.
 
 how to replicate:
 
 on a clean system, or rm -rf /var/db/teamspeak /var/log/teamspeak
 
 make deinstall
 rm -rf /var/db/teamspeak /var/log/teamspeak
 
 make package
 make deinstall
 rm -rf /var/db/teamspeak /var/log/teamspeak
 
 pkg_add /usr/ports/packages/Latest/teamspeak.tbz
 
 notice: without my patches there is no /var/db/teamspeak.
 
 Do you approve of my minor changes? (apply this patch against CURRENT cvs, not against updated port)
 I can send you a portdir tarball if that would help.
 
 -- 
 Michael Scheidell, CTO
 SECNAP Network Security Corporation
 http://people.freebsd.org/~scheidell
 
 ______________________________________________________________________
 This email has been scanned and certified safe by SpammerTrap(r). 
 For Information please see http://www.spammertrap.com/
 ______________________________________________________________________  
   
 --ELM1336038631-76912-0_
 Content-Transfer-Encoding: 7bit
 Content-Type: text/x-patch
 Content-Disposition: attachment; filename="pr_166654_audio_teamspeak3_server.patch"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/audio/teamspeak3-server/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- Makefile	19 Nov 2011 08:42:47 -0000	1.21
 +++ Makefile	3 May 2012 09:41:06 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	teamspeak3-server
 -PORTVERSION=	3.0.1
 +PORTVERSION=	3.0.3
  PORTEPOCH=	1
  CATEGORIES=	audio net
  MASTER_SITES=	http://teamspeak.gameserver.gamed.de/ts3/releases/${PORTVERSION}/ \
 @@ -16,6 +16,15 @@
  MAINTAINER=	hirner@bitfire.at
  COMMENT=	Server side of the TeamSpeak group voice chat system
  
 +LICENSE=	teamspeak
 +LICENSE_NAME=	TeamSpeak 3.x End User License Agreement
 +LICENSE_FILE=	${WRKSRC}/LICENSE
 +LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 +
 +.ifdef (PACKAGE_BUILDING)
 +LICENSE_PERMS+=	auto-accept
 +.endif
 +
  USE_ICONV=	yes
  USE_LDCONFIG=	${PREFIX}/lib/teamspeak/server
  USE_RC_SUBR=	teamspeak
 @@ -29,13 +38,13 @@
  USERS=	teamspeak
  GROUPS=	teamspeak
  
 -LICENSE=	teamspeak
 -LICENSE_NAME=	TeamSpeak 3.x End User License Agreement
 -LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 -LICENSE_FILE=	${WRKSRC}/LICENSE
 -
  CONFLICTS=	teamspeak_server-[0-9]*
  
 +PLIST_SUB+=	DBDIR=${DBDIR} \
 +		LOGDIR=${LOGDIR} \
 +		USERS=${USERS} \
 +		GROUPS=${GROUPS}
 +
  .include <bsd.port.options.mk>
  
  .if ${ARCH} ==	"i386"
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/audio/teamspeak3-server/distinfo,v
 retrieving revision 1.12
 diff -u -r1.12 distinfo
 --- distinfo	19 Nov 2011 08:42:47 -0000	1.12
 +++ distinfo	3 May 2012 09:41:06 -0000
 @@ -1,4 +1,4 @@
 -SHA256 (teamspeak3-server_freebsd-x86-3.0.1.tar.gz) = 919165cd1a7660271b78ce244c380bd18d6e3037e53939e2915d02809fff5b5b
 -SIZE (teamspeak3-server_freebsd-x86-3.0.1.tar.gz) = 4396259
 -SHA256 (teamspeak3-server_freebsd-amd64-3.0.1.tar.gz) = d0fefb8bc7423a52e291b45cd02e8d3ec8e3a8f7f58c69c9a9fd9743d915d5e2
 -SIZE (teamspeak3-server_freebsd-amd64-3.0.1.tar.gz) = 3902437
 +SIZE (teamspeak3-server_freebsd-amd64-3.0.3.tar.gz) = 3972768
 +SHA256 (teamspeak3-server_freebsd-amd64-3.0.3.tar.gz) = a6954eba16bbd2f8920f90e94ea5dbf7b7247918c7b3e7636956b7451d3e7717
 +SIZE (teamspeak3-server_freebsd-x86-3.0.3.tar.gz) = 4480739
 +SHA256 (teamspeak3-server_freebsd-x86-3.0.3.tar.gz) = f0f8f2d8bfe14ca58e12d8f1c9c766560ff6e9be09fe27129d775863d75c912e
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/audio/teamspeak3-server/pkg-plist,v
 retrieving revision 1.9
 diff -u -r1.9 pkg-plist
 --- pkg-plist	19 Nov 2011 08:42:47 -0000	1.9
 +++ pkg-plist	3 May 2012 09:41:06 -0000
 @@ -215,6 +215,8 @@
  share/teamspeak/server/serverquerydocs/servergroupadd.txt
  share/teamspeak/server/serverquerydocs/servergroupaddclient.txt
  share/teamspeak/server/serverquerydocs/servergroupaddperm.txt
 +share/teamspeak/server/serverquerydocs/servergroupautoaddperm.txt
 +share/teamspeak/server/serverquerydocs/servergroupautodelperm.txt
  share/teamspeak/server/serverquerydocs/servergroupbyclientid.txt
  share/teamspeak/server/serverquerydocs/servergroupclientlist.txt
  share/teamspeak/server/serverquerydocs/servergroupcopy.txt
 @@ -236,6 +238,9 @@
  share/teamspeak/server/serverquerydocs/serversnapshotdeploy.txt
  share/teamspeak/server/serverquerydocs/serverstart.txt
  share/teamspeak/server/serverquerydocs/serverstop.txt
 +share/teamspeak/server/serverquerydocs/servertemppasswordadd.txt
 +share/teamspeak/server/serverquerydocs/servertemppassworddel.txt
 +share/teamspeak/server/serverquerydocs/servertemppasswordlist.txt
  share/teamspeak/server/serverquerydocs/setclientchannelgroup.txt
  share/teamspeak/server/serverquerydocs/tokenadd.txt
  share/teamspeak/server/serverquerydocs/tokendelete.txt
 @@ -249,5 +254,7 @@
  @dirrm share/teamspeak/server
  @dirrmtry share/teamspeak
  @dirrmtry etc/teamspeak
 -@dirrmtry /var/db/teamspeak
 -@dirrmtry /var/log/teamspeak
 +@comment Ignore the portlint errors, portlint is wrong. dirrmtry won't work
 +@exec mkdir -p %%DBDIR%% %%LOGDIR%%
 +@exec chown -R %%USERS%%:%%GROUPS%% %%DBDIR%% %%LOGDIR%%
 +@unexec rmdir %%DBDIR%% %%LOGDIR%% 2>/dev/null || true
 Index: files/pkg-message.in
 ===================================================================
 RCS file: /home/pcvs/ports/audio/teamspeak3-server/files/pkg-message.in,v
 retrieving revision 1.3
 diff -u -r1.3 pkg-message.in
 --- files/pkg-message.in	19 Nov 2011 08:42:47 -0000	1.3
 +++ files/pkg-message.in	3 May 2012 09:41:06 -0000
 @@ -9,7 +9,7 @@
  put it into %%PREFIX%%/etc/teamspeak
  
  To see the admin token after the first start, have a look
 -into the logs in /var/log/teamspeak
 +into the logs in %%LOGDIR%%
  
  TeamSpeak DNS server (tsdns) is not handled by this port. If you
  need id, please download and install it manually.
 Index: files/teamspeak.in
 ===================================================================
 RCS file: /home/pcvs/ports/audio/teamspeak3-server/files/teamspeak.in,v
 retrieving revision 1.2
 diff -u -r1.2 teamspeak.in
 --- files/teamspeak.in	14 Jan 2012 08:55:25 -0000	1.2
 +++ files/teamspeak.in	3 May 2012 09:41:06 -0000
 @@ -18,10 +18,10 @@
  name="teamspeak"
  rcvar=teamspeak_enable
  
 -db_dir=/var/db/teamspeak
 -log_dir=/var/log/teamspeak
 +db_dir=%%DBDIR%%
 +log_dir=%%LOGDIR%%
  
 -pidfile=/var/db/teamspeak/teamspeak_server.pid
 +pidfile=%%DBDIR%%/teamspeak_server.pid
  procname=%%PREFIX%%/libexec/teamspeak_server
  command=/usr/sbin/daemon
  command_args="-fp $pidfile -u teamspeak %%PREFIX%%/libexec/teamspeak_server dbsqlpath=%%PREFIX%%/share/teamspeak/server/sql/ inifile=%%PREFIX%%/etc/teamspeak/ts3server.ini licensepath=%%PREFIX%%/etc/teamspeak/ logpath=$log_dir"
 
 --ELM1336038631-76912-0_--

From: Michael Scheidell <scheidell@freebsd.org>
To: <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/166654: [maintainer update] audio/teamspeak3-server: New
 version 3.0.3 from upstream
Date: Thu, 3 May 2012 08:37:43 -0400

 it has been suggested that this would be the more appropriate patch
 
 .ifdef (BATCH)
 IGNORE=         license ${LICENSE} needs confirmation, but BATCH is defined
 .endif
 
 -- 
 Michael Scheidell, CTO
  >*| * SECNAP Network Security Corporation
 d: +1.561.948.2259
 w: http://people.freebsd.org/~scheidell
State-Changed-From-To: feedback->closed 
State-Changed-By: scheidell 
State-Changed-When: Fri May 4 18:27:06 UTC 2012 
State-Changed-Why:  
Committed, with minor changes.  Please review.  Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166654: commit references a PR
Date: Fri,  4 May 2012 18:26:22 +0000 (UTC)

 scheidell    2012-05-04 18:26:13 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/teamspeak3-server Makefile distinfo pkg-plist 
     audio/teamspeak3-server/files pkg-message.in teamspeak.in 
   Log:
   - Update to 3.0.3 [1]
   - Update LICENSE_PERMS [1]
   - Add @exec's to pkg-plist since Makefile:post-install isn't run with pkg-add [2]
   - Add BATCH check because you can't acctept license in batch mode [3]
   - Change mkdir/chown in Makefile (and pkg-plist) to install [3]
   
   PR:             ports/166654 [1]
   Submitted by:   Richard Hirner <hirner@bitfire.at> (maintainer) [1]
   Submitted by:   scheidell (me) [2]
   Submitted by:   crees@ [3]
   
   Revision  Changes    Path
   1.22      +18 -8     ports/audio/teamspeak3-server/Makefile
   1.13      +4 -4      ports/audio/teamspeak3-server/distinfo
   1.4       +1 -1      ports/audio/teamspeak3-server/files/pkg-message.in
   1.3       +4 -4      ports/audio/teamspeak3-server/files/teamspeak.in
   1.10      +11 -3     ports/audio/teamspeak3-server/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166654: commit references a PR
Date: Fri,  4 May 2012 18:47:27 +0000 (UTC)

 scheidell    2012-05-04 18:46:56 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/teamspeak3-server Makefile 
     audio/teamspeak3-server/files pkg-message.in 
   Log:
   - Forgot SUB_LIST (without it, %%s didn't expand in rc script)
   - No PORTREVISION bump (caught before mirrors had a change to sync)
   
   PR:             ports/166654
   Submitted by:   scheidell (me)
   Approved by:    maintainer (implicit)
   
   Revision  Changes    Path
   1.23      +3 -0      ports/audio/teamspeak3-server/Makefile
   1.5       +1 -1      ports/audio/teamspeak3-server/files/pkg-message.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Richard Hirner <hirner@bitfire.at>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166654: [maintainer update] audio/teamspeak3-server: New
 version 3.0.3 from upstream
Date: Tue, 08 May 2012 00:45:36 +0200

 Seems to be OK for me (I'm not so experienced in port-making), just
 please make sure that the distfile from their server or other binaries
 NEVER get packaged/distributed automatically because the license doesn't
 allow that.
 
 Best regards,
 Richard
 
>Unformatted:
