From root@kobe.netlab.nec.de  Mon Dec 20 08:36:03 2004
Return-Path: <root@kobe.netlab.nec.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1D83516A4CE; Mon, 20 Dec 2004 08:36:03 +0000 (GMT)
Received: from kobe.netlab.nec.de (kobe.netlab.nec.de [195.37.70.60])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7C70643D53; Mon, 20 Dec 2004 08:36:02 +0000 (GMT)
	(envelope-from root@kobe.netlab.nec.de)
Received: from kobe.netlab.nec.de (localhost [127.0.0.1])
	by kobe.netlab.nec.de (8.13.1/8.13.1) with ESMTP id iBK8ar3d021988;
	Mon, 20 Dec 2004 09:36:53 +0100 (CET)
	(envelope-from root@kobe.netlab.nec.de)
Received: (from root@localhost)
	by kobe.netlab.nec.de (8.13.1/8.13.1/Submit) id iBK8aqjd021987;
	Mon, 20 Dec 2004 09:36:52 +0100 (CET)
	(envelope-from root)
Message-Id: <200412200836.iBK8aqjd021987@kobe.netlab.nec.de>
Date: Mon, 20 Dec 2004 09:36:52 +0100 (CET)
From: Lars Eggert <lars.eggert@gmx.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nork@freebsd.org
Subject: [PATCH] net/DarwinStreamingServer: must link against libc_r to avoid crashes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         75291
>Category:       ports
>Synopsis:       [PATCH] net/DarwinStreamingServer: must link against libc_r to avoid crashes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nork
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 20 08:40:26 GMT 2004
>Closed-Date:    Sun May 01 10:47:35 GMT 2005
>Last-Modified:  Sun May 01 10:47:35 GMT 2005
>Originator:     Lars Eggert
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD kobe.netlab.nec.de 5.3-STABLE FreeBSD 5.3-STABLE #14: Tue Dec  7 13:32:55 CET
>Description:
I've found that if I don't link this against libc_r, the streaming
server often crashes when clients attempt to start a stream.

