updated to: 5_0_3_2

Changed files:
    dstreamserv-Buildit.patch -> 1.2
    dstreamserv-buildtarball.patch -> 1.1
    dstreamserv-defaultpath.patch -> 1.1
    dstreamserv-qtpasswd.patch -> 1.1
    dstreamserv-relayconfig.xml -> 1.1
    dstreamserv.init -> 1.8

diff --git a/dstreamserv-Buildit.patch b/dstreamserv-Buildit.patch
index 4bbd2d6a2d08b108da9e99d57f80b50b6b2b1760..9aee15c207a09dc046704265b18adeb9f45c037c 100644 (file)
--- a/dstreamserv-Buildit.patch
+++ b/dstreamserv-Buildit.patch
@@ -1,5 +1,5 @@
---- ./DSS-4_1_2.src/Buildit.orig       2002-11-02 02:08:06.000000000 +0100
-+++ DSS-4_1_2.src/Buildit      2003-12-28 14:58:36.000000000 +0100
+--- DSS-v5_0_3_2/Buildit.orig  2004-06-10 02:03:33.000000000 +0200
++++ DSS-v5_0_3_2/Buildit       2005-03-29 14:57:11.590729016 +0200
 @@ -16,17 +16,17 @@
  
        Linux.ppc)
@@ -39,19 +39,16 @@
 +              COMPILER_FLAGS="-fPIC -D_REENTRANT -D__USE_POSIX -D__linux__ -pipe"
          INCLUDE_FLAG="-include"
                
-               CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt -lstdc++"
+               CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"
  
 -              SHARED=-shared
 +              SHARED="-fPIC -shared"
                MODULE_LIBS=
                
                if [ -f /usr/include/socketbits.h ]; then
-@@ -135,19 +135,19 @@
- 
-       
+@@ -176,17 +176,17 @@
        *)
--              echo "I don't know your platform. I'll assume this is a Linux x86 platform."
-+              echo "I don't know your platform. I'll assume this is a Linux platform."
+               echo "I don't know your platform. I'll assume this is a Linux x86 platform."
                echo "Please edit the BuildServer script & PlatformHeader.h to add your platform."
 -              CPLUS=gcc
 -              CCOMP=gcc

diff --git a/dstreamserv-buildtarball.patch b/dstreamserv-buildtarball.patch
new file mode 100644 (file)
index 0000000..3e32f0a
--- /dev/null
+++ b/dstreamserv-buildtarball.patch
@@ -0,0 +1,83 @@
+--- DSS-v5_0_3_2/buildtarball.orig     2002-12-21 18:41:05.000000000 +0100
++++ DSS-v5_0_3_2/buildtarball  2004-09-17 00:14:22.000000000 +0200
+@@ -16,23 +16,23 @@
+       ;;              
+ esac
+ 
+-echo removing DarwinStreamingSrvr4.1.x-$PLAT.tar.gz
+-if rm -f DarwinStreamingSrvr4.1.x-$PLAT.tar.gz; 
++echo removing DarwinStreamingSrvr$1-$PLAT.tar.gz
++if rm -f DarwinStreamingSrvr$1-$PLAT.tar.gz; 
+ then :
+ fi
+ 
+-echo removing DarwinStreamingSrvr4.1.x-$PLAT
+-if rm -rf DarwinStreamingSrvr4.1.x-$PLAT; 
++echo removing DarwinStreamingSrvr$1-$PLAT
++if rm -rf DarwinStreamingSrvr$1-$PLAT; 
+ then :
+ fi
+ 
+-echo removing StreamingProxy-4.1.x-$PLAT.tar.gz
+-if rm -f StreamingProxy-4.1.x-$PLAT.tar.gz; 
++echo removing StreamingProxy-$1-$PLAT.tar.gz
++if rm -f StreamingProxy-$1-$PLAT.tar.gz; 
+ then :
+ fi
+ 
+-echo removing StreamingProxy-4.1.x-$PLAT
+-if rm -rf StreamingProxy-4.1.x-$PLAT 
++echo removing StreamingProxy-$1-$PLAT
++if rm -rf StreamingProxy-$1-$PLAT 
+ then :
+ fi
+ 
+@@ -67,27 +67,31 @@
+       exit 1
+ fi
+ 
+-if [ ! -d StreamingLoadTool ];
+-then 
+-      echo "Error: there is no StreamingLoadTool folder."
+-      echo Cannot build StreamingLoadTool. Exiting!
++if [ "$1" = "dss" ]; then
++    echo ""
++else
++    if [ ! -d StreamingLoadTool ];
++    then 
++        echo "Error: there is no StreamingLoadTool folder."
++        echo Cannot build StreamingLoadTool. Exiting!
+         exit 1
+-fi
+-
+-if [ ! -f StreamingLoadTool/StreamingLoadTool ];
+-then
++    fi
++    
++    if [ ! -f StreamingLoadTool/StreamingLoadTool ];
++    then
+         echo "StreamingLoadTool failed to build!"
+-      echo Buildit FAILED. Exiting!
+-      exit 1
++        echo Buildit FAILED. Exiting!
++        exit 1
++    fi
+ fi
+ 
+-./DSS_MakeRoot -f DarwinStreamingSrvr4.1.x-$PLAT
+-tar cvf DarwinStreamingSrvr4.1.x-$PLAT.tar DarwinStreamingSrvr4.1.x-$PLAT
+-gzip DarwinStreamingSrvr4.1.x-$PLAT.tar
+-
+-./DSS_MakeProxyRoot StreamingProxy-4.1.x-$PLAT
+-tar cvf StreamingProxy-4.1.x-$PLAT.tar StreamingProxy-4.1.x-$PLAT
+-gzip StreamingProxy-4.1.x-$PLAT.tar
++./DSS_MakeRoot -f DarwinStreamingSrvr$1-$PLAT $1
++tar cvf DarwinStreamingSrvr$1-$PLAT.tar DarwinStreamingSrvr$1-$PLAT
++gzip DarwinStreamingSrvr$1-$PLAT.tar
++
++./DSS_MakeProxyRoot StreamingProxy-$1-$PLAT
++tar cvf StreamingProxy-$1-$PLAT.tar StreamingProxy-$1-$PLAT
++gzip StreamingProxy-$1-$PLAT.tar
+ 
+ echo Success!
+ 

