head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_1_STABLE_MP:1.3; locks; strict; comment @# @; 1.4 date 2003.11.26.20.52.59; author ms; state dead; branches; next 1.3; 1.3 date 2003.06.06.08.15.43; author ms; state Exp; branches; next 1.2; 1.2 date 2003.06.02.16.01.53; author ms; state Exp; branches; next 1.1; 1.1 date 2003.05.09.19.28.16; author ms; state Exp; branches; next ; desc @@ 1.4 log @Major overhaul of package, return to functional state, and upgrading package: dss 4.1.3 -> 5.0 @ text @diff -Naur DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/playlist-lib.pl DSS-4_1_3.src/WebAdmin/WebAdminHtml/playlist-lib.pl --- DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/playlist-lib.pl Sat Feb 22 00:42:27 2003 +++ DSS-4_1_3.src/WebAdmin/WebAdminHtml/playlist-lib.pl Fri May 9 17:50:28 2003 @@@@ -384,7 +384,7 @@@@ $item =~ /(.+)[:]([0-9]+)$/; $movie = $1; $wt = $2; - if ($wt == "") { + if ($wt eq "") { $wt = 10; } $movie =~ s/\"/\"\"/g; @@@@ -669,7 +669,7 @@@@ $item =~ /(.+)[:]([0-9]+)$/; $movie = $1; $wt = $2; - if ($wt == "") { + if ($wt eq "") { $wt = 10; } $htmlstr .= &playlistlib::EmitPLRemoveMovieTableRowHTML($movie, $wt, $label); @@@@ -769,7 +769,7 @@@@ $item =~ /(.+)[:]([0-9]+)$/; $movie = $1; $wt = $2; - if ($wt == "") { + if ($wt eq "") { $wt = 10; } $htmlstr .= &playlistlib::EmitPLDetailTableRowHTML($movie, $wt, $i, $label); diff -Naur DSS-4_1_3.src.orig/qtaccess DSS-4_1_3.src/qtaccess --- DSS-4_1_3.src.orig/qtaccess Sat Feb 22 00:42:15 2003 +++ DSS-4_1_3.src/qtaccess Mon Jun 2 17:28:44 2003 @@@@ -1,9 +1,9 @@@@ # qtaccess -# A sample access file for streaming -# server authorization +# A sample access file for streaming +# server authorization # ---------------------------------- -# Note: -# For each keyword, the first sentence in the comment +# Note: +# For each keyword, the first sentence in the comment # explains the keyword, and the usage: line explains # how to use it. Anything not in angle brackets is a keyword # and keywords are case-sensitive. @@@@ -12,31 +12,29 @@@@ # AuthScheme: The authentication scheme that will be used # usage: AuthScheme # where scheme is either "basic" or "digest" -AuthScheme basic +AuthScheme digest # AuthName: The authentication realm that will be # presented to the client (for Basic Authentication only) # usage: AuthName # where realm can be a single word or a quoted multi-word string -AuthName "streaming server realm" +AuthName "Streaming Server" # AuthUserFile: The filename that contains the list of users -# for this access file +# for this access file # If not given, the default filename is /Library/QuickTimeStreaming/Config/qtusers for MacOSX -# If not given, the default filename is /etc/streaming/qtusers for POSIX +# If not given, the default filename is @@l_prefix@@/etc/dss/qtusers for POSIX # usage: AuthUserFile -#AuthUserFile /etc/streaming/qtusers -AuthUserFile /Library/QuickTimeStreaming/Config/qtusers +AuthUserFile @@l_prefix@@/etc/dss/qtusers -# AuthGroupFile: The filename that contains the groups and the +# AuthGroupFile: The filename that contains the groups and the # users that belong to each group # If not given, the default filename is /Library/QuickTimeStreaming/Config/qtgroups for MacOSX -# If not given, the default filename is /etc/streaming/qtgroups for POSIX +# If not given, the default filename is @@l_prefix@@/etc/dss/qtgroups for POSIX # usage: AuthGroupFile -#AuthGroupFile /etc/streaming/qtgroups -AuthGroupFile /Library/QuickTimeStreaming/Config/qtgroups +AuthGroupFile @@l_prefix@@/etc/dss/qtgroups -# require user: The names next to this specify which user +# require user: The names next to this specify which user # is allowed to access the media in this folder # below are two special cases: # require any-user => implies any user is allowed without @@@@ -44,24 +42,24 @@@@ # require valid-user => implies any user that is # authenticated is allowed access # usage: require user ... -require user johndoe +require any-user # require group: The names of the groups that are allowed # access to the media in this folder # usage: require group ... -require group movie-watchers # : This directive is to specify access control # for READ and/or WRITE privileges. If not present, all access control # keywords apply to READ privileges only. -# is used for WRITE privileges, and for +# is used for WRITE privileges, and for # both. can be omitted as the access keywords outside the # Limit directive # usage: ... - - AuthName "streaming server broadcaster realm" - AuthUserFile /Library/QuickTimeStreaming/Config/qtbroadcastusers - AuthGroupFile /Library/QuickTimeStreaming/Config/qtbroadcastgroups - require group broadcaster - + +# +# AuthName "Streaming Server Broadcaster" +# AuthUserFile @@l_prefix@@/etc/dss/qtbroadcastusers +# AuthGroupFile @@l_prefix@@/etc/dss/qtbroadcastgroups +# require group broadcaster +# diff -Naur DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/cgi-lib.pl DSS-4_1_3.src/WebAdmin/WebAdminHtml/cgi-lib.pl --- DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/cgi-lib.pl Sat Feb 22 00:42:24 2003 +++ DSS-4_1_3.src/WebAdmin/WebAdminHtml/cgi-lib.pl Thu Jun 5 18:13:26 2003 @@@@ -51,7 +51,7 @@@@ $charsetstr = ';charset=Shift_JIS'; } - my $headerstr = "HTTP/1.0 200 OK\r\nDate: $datestr\r\nServer: $_[0]\r\nContent-Type: text/html$charsetstr\r\nConnection:close\r\n"; + my $headerstr = "HTTP/1.0 200 OK\r\nDate: $datestr\r\nServer: $_[0]\r\nContent-Type: text/html$charsetstr\r\n\r\nConnection:close\r\n"; if ($_[1] eq "") { $headerstr .= "\r\n" } @ 1.3 log @Bring adminserver to life, but still missing text strings @ text @@ 1.2 log @Finish all non-adminserver package components @ text @d123 12 @ 1.1 log @Patch playlist script, make more path substitutions, and copy admin HTML files to share dir @ text @d31 92 @