Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 52583 Details for
Bug 84011
New ebuild for Darwin Streaming Server (dss) version 5.0.3.2
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Darwin Streaming Server v5.0.3.2 patch used by ebuild
darwin-streaming-server-5.0.3.2-gentoo.patch (text/plain), 11.19 KB, created by
Jonathan Polansky
on 2005-03-03 15:06:36 UTC
(
hide
)
Description:
Darwin Streaming Server v5.0.3.2 patch used by ebuild
Filename:
MIME Type:
Creator:
Jonathan Polansky
Created:
2005-03-03 15:06:36 UTC
Size:
11.19 KB
patch
obsolete
>diff -Naur old/DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl new/DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl >--- old/DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl 2005-02-09 11:36:49.000000000 -0800 >+++ new/DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl 2005-02-09 11:40:18.000000000 -0800 >@@ -71,7 +71,7 @@ > $defaultConfigPath = "/Library/QuickTimeStreaming/Config/streamingadminserver.conf"; > } > else { >- $defaultConfigPath = "/etc/streaming/streamingadminserver.conf"; >+ $defaultConfigPath = "/etc/dss/streamingadminserver.conf"; > } > > $debug = 0; >@@ -222,8 +222,8 @@ > else { > %vital = ("port", 1220, > "sslport", 1240, >- "root", "/var/streaming/AdminHtml", >- "plroot", "/var/streaming/playlists/", >+ "root", "/var/lib/dss/admin", >+ "plroot", "/var/lib/dss/media/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,28 +238,28 @@ > "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/dss/streamingadminserver.log", > "log", "1", > "logclear", "0", > "logtime", "168", > "messagesfile", "messages", > "gbrowse", "0", > "ssl", "0", >- "crtfile", "/etc/streaming/streamingadminserver.pem", >- "keyfile", "/etc/streaming/streamingadminserver.pem", >+ "crtfile", "/etc/dss/streamingadminserver.pem", >+ "keyfile", "/etc/dss/streamingadminserver.pem", > #"keypasswordfile", "", >- "qtssQTPasswd", "/usr/local/bin/qtpasswd", >- "qtssPlaylistBroadcaster", "/usr/local/bin/PlaylistBroadcaster", >- "qtssMP3Broadcaster", "/usr/local/bin/MP3Broadcaster", >+ "qtssQTPasswd", "/usr/bin/qtpasswd", >+ "qtssPlaylistBroadcaster", "/usr/bin/PlaylistBroadcaster", >+ "qtssMP3Broadcaster", "/usr/bin/MP3Broadcaster", > "helpurl", "http://helpqt.apple.com/dssWebAdminHelpR3/dssWebAdmin.help/DSSHelp.htm", > "tempfileloc", "/tmp", > "qtssAdmin", "streamingadmin", > "cacheMessageFiles", "0", > "pidfile", "/var/run/streamingadminserver.pid", >- "runUser", "qtss", >- "runGroup", "qtss", >+ "runUser", "nobody", >+ "runGroup", "nogroup", > "cookieExpireSeconds", "600" > ); > } >diff -Naur old/DSS-v5_0_3_2/WebAdmin/streamingadminserver.conf new/DSS-v5_0_3_2/WebAdmin/streamingadminserver.conf >--- old/DSS-v5_0_3_2/WebAdmin/streamingadminserver.conf 2005-02-09 11:46:35.000000000 -0800 >+++ new/DSS-v5_0_3_2/WebAdmin/streamingadminserver.conf 2005-02-09 11:46:24.000000000 -0800 >@@ -6,11 +6,11 @@ > > # The root directory for all the html and cgi files > # The path should be absolute >-root=/Library/QuickTimeStreaming/AdminHtml >+root=/var/lib/dss/admin > > # The root directory for play lists managed by the adminserver > # The path should be absolute >-plroot=/Library/QuickTimeStreaming/Playlists >+plroot=/var/lib/dss/media/playlists > > # The host name of the streaming admin server > host=foo.bar.com >@@ -22,11 +22,11 @@ > qtssPort=554 > > # The name of the streaming server binary >-qtssName=/usr/sbin/QuickTimeStreamingServer >+qtssName=/usr/sbin/DarwinStreamingServer > > # If set to 1, admin server will start qtss when it is launched > # If set to 0, qtss will not be launched when the admin starts up >-qtssAutoStart=1 >+qtssAutoStart=0 > > # To add new mime types > # If the suffix is xxx, and the >@@ -41,7 +41,7 @@ > log=1 > > # The full path of the streaming admin server log file >-logfile=/Library/QuickTimeStreaming/Logs/streamingadminserver.log >+logfile=/var/log/dss/streamingadminserver.log > > # Number of hours before which logs are rolled > logtime=168 >diff -Naur old/DSS-v5_0_3_2/defaultPaths.h new/DSS-v5_0_3_2/defaultPaths.h >--- old/DSS-v5_0_3_2/defaultPaths.h 2005-02-09 11:36:49.000000000 -0800 >+++ new/DSS-v5_0_3_2/defaultPaths.h 2005-02-09 11:40:18.000000000 -0800 >@@ -58,11 +58,11 @@ > > # define DEFAULTPATHS_DIRECTORY_SEPARATOR "/" > >-# 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_ETC_DIR "/etc/dss/" >+# define DEFAULTPATHS_ETC_DIR_OLD "/etc/dss/" >+# define DEFAULTPATHS_SSM_DIR "/usr/lib/dss/" >+# define DEFAULTPATHS_LOG_DIR "/var/log/dss/" >+# define DEFAULTPATHS_MOVIES_DIR "/var/lib/dss/media/" > # define DEFAULTPATHS_PID_DIR "/var/run/" > > #endif >diff -Naur old/DSS-v5_0_3_2/qtaccess new/DSS-v5_0_3_2/qtaccess >--- old/DSS-v5_0_3_2/qtaccess 2005-02-09 11:36:49.000000000 -0800 >+++ new/DSS-v5_0_3_2/qtaccess 2005-02-09 11:40:18.000000000 -0800 >@@ -26,7 +26,7 @@ > # If not given, the default filename is /etc/streaming/qtusers for POSIX > # usage: AuthUserFile <user filename> > #AuthUserFile /etc/streaming/qtusers >-AuthUserFile /Library/QuickTimeStreaming/Config/qtusers >+AuthUserFile /etc/dss/qtusers > > # AuthGroupFile: The filename that contains the groups and the > # users that belong to each group >@@ -34,7 +34,7 @@ > # If not given, the default filename is /etc/streaming/qtgroups for POSIX > # usage: AuthGroupFile <group filename> > #AuthGroupFile /etc/streaming/qtgroups >-AuthGroupFile /Library/QuickTimeStreaming/Config/qtgroups >+AuthGroupFile /etc/dss/qtgroups > > # require user: The names next to this specify which user > # is allowed to access the media in this folder >@@ -60,8 +60,8 @@ > # usage: <Limit [READ|WRITE] ..> ... </Limit> > <Limit WRITE> > AuthName "streaming server broadcaster realm" >- AuthUserFile /Library/QuickTimeStreaming/Config/qtbroadcastusers >- AuthGroupFile /Library/QuickTimeStreaming/Config/qtbroadcastgroups >+ AuthUserFile /etc/dss/qtbroadcastusers >+ AuthGroupFile /etc/dss/qtbroadcastgroups > require group broadcaster > </Limit> > >diff -Naur old/DSS-v5_0_3_2/qtgroups new/DSS-v5_0_3_2/qtgroups >--- old/DSS-v5_0_3_2/qtgroups 2005-02-09 11:36:49.000000000 -0800 >+++ new/DSS-v5_0_3_2/qtgroups 2005-02-09 11:40:18.000000000 -0800 >@@ -1 +1 @@ >-admin: aGFja21l >+admin: >diff -Naur old/DSS-v5_0_3_2/qtusers new/DSS-v5_0_3_2/qtusers >--- old/DSS-v5_0_3_2/qtusers 2005-02-09 11:36:49.000000000 -0800 >+++ new/DSS-v5_0_3_2/qtusers 2005-02-09 11:40:18.000000000 -0800 >@@ -1,2 +1 @@ > realm Streaming Server >-aGFja21l:0muym.z3yrHSw:fa000739887bb2871bcf0c9201b5ebd5 >diff -Naur old/DSS-v5_0_3_2/streamingserver.xml-POSIX new/DSS-v5_0_3_2/streamingserver.xml-POSIX >--- old/DSS-v5_0_3_2/streamingserver.xml-POSIX 2005-02-09 11:36:49.000000000 -0800 >+++ new/DSS-v5_0_3_2/streamingserver.xml-POSIX 2005-02-09 11:40:18.000000000 -0800 >@@ -1,5 +1,5 @@ > <?xml version ="1.0"?> >-<!-- This is a sample /etc/streaming/streamingserver.xml file --> >+<!-- This is a sample /etc/dss/streamingserver.xml file --> > <!-- The Document Type Definition (DTD) for the file --> > <!DOCTYPE CONFIGURATION [ > <!ELEMENT CONFIGURATION (SERVER, MODULE*)> >@@ -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/dss</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/dss</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/dss/media</PREF> > > <!-- Maximum amount of bandwidth the server is allowed to serve. --> > <!-- value is in kilobits/sec. While this limit is exceeded, new client requests. --> >@@ -141,10 +141,10 @@ > <PREF NAME="rtsp_timeout" TYPE="UInt32">0</PREF> > > <!-- Run as this user --> >- <PREF NAME="run_user_name"></PREF> >+ <PREF NAME="run_user_name">nobody</PREF> > > <!-- Member of this group --> >- <PREF NAME="run_group_name"></PREF> >+ <PREF NAME="run_group_name">nogroup</PREF> > > <!-- The following 8 prefs implement the server's thinning algorithm. --> > <!-- They are all in milliseconds --> >@@ -293,10 +293,10 @@ > <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/dss</PREF> > > <!-- Name of the access log file. --> >- <PREF NAME="request_logfile_name">StreamingServer</PREF> >+ <PREF NAME="request_logfile_name">dss</PREF> > > <!-- Either "true" or "false". Logs date time field --> > <!-- in GMT if true and in localtime if false--> >@@ -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/dss</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/dss/media/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/dss</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> >@@ -518,7 +518,7 @@ > <MODULE NAME="QTSSRelayModule"> > <!-- Relay preferences file. This file should be in the documented .rcf (Relay config file) --> > <!-- format. The Relay will use this to load up all relay streams --> >- <PREF NAME="relay_prefs_file">/etc/streaming/relayconfig.xml</PREF> >+ <PREF NAME="relay_prefs_file">/etc/dss/relayconfig.xml</PREF> > > <!-- enter this URL into a web browser and get a web page with current stats on --> > <!-- your active relays --> >@@ -530,10 +530,10 @@ > <PREF NAME="modAccess_qtaccessfilename">qtaccess</PREF> > > <!-- The default path and file name for the AccessModule's groups list --> >- <PREF NAME="modAccess_groupsfilepath">/etc/streaming/qtgroups</PREF> >+ <PREF NAME="modAccess_groupsfilepath">/etc/dss/qtgroups</PREF> > > <!-- The default path and file name for the AccessModule's user list --> >- <PREF NAME="modAccess_usersfilepath">/etc/streaming/qtusers</PREF> >+ <PREF NAME="modAccess_usersfilepath">/etc/dss/qtusers</PREF> > </MODULE> > > <MODULE NAME="QTSSAdminModule">
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 84011
:
52582
| 52583 |
52584
|
52585
|
56001
|
75497
|
75498
|
83949
|
83963
|
83964
|
83967
|
83968
|
122961
|
125019
|
125021
|
155645