diff --git a/dstreamserv-defaultpath.patch b/dstreamserv-defaultpath.patch
new file mode 100644 (file)
index 0000000..46f85c8
--- /dev/null
+++ b/dstreamserv-defaultpath.patch
@@ -0,0 +1,117 @@
+--- DSS-v5_0_3_2/defaultPaths.h.orig   2003-08-16 01:52:39.000000000 +0200
++++ DSS-v5_0_3_2/defaultPaths.h        2005-03-29 15:55:50.483775960 +0200
+@@ -60,9 +60,9 @@
+ 
+ # define DEFAULTPATHS_ETC_DIR                 "/etc/streaming/"
+ # define DEFAULTPATHS_ETC_DIR_OLD             "/etc/"
+-# define DEFAULTPATHS_SSM_DIR                 "/usr/local/sbin/StreamingServerModules/"
+-# define DEFAULTPATHS_LOG_DIR                 "/var/streaming/logs/"
+-# define DEFAULTPATHS_MOVIES_DIR        "/usr/local/movies/"
++# define DEFAULTPATHS_SSM_DIR                 "/usr/lib/StreamingServerModules/"
++# define DEFAULTPATHS_LOG_DIR                 "/var/log/streaming/"
++# define DEFAULTPATHS_MOVIES_DIR        "/var/lib/streaming/movies/"
+ # define DEFAULTPATHS_PID_DIR           "/var/run/"
+ 
+ #endif
+--- DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl.orig     2003-08-28 01:21:55.000000000 +0200
++++ DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl  2005-03-29 16:12:14.000000000 +0200
+@@ -222,8 +222,8 @@
+ else {
+       %vital = ("port", 1220,
+         "sslport", 1240,
+-        "root", "/var/streaming/AdminHtml",
+-      "plroot", "/var/streaming/playlists/",
++        "root", "/usr/share/streaming/AdminHtml",
++      "plroot", "/var/lib/streaming/playlists/",
+         "server", "DSS 4.1 Admin Server/1.0",
+         "index_docs", "index.html parse_xml.cgi index.htm index.cgi",
+         "addtype_html", "text/html",
+@@ -238,9 +238,9 @@
+         "realm", "DSS Admin Server",
+         "qtssIPAddress", "localhost",
+         "qtssPort", "554",
+-        "qtssName", "/usr/local/sbin/DarwinStreamingServer",
++        "qtssName", "/usr/sbin/DarwinStreamingServer",
+       "qtssAutoStart", "1",
+-        "logfile", "/var/streaming/logs/streamingadminserver.log",
++        "logfile", "/var/log/streaming/streamingadminserver.log",
+         "log", "1",
+         "logclear", "0",
+         "logtime", "168",
+@@ -250,9 +250,9 @@
+         "crtfile", "/etc/streaming/streamingadminserver.pem",
+         "keyfile", "/etc/streaming/streamingadminserver.pem",
+         #"keypasswordfile", "",
+-        "qtssQTPasswd", "/usr/local/bin/qtpasswd",
+-        "qtssPlaylistBroadcaster", "/usr/local/bin/PlaylistBroadcaster",
+-        "qtssMP3Broadcaster", "/usr/local/bin/MP3Broadcaster",
++        "qtssQTPasswd", "/usr/sbin/qtpasswd",
++        "qtssPlaylistBroadcaster", "/usr/bin/PlaylistBroadcaster",
++        "qtssMP3Broadcaster", "/usr/bin/MP3Broadcaster",
+         "helpurl", "http://helpqt.apple.com/dssWebAdminHelpR3/dssWebAdmin.help/DSSHelp.htm",
+         "tempfileloc", "/tmp",
+         "qtssAdmin", "streamingadmin",
+--- DSS-v5_0_3_2/streamingserver.xml-POSIX.orig        2003-04-09 02:30:00.000000000 +0200
++++ DSS-v5_0_3_2/streamingserver.xml-POSIX     2005-03-29 18:45:24.940054128 +0200
+@@ -79,7 +79,7 @@
+       <PREF NAME="error_logfile_interval" TYPE="UInt32">7</PREF>
+ 
+       <!-- error log. A value of 0 means unlimited. -->
+-      <PREF NAME="error_logfile_dir">/var/streaming/logs</PREF>
++      <PREF NAME="error_logfile_dir">/var/log/streaming</PREF>
+ 
+       <!-- Name of the error log file. -->
+       <PREF NAME="error_logfile_name">Error</PREF>
+@@ -88,7 +88,7 @@
+     <PREF NAME="pid_file">/var/run/DarwinStreamingServer.pid</PREF>
+ 
+       <!-- Path to the folder containing dynamic loadable server modules -->
+-      <PREF NAME="module_folder">/usr/local/sbin/StreamingServerModules</PREF>
++      <PREF NAME="module_folder">/usr/lib/StreamingServerModules</PREF>
+ 
+       <!-- If the server discovers it is serving more than its -->
+       <!-- allowed maximum bandwidth (using the average bandwidth computation) it -->
+@@ -117,7 +117,7 @@
+       <PREF NAME="bind_ip_addr">0</PREF>
+ 
+       <!-- Path to the root folder for movies. -->
+-      <PREF NAME="movie_folder">/usr/local/movies/</PREF>
++      <PREF NAME="movie_folder">/var/lib/streaming/movies/</PREF>
+ 
+       <!-- Maximum amount of bandwidth the server is allowed to serve. -->
+       <!-- value is in kilobits/sec. While this limit is exceeded, new client requests. -->
+@@ -293,7 +293,7 @@
+       <PREF NAME="request_logfile_size" TYPE="UInt32">10240000</PREF>
+ 
+       <!-- Path to directory where access logs are stored. -->
+-      <PREF NAME="request_logfile_dir">/var/streaming/logs</PREF>
++      <PREF NAME="request_logfile_dir">/var/log/streaming</PREF>
+ 
+       <!-- Name of the access log file. -->
+       <PREF NAME="request_logfile_name">StreamingServer</PREF>
+@@ -364,7 +364,7 @@
+     <PREF NAME="mp3_request_logfile_name" >mp3_access</PREF>
+     
+       <!-- Path to directory where access logs are stored. -->
+-      <PREF NAME="mp3_request_logfile_dir">/var/streaming/logs</PREF>
++      <PREF NAME="mp3_request_logfile_dir">/var/log/streaming</PREF>
+ 
+       <!-- Either "true" or "false". This toggles -->
+       <!-- mp3 access logging on and off. -->
+@@ -396,14 +396,14 @@
+       <PREF NAME="http_xfer_enabled" TYPE="Bool16" >false</PREF>
+       <!-- Path to the http download folder. All files -->
+       <!-- that are requested from this folder are sent via HTTP -->
+-      <PREF NAME="http_folder">/usr/local/movies/http</PREF>
++      <PREF NAME="http_folder">/var/lib/streaming/http</PREF>
+       <!-- Either "true" or "false". This toggles http module -->
+       <!-- logging on and off. -->
+       <PREF NAME="http_logging" TYPE="Bool16">true</PREF>
+       <!-- Name of the http module log file. -->
+       <PREF NAME="http_logfile_name">Http</PREF>
+       <!-- Path to directory where http module logs are stored. -->
+-      <PREF NAME="http_logfile_dir">/var/streaming/logs</PREF>
++      <PREF NAME="http_logfile_dir">/var/log/streaming</PREF>
+       <!-- Maximum allowed size in bytes for the http module log. A -->
+       <!-- value of 0 means unlimited. -->
+       <PREF NAME="http_logfile_size" TYPE="UInt32">256000</PREF>

diff --git a/dstreamserv-qtpasswd.patch b/dstreamserv-qtpasswd.patch
new file mode 100644 (file)
index 0000000..7c4aeed
--- /dev/null
+++ b/dstreamserv-qtpasswd.patch
@@ -0,0 +1,20 @@
+--- DSS-v5_0_3_2/qtpasswd.tproj/QTSSPasswd.cpp.orig    2003-08-16 01:53:34.000000000 +0200
++++ DSS-v5_0_3_2/qtpasswd.tproj/QTSSPasswd.cpp 2005-03-29 19:54:14.623246856 +0200
+@@ -919,12 +919,12 @@
+     if(lastOccurOfSeparator != NULL) 
+     {
+               int filenameLength = ::strlen(lastOccurOfSeparator) + sizeof(char);
+-              tempFilePathLength = pathLength - filenameLength + sizeof(char) + ::strlen(tmpFile);
++              tempFilePathLength = pathLength - filenameLength + sizeof(char) + ::strlen(tmpFile) + 2;
+               
+-              tempFilePath = new char[tempFilePathLength];
+-              memcpy(tempFilePath, qtusersFilePath, (pathLength - filenameLength));
+-              memcpy(tempFilePath + (pathLength - filenameLength), tmpFile, ::strlen(tmpFile));
+-              tempFilePath[pathLength - filenameLength + ::strlen(tmpFile)] = '\0';
++              tempFilePath = new char[tempFilePathLength + 2];
++              memcpy(tempFilePath, qtusersFilePath, (pathLength - filenameLength + 2));
++              memcpy(tempFilePath + (pathLength - filenameLength) + 2, tmpFile, ::strlen(tmpFile));
++              tempFilePath[pathLength - filenameLength + ::strlen(tmpFile) + 2] = '\0';
+               
+               /* Get temp users file path name */
+               if (!createGroup && !deleteGroup)

diff --git a/dstreamserv-relayconfig.xml b/dstreamserv-relayconfig.xml
new file mode 100644 (file)
index 0000000..c0e062b
--- /dev/null
+++ b/dstreamserv-relayconfig.xml
@@ -0,0 +1,6 @@
+<RELAY_CONFIG>
+       <OBJECT TYPE="relay" NAME="***qtssDefaultRelay***">
+               <OBJECT CLASS="source" TYPE="announced_source">
+               </OBJECT>
+       </OBJECT>
+</RELAY_CONFIG>

diff --git a/dstreamserv.init b/dstreamserv.init
index 97e44ec05b53304bc4b8ac42429a0776f1123513..05786b737921e0faa2a8fa57dadd78bbb57ded38 100755 (executable)
--- a/dstreamserv.init
+++ b/dstreamserv.init
@@ -35,11 +35,11 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/DSS ]; then
                msg_starting DSS
-               daemon /usr/local/sbin/DarwinStreamingServer 
+               daemon /usr/sbin/DarwinStreamingServer
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/DSS
                msg_starting "DSS Admin"
-               daemon /usr/local/sbin/streamingadminserver.pl
+               daemon /usr/sbin/streamingadminserver.pl
                RET=$?
                [ $RETVAL -eq 0 ] && RETVAL=$RET
        else
@@ -53,7 +53,8 @@ case "$1" in
                msg_stopping DSS
                killproc DarwinStreamingServer 
                msg_stopping "DSS Admin"
-               ps x | grep 'streaming' | grep -v grep|awk '{print $1};' | xargs kill
+               kill -9 `cat /var/run/streamingadminserver.pid`
+               rm -f /var/run/streamingadminserver.pid
                rm -f /var/lock/subsys/DSS >/dev/null 2>&1
        else
                msg_not_running DSS