openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Bring adminserver to life, but still missing text strings

master
Michael Schloh von Bennewitz 23 years ago committed by Ralf S. Engelschall
parent
2f810503c1
commit
adb7e259cf
3 changed files with 68 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      dss/dss.patch
  2. 39
      dss/dss.spec
  3. 38
      dss/rc.dss

12
dss/dss.patch
Unescape View File

@ -120,3 +120,15 @@ diff -Naur DSS-4_1_3.src.orig/qtaccess DSS-4_1_3.src/qtaccess
+# require group broadcaster +# require group broadcaster
+#</Limit> +#</Limit>
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"
}

39
dss/dss.spec
Unescape View File

@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
Group: Video Group: Video
License: APSL License: APSL
Version: %{V_opkg} Version: %{V_opkg}
Release: 20030605 Release: 20030606
# list of sources # list of sources
Source0: http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz Source0: http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz
@ -64,8 +64,9 @@ AutoReqProv: no
%patch -p1 %patch -p1
l_hostname=`%{l_shtool} echo -e %h%d` l_hostname=`%{l_shtool} echo -e %h%d`
%{l_shtool} subst \ %{l_shtool} subst \
-e 's;/etc/streaming/;%{l_prefix}/etc/dss/;' \ -e 's;/etc/streaming/;%{l_prefix}/etc/dss/;g' \
-e 's;/etc/\(streaming.*server.conf\);%{l_prefix}/etc/dss/\1;' \ -e 's;/etc/streamingserver.xml;%{l_prefix}/etc/dss/streamingserver.xml;g' \
-e 's;/etc/streamingadminserver.conf;%{l_prefix}/etc/dss/streamingadmin.conf;g' \
APIModules/QTSSAccessModule/QTSSAccessModule.cpp \ APIModules/QTSSAccessModule/QTSSAccessModule.cpp \
APIModules/QTSSDemoAuthorizationModule.bproj/QTSSDemoModule.cpp \ APIModules/QTSSDemoAuthorizationModule.bproj/QTSSDemoModule.cpp \
APIModules/QTSSReflectorModule/QTSSRelayModule.cpp \ APIModules/QTSSReflectorModule/QTSSRelayModule.cpp \
@ -75,10 +76,19 @@ AutoReqProv: no
WebAdmin/src/streamingadminserver.pl \ WebAdmin/src/streamingadminserver.pl \
WebAdmin/streamingadminserver_Darwin.conf WebAdmin/streamingadminserver_Darwin.conf
%{l_shtool} subst \ %{l_shtool} subst \
-e 's;/var/streaming/AdminHtml;%{l_prefix}/var/dss/webadmin;' \ -e 's;/var/streaming/AdminHtml;%{l_prefix}/var/dss/webadmin;g' \
-e 's;/usr/local/bin/qtpasswd;%{l_prefix}/bin/qtpasswd;g' \
-e 's;/usr/local/bin/PlaylistBroadcaster;%{l_prefix}/bin/PlaylistBroadcaster;g' \
-e 's;/usr/local/bin/MP3Broadcaster;%{l_prefix}/bin/MP3Broadcaster;g' \
-e 's;/var/streaming/playlists/;share/dss/playlists;g' \
-e 's;"realm", "DSS Admin Server";"realm", "Streaming Admin Server";g' \
-e 's;"qtssAdmin", "streamingadmin";"qtssAdmin", "dssadmin";g' \
-e 's;#"pidfile", "/var/streaming/streamingadminserver.pid";"pidfile", "%{l_prefix}/var/dss/dssadmin.pid";g' \
-e 's;/usr/local/sbin/DarwinStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer -c %{l_prefix}/etc/dss/streamingadmin.conf;g' \
-e 's;/var/streaming/logs/streamingadminserver.log;%{l_prefix}/var/dss/logs/StreamingAdmin.log;g' \
WebAdmin/src/streamingadminserver.pl WebAdmin/src/streamingadminserver.pl
%{l_shtool} subst \ %{l_shtool} subst \
-e 's;/etc/streaming/qtusers;%{l_prefix}/etc/dss/qtusers;' \ -e 's;/etc/streaming/qtusers;%{l_prefix}/etc/dss/qtusers;g' \
qtpasswd.tproj/QTSSPasswd.cpp qtpasswd.tproj/QTSSPasswd.cpp
%{l_shtool} subst \ %{l_shtool} subst \
-e 's;[ \t]$;;g' \ -e 's;[ \t]$;;g' \
@ -97,15 +107,24 @@ AutoReqProv: no
-e 's;/Library/QuickTimeStreaming/Config/qtusers;%{l_prefix}/etc/dss/qtusers;g' \ -e 's;/Library/QuickTimeStreaming/Config/qtusers;%{l_prefix}/etc/dss/qtusers;g' \
streamingserver.xml streamingserver.xml
%{l_shtool} subst \ %{l_shtool} subst \
-e 's;qtssAutoStart=1;qtssAutoStart=0;g' \
-e "s;host=foo.bar.com;host=$l_hostname;g" \ -e "s;host=foo.bar.com;host=$l_hostname;g" \
-e 's;/Library/QuickTimeStreaming/Logs;%{l_prefix}/var/dss/logs;g' \ -e 's;/Library/QuickTimeStreaming/Logs/streamingadminserver.log;%{l_prefix}/var/dss/logs/StreamingAdmin.log;g' \
-e 's;/Library/QuickTimeStreaming/AdminHtml;%{l_prefix}/var/dss/webadmin;g' \ -e 's;/Library/QuickTimeStreaming/AdminHtml;%{l_prefix}/var/dss/webadmin;g' \
-e 's;/Library/QuickTimeStreaming/Playlists;%{l_prefix}/share/dss/playlists;g' \ -e 's;/Library/QuickTimeStreaming/Playlists;%{l_prefix}/share/dss/playlists;g' \
-e 's;/usr/sbin/QuickTimeStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer -c %{l_prefix}/etc/dss/streamingserver.xml;g' \ -e 's;/usr/sbin/QuickTimeStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer -c %{l_prefix}/etc/dss/streamingserver.xml;g' \
WebAdmin/streamingadminserver.conf WebAdmin/streamingadminserver.conf
%{l_shtool} subst \
-e 's;^#!/.*/perl;#! %{l_prefix}/bin/perl;' \
WebAdmin/WebAdminHtml/*.pl \
WebAdmin/WebAdminHtml/*.cgi
%{l_shtool} subst \ %{l_shtool} subst \
-e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_prefix@;%{l_prefix};g' \
qtaccess qtaccess
%{l_shtool} echo \
'# OpenPKG additional' \
>>WebAdmin/streamingadminserver.conf
%{l_shtool} echo \ %{l_shtool} echo \
'keyfile=%{l_prefix}/etc/dss/streamingadminserver.pem' \ 'keyfile=%{l_prefix}/etc/dss/streamingadminserver.pem' \
>>WebAdmin/streamingadminserver.conf >>WebAdmin/streamingadminserver.conf
@ -122,7 +141,7 @@ AutoReqProv: no
'qtssMP3Broadcaster=%{l_prefix}/bin/MP3Broadcaster' \ 'qtssMP3Broadcaster=%{l_prefix}/bin/MP3Broadcaster' \
>>WebAdmin/streamingadminserver.conf >>WebAdmin/streamingadminserver.conf
%{l_shtool} echo \ %{l_shtool} echo \
'pidfile=%{l_prefix}/var/dss/streamingadminserver.pid' \ 'pidfile=%{l_prefix}/var/dss/dssadmin.pid' \
>>WebAdmin/streamingadminserver.conf >>WebAdmin/streamingadminserver.conf
%build %build
@ -220,9 +239,10 @@ AutoReqProv: no
%{l_shtool} install -s -c -m 755 \ %{l_shtool} install -s -c -m 755 \
DarwinStreamingServer $RPM_BUILD_ROOT%{l_prefix}/sbin/ DarwinStreamingServer $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 755 \ %{l_shtool} install -c -m 755 \
-e 's;#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \ -e 's;#!/usr/bin/perl;#! %{l_prefix}/bin/perl;' \
WebAdmin/src/streamingadminserver.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/ WebAdmin/src/streamingadminserver.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/
cp -rp WebAdmin/WebAdminHtml $RPM_BUILD_ROOT%{l_prefix}/var/dss/webadmin cp -rp WebAdmin/WebAdminHtml $RPM_BUILD_ROOT%{l_prefix}/var/dss/webadmin
chmod a+x $RPM_BUILD_ROOT%{l_prefix}/var/dss/webadmin/*.cgi
# install miscellaneous binaries # install miscellaneous binaries
%{l_shtool} install -s -c -m 755 \ %{l_shtool} install -s -c -m 755 \
@ -242,6 +262,7 @@ AutoReqProv: no
( (
cd $RPM_BUILD_ROOT%{l_prefix}/etc/dss/ cd $RPM_BUILD_ROOT%{l_prefix}/etc/dss/
mv -f relayconfig.xml-Sample relayconfig.xml mv -f relayconfig.xml-Sample relayconfig.xml
mv -f streamingadminserver.conf streamingadmin.conf
) )
# install run commands # install run commands
@ -263,7 +284,7 @@ AutoReqProv: no
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \ %{l_files_std} \
'%config %{l_prefix}/share/dss/qtaccess' \ '%config %{l_prefix}/share/dss/movies/qtaccess' \
'%config %{l_prefix}/etc/dss/*' '%config %{l_prefix}/etc/dss/*'
%files -f files %files -f files

38
dss/rc.dss
Unescape View File

@ -4,26 +4,40 @@
## ##
%config %config
dss_enable="yes" dssadmin_enable="yes"
dssdaemon_enable="yes"
%start -p 220 -u @l_susr@ %start -p 220 -u @l_susr@
opServiceEnabled dss || exit 0 opServiceEnabled dssadmin || exit 0
@l_prefix@/sbin/streamingadminserver.pl -c @l_prefix@/etc/dss/streamingadmin.conf >/dev/null 2>&1 &
opServiceEnabled dssdaemon || exit 0
@l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 & @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
echo $! >@l_prefix@/var/dss/dss.pid echo $! >@l_prefix@/var/dss/dssdaemon.pid
%stop -p 200 -u @l_susr@ %stop -p 200 -u @l_susr@
opServiceEnabled dss || exit 0 opServiceEnabled dssadmin || exit 0
if [ -f @l_prefix@/var/dss/dss.pid ]; then if [ -f @l_prefix@/var/dss/dssadmin.pid ]; then
kill -TERM `cat @l_prefix@/var/dss/dss.pid` kill -TERM `cat @l_prefix@/var/dss/dssadmin.pid`
rm @l_prefix@/var/dss/dss.pid rm @l_prefix@/var/dss/dssadmin.pid
fi
opServiceEnabled dssdaemon || exit 0
if [ -f @l_prefix@/var/dss/dssdaemon.pid ]; then
kill -TERM `cat @l_prefix@/var/dss/dssdaemon.pid`
rm @l_prefix@/var/dss/dssdaemon.pid
fi fi
%restart -p 200 -u @l_susr@ %restart -p 200 -u @l_susr@
opServiceEnabled dss || exit 0 opServiceEnabled dssadmin || exit 0
if [ -f @l_prefix@/var/dss/dss.pid ]; then if [ -f @l_prefix@/var/dss/dssadmin.pid ]; then
kill -TERM `cat @l_prefix@/var/dss/dss.pid` kill -TERM `cat @l_prefix@/var/dss/dssadmin.pid`
rm @l_prefix@/var/dss/dss.pid rm @l_prefix@/var/dss/dssadmin.pid
fi
@l_prefix@/sbin/streamingadminserver.pl -c @l_prefix@/etc/dss/streamingadmin.conf >/dev/null 2>&1 &
opServiceEnabled dssdaemon || exit 0
if [ -f @l_prefix@/var/dss/dssdaemon.pid ]; then
kill -TERM `cat @l_prefix@/var/dss/dssdaemon.pid`
rm @l_prefix@/var/dss/dssdaemon.pid
fi fi
@l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 & @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
echo $! >@l_prefix@/var/dss/dss.pid echo $! >@l_prefix@/var/dss/dssdaemon.pid

Write Preview
Loading…
Cancel
Save