Port maintainer (nork@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- DarwinStreamingServer-5.0.1.1_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/DarwinStreamingServer/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	16 Dec 2004 14:38:53 -0000	1.14
+++ Makefile	20 Dec 2004 08:34:44 -0000
@@ -36,8 +36,11 @@
 		CXX="${CXX}"				\
 		MAKE="${MAKE}"				\
 		DATADIR="${DATADIR}"			\
-		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
+		PTHREAD_LIBS="-lc_r"		\
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
+
+#		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
+#		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/dssPackageMetaData ${WRKSRC}/pubPackageMetaData ${WRKSRC}/qtssPackageMetaData
--- DarwinStreamingServer-5.0.1.1_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nork 
Responsible-Changed-By: vs 
Responsible-Changed-When: Mon Dec 20 16:08:20 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer 

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

From: "Volker Stolz" <vs@freebsd.org>
To: freebsd-gnats-submit@freebsd.org, lars.eggert@gmx.net
Cc:  
Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link against libc_r to avoid crashes
Date: Mon, 03 Jan 2005 10:46:19 +0100

 Please remember that linking with -lc_r is (almost?) never the right thing  
 to do and *will* break on 4.X.
 Can you be more exact in explaining what is going wrong?
 
 Cheers,
    Volker

From: Lars Eggert <lars.eggert@netlab.nec.de>
To: Volker Stolz <vs@freebsd.org>
Cc: freebsd-gnats-submit@freebsd.org, lars.eggert@gmx.net
Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link against
 libc_r to avoid crashes
Date: Mon, 03 Jan 2005 10:56:56 +0100

 Volker Stolz wrote:
 > Please remember that linking with -lc_r is (almost?) never the right 
 > thing  to do and *will* break on 4.X.
 > Can you be more exact in explaining what is going wrong?
 
 The streaming server dumps core when clients connect to it if it is not 
 linked against libc_r on 5.x. Sorry, can't be more specific than this.
 
 Lars
 -- 
 Lars Eggert                                     NEC Network Laboratories

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Lars Eggert <lars.eggert@netlab.nec.de>
Cc: nork@FreeBSD.org, Volker Stolz <vs@FreeBSD.org>,
	freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link
 against libc_r to avoid crashes
Date: Tue, 4 Jan 2005 04:13:59 +0900 (JST)

 On Mon, 3 Jan 2005 10:00:53 GMT
 Lars Eggert <lars.eggert@netlab.nec.de> wrote:
 > The following reply was made to PR ports/75291; it has been noted by GNATS.
 > From: Lars Eggert <lars.eggert@netlab.nec.de>
 > To: Volker Stolz <vs@freebsd.org>
 > Cc: freebsd-gnats-submit@freebsd.org, lars.eggert@gmx.net
 > Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link against
 >  libc_r to avoid crashes
 > Date: Mon, 03 Jan 2005 10:56:56 +0100
 >  Volker Stolz wrote:
 >  > Please remember that linking with -lc_r is (almost?) never the right 
 >  > thing  to do and *will* break on 4.X.
 >  > Can you be more exact in explaining what is going wrong?
 >  The streaming server dumps core when clients connect to it if it is not 
 >  linked against libc_r on 5.x. Sorry, can't be more specific than this.
 
 	I understand that Lars said, well.  But I'm debating whether
 	to adopt Lars's fix.  Because I seem that using libmap.conf is
 	better.  But inconclusive:-(.

From: Lars Eggert <lars.eggert@netlab.nec.de>
To: Norikatsu Shigemura <nork@FreeBSD.org>
Cc: Volker Stolz <vs@FreeBSD.org>, freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link against
 libc_r to avoid crashes
Date: Mon, 03 Jan 2005 21:49:41 +0100

 Norikatsu Shigemura wrote:
 >> Volker Stolz wrote:
 >> > Please remember that linking with -lc_r is (almost?) never the right 
 >> > thing  to do and *will* break on 4.X.
 >> > Can you be more exact in explaining what is going wrong?
 >> The streaming server dumps core when clients connect to it if it is not 
 >> linked against libc_r on 5.x. Sorry, can't be more specific than this.
 > 
 > 	I understand that Lars said, well.  But I'm debating whether
 > 	to adopt Lars's fix.  Because I seem that using libmap.conf is
 > 	better.  But inconclusive:-(.
 
 If a libmap.conf solution still works (wasn't libmap.conf retired 
 already?) that'd be better than my patch, probably.
 
 Lars
 -- 
 Lars Eggert                                     NEC Network Laboratories

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Lars Eggert <lars.eggert@netlab.nec.de>
Cc: nork@FreeBSD.org, vs@FreeBSD.org,
	freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link
 against libc_r to avoid crashes
Date: Sun, 20 Feb 2005 23:39:59 +0900 (JST)

 	I'll update to 5.0.3.2.  Please confirm my patch.
 
 	Disable over-optimaization:
 	DSS tries to compile with -O3/-O2 options.  I consider that
 	this causes that DSS is unstable.  So I disabled -O2/-O3.
 	But I don't confirm that this is ok.  Would you please
 	confirm it?
 
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/net/DarwinStreamingServer/Makefile,v
 retrieving revision 1.14
 diff -u -r1.14 Makefile
 --- Makefile	16 Dec 2004 14:38:53 -0000	1.14
 +++ Makefile	20 Feb 2005 08:50:32 -0000
 @@ -6,13 +6,13 @@
  #
  
  PORTNAME=	DarwinStreamingServer
 -PORTVERSION=	5.0.1.1
 -PORTREVISION=	2
 +PORTVERSION=	5.0.3.2
 +PORTREVISION=	0
  CATEGORIES=	net
  MASTER_SITES=	#http://developer.apple.com/darwin/projects/streaming/source/
  #		You must accept APSL (Apple Public Source License),  and get
 -#		DarwinStreamingSrc5.0.zip.
 -DISTNAME=	DarwinStreamingSrc${PORTVERSION}
 +#		DSS-v5_0_3_2.zip.
 +DISTNAME=	DSS-v${PORTVERSION:S/./_/g}
  
  MAINTAINER=	nork@FreeBSD.org
  COMMENT=	Darwin Streaming Server, a MP3, MPEG4 and QuickTime streaming server
 @@ -55,37 +55,66 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,' \
 +		${WRKSRC}/Install							\
  		${WRKSRC}/defaultPaths.h						\
  		${WRKSRC}/streamingserver.xml-POSIX					\
  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
  		${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl
  	@${REINPLACE_CMD} -e 's,${PREFIX}/sbin/StreamingServerModules,${PREFIX}/libexec/StreamingServerModules,' \
 +		${WRKSRC}/Install							\
  		${WRKSRC}/defaultPaths.h						\
  		${WRKSRC}/streamingserver.xml-POSIX
  	@${REINPLACE_CMD} -e 's,${PREFIX}/movies,${DATADIR}/movies,' \
 +		${WRKSRC}/Install							\
  		${WRKSRC}/defaultPaths.h						\
  		${WRKSRC}/streamingserver.xml-POSIX					\
  		${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl
  	@${REINPLACE_CMD} -e 's,/etc/streaming,${PREFIX}/etc/streaming,' \
 +		${WRKSRC}/Install							\
  		${WRKSRC}/qtaccess							\
  		${WRKSRC}/defaultPaths.h						\
  		${WRKSRC}/streamingserver.xml-POSIX					\
  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
  	@${REINPLACE_CMD} -e 's,/var/streaming/logs,/var/log/streaming,' \
 +		${WRKSRC}/Install							\
  		${WRKSRC}/defaultPaths.h						\
  		${WRKSRC}/streamingserver.xml-POSIX					\
  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
  	@${REINPLACE_CMD} -e 's,/var/streaming/AdminHtml,${DATADIR}/AdminHtml,' \
 +		${WRKSRC}/Install							\
  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
  	@${REINPLACE_CMD} -e 's,/var/streaming/playlists,/var/spool/streaming.playlists,' \
 +		${WRKSRC}/Install							\
  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
  	@${REINPLACE_CMD} -e 's,/var/streaming/streamingadminserver.pid,/var/run/streamingadminserver.pid,' \
  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
 +	@${REINPLACE_CMD} -e '/-O[23]/d' \
 +		${WRKSRC}/Makefile.POSIX						\
 +		${WRKSRC}/QTFileLib/Makefile.POSIX					\
 +		${WRKSRC}/qtpasswd.tproj/Makefile.POSIX					\
 +		${WRKSRC}/MP3Broadcaster/Makefile.POSIX					\
 +		${WRKSRC}/HTTPUtilitiesLib/Makefile.POSIX				\
 +		${WRKSRC}/CommonUtilitiesLib/Makefile.POSIX				\
 +		${WRKSRC}/StreamingProxy.tproj/Makefile.POSIX				\
 +		${WRKSRC}/StreamingServer.pbproj/project.pbxproj			\
 +		${WRKSRC}/PlaylistBroadcaster.tproj/Makefile.POSIX			\
 +		${WRKSRC}/QTFileTools/QTRTPGen.tproj/Makefile.POSIX			\
 +		${WRKSRC}/QTFileTools/QTSDPGen.tproj/Makefile.POSIX			\
 +		${WRKSRC}/QTFileTools/QTFileInfo.tproj/Makefile.POSIX			\
 +		${WRKSRC}/QTFileTools/QTFileTest.tproj/Makefile.POSIX			\
 +		${WRKSRC}/APIModules/QTSSRefMovieModule/Makefile.POSIX			\
 +		${WRKSRC}/QTFileTools/QTTrackInfo.tproj/Makefile.POSIX			\
 +		${WRKSRC}/QTFileTools/QTBroadcaster.tproj/Makefile.POSIX		\
 +		${WRKSRC}/QTFileTools/QTRTPFileTest.tproj/Makefile.POSIX		\
 +		${WRKSRC}/QTFileTools/QTSampleLister.tproj/Makefile.POSIX		\
 +		${WRKSRC}/APIModules/QTSSRawFileModule.bproj/Makefile.POSIX		\
 +		${WRKSRC}/APIModules/QTSSSpamDefenseModule.bproj/Makefile.POSIX		\
 +		${WRKSRC}/APIModules/QTSSDemoAuthorizationModule.bproj/Makefile.POSIX
  
  do-build:
  	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Buildit)
 @@ -93,7 +122,7 @@
  post-build:
  	@${CP} ${.CURDIR}/pkg-message ${WRKDIR}/pkg-message
  	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKDIR}/pkg-message
 -	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./DSS_MakeRoot -f ${OPSYS} dss)
 +	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./DSS_MakeRoot -f ${OPSYS})
  
  pre-install:
  	@${SETENV} PKG_PREFIX=${PREFIX} \
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/net/DarwinStreamingServer/distinfo,v
 retrieving revision 1.6
 diff -u -r1.6 distinfo
 --- distinfo	2 Mar 2004 10:36:44 -0000	1.6
 +++ distinfo	21 Jan 2005 01:20:04 -0000
 @@ -1 +1,2 @@
 -MD5 (DarwinStreamingSrc5.0.1.1.zip) = 09988fb421053f8222715a7746973fae
 +MD5 (DSS-v5_0_3_2.zip) = 394e74199a01e5f54c743bb02f898edd
 +SIZE (DSS-v5_0_3_2.zip) = 10859092
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/net/DarwinStreamingServer/pkg-plist,v
 retrieving revision 1.3
 diff -u -r1.3 pkg-plist
 --- pkg-plist	2 Feb 2004 17:50:20 -0000	1.3
 +++ pkg-plist	20 Feb 2005 09:48:52 -0000
 @@ -1,11 +1,10 @@
 -bin/createuserstreamingdir
  bin/qtpasswd
  bin/MP3Broadcaster
  bin/PlaylistBroadcaster
  sbin/DarwinStreamingServer
  sbin/streamingadminserver.pl
 -libexec/StreamingServerModules/QTSSHomeDirectoryModule
 -libexec/StreamingServerModules/QTSSRefMovieModule
 +@comment libexec/StreamingServerModules/QTSSHomeDirectoryModule
 +@comment libexec/StreamingServerModules/QTSSRefMovieModule
  @exec   mkdir %D/%%DATADIR%%                 2>/dev/null || true
  @exec   mkdir %D/%%DATADIR%%/movies          2>/dev/null || true
  %%DATADIR%%/readme.txt
 @@ -153,11 +152,12 @@
  @dirrm %%DATADIR%%/AdminHtml/images
  @dirrm %%DATADIR%%/AdminHtml/html_en
  @dirrm %%DATADIR%%/AdminHtml
 -@unexec rmdir %D/%%DATADIR%%/movies          2>/dev/null || true
 -@unexec rmdir %D/%%DATADIR%%                 2>/dev/null || true
 -@dirrm libexec/StreamingServerModules
 -@unexec rmdir %D/etc/streaming               2>/dev/null || true
 -@unexec rmdir /var/spool/streaming.playlists 2>/dev/null || true
 -@exec   mkdir /var/spool/streaming.playlists 2>/dev/null || true
 -@unexec rmdir /var/log/streaming             2>/dev/null || true
 -@exec   mkdir /var/log/streaming             2>/dev/null || true
 +@unexec rmdir %D/%%DATADIR%%/movies             2>/dev/null || true
 +@unexec rmdir %D/%%DATADIR%%                    2>/dev/null || true
 +@unexec rmdir %D/libexec/StreamingServerModules 2>/dev/null || true
 +@exec   mkdir %D/libexec/StreamingServerModules 2>/dev/null || true
 +@unexec rmdir %D/etc/streaming                  2>/dev/null || true
 +@unexec rmdir /var/spool/streaming.playlists    2>/dev/null || true
 +@exec   mkdir /var/spool/streaming.playlists    2>/dev/null || true
 +@unexec rmdir /var/log/streaming                2>/dev/null || true
 +@exec   mkdir /var/log/streaming                2>/dev/null || true
 Index: files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp
 ===================================================================
 RCS file: /home/ncvs/ports/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp,v
 retrieving revision 1.1
 diff -u -r1.1 patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp
 --- files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp	16 Dec 2004 14:38:53 -0000	1.1
 +++ files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp	21 Jan 2005 01:23:45 -0000
 @@ -1,6 +1,6 @@
 ---- APIModules/QTSSReflectorModule/ReflectorStream.cpp.orig	Sat Aug 16 08:52:46 2003
 -+++ APIModules/QTSSReflectorModule/ReflectorStream.cpp	Thu Dec 16 23:29:41 2004
 -@@ -173,7 +173,7 @@
 +--- APIModules/QTSSReflectorModule/ReflectorStream.cpp.orig	Thu Jun 10 09:03:34 2004
 ++++ APIModules/QTSSReflectorModule/ReflectorStream.cpp	Fri Jan 21 10:23:11 2005
 +@@ -179,7 +179,7 @@
       theRRWriter++;
       *theRRWriter = htonl(theSsrc);
       theRRWriter++;
 Index: files/patch-Buildit
 ===================================================================
 RCS file: /home/ncvs/ports/net/DarwinStreamingServer/files/patch-Buildit,v
 retrieving revision 1.3
 diff -u -r1.3 patch-Buildit
 --- files/patch-Buildit	1 Feb 2004 18:14:46 -0000	1.3
 +++ files/patch-Buildit	20 Feb 2005 08:30:53 -0000
 @@ -1,6 +1,6 @@
 ---- Buildit.orig	Thu Nov 13 10:02:58 2003
 -+++ Buildit	Sun Jan 18 07:23:31 2004
 -@@ -81,20 +81,20 @@ case $PLAT in
 +--- Buildit.orig	Thu Jun 10 09:03:33 2004
 ++++ Buildit	Sun Feb 20 17:19:01 2005
 +@@ -78,20 +78,20 @@
   		fi
   		;;
   
 Index: files/patch-DSS_MakeRoot
 ===================================================================
 RCS file: files/patch-DSS_MakeRoot
 diff -N files/patch-DSS_MakeRoot
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-DSS_MakeRoot	21 Jan 2005 20:08:48 -0000
 @@ -0,0 +1,24 @@
 +--- DSS_MakeRoot.orig	Tue Mar 11 12:13:25 2003
 ++++ DSS_MakeRoot	Sat Jan 22 05:08:36 2005
 +@@ -249,21 +249,6 @@
 + 	cp -f WebAdmin/WebAdminHtml/html_en/messages $INSTALLROOT/AdminHtml/html_en/
 + 	cp -f WebAdmin/WebAdminHtml/html_en/genres $INSTALLROOT/AdminHtml/html_en/
 + 	
 +-	echo creating "$INSTALLROOT/AdminHtml/html_de/" directory
 +-	mkdir -p $INSTALLROOT/AdminHtml/html_de/
 +-	cp -f WebAdmin/WebAdminHtml/html_de/messages $INSTALLROOT/AdminHtml/html_de/
 +-	cp -f WebAdmin/WebAdminHtml/html_de/genres $INSTALLROOT/AdminHtml/html_de/
 +-
 +-	echo creating "$INSTALLROOT/AdminHtml/html_fr/" directory
 +-	mkdir -p $INSTALLROOT/AdminHtml/html_fr/
 +-	cp -f WebAdmin/WebAdminHtml/html_fr/messages $INSTALLROOT/AdminHtml/html_fr/
 +-	cp -f WebAdmin/WebAdminHtml/html_fr/genres $INSTALLROOT/AdminHtml/html_fr/
 +-
 +-	echo creating "$INSTALLROOT/AdminHtml/html_ja/" directory
 +-	mkdir -p $INSTALLROOT/AdminHtml/html_ja/
 +-	cp -f WebAdmin/WebAdminHtml/html_ja/messages $INSTALLROOT/AdminHtml/html_ja/
 +-	cp -f WebAdmin/WebAdminHtml/html_ja/genres $INSTALLROOT/AdminHtml/html_ja/
 +-
 + fi
 + 
 + 
 Index: files/patch-Install
 ===================================================================
 RCS file: /home/ncvs/ports/net/DarwinStreamingServer/files/patch-Install,v
 retrieving revision 1.2
 diff -u -r1.2 patch-Install
 --- files/patch-Install	1 Feb 2004 18:14:46 -0000	1.2
 +++ files/patch-Install	20 Feb 2005 13:32:22 -0000
 @@ -1,12 +1,6 @@
 ---- Install.orig	Thu Nov 13 10:02:58 2003
 -+++ Install	Mon Feb  2 02:56:41 2004
 -@@ -1,4 +1,4 @@
 --#!/bin/bash
 -+#!/bin/sh
 - 
 - # Install script for the Darwin Streaming Server
 - # source release
 -@@ -16,6 +16,7 @@
 +--- Install.orig	Wed Jul 24 07:00:31 2002
 ++++ Install	Sun Feb 20 22:31:51 2005
 +@@ -15,6 +15,7 @@
   
   if [ $USERID = 0 ]; then
   
 @@ -14,7 +8,7 @@
   	echo Checking for and Killing currently running Darwin Streaming Server
   	if [ `uname` = "FreeBSD" ]; then
   		ps -ax | awk '/DarwinStreamingServer/ {print $1}' | xargs kill -9  
 -@@ -113,14 +114,15 @@
 +@@ -110,6 +111,7 @@
   	fi
   
   	echo
 @@ -22,140 +16,88 @@
   
   ## CHANGE PERL PATH IN streamingadminserver.pl AND parse_xml.cgi ##
   
 - # Look for perl in the default locations
 - if [ -x /usr/freeware/bin/perl ]; then
 - 	perldef=/usr/freeware/bin/perl
 --elif [ -x /usr/local/bin/perl ]; then
 --	perldef=/usr/local/bin/perl
 -+elif [ -x ${LOCALBASE}/bin/perl ]; then
 -+	perldef=${LOCALBASE}/bin/perl
 - elif [ -x /usr/bin/perl ]; then
 - 	perldef=/usr/bin/perl
 - else
 -@@ -189,159 +191,160 @@
 - fi
 +@@ -196,64 +198,72 @@
 +         fi              
   
 - # Add the unprivileged user qtss as the server's run user
 -+if false; then
 - 	echo "Creating unprivileged user to run the server = \"qtss\"."
 -     if [ $INSTALL_OS = "Linux" ]; then
 -         /usr/sbin/useradd -M qtss > /dev/null 2>&1
 -     else
 -         /usr/sbin/useradd qtss > /dev/null 2>&1
 -     fi
 -+fi
 - 	
 - ## INSTALL NEW VERSION ##
 --    if [ ! -d /usr/local/sbin ]; then
 --            echo creating "/usr/local/sbin" directory
 --            mkdir -p /usr/local/sbin
 -+    if [ ! -d ${PREFIX}/sbin ]; then
 -+            echo creating "${PREFIX}/sbin" directory
 -+            mkdir -p ${PREFIX}/sbin
 -     fi              
 --    if [ ! -d /usr/local/bin ]; then
 --            echo creating "/usr/local/bin" directory
 --            mkdir -p /usr/local/bin
 -+    if [ ! -d ${PREFIX}/bin ]; then
 -+            echo creating "${PREFIX}/bin" directory
 -+            mkdir -p ${PREFIX}/bin
 -     fi              
 - 
 --	echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer"
 + 	echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer"
  -	cp -f DarwinStreamingServer /usr/local/sbin/
 -+	echo copying "DarwinStreamingServer" to "${PREFIX}/sbin/DarwinStreamingServer"
 -+	${BSD_INSTALL_PROGRAM} DarwinStreamingServer ${PREFIX}/sbin/
 ++	${BSD_INSTALL_PROGRAM} DarwinStreamingServer /usr/local/sbin/
   	
   	
 --	echo copying "PlaylistBroadcaster" to "/usr/local/bin/PlaylistBroadcaster"
 + 	echo copying "PlaylistBroadcaster" to "/usr/local/bin/PlaylistBroadcaster"
  -	cp -f PlaylistBroadcaster /usr/local/bin/
 -+	echo copying "PlaylistBroadcaster" to "${PREFIX}/bin/PlaylistBroadcaster"
 -+	${BSD_INSTALL_PROGRAM} PlaylistBroadcaster ${PREFIX}/bin/
 ++	${BSD_INSTALL_PROGRAM} PlaylistBroadcaster /usr/local/bin/
   	
 --	echo copying "MP3Broadcaster" to "/usr/local/bin/MP3Broadcaster"
 + 	echo copying "MP3Broadcaster" to "/usr/local/bin/MP3Broadcaster"
  -	cp -f MP3Broadcaster /usr/local/bin/
 -+	echo copying "MP3Broadcaster" to "${PREFIX}/bin/MP3Broadcaster"
 -+	${BSD_INSTALL_PROGRAM} MP3Broadcaster ${PREFIX}/bin/
 ++	${BSD_INSTALL_PROGRAM} MP3Broadcaster /usr/local/bin/
   	
 --	echo copying "qtpasswd" to "/usr/local/bin/qtpasswd"
 + 	echo copying "qtpasswd" to "/usr/local/bin/qtpasswd"
  -	cp -f qtpasswd /usr/local/bin/
 -+	echo copying "qtpasswd" to "${PREFIX}/bin/qtpasswd"
 -+	${BSD_INSTALL_PROGRAM} qtpasswd ${PREFIX}/bin/
 ++	${BSD_INSTALL_PROGRAM} qtpasswd /usr/local/bin/
   
   	# For now, do not copy modules as there are no supported dynamic modules
  -	# echo copying modules to "/usr/local/sbin/StreamingServerModules"
  -	if [ ! -d /usr/local/sbin/StreamingServerModules ]; then
  -		echo creating "/usr/local/sbin/StreamingServerModules" directory
  -		mkdir /usr/local/sbin/StreamingServerModules
 -+	# echo copying modules to "${PREFIX}/libexec/StreamingServerModules"
 -+	if [ ! -d ${PREFIX}/libexec/StreamingServerModules ]; then
 -+		echo creating "${PREFIX}/libexec/StreamingServerModules" directory
 -+		mkdir ${PREFIX}/libexec/StreamingServerModules
 - 	fi
 --	cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/
 -+	${BSD_INSTALL_PROGRAM} StreamingServerModules/* ${PREFIX}/libexec/StreamingServerModules/
 ++	# echo copying modules to "/usr/local/libexec/StreamingServerModules"
 ++	if [ ! -d /usr/local/libexec/StreamingServerModules ]; then
 ++		echo creating "/usr/local/libexec/StreamingServerModules" directory
 ++		mkdir /usr/local/libexec/StreamingServerModules
 + 	fi
 +-	# cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/
 ++	# ${BSD_INSTALL_PROGRAM} StreamingServerModules/* /usr/local/libexec/StreamingServerModules/
 + 	
 + 	if [ ! -d /etc/streaming ]; then
 + 		echo creating "/etc/streaming" directory
 + 		mkdir -p /etc/streaming
 + 	fi
 + 	
 +-	echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml-sample"
 +-	cp -f streamingserver.xml /etc/streaming/streamingserver.xml-sample
 ++	echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml-dist"
 ++	${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml-dist
 + 	
 ++	if [ ! -e /etc/streaming/streamingserver.xml ]; then
 + 	echo;echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml"
 +-	cp -f streamingserver.xml /etc/streaming/streamingserver.xml
 ++	${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml
 + 	chmod 600 /etc/streaming/streamingserver.xml
 ++	fi
   
 --	if [ -e /usr/local/sbin/StreamingServerModules/QTSSHomeDirectoryModule ]; then
 --		echo copying "createuserstreamingdir" to "/usr/local/bin/createuserstreamingdir"
 --		cp -f createuserstreamingdir $INSTALLROOT/usr/local/bin/
 -+	if [ -e ${PREFIX}/libexec/StreamingServerModules/QTSSHomeDirectoryModule ]; then
 -+		echo copying "createuserstreamingdir" to "${PREFIX}/bin/createuserstreamingdir"
 -+		${BSD_INSTALL_SCRIPT} createuserstreamingdir ${PREFIX}/bin/
 - 	fi
 - 	
 --	if [ ! -d /etc/streaming ]; then
 --		echo creating "/etc/streaming" directory
 --		mkdir -p /etc/streaming
 -+	if [ ! -d ${PREFIX}/etc/streaming ]; then
 -+		echo creating "${PREFIX}/etc/streaming" directory
 -+		mkdir -p ${PREFIX}/etc/streaming
 - 	fi
 - 	
 --	if [ ! -e /etc/streaming/streamingserver.xml ]; then
 --		/usr/local/sbin/DarwinStreamingServer -x
 -+	echo;echo copying "streamingserver.xml" to "${PREFIX}/etc/streaming/streamingserver.xml-dist"
 -+	${BSD_INSTALL_DATA} streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml-dist
 -+	if [ ! -e ${PREFIX}/etc/streaming/streamingserver.xml ]; then
 -+		echo;echo copying "streamingserver.xml" to "${PREFIX}/etc/streaming/streamingserver.xml"
 -+		${BSD_INSTALL_DATA} streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml
 - 	fi
 - 	
 --	chmod 600 /etc/streaming/streamingserver.xml
 --	chown qtss /etc/streaming/streamingserver.xml
 -+	chmod 600 ${PREFIX}/etc/streaming/streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml-dist
 -+	chown qtss:qtss ${PREFIX}/etc/streaming/streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml-dist
 - 	
  -	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml-Sample"
  -	cp -f relayconfig.xml-Sample /etc/streaming/relayconfig.xml-Sample
  -	chmod 600 /etc/streaming/relayconfig.xml-Sample
 --	if [ -e /etc/streaming/relayconfig.xml ]; then
 --		chown qtss /etc/streaming/relayconfig.xml
 -+	echo;echo copying "relayconfig.xml-Sample" to "${PREFIX}/etc/streaming/relayconfig.xml-dist"
 -+	${BSD_INSTALL_DATA} relayconfig.xml-Sample ${PREFIX}/etc/streaming/relayconfig.xml-dist
 -+	if [ ! -e ${PREFIX}/etc/streaming/relayconfig.xml ]; then
 -+		echo;echo copying "relayconfig.xml-Sample" to "${PREFIX}/etc/streaming/relayconfig.xml"
 -+		${BSD_INSTALL_DATA} relayconfig.xml-Sample ${PREFIX}/etc/streaming/relayconfig.xml
 - 	fi
 - 	
 ++	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml-dist"
 ++	${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml-dist
 ++	chmod 600 /etc/streaming/relayconfig.xml-dist
 ++		
 ++	if [ ! -e /etc/streaming/relayconfig.xml ]; then
 ++	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml"
 ++	${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml
 ++	chmod 600 /etc/streaming/relayconfig.xml
 ++	fi
 + 		
  -	echo;echo copying "qtusers" to "/etc/streaming/qtusers"
  -	cp -f qtusers /etc/streaming/qtusers
  -	chmod 600 /etc/streaming/qtusers
 --	chown qtss /etc/streaming/qtusers
 -+	echo;echo copying "qtusers" to "${PREFIX}/etc/streaming/qtusers-dist"
 -+	install -c -o qtss -g qtss -m 0600 qtusers ${PREFIX}/etc/streaming/qtusers-dist
 - 
 +-
  -	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups"
  -	cp -f qtgroups /etc/streaming/qtgroups
  -	chmod 600 /etc/streaming/qtgroups
 --	chown qtss /etc/streaming/qtgroups
 ++	echo;echo copying "qtusers" to "/etc/streaming/qtusers-dist"
 ++	${BSD_INSTALL_DATA} qtusers /etc/streaming/qtusers-dist
 ++	chmod 600 /etc/streaming/qtusers-dist
 ++
  +	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups-dist"
 -+	install -c -o qtss -g qtss -m 0600  qtgroups ${PREFIX}/etc/streaming/qtgroups-dist
 ++	${BSD_INSTALL_DATA} qtgroups /etc/streaming/qtgroups-dist
 ++	chmod 600 /etc/streaming/qtgroups-dist
   
 --	#echo;echo copying "streamingadminserver.pem" to "/etc/streaming/streamingadminserver.pem"
 + 	#echo;echo copying "streamingadminserver.pem" to "/etc/streaming/streamingadminserver.pem"
  -	#cp -f streamingadminserver.pem /etc/streaming/streamingadminserver.pem
 --	#chmod 400 /etc/streaming/streamingadminserver.pem
 -+	#echo;echo copying "streamingadminserver.pem" to "${PREFIX}/etc/streaming/streamingadminserver.pem"
 -+	#install -c -o qtss -g qtss -m 0400 streamingadminserver.pem ${PREFIX}/etc/streaming/streamingadminserver.pem
 ++	#${BSD_INSTALL_DATA} streamingadminserver.pem /etc/streaming/streamingadminserver.pem
 + 	#chmod 400 /etc/streaming/streamingadminserver.pem
   
  -	if [ ! -d /var/streaming ]; then
  -		echo creating "/var/streaming" directory
 @@ -165,8 +107,8 @@
  +		mkdir -p ${DATADIR}
   	fi
   	
 --	echo copying "readme.txt" to "/var/streaming/readme.txt"
 --	cp -f readme.txt /var/streaming/readme.txt
 +-	echo copying "readme.pdf" to "/var/streaming/readme.pdf"
 +-	cp -f readme.pdf /var/streaming/readme.pdf
  +	echo copying "readme.txt" to "${DATADIR}/readme.txt"
  +	${BSD_INSTALL_DATA} readme.txt ${DATADIR}/readme.txt
   	
 @@ -175,109 +117,64 @@
  +	echo copying "3rdPartyAcknowledgements.rtf" to "${DATADIR}/3rdPartyAcknowledgements.rtf"
  +	${BSD_INSTALL_DATA} 3rdPartyAcknowledgements.rtf ${DATADIR}/3rdPartyAcknowledgements.rtf
   	
 --	if [ ! -d /var/streaming/logs ]; then
 --		echo creating "/var/streaming/logs" directory
 --		mkdir -p /var/streaming/logs
 -+	if [ ! -d /var/log/streaming ]; then
 -+		echo creating "/var/log/streaming" directory
 -+		mkdir -p /var/log/streaming
 + 	if [ ! -d /var/streaming/logs ]; then
 + 		echo creating "/var/streaming/logs" directory
 +@@ -272,46 +282,49 @@
   	fi
   	
 --	if [ ! -d /usr/local/movies ]; then
 --		echo creating "/usr/local/movies" directory
 --		mkdir -p /usr/local/movies
 -+	if [ ! -d ${DATADIR}/movies ]; then
 -+		echo creating "${DATADIR}/movies" directory
 -+		mkdir -p ${DATADIR}/movies
 - 	fi
 - 	
 --	if [ ! -d /var/streaming/playlists ]; then
 --		echo creating "/var/streaming/playlists" directory
 --		mkdir -p /var/streaming/playlists
 -+	if [ ! -d /var/spool/streaming.playlists ]; then
 -+		echo creating "/var/spool/streaming.playlists" directory
 -+		mkdir -p /var/spool/streaming.playlists
 - 	fi
 --	chmod 770 /var/streaming/playlists
 --	chmod 775 /usr/local/movies
 -+	chown qtss:qtss /var/spool/streaming.playlists
 -+	chmod 770 /var/spool/streaming.playlists
 -+	chmod 775 ${PREFIX}/movies
 - 	
 --    echo copying "sample_100kbit.mov" into "/usr/local/movies/sample_100kbit.mov"
 +     echo copying "sample_100kbit.mov" into "/usr/local/movies/sample_100kbit.mov"
  -    cp -f sample_100kbit.mov /usr/local/movies/
 -+    echo copying "sample_100kbit.mov" into "${DATADIR}/movies/sample_100kbit.mov"
 -+    ${BSD_INSTALL_DATA} sample_100kbit.mov ${DATADIR}/movies/
 ++    ${BSD_INSTALL_DATA} sample_100kbit.mov /usr/local/movies/
   
 --    echo copying "sample_300kbit.mov" into "/usr/local/movies/sample_300kbit.mov"
 +     echo copying "sample_300kbit.mov" into "/usr/local/movies/sample_300kbit.mov"
  -    cp -f sample_300kbit.mov /usr/local/movies/
 -+    echo copying "sample_300kbit.mov" into "${DATADIR}/movies/sample_300kbit.mov"
 -+    ${BSD_INSTALL_DATA} sample_300kbit.mov ${DATADIR}/movies/
 ++    ${BSD_INSTALL_DATA} sample_300kbit.mov /usr/local/movies/
   
 --    echo copying "sample_100kbit.mp4" into "/usr/local/movies/sample_100kbit.mp4"
 +     echo copying "sample_100kbit.mp4" into "/usr/local/movies/sample_100kbit.mp4"
  -    cp -f sample_100kbit.mp4 /usr/local/movies/
 -+    echo copying "sample_100kbit.mp4" into "${DATADIR}/movies/sample_100kbit.mp4"
 -+    ${BSD_INSTALL_DATA} sample_100kbit.mp4 ${DATADIR}/movies/
 ++    ${BSD_INSTALL_DATA} sample_100kbit.mp4 /usr/local/movies/
   
 --    echo copying "sample_300kbit.mp4" into "/usr/local/movies/sample_300kbit.mp4"
 +     echo copying "sample_300kbit.mp4" into "/usr/local/movies/sample_300kbit.mp4"
  -    cp -f sample_300kbit.mp4 /usr/local/movies/
 -+    echo copying "sample_300kbit.mp4" into "${DATADIR}/movies/sample_300kbit.mp4"
 -+    ${BSD_INSTALL_DATA} sample_300kbit.mp4 ${DATADIR}/movies/
 ++    ${BSD_INSTALL_DATA} sample_300kbit.mp4 /usr/local/movies/
   
 --    echo copying "sample.mp3" into "/usr/local/movies/sample.mp3"
 +     echo copying "sample.mp3" into "/usr/local/movies/sample.mp3"
  -    cp -f sample.mp3 /usr/local/movies/
 -+    echo copying "sample.mp3" into "${DATADIR}/movies/sample.mp3"
 -+    ${BSD_INSTALL_DATA} sample.mp3 ${DATADIR}/movies/
 ++    ${BSD_INSTALL_DATA} sample.mp3 /usr/local/movies/
   
 - if [ -e StreamingLoadTool ]; then
 --	echo copying "StreamingLoadTool" to "/usr/local/bin/StreamingLoadTool"
 ++	if false; then
 + 	echo copying "StreamingLoadTool" to "/usr/local/bin/StreamingLoadTool"
  -	cp -f StreamingLoadTool /usr/local/bin/
 -+	echo copying "StreamingLoadTool" to "${PREFIX}/bin/StreamingLoadTool"
 -+	${BSD_INSTALL_PROGRAM} StreamingLoadTool ${PREFIX}/bin/
 ++	${BSD_INSTALL_PROGRAM} StreamingLoadTool /usr/local/bin/
   	
  -	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf"
  -	cp -f streamingloadtool.conf /etc/streaming/
 -+	echo copying "streamingloadtool.conf" to "${PREFIX}/etc/streaming/streamingloadtool.conf"
 -+	${BSD_INSTALL_DATA} streamingloadtool.conf ${PREFIX}/etc/streaming/
 - fi
 ++	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf-dist"
 ++	${BSD_INSTALL_DATA} streamingloadtool.conf /etc/streaming/streamingloadtool.conf-dist
 ++	fi
   	
   	#WebAdmin install
 --	echo copying "streamingadminserver.pl" into "/usr/local/sbin/streamingadminserver.pl"
 + 	echo copying "streamingadminserver.pl" into "/usr/local/sbin/streamingadminserver.pl"
  -	cp -f streamingadminserver.pl /usr/local/sbin/streamingadminserver.pl
 -+	echo copying "streamingadminserver.pl" into "${PREFIX}/sbin/streamingadminserver.pl"
 -+	${BSD_INSTALL_SCRIPT} streamingadminserver.pl ${PREFIX}/sbin/streamingadminserver.pl
 ++	${BSD_INSTALL_SCRIPT} streamingadminserver.pl /usr/local/sbin/streamingadminserver.pl
   	
 --	if [ -d /var/streaming/AdminHtml/ ]; then
 --	    echo removing old version of html from "/var/streaming/AdminHtml"
 --	    rm -r -f /var/streaming/AdminHtml/*
 -+	if [ -d ${DATADIR}/AdminHtml/ ]; then
 -+	    echo removing old version of html from "/${DATADIR}/AdminHtml"
 -+	    rm -r -f ${DATADIR}/AdminHtml/*
 + 	if [ -d /var/streaming/AdminHtml/ ]; then
 + 	    echo removing old version of html from "/var/streaming/AdminHtml"
 + 	    rm -r -f /var/streaming/AdminHtml/*
   	fi    
 - 	
  -	if [ ! -d /var/streaming/ ]; then
 --		echo creating "/var/streaming/AdminHtml" directory
 --		mkdir -p /var/streaming/AdminHtml
 -+	if [ ! -d ${DATADIR}/AdminHtml ]; then
 -+		echo creating "${DATADIR}/AdminHtml" directory
 -+		mkdir -p ${DATADIR}/AdminHtml
 ++	if [ ! -d /var/streaming/AdminHtml ]; then
 + 		echo creating "/var/streaming/AdminHtml" directory
 + 		mkdir -p /var/streaming/AdminHtml
   	fi
 --	echo copying Admin HTML to "/var/streaming/AdminHtml" directory
 + 	echo copying Admin HTML to "/var/streaming/AdminHtml" directory
  -	cp -f -r AdminHtml /var/streaming/
 -+	echo copying Admin HTML to "${DATADIR}/AdminHtml" directory
  +	tar -cf - AdminHtml | tar -xf - -C ${DATADIR}
   	
 - 
 --	chown -R -f qtss /var/streaming/
 --	chown -R -f qtss /etc/streaming/
 --	chown -R -f qtss /usr/local/movies/
 -+	chown -R -f qtss:qtss ${DATADIR}/
 -+	chown -R -f qtss:qtss ${PREFIX}/etc/streaming/
 - 
  -	echo;echo "Launching streamingadminserver.pl"
  -	/usr/local/sbin/streamingadminserver.pl
  +#	echo;echo "Launching streamingadminserver.pl"
 -+#	${PREFIX}/sbin/streamingadminserver.pl
 ++#	/usr/local/sbin/streamingadminserver.pl
   	
   	echo;echo Installation Complete
   
 @@ -285,24 +182,9 @@
   	# Setup for DSS
   	# Prompts for a username and password
   	# that can be used to administer the server
 -@@ -391,7 +394,7 @@
 - 	echo ""
 - 	
 - 	# Add the new admin username to /etc/streaming/qtusers
 --	/usr/local/bin/qtpasswd -p $password $username
 -+	${PREFIX}/bin/qtpasswd -p $password $username
 - 	
 - 	# Add the new admin username to /etc/streaming/qtgroups
 - 	# and delete the default admin username
 -@@ -399,11 +402,12 @@
 - 	mv /etc/streaming/qtgroups.tmp /etc/streaming/qtgroups
 - 	
 - 	# Remove the default admin username to /etc/streaming/qtusers
 --	/usr/local/bin/qtpasswd -F -d 'aGFja21l' > /dev/null
 -+	${PREFIX}/bin/qtpasswd -F -d 'aGFja21l' > /dev/null
 +@@ -372,6 +385,7 @@
 + 	/usr/local/bin/qtpasswd -F -d 'aGFja21l' > /dev/null
   		
 - 	chown -R -f qtss /etc/streaming/
 - 	
   	echo Setup Complete!
  +fi
   	
 Index: files/patch-WebAdmin::src::streamingadminserver.pl
 ===================================================================
 RCS file: /home/ncvs/ports/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl,v
 retrieving revision 1.3
 diff -u -r1.3 patch-WebAdmin::src::streamingadminserver.pl
 --- files/patch-WebAdmin::src::streamingadminserver.pl	1 Feb 2004 18:14:46 -0000	1.3
 +++ files/patch-WebAdmin::src::streamingadminserver.pl	22 Jan 2005 00:56:14 -0000
 @@ -1,6 +1,15 @@
 ---- WebAdmin/src/streamingadminserver.pl.orig	Tue Oct 28 09:43:24 2003
 -+++ WebAdmin/src/streamingadminserver.pl	Sun Jan 18 07:25:04 2004
 -@@ -255,7 +255,7 @@ else {
 +--- WebAdmin/src/streamingadminserver.pl.orig	Thu Aug 28 08:21:55 2003
 ++++ WebAdmin/src/streamingadminserver.pl	Sat Jan 22 09:55:56 2005
 +@@ -40,7 +40,7 @@
 + }
 + else
 + {
 +-    eval "use Net::SSleay";
 ++    eval "use Net::SSLeay";
 + }
 + $ssl_available = 0;
 + if (!$@) {
 +@@ -248,7 +248,7 @@
   	  "gbrowse", "0",
   	  "ssl", "0",
   	  "crtfile", "/etc/streaming/streamingadminserver.pem",

From: Lars Eggert <lars.eggert@netlab.nec.de>
To: Norikatsu Shigemura <nork@FreeBSD.org>
Cc: vs@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link against
 libc_r to avoid crashes
Date: Mon, 21 Feb 2005 11:05:21 +0200

 Norikatsu Shigemura wrote:
 > 	I'll update to 5.0.3.2.  Please confirm my patch.
 > 
 > 	Disable over-optimaization:
 > 	DSS tries to compile with -O3/-O2 options.  I consider that
 > 	this causes that DSS is unstable.  So I disabled -O2/-O3.
 > 	But I don't confirm that this is ok.  Would you please
 > 	confirm it?
 
 I can try, but not before the middle of next week.
 
 -- 
 Lars Eggert                                     NEC Network Laboratories

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Lars Eggert <lars.eggert@netlab.nec.de>
Cc: nork@FreeBSD.org, vs@FreeBSD.org,
	freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link
 against libc_r to avoid crashes
Date: Mon, 21 Feb 2005 23:39:46 +0900 (JST)

 On Mon, 21 Feb 2005 11:05:21 +0200
 Lars Eggert <lars.eggert@netlab.nec.de> wrote:
 > > 	I'll update to 5.0.3.2.  Please confirm my patch.
 > > 	Disable over-optimaization:
 > > 	DSS tries to compile with -O3/-O2 options.  I consider that
 > > 	this causes that DSS is unstable.  So I disabled -O2/-O3.
 > > 	But I don't confirm that this is ok.  Would you please
 > > 	confirm it?
 > I can try, but not before the middle of next week.
 
 	Thank you.  I'll try to run it, too.

From: Lars Eggert <lars.eggert@netlab.nec.de>
To: Norikatsu Shigemura <nork@FreeBSD.org>
Cc: vs@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/75291: [PATCH] net/DarwinStreamingServer: must link against
 libc_r to avoid crashes
Date: Mon, 14 Mar 2005 12:51:25 +0100

 This is a cryptographically signed message in MIME format.
 
 --------------ms000908080404080602050008
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Norikatsu Shigemura wrote:
 > On Mon, 21 Feb 2005 11:05:21 +0200
 > Lars Eggert <lars.eggert@netlab.nec.de> wrote:
 > 
 >>>	I'll update to 5.0.3.2.  Please confirm my patch.
 >>>	Disable over-optimaization:
 >>>	DSS tries to compile with -O3/-O2 options.  I consider that
 >>>	this causes that DSS is unstable.  So I disabled -O2/-O3.
 >>>	But I don't confirm that this is ok.  Would you please
 >>>	confirm it?
 >>
 >>I can try, but not before the middle of next week.
 > 
 > 	Thank you.  I'll try to run it, too.
 
 Sorry for the slow reponse. I'm testing it now, and it seems to work OK.
 Feel free to close the PR.
 
 -- 
 Lars Eggert                                     NEC Network Laboratories
 
 --------------ms000908080404080602050008
 Content-Type: application/x-pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
 Content-Description: S/MIME Cryptographic Signature
 
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJpzCC
 Ay4wggKXoAMCAQICAwyFWjANBgkqhkiG9w0BAQQFADBiMQswCQYDVQQGEwJaQTElMCMGA1UE
 ChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNv
 bmFsIEZyZWVtYWlsIElzc3VpbmcgQ0EwHhcNMDQwNjE3MDcyMjAzWhcNMDUwNjE3MDcyMjAz
 WjCBhDEPMA0GA1UEBBMGRWdnZXJ0MQ0wCwYDVQQqEwRMYXJzMRQwEgYDVQQDEwtMYXJzIEVn
 Z2VydDEoMCYGCSqGSIb3DQEJARYZbGFycy5lZ2dlcnRAbmV0bGFiLm5lYy5kZTEiMCAGCSqG
 SIb3DQEJARYTbGFycy5lZ2dlcnRAZ214Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBAOowMZjwQREXIdWxQacJDyqczykKpfIVmid2m8xBuUO53uWgnK3F8R20u/7PVugU
 zjNNqaivnU6qHtr/jdAn1UnyXzA/4Re+AqsKNiw8hZkVonkJ+G4O0TFzMNeWUdrjX1FaSAsL
 uAPA6661cN4YDzrOYC3O3zgGtVvJAra0+iw9eD2qWsnH0AVLFtq7H5ZFhz5zeOeCrrayqEhf
 S6tnTSjBzaH8SOdeemPTxdLRbMptLSy7lEFo8f1xisltw2eRT0txoUCqq0mjFEp8LgJ+s6p1
 4M4cG3CDkKd5kNjdTWaokAo4qmpfF9IyA7uheaAHAz8UOH5GsH+Vkjbz5yFO1SsCAwEAAaNL
 MEkwOQYDVR0RBDIwMIEZbGFycy5lZ2dlcnRAbmV0bGFiLm5lYy5kZYETbGFycy5lZ2dlcnRA
 Z214Lm5ldDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBAUAA4GBAE9rOnUtJERYLNbDztLI
 sH4AolAWkvNKoj7Ikst1M1X3myXqxYAHa9bsoPJy15qEV2B4ftOmJLrZL9kb8RZnzGBii8a/
 XQ5wqaHZAJYcxQ6lp6UDTabhQN7J1trAOKgs+PFlF3lm6NOkXygiQH5PPO5kIHRjNvXpNGYe
 C7S3K8YsMIIDLjCCApegAwIBAgIDDIVaMA0GCSqGSIb3DQEBBAUAMGIxCzAJBgNVBAYTAlpB
 MSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3
 dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQTAeFw0wNDA2MTcwNzIyMDNaFw0wNTA2
 MTcwNzIyMDNaMIGEMQ8wDQYDVQQEEwZFZ2dlcnQxDTALBgNVBCoTBExhcnMxFDASBgNVBAMT
 C0xhcnMgRWdnZXJ0MSgwJgYJKoZIhvcNAQkBFhlsYXJzLmVnZ2VydEBuZXRsYWIubmVjLmRl
 MSIwIAYJKoZIhvcNAQkBFhNsYXJzLmVnZ2VydEBnbXgubmV0MIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEA6jAxmPBBERch1bFBpwkPKpzPKQql8hWaJ3abzEG5Q7ne5aCcrcXx
 HbS7/s9W6BTOM02pqK+dTqoe2v+N0CfVSfJfMD/hF74Cqwo2LDyFmRWieQn4bg7RMXMw15ZR
 2uNfUVpICwu4A8DrrrVw3hgPOs5gLc7fOAa1W8kCtrT6LD14PapaycfQBUsW2rsflkWHPnN4
 54KutrKoSF9Lq2dNKMHNofxI5156Y9PF0tFsym0tLLuUQWjx/XGKyW3DZ5FPS3GhQKqrSaMU
 SnwuAn6zqnXgzhwbcIOQp3mQ2N1NZqiQCjiqal8X0jIDu6F5oAcDPxQ4fkawf5WSNvPnIU7V
 KwIDAQABo0swSTA5BgNVHREEMjAwgRlsYXJzLmVnZ2VydEBuZXRsYWIubmVjLmRlgRNsYXJz
 LmVnZ2VydEBnbXgubmV0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEEBQADgYEAT2s6dS0k
 RFgs1sPO0siwfgCiUBaS80qiPsiSy3UzVfebJerFgAdr1uyg8nLXmoRXYHh+06Ykutkv2Rvx
 FmfMYGKLxr9dDnCpodkAlhzFDqWnpQNNpuFA3snW2sA4qCz48WUXeWbo06RfKCJAfk887mQg
 dGM29ek0Zh4LtLcrxiwwggM/MIICqKADAgECAgENMA0GCSqGSIb3DQEBBQUAMIHRMQswCQYD
 VQQGEwJaQTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAY
 BgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZp
 Y2VzIERpdmlzaW9uMSQwIgYDVQQDExtUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgQ0ExKzAp
 BgkqhkiG9w0BCQEWHHBlcnNvbmFsLWZyZWVtYWlsQHRoYXd0ZS5jb20wHhcNMDMwNzE3MDAw
 MDAwWhcNMTMwNzE2MjM1OTU5WjBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENv
 bnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWls
 IElzc3VpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSmPFVzVftOucqZWh5o
 wHUEcJ3f6f+jHuy9zfVb8hp2vX8MOmHyv1HOAdTlUAow1wJjWiyJFXCO3cnwK4Vaqj9xVsuv
 PAsH5/EfkTYkKhPPK9Xzgnc9A74r/rsYPge/QIACZNenprufZdHFKlSFD0gEf6e20TxhBEAe
 ZBlyYLf7AgMBAAGjgZQwgZEwEgYDVR0TAQH/BAgwBgEB/wIBADBDBgNVHR8EPDA6MDigNqA0
 hjJodHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlUGVyc29uYWxGcmVlbWFpbENBLmNybDAL
 BgNVHQ8EBAMCAQYwKQYDVR0RBCIwIKQeMBwxGjAYBgNVBAMTEVByaXZhdGVMYWJlbDItMTM4
 MA0GCSqGSIb3DQEBBQUAA4GBAEiM0VCD6gsuzA2jZqxnD3+vrL7CF6FDlpSdf0whuPg2H6ot
 nzYvwPQcUCCTcDz9reFhYsPZOhl+hLGZGwDFGguCdJ4lUJRix9sncVcljd2pnDmOjCBPZV+V
 2vf3h9bGCE6u9uo05RAaWzVNd+NWIXiC3CEZNd4ksdMdRv9dX2VPMYIDOzCCAzcCAQEwaTBi
 MQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEs
 MCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3VpbmcgQ0ECAwyFWjAJBgUr
 DgMCGgUAoIIBpzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0w
 NTAzMTQxMTUxMjVaMCMGCSqGSIb3DQEJBDEWBBQ8OaSKQFwCOhxg2UlX24WNVUQvoDBSBgkq
 hkiG9w0BCQ8xRTBDMAoGCCqGSIb3DQMHMA4GCCqGSIb3DQMCAgIAgDANBggqhkiG9w0DAgIB
 QDAHBgUrDgMCBzANBggqhkiG9w0DAgIBKDB4BgkrBgEEAYI3EAQxazBpMGIxCzAJBgNVBAYT
 AlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNU
 aGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQQIDDIVaMHoGCyqGSIb3DQEJEAIL
 MWugaTBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkg
 THRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3VpbmcgQ0ECAwyF
 WjANBgkqhkiG9w0BAQEFAASCAQAeLGe/Ca9o89H6ERKpxc4Vv1a9XbCIBPwAeVX3C0Ktxukt
 lm13cvidCvX9oLmefg+OXJwvODHoh4kCNp/NqvGSWwroU6oEr+XbHuc4YExZjDABFKPJGxhi
 l6nFOY19esJlbCeVQQcKOEXPLV3e9Ukf1HZnjywe8mrykLmnvxgdxs/PesiZ1/uR4HI4T5Au
 RlbQLZzzwOHjjmxUjDlkHbi7KjFCa4E+10FiS+DXxCXNpcB4ehUjgfCnxCTaYT8+rM18Jgzn
 LT0YaFF3pF58dVaZU61U0+k0BgEkDATUbj4TEs+CPQu5CiGTHh0wviyNWq/oRYJ9emkk9kSA
 d+Mzg3vIAAAAAAAA
 --------------ms000908080404080602050008--
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Sun May 1 10:47:00 GMT 2005 
State-Changed-Why:  
Oops, sorry. 
Committed, done.  Thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75291 
>Unformatted:
