Changes 5.5.5:

- Compilation problems using gcc 4
- Support for SDPs created by VLC and Mpeg4IP
- Fix date display in DSS Web Admin
- Better support for streaming through NAT
- Better support for running DSS on a multi-homed system
- Relaying problems with VLC
- A security fix for possible stack and heap overflow attacks in the
  StreamingProxy (CVE-2007-0748, CVE-2007-0749)
- A fix for sync sample searching on OS X intel.
- A fix for an infinite loop when the server fails to bind to streaming ports.
- An enhancement allowing RTSP requests to contain the hh:mm:ss format for
  the npt value

8 files changed, 29 insertions, 63 deletions

diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 259e3c4a10c..0d1c6fd214b 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/12/15 13:11:10 adam Exp $
+# $NetBSD: Makefile,v 1.3 2007/05/23 07:52:15 adam Exp $
 
-DISTNAME=	DarwinStreamingSrvr5.5.4-Source
-PKGNAME=	DarwinStreamingServer-5.5.4
+DISTNAME=	DarwinStreamingSrvr5.5.5-Source
+PKGNAME=	DarwinStreamingServer-5.5.5
 CATEGORIES=	net multimedia
 MASTER_SITES=	http://www.opensource.apple.com/projects/streaming/release/
-EXTRACT_SUFX=	.tar
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://developer.apple.com/opensource/server/streaming/
@@ -45,7 +44,6 @@ BUILD_DIRS+=	QTFileTools/QTRTPGen.tproj
 BUILD_DIRS+=	QTFileTools/QTSDPGen.tproj
 BUILD_DIRS+=	QTFileTools/QTSampleLister.tproj
 BUILD_DIRS+=	QTFileTools/QTTrackInfo.tproj
-BUILD_DIRS+=	StreamingLoadTool
 
 INSTALLATION_DIRS+=	libexec/StreamingServerModules
 INSTALLATION_DIRS+=	share/examples/streaming
@@ -93,6 +91,7 @@ SUBST_FILES.makefile+=	APIModules/QTSSHomeDirectoryModule/Makefile.POSIX
 SUBST_FILES.makefile+=	APIModules/QTSSRawFileModule.bproj/Makefile.POSIX
 SUBST_FILES.makefile+=	APIModules/QTSSRefMovieModule/Makefile.POSIX
 SUBST_FILES.makefile+=	APIModules/QTSSSpamDefenseModule.bproj/Makefile.POSIX
+SUBST_FILES.makefile+=	APIStubLib/makefile.apistublib.POSIX
 SUBST_FILES.makefile+=	CommonUtilitiesLib/Makefile.POSIX
 SUBST_FILES.makefile+=	HTTPUtilitiesLib/Makefile.POSIX
 SUBST_FILES.makefile+=	MP3Broadcaster/Makefile.POSIX
@@ -107,10 +106,9 @@ SUBST_FILES.makefile+=	QTFileTools/QTRTPGen.tproj/Makefile.POSIX
 SUBST_FILES.makefile+=	QTFileTools/QTSDPGen.tproj/Makefile.POSIX
 SUBST_FILES.makefile+=	QTFileTools/QTSampleLister.tproj/Makefile.POSIX
 SUBST_FILES.makefile+=	QTFileTools/QTTrackInfo.tproj/Makefile.POSIX
-SUBST_FILES.makefile+=	StreamingLoadTool/Makefile.POSIX
 SUBST_FILES.makefile+=	StreamingProxy.tproj/Makefile.POSIX
 SUBST_FILES.makefile+=	qtpasswd.tproj/Makefile.POSIX
-SUBST_SED.makefile+=	-e "s|-O[23]||"
+SUBST_SED.makefile+=	-e "s|-O[023]||"
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
@@ -159,8 +157,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/qtgroups ${PREFIX}/share/examples/streaming
 	${INSTALL_DATA}	${WRKSRC}/Documentation/readme.txt ${PREFIX}/share/streaming
 	${INSTALL_DATA}	${WRKSRC}/Documentation/3rdPartyAcknowledgements.rtf ${PREFIX}/share/streaming
