From 6ea69eef7a7c9307cff9c1372e7c1b5577844140 Mon Sep 17 00:00:00 2001 From: nork Date: Sun, 1 Jun 2008 09:46:18 +0000 Subject: Update to 6.0.3. --- net/DarwinStreamingServer/Makefile | 91 +++++++++++----------- net/DarwinStreamingServer/distinfo | 9 ++- net/DarwinStreamingServer/files/patch-Buildit | 68 +++++++++++++++- .../files/patch-CommonUtilitiesLib::OSHeaders.h | 49 ------------ net/DarwinStreamingServer/files/patch-DSS_MakeRoot | 4 +- net/DarwinStreamingServer/files/patch-Install | 49 ++++++------ .../patch-MP3Broadcaster::BroadcasterMain.cpp | 8 +- ...ylistBroadcaster.tproj::PlaylistBroadcaster.cpp | 13 ++-- .../files/patch-Server.tproj::main.cpp | 8 +- .../patch-StreamingLoadTool-StreamingLoadTool.cpp | 11 +++ .../files/patch-StreamingProxy.tproj-proxy.c | 6 +- .../patch-WebAdmin::src::streamingadminserver.pl | 4 +- .../files/patch-qtpasswd.tproj-QTSSPasswd.cpp | 6 +- net/DarwinStreamingServer/pkg-descr | 1 + net/DarwinStreamingServer/pkg-plist | 5 ++ 15 files changed, 181 insertions(+), 151 deletions(-) delete mode 100644 net/DarwinStreamingServer/files/patch-CommonUtilitiesLib::OSHeaders.h create mode 100644 net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp (limited to 'net') diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile index 2050b904aa3a..43465c820c7a 100644 --- a/net/DarwinStreamingServer/Makefile +++ b/net/DarwinStreamingServer/Makefile @@ -6,14 +6,18 @@ # PORTNAME= DarwinStreamingServer -PORTVERSION= 5.5.5 +PORTVERSION= 6.0.3 PORTREVISION= 0 CATEGORIES= net -MASTER_SITES= #http://developer.apple.com/darwin/projects/streaming/source/ -# You must accept APSL (Apple Public Source License), and get -# DarwinStreamingSrvr5.5.5-Source.tar.gz. +MASTER_SITES= http://dss.macosforge.org/downloads/ DISTNAME= DarwinStreamingSrvr${PORTVERSION}-Source -#EXTRACT_SUFX= .tar +EXTRACT_SUFX= .tar + +PATCH_SITES= http://www.abrahamsson.com/ \ + ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR=nork +PATCHFILES= dss-6.0.3.patch +PATCH_DIST_STRIP=-p1 MAINTAINER= nork@FreeBSD.org COMMENT= Darwin Streaming Server, a MP3, MPEG4 and QuickTime streaming server @@ -22,7 +26,8 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net NOT_FOR_ARCHS= ia64 sparc64 -USE_PERL5= yes +USE_PERL5_RUN= yes +USE_PERL5_BUILD=yes USE_RC_SUBR= streamingadminserver.sh darwin_streaming_server.sh SUB_LIST+= PERL=${PERL} @@ -37,84 +42,75 @@ MAKE_ENV+= CC="${CC}" \ .include -.if ${OSVERSION} >= 700042 && ${ARCH} != i386 -BROKEN= Does not compile -.endif - post-extract: - @${RM} -rf ${WRKSRC}/dssPackageMetaData ${WRKSRC}/pubPackageMetaData ${WRKSRC}/qtssPackageMetaData - -.if !defined(PACKAGE_BUILDING) -pre-fetch: - @[ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ] || ( \ - ${ECHO} "********************************************************************"; \ - ${ECHO} "Please get ${DISTNAME}${EXTRACT_SUFX} from"; \ - ${ECHO} " http://developer.apple.com/darwin/projects/streaming/"; \ - ${ECHO} "And, you must accept APSL (Apple Public Source License)."; \ - ${ECHO} "Then, put in ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}."; \ - ${ECHO} "********************************************************************"; \ - ${FALSE} \ - ) -.endif + @${RM} -rf \ + ${WRKSRC}/dssPackageMetaData \ + ${WRKSRC}/pubPackageMetaData \ + ${WRKSRC}/qtssPackageMetaData \ + ${WRKSRC}/WebAdmin/NetSSLeay post-patch: - @${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,' \ + @${REINPLACE_CMD} -e 's,/var/streaming/logs,/var/log/streaming,' \ ${WRKSRC}/Install \ ${WRKSRC}/defaultPaths.h \ ${WRKSRC}/Documentation/readme.txt \ ${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}/WebAdmin/streamingadminserver_Darwin.conf + @${REINPLACE_CMD} -e 's,/var/streaming/playlists,/var/spool/streaming.playlists,' \ ${WRKSRC}/Install \ - ${WRKSRC}/defaultPaths.h \ ${WRKSRC}/Documentation/readme.txt \ - ${WRKSRC}/streamingserver.xml-POSIX - @${REINPLACE_CMD} -e 's,${PREFIX}/movies,${DATADIR}/movies,' \ + ${WRKSRC}/WebAdmin/src/streamingadminserver.pl \ + ${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf + + @${REINPLACE_CMD} -e 's,/usr/local/movies,${DATADIR}/movies,' \ ${WRKSRC}/Install \ ${WRKSRC}/defaultPaths.h \ ${WRKSRC}/Documentation/readme.txt \ ${WRKSRC}/streamingserver.xml-POSIX \ ${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl - @${REINPLACE_CMD} -e 's,/etc/streaming,${PREFIX}/etc/streaming,' \ + @${REINPLACE_CMD} -e 's,/usr/local/sbin/StreamingServerModules,/usr/local/libexec/StreamingServerModules,' \ ${WRKSRC}/Install \ - ${WRKSRC}/qtaccess \ ${WRKSRC}/defaultPaths.h \ ${WRKSRC}/Documentation/readme.txt \ - ${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}/streamingserver.xml-POSIX + @${REINPLACE_CMD} -e 's,/etc/streaming,/usr/local/etc/streaming,' \ ${WRKSRC}/Install \ + ${WRKSRC}/qtaccess \ ${WRKSRC}/defaultPaths.h \ ${WRKSRC}/Documentation/readme.txt \ ${WRKSRC}/streamingserver.xml-POSIX \ ${WRKSRC}/WebAdmin/src/streamingadminserver.pl \ + ${WRKSRC}/StreamingProxy.tproj/StreamingProxy.html \ ${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf - @${REINPLACE_CMD} -e 's,/var/streaming/AdminHtml,${DATADIR}/AdminHtml,' \ + @${REINPLACE_CMD} -e 's,/var/streaming,${DATADIR},' \ ${WRKSRC}/Install \ ${WRKSRC}/WebAdmin/src/streamingadminserver.pl \ ${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf - @${REINPLACE_CMD} -e 's,/var/streaming/playlists,/var/spool/streaming.playlists,' \ + + @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \ ${WRKSRC}/Install \ + ${WRKSRC}/qtaccess \ + ${WRKSRC}/defaultPaths.h \ ${WRKSRC}/Documentation/readme.txt \ + ${WRKSRC}/streamingserver.xml-POSIX \ ${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}/StreamingProxy.tproj/StreamingProxy.html \ + ${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf \ + ${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl + @${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}/StreamingLoadTool/Makefile.POSIX \ ${WRKSRC}/CommonUtilitiesLib/Makefile.POSIX \ ${WRKSRC}/StreamingProxy.tproj/Makefile.POSIX \ - ${WRKSRC}/StreamingServer.xcode/project.pbxproj \ ${WRKSRC}/PlaylistBroadcaster.tproj/Makefile.POSIX \ ${WRKSRC}/QTFileTools/QTRTPGen.tproj/Makefile.POSIX \ ${WRKSRC}/QTFileTools/QTSDPGen.tproj/Makefile.POSIX \ - ${WRKSRC}/StreamingServer.pbproject/project.pbxproj \ ${WRKSRC}/QTFileTools/QTFileInfo.tproj/Makefile.POSIX \ ${WRKSRC}/QTFileTools/QTFileTest.tproj/Makefile.POSIX \ ${WRKSRC}/APIModules/QTSSRefMovieModule/Makefile.POSIX \ @@ -125,15 +121,20 @@ post-patch: ${WRKSRC}/APIModules/QTSSHomeDirectoryModule/Makefile.POSIX \ ${WRKSRC}/APIModules/QTSSRawFileModule.bproj/Makefile.POSIX \ ${WRKSRC}/APIModules/QTSSSpamDefenseModule.bproj/Makefile.POSIX \ + ${WRKSRC}/APIModules/QTSSDemoRedirectModule.bproj/Makefile.POSIX \ ${WRKSRC}/APIModules/QTSSDemoAuthorizationModule.bproj/Makefile.POSIX do-build: - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Buildit) + # XXX: Quick hack after ddss-6.0.3.patch is patched. + # I don't know why these files are removed. + # ${LN} -s RTSPRequest3GPP.cpp.orig ${WRKSRC}/Server.tproj/RTSPRequest3GPP.cpp + # ${LN} -s RTPStream.h.orig ${WRKSRC}/Server.tproj/RTPStream.h + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} sh -x ./Buildit) 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}) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} /bin/sh -x ./DSS_MakeRoot -f ${OPSYS}) pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo index 69d295479bc6..110ccaffd772 100644 --- a/net/DarwinStreamingServer/distinfo +++ b/net/DarwinStreamingServer/distinfo @@ -1,3 +1,6 @@ -MD5 (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 2ddc217ce0c8d823f4172f3bb4e6282d -SHA256 (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 71ade02084bd1602582ccf11b3ce43b46eb7b0039ac593cc9f8a67371b7a16a3 -SIZE (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 21468268 +MD5 (DarwinStreamingSrvr6.0.3-Source.tar) = ca676691db8417d05121699c0ca3d549 +SHA256 (DarwinStreamingSrvr6.0.3-Source.tar) = 7bf75ced3f603f55c6f7601bfecd9f26393ea98be821d24169f2091843706522 +SIZE (DarwinStreamingSrvr6.0.3-Source.tar) = 32593920 +MD5 (dss-6.0.3.patch) = ee10f86fd27ef2da68782414e30cd226 +SHA256 (dss-6.0.3.patch) = 13741e14f704d3b0db00100c9213ff0bec104403622905e92f370d846bf8f2ea +SIZE (dss-6.0.3.patch) = 15014 diff --git a/net/DarwinStreamingServer/files/patch-Buildit b/net/DarwinStreamingServer/files/patch-Buildit index 523376c6986f..4e5960a8c1ce 100644 --- a/net/DarwinStreamingServer/files/patch-Buildit +++ b/net/DarwinStreamingServer/files/patch-Buildit @@ -1,6 +1,39 @@ ---- Buildit.orig Fri Jul 14 18:36:35 2006 -+++ Buildit Thu Aug 24 13:58:16 2006 -@@ -100,20 +100,20 @@ +--- Buildit.orig 2008-03-26 09:42:48.000000000 +0900 ++++ Buildit 2008-06-01 04:24:51.000000000 +0900 +@@ -9,19 +9,19 @@ + fi + + SHOW_HELP=0 +-if [ "$1" = "-v" ] ; then ++if [ x"$1" = x"-v" ] ; then + SHOW_HELP=1 + fi + +-if [ "$1" = "-h" ] ; then ++if [ x"$1" = x"-h" ] ; then + SHOW_HELP=1 + fi + +-if [ "$1" = "?" ] ; then ++if [ x"$1" = x"?" ] ; then + SHOW_HELP=1 + fi + +-if [ "$1" = "help" ] ; then ++if [ x"$1" = x"help" ] ; then + SHOW_HELP=1 + fi + +@@ -42,7 +42,7 @@ + fi + + +-if [ "$1" = "install" ] ; then ++if [ x"$1" = x"install" ] ; then + if [ $PLATFORM = dss ] ; then + echo "OS X Darwin Streaming Server" + ./BuildOSXInstallerPkg $2 $3 +@@ -128,20 +128,20 @@ fi ;; @@ -13,7 +46,7 @@ - MAKE=make + CPLUS=${CXX} + CCOMP=${CC} -+ LINKER=${CXX} ++ LINKER="${CXX}" + MAKE=${MAKE} - COMPILER_FLAGS= @@ -30,3 +63,30 @@ ;; # SunOS.sun4m | \ +@@ -241,7 +241,7 @@ + ;; + esac + +-if [ "$*" = "install" ] ; then ++if [ x"$1" = x"install" ] ; then + + if [ `uname` != "SunOS" ]; then + USERID=`id -u` +@@ -329,7 +329,7 @@ + echo Building QTFileLib internal for $PLAT with $CPLUS + cd ../QTFileLib/ + +- if [ "$*" = "clean" ] ; then ++ if [ x"$*" = x"clean" ] ; then + $MAKE -f Makefile.POSIX $* + else + $MAKE -f Makefile.POSIX all $* +@@ -421,7 +421,7 @@ + $MAKE -f Makefile.POSIX $* + fi + +- if [ "$*" = "install" ] ; then ++ if [ x"$1" = x"install" ] ; then + cd .. + pwdi + echo diff --git a/net/DarwinStreamingServer/files/patch-CommonUtilitiesLib::OSHeaders.h b/net/DarwinStreamingServer/files/patch-CommonUtilitiesLib::OSHeaders.h deleted file mode 100644 index d26e6f2d9fa5..000000000000 --- a/net/DarwinStreamingServer/files/patch-CommonUtilitiesLib::OSHeaders.h +++ /dev/null @@ -1,49 +0,0 @@ ---- CommonUtilitiesLib/OSHeaders.h.orig Wed May 18 17:01:14 2005 -+++ CommonUtilitiesLib/OSHeaders.h Sun Aug 13 00:34:52 2006 -@@ -27,11 +27,20 @@ - #define OSHeaders_H - #include - -+#ifdef __amd64__ -+#define CPU_64BIT -+#endif -+ - #define kSInt16_Max USHRT_MAX - #define kUInt16_Max USHRT_MAX - -+#ifdef CPU_64BIT -+#define kSInt32_Max INT_MAX -+#define kUInt32_Max UINT_MAX -+#else - #define kSInt32_Max LONG_MAX - #define kUInt32_Max ULONG_MAX -+#endif - - #define kSInt64_Max LONG_LONG_MAX - #define kUInt64_Max ULONG_LONG_MAX -@@ -72,8 +81,13 @@ - typedef signed char SInt8; - typedef unsigned short UInt16; - typedef signed short SInt16; -+#ifdef CPU_64BIT -+ typedef unsigned int UInt32; -+ typedef signed int SInt32; -+#else - typedef unsigned long UInt32; - typedef signed long SInt32; -+#endif - typedef signed long long SInt64; - typedef unsigned long long UInt64; - typedef float Float32; -@@ -81,7 +95,11 @@ - typedef UInt16 Bool16; - typedef UInt8 Bool8; - -+#ifdef CPU_64BIT -+ typedef unsigned int FourCharCode; -+#else - typedef unsigned long FourCharCode; -+#endif - typedef FourCharCode OSType; - - #ifdef FOUR_CHARS_TO_INT diff --git a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot index 08d94055b9bd..b0976076699d 100644 --- a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot +++ b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot @@ -1,5 +1,5 @@ ---- DSS_MakeRoot.orig Fri May 27 18:54:45 2005 -+++ DSS_MakeRoot Sun Aug 13 00:33:59 2006 +--- DSS_MakeRoot.orig 2007-11-16 14:18:07.000000000 +0900 ++++ DSS_MakeRoot 2008-06-01 14:45:36.000000000 +0900 @@ -5,10 +5,10 @@ # source release diff --git a/net/DarwinStreamingServer/files/patch-Install b/net/DarwinStreamingServer/files/patch-Install index bbb0d2ada5e0..fbd6fcea80bb 100644 --- a/net/DarwinStreamingServer/files/patch-Install +++ b/net/DarwinStreamingServer/files/patch-Install @@ -1,5 +1,5 @@ ---- Install.orig Fri May 27 18:55:01 2005 -+++ Install Wed Jan 10 01:05:07 2007 +--- Install.orig 2008-03-26 09:42:51.000000000 +0900 ++++ Install 2008-06-01 18:02:09.000000000 +0900 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -22,7 +22,7 @@ ## CHANGE PERL PATH IN streamingadminserver.pl AND parse_xml.cgi ## -@@ -207,29 +209,29 @@ +@@ -209,29 +211,29 @@ fi echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer" @@ -58,11 +58,11 @@ + if [ -e /usr/local/libexec/StreamingServerModules/QTSSHomeDirectoryModule ]; then echo copying "createuserstreamingdir" to "/usr/local/bin/createuserstreamingdir" - cp -f createuserstreamingdir $INSTALLROOT/usr/local/bin/ -+ ${BSD_INSTALL_PROGRAM} createuserstreamingdir $INSTALLROOT/usr/local/bin/ ++ ${BSD_INSTALL_PROGRAM} createuserstreamingdir /usr/local/bin/ fi if [ ! -d /etc/streaming ]; then -@@ -237,44 +239,53 @@ +@@ -239,32 +241,41 @@ mkdir -p /etc/streaming fi @@ -117,27 +117,21 @@ + #${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 -- mkdir -p /var/streaming -+ if [ ! -d ${DATADIR} ]; then -+ echo creating "${DATADIR}" directory -+ mkdir -p ${DATADIR} + if [ ! -d /var/streaming ]; then +@@ -273,10 +284,10 @@ fi -- echo copying "readme.txt" to "/var/streaming/readme.txt" + echo copying "readme.txt" to "/var/streaming/readme.txt" - cp -f readme.txt /var/streaming/readme.txt -+ echo copying "readme.txt" to "${DATADIR}/readme.txt" -+ ${BSD_INSTALL_DATA} readme.txt ${DATADIR}/readme.txt ++ ${BSD_INSTALL_DATA} readme.txt /var/streaming/readme.txt -- echo copying "3rdPartyAcknowledgements.rtf" to "/var/streaming/3rdPartyAcknowledgements.rtf" + echo copying "3rdPartyAcknowledgements.rtf" to "/var/streaming/3rdPartyAcknowledgements.rtf" - cp -f 3rdPartyAcknowledgements.rtf /var/streaming/3rdPartyAcknowledgements.rtf -+ echo copying "3rdPartyAcknowledgements.rtf" to "${DATADIR}/3rdPartyAcknowledgements.rtf" -+ ${BSD_INSTALL_DATA} 3rdPartyAcknowledgements.rtf ${DATADIR}/3rdPartyAcknowledgements.rtf ++ ${BSD_INSTALL_DATA} 3rdPartyAcknowledgements.rtf /var/streaming/3rdPartyAcknowledgements.rtf if [ ! -d /var/streaming/logs ]; then echo creating "/var/streaming/logs" directory -@@ -290,70 +301,72 @@ +@@ -292,70 +303,81 @@ echo creating "/var/streaming/playlists" directory mkdir -p /var/streaming/playlists fi @@ -190,6 +184,13 @@ - cp -f streamingloadtool.conf /etc/streaming/ + echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf-dist" + ${BSD_INSTALL_DATA} streamingloadtool.conf /etc/streaming/streamingloadtool.conf-dist ++ ++ if [ ! -e /etc/streaming/streamingloadtool.conf ]; then ++ echo;echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf" ++ ${BSD_INSTALL_DATA} streamingloadtool.conf /etc/streaming/streamingloadtool.conf ++ chown qtss /etc/streaming/streamingloadtool.conf ++ chmod 600 /etc/streaming/streamingloadtool.conf ++ fi fi #WebAdmin install @@ -209,17 +210,17 @@ fi echo copying Admin HTML to "/var/streaming/AdminHtml" directory - cp -f -r AdminHtml /var/streaming/ -+ tar -cf - AdminHtml | tar -xf - -C ${DATADIR} ++ pax -rwpe AdminHtml /var/streaming/ chown -R -f qtss /var/streaming/ chown -R -f qtss /etc/streaming/ chown -R -f qtss /usr/local/movies/ -- echo;echo "Launching streamingadminserver.pl" -- /usr/local/sbin/streamingadminserver.pl -+# echo;echo "Launching streamingadminserver.pl" -+# /usr/local/sbin/streamingadminserver.pl ++if false; then + echo;echo "Launching streamingadminserver.pl" + /usr/local/sbin/streamingadminserver.pl ++fi echo;echo Installation Complete @@ -227,7 +228,7 @@ # Setup for DSS # Prompts for a username and password # that can be used to administer the server -@@ -416,6 +429,7 @@ +@@ -418,6 +440,7 @@ chown -R -f qtss /etc/streaming/ echo Setup Complete! diff --git a/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp b/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp index 7130eb19e325..8bd95bf27ad5 100644 --- a/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp +++ b/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp @@ -1,5 +1,5 @@ ---- MP3Broadcaster/BroadcasterMain.cpp.orig Sat Mar 12 08:24:54 2005 -+++ MP3Broadcaster/BroadcasterMain.cpp Sat Feb 10 03:54:31 2007 +--- MP3Broadcaster/BroadcasterMain.cpp.orig 2008-05-06 08:28:57.000000000 +0900 ++++ MP3Broadcaster/BroadcasterMain.cpp 2008-06-01 18:05:51.000000000 +0900 @@ -85,7 +85,7 @@ char* config = NULL; char* playList = NULL; @@ -22,8 +22,8 @@ struct sigaction act; --#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) -+#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__amd64__) +-#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__linuxppc__) ++#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__linuxppc__) || defined(__amd64__) sigemptyset(&act.sa_mask); act.sa_flags = 0; act.sa_handler = (void(*)(int))&SignalEventHandler; diff --git a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp index 82e5d4962f35..9f119dac5ad4 100644 --- a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp +++ b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp @@ -1,18 +1,15 @@ ---- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig Sat Mar 12 08:24:54 2005 -+++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp Sat Feb 10 04:04:32 2007 -@@ -229,9 +229,9 @@ - - sgProgramName = argv[0]; +--- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig 2008-05-06 08:29:00.000000000 +0900 ++++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp 2008-06-01 18:07:58.000000000 +0900 +@@ -231,7 +231,7 @@ #ifdef __Win32__ -- while ((anOption = getopt(argc, argv, "vhdcpbDtai:fe:" )) != EOF) -+ while ((anOption = getopt(argc, argv, "vhdcpbDtai:fe:" )) != -1) + while ((anOption = getopt(argc, argv, "vhdcpbDtai:fe:" )) != EOF) #else - while ((anOption = getopt(argc, argv, "vhdcpbDls:tai:fe:" )) != EOF) + while ((anOption = getopt(argc, argv, "vhdcpbDls:tai:fe:" )) != -1) #endif { -@@ -2077,7 +2077,7 @@ +@@ -2082,7 +2082,7 @@ struct sigaction act; diff --git a/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp b/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp index 902f1124e1ba..92f1739f5f12 100644 --- a/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp +++ b/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp @@ -1,6 +1,6 @@ ---- Server.tproj/main.cpp.orig Wed Apr 27 21:21:14 2005 -+++ Server.tproj/main.cpp Sat Feb 10 04:06:49 2007 -@@ -212,7 +212,7 @@ +--- Server.tproj/main.cpp.orig 2008-05-06 08:28:59.000000000 +0900 ++++ Server.tproj/main.cpp 2008-06-01 18:09:20.000000000 +0900 +@@ -216,7 +216,7 @@ //(void) ::signal(SIGPIPE, SIG_IGN); struct sigaction act; @@ -9,7 +9,7 @@ sigemptyset(&act.sa_mask); act.sa_flags = 0; act.sa_handler = (void(*)(int))&sigcatcher; -@@ -291,7 +291,7 @@ +@@ -306,7 +306,7 @@ char* theConfigFilePath = sDefaultConfigFilePath; char* theXMLFilePath = sDefaultXMLFilePath; diff --git a/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp b/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp new file mode 100644 index 000000000000..205795fc6a33 --- /dev/null +++ b/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp @@ -0,0 +1,11 @@ +--- StreamingLoadTool/StreamingLoadTool.cpp.orig 2008-06-01 18:20:48.000000000 +0900 ++++ StreamingLoadTool/StreamingLoadTool.cpp 2008-06-01 18:31:35.000000000 +0900 +@@ -135,7 +135,7 @@ + #ifndef __Win32__ + struct sigaction act; + +-#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) ++#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) || defined(__amd64__) + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + act.sa_handler = (void(*)(int))&sigcatcher; diff --git a/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c b/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c index 210618c63f39..ea7618d760af 100644 --- a/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c +++ b/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c @@ -1,6 +1,6 @@ ---- StreamingProxy.tproj/proxy.c.orig Sat Feb 10 04:02:08 2007 -+++ StreamingProxy.tproj/proxy.c Sat Feb 10 04:02:33 2007 -@@ -203,7 +203,7 @@ +--- StreamingProxy.tproj/proxy.c.orig 2008-05-06 08:28:57.000000000 +0900 ++++ StreamingProxy.tproj/proxy.c 2008-06-01 18:10:57.000000000 +0900 +@@ -204,7 +204,7 @@ { int i, j; int numOptions = 0; // num command line options spec'd diff --git a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl b/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl index 39d4d946f272..2d1c9206bbb5 100644 --- a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl +++ b/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl @@ -1,5 +1,5 @@ ---- WebAdmin/src/streamingadminserver.pl.orig Thu Jul 7 07:57:00 2005 -+++ WebAdmin/src/streamingadminserver.pl Sun Jul 10 15:18:05 2005 +--- WebAdmin/src/streamingadminserver.pl.orig 2008-05-06 08:28:57.000000000 +0900 ++++ WebAdmin/src/streamingadminserver.pl 2008-06-01 15:51:14.000000000 +0900 @@ -255,7 +255,7 @@ "gbrowse", "0", "ssl", "0", diff --git a/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp b/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp index 6094928a28e4..37139e734bb3 100644 --- a/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp +++ b/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp @@ -1,6 +1,6 @@ ---- qtpasswd.tproj/QTSSPasswd.cpp.orig Fri May 20 04:03:22 2005 -+++ qtpasswd.tproj/QTSSPasswd.cpp Sat Feb 10 04:05:38 2007 -@@ -720,7 +720,7 @@ +--- qtpasswd.tproj/QTSSPasswd.cpp.orig 2008-05-06 08:28:58.000000000 +0900 ++++ qtpasswd.tproj/QTSSPasswd.cpp 2008-06-01 18:11:56.000000000 +0900 +@@ -723,7 +723,7 @@ extern int optind; /* Read command line arguments */ diff --git a/net/DarwinStreamingServer/pkg-descr b/net/DarwinStreamingServer/pkg-descr index 41567dbd8ba0..f2ab21094d17 100644 --- a/net/DarwinStreamingServer/pkg-descr +++ b/net/DarwinStreamingServer/pkg-descr @@ -3,4 +3,5 @@ streaming QuickTime data to clients across the Internet using the industry standard RTP and RTSP protocols. It is based on the same code as Apple's QuickTime Streaming Server. +WWW: http://dss.macosforge.org/ WWW: http://developer.apple.com/darwin/projects/streaming/ diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist index 94bcb95ffc25..7fc0b6820bdc 100644 --- a/net/DarwinStreamingServer/pkg-plist +++ b/net/DarwinStreamingServer/pkg-plist @@ -1,6 +1,7 @@ bin/qtpasswd bin/MP3Broadcaster bin/PlaylistBroadcaster +bin/StreamingLoadTool sbin/DarwinStreamingServer sbin/streamingadminserver.pl libexec/StreamingServerModules/QTSSRefMovieModule @@ -89,6 +90,7 @@ libexec/StreamingServerModules/QTSSHomeDirectoryModule %%DATADIR%%/AdminHtml/images/weight_up_arrow.gif %%DATADIR%%/AdminHtml/images/whitepixel.gif %%DATADIR%%/AdminHtml/images/wieght_down_arrow.gif +%%DATADIR%%/AdminHtml/includes/DarwinDragWidget.js %%DATADIR%%/AdminHtml/includes/DarwinListbox.js %%DATADIR%%/AdminHtml/includes/draglib.js %%DATADIR%%/AdminHtml/includes/encode_unicode.js @@ -147,6 +149,9 @@ etc/streaming/relayconfig.xml-dist @unexec if cmp -s %D/etc/streaming/streamingserver.xml %D/etc/streaming/streamingserver.xml-dist; then rm -f %D/etc/streaming/streamingserver.xml; fi etc/streaming/streamingserver.xml-dist @exec [ ! -f %B/streamingserver.xml ] && cp %B/%f %B/streamingserver.xml +@unexec if cmp -s %D/etc/streaming/streamingloadtool.conf %D/etc/streaming/streamingloadtool.conf-dist; then rm -f %D/etc/streaming/streamingloadtool.conf; fi +etc/streaming/streamingloadtool.conf-dist +@exec [ ! -f %B/streamingloadtool.conf ] && cp %B/%f %B/streamingloadtool.conf @dirrm %%DATADIR%%/AdminHtml/includes @dirrm %%DATADIR%%/AdminHtml/images @dirrm %%DATADIR%%/AdminHtml/html_en -- cgit