-	${INSTALL_PROGRAM} ${WRKSRC}/StreamingLoadTool/StreamingLoadTool ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/StreamingLoadTool/streamingloadtool.conf ${PREFIX}/share/examples/streaming
 	${INSTALL_SCRIPT} ${WRKSRC}/WebAdmin/src/streamingadminserver.pl ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/WebAdmin/WebAdminHtml/*.pl ${PREFIX}/share/streaming/AdminHtml
 	${INSTALL_DATA} ${WRKSRC}/WebAdmin/WebAdminHtml/*.cgi ${PREFIX}/share/streaming/AdminHtml
diff --git a/net/DarwinStreamingServer/PLIST b/net/DarwinStreamingServer/PLIST
index e3e8991ea50..d773800a1d5 100644
--- a/net/DarwinStreamingServer/PLIST
+++ b/net/DarwinStreamingServer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/08 09:41:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/05/23 07:52:15 adam Exp $
 bin/MP3Broadcaster
 bin/PlaylistBroadcaster
 bin/QTBroadcaster
@@ -8,7 +8,6 @@ bin/QTRTPGen
 bin/QTSDPGen
 bin/QTSampleLister
 bin/QTTrackInfo
-bin/StreamingLoadTool
 bin/createuserstreamingdir
 bin/qtpasswd
 libexec/StreamingServerModules/QTSSHomeDirectoryModule
@@ -18,7 +17,6 @@ sbin/streamingadminserver.pl
 share/examples/streaming/qtgroups
 share/examples/streaming/qtusers
 share/examples/streaming/relayconfig.xml-Sample
-share/examples/streaming/streamingloadtool.conf
 share/examples/streaming/streamingserver.xml-POSIX
 share/streaming/3rdPartyAcknowledgements.rtf
 share/streaming/AdminHtml/MapUTF.pl
diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo
index 8a96b8dc8b5..13e5c61080c 100644
--- a/net/DarwinStreamingServer/distinfo
+++ b/net/DarwinStreamingServer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/03/07 18:22:43 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/05/23 07:52:15 adam Exp $
 
-SHA1 (DarwinStreamingSrvr5.5.4-Source.tar) = 8d7c50abd9dee2da8bfcf5b080ad6a5f04b7e159
-RMD160 (DarwinStreamingSrvr5.5.4-Source.tar) = 741844be26fca61ae2da809191d80ae7894f845d
-Size (DarwinStreamingSrvr5.5.4-Source.tar) = 32829440 bytes
+SHA1 (DarwinStreamingSrvr5.5.5-Source.tar.gz) = ba8419be20e1911f7167dbd48722b2ba5e6f1fe1
+RMD160 (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 62996496da51971e384fc26dd336ef2785c2dca7
+Size (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 21468268 bytes
 SHA1 (patch-aa) = 2fc84964264f9b6529d031801b36bcca89f591a6
 SHA1 (patch-ab) = a2eb1ed133e3ebdc7e520a14062a48dcce58d9a6
 SHA1 (patch-ac) = be78f45065581e635457f3e345b674e0d720e8c2
@@ -17,11 +17,10 @@ SHA1 (patch-ak) = d573cee55a6097caf36de30cf95ea542c1f7a24f
 SHA1 (patch-al) = bd076ddc40df092d92cc18aba319f732287cdb6b
 SHA1 (patch-am) = 68de6ee8be78b602a5c615a5ed72c2e97d0eb953
 SHA1 (patch-an) = 9477b41eddeb0496cf8d3326a4e5fb9800efc157
-SHA1 (patch-ao) = 24c52b5de2f4a5d8484822a3225921d929e3b59b
-SHA1 (patch-ap) = 08828b78fa5847826061b3766d113cecc55a48cb
-SHA1 (patch-aq) = 1168e928db76833d25774a3fb5fd9223ba669d78
-SHA1 (patch-ar) = dda83105b0ff25ada62ee36e10b879a38d833324
+SHA1 (patch-ap) = 775ea3c983f874c7cda960e0442a749349d76a13
+SHA1 (patch-aq) = 229a6f94e731cbaf2ddcc4dbd6176be03251e2d8
+SHA1 (patch-ar) = 2abf9960c777a976d60b6189cd66696c39dd18de
 SHA1 (patch-as) = fd17b346afc4c4ebaa0c7bbf84229a2187860d6b
-SHA1 (patch-at) = 7cb7d452fc7f8e903998638271952f6232da8469
+SHA1 (patch-at) = d1d879ae4c072c7780b524611c5102c6bdad2fb8
 SHA1 (patch-au) = 89fe0648eb3acd83a9138f0b79c12e54086fa2a2
 SHA1 (patch-av) = 6408826975740e2e75a1a1c019516542d44552ed
diff --git a/net/DarwinStreamingServer/patches/patch-ao b/net/DarwinStreamingServer/patches/patch-ao
deleted file mode 100644
index b34b2603d7c..00000000000
--- a/net/DarwinStreamingServer/patches/patch-ao
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
-
---- APIModules/QTSSReflectorModule/ReflectorStream.cpp.orig	2005-07-31 11:00:31.000000000 +0200
-+++ APIModules/QTSSReflectorModule/ReflectorStream.cpp
-@@ -381,11 +381,11 @@ QTSS_Error ReflectorStream::BindSockets(
-     // specified by the source info, we can use that to demultiplex separate broadcasts on
-     // the same port. If the src IP addr is 0, we cannot do this and must dedicate 1 port per
-     // broadcast
--    fSockets = sSocketPool.GetUDPSocketPair(INADDR_ANY, fStreamInfo.fPort, fStreamInfo.fSrcIPAddr, 0);
-+    fSockets = sSocketPool.GetUDPSocketPair(fStreamInfo.fDestIPAddr, fStreamInfo.fPort, fStreamInfo.fSrcIPAddr, 0);
-     if ((fSockets == NULL) && fStreamInfo.fSetupToReceive)
-     {
-         fStreamInfo.fPort = 0;
--        fSockets = sSocketPool.GetUDPSocketPair(INADDR_ANY, fStreamInfo.fPort, fStreamInfo.fSrcIPAddr, 0);
-+        fSockets = sSocketPool.GetUDPSocketPair(fStreamInfo.fDestIPAddr, fStreamInfo.fPort, fStreamInfo.fSrcIPAddr, 0);
-     }
-     if (fSockets == NULL)
-         return QTSSModuleUtils::SendErrorResponse(inRequest, qtssServerInternal,
-@@ -1412,7 +1412,7 @@ Bool16 ReflectorSocket::ProcessPacket(co
-         {   
-             // Check to see if we need to set the remote RTCP address
-             // for this stream. This will be necessary if the source is unicast.
--            if ((theRemoteAddr != 0) && (theSender->fStream->fDestRTCPAddr == 0))
-+            if ((theRemoteAddr != 0) && (theSender->fStream->fDestRTCPAddr == 0) && (thePacket->IsRTCP()))
-             {
-                 // If the source is multicast, this shouldn't be necessary
-                 Assert(!SocketUtils::IsMulticastIPAddr(theSender->fStream->fStreamInfo.fDestIPAddr));
diff --git a/net/DarwinStreamingServer/patches/patch-ap b/net/DarwinStreamingServer/patches/patch-ap
index cabf0d4d97c..24e1c194cd8 100644
--- a/net/DarwinStreamingServer/patches/patch-ap
+++ b/net/DarwinStreamingServer/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-ap,v 1.2 2007/05/23 07:52:15 adam Exp $
 
---- CommonUtilitiesLib/OSRef.h.orig	2006-12-14 19:43:43.000000000 +0100
+--- CommonUtilitiesLib/OSRef.h.orig	2007-02-16 00:13:47.000000000 +0100
 +++ CommonUtilitiesLib/OSRef.h
-@@ -56,6 +56,9 @@ class OSRefTableUtils
+@@ -58,6 +58,9 @@ class OSRefTableUtils
          friend class OSRefKey;
  };
  
diff --git a/net/DarwinStreamingServer/patches/patch-aq b/net/DarwinStreamingServer/patches/patch-aq
index aaf028aa02e..225d70b36e8 100644
--- a/net/DarwinStreamingServer/patches/patch-aq
+++ b/net/DarwinStreamingServer/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-aq,v 1.2 2007/05/23 07:52:15 adam Exp $
 
---- CommonUtilitiesLib/UDPDemuxer.h.orig	2006-12-14 20:20:20.000000000 +0100
+--- CommonUtilitiesLib/UDPDemuxer.h.orig	2007-02-16 00:13:47.000000000 +0100
 +++ CommonUtilitiesLib/UDPDemuxer.h
-@@ -44,6 +44,8 @@ class Task;
+@@ -45,6 +45,8 @@ class UDPDemuxerKey;
  //IMPLEMENTATION ONLY:
  //HASH TABLE CLASSES USED ONLY IN IMPLEMENTATION
  
diff --git a/net/DarwinStreamingServer/patches/patch-ar b/net/DarwinStreamingServer/patches/patch-ar
index 9df0b30f33c..96de13879c2 100644
--- a/net/DarwinStreamingServer/patches/patch-ar
+++ b/net/DarwinStreamingServer/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-ar,v 1.2 2007/05/23 07:52:15 adam Exp $
 
---- Server.tproj/QTSServer.h.orig	2006-12-14 20:29:25.000000000 +0100
+--- Server.tproj/QTSServer.h.orig	2007-02-16 00:13:49.000000000 +0100
 +++ Server.tproj/QTSServer.h
-@@ -114,7 +114,7 @@ class QTSServer : public QTSServerInterf
+@@ -115,7 +115,7 @@ class QTSServer : public QTSServerInterf
          // GLOBAL TASKS
          RTCPTask*           fRTCPTask;
          RTPStatsUpdaterTask*fStatsTask;
diff --git a/net/DarwinStreamingServer/patches/patch-at b/net/DarwinStreamingServer/patches/patch-at
index a9d2e0bbe82..4251672e9a1 100644
--- a/net/DarwinStreamingServer/patches/patch-at
+++ b/net/DarwinStreamingServer/patches/patch-at
@@ -1,13 +1,13 @@
-$NetBSD: patch-at,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-at,v 1.2 2007/05/23 07:52:16 adam Exp $
 
---- APIModules/QTSSSpamDefenseModule.bproj/QTSSSpamDefenseModule.cpp.orig	2006-12-14 22:31:31.000000000 +0100
+--- APIModules/QTSSSpamDefenseModule.bproj/QTSSSpamDefenseModule.cpp.orig	2007-02-16 00:13:47.000000000 +0100
 +++ APIModules/QTSSSpamDefenseModule.bproj/QTSSSpamDefenseModule.cpp
-@@ -39,6 +39,8 @@
- 
- static QTSS_ModulePrefsObject sPrefs = NULL;
+@@ -62,6 +62,8 @@ class IPAddrTableElem
+         friend class OSHashTable<IPAddrTableElem, IPAddrTableKey>;
+ };
  
 +// defined below
 +class IPAddrTableKey;
  
- class IPAddrTableElem
+ class IPAddrTableKey
  {