OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Jun-2003 10:15:44
Branch: HEAD Handle: 2003060609154201
Modified files:
openpkg-src/dss dss.patch dss.spec rc.dss
openpkg-web news.txt
Log:
Bring adminserver to life, but still missing text strings
Summary:
Revision Changes Path
1.3 +12 -0 openpkg-src/dss/dss.patch
1.14 +30 -9 openpkg-src/dss/dss.spec
1.3 +26 -12 openpkg-src/dss/rc.dss
1.4750 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dss/dss.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 dss.patch
--- openpkg-src/dss/dss.patch 2 Jun 2003 16:01:53 -0000 1.2
+++ openpkg-src/dss/dss.patch 6 Jun 2003 08:15:43 -0000 1.3
@@ -120,3 +120,15 @@
+# require group broadcaster
+#</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"
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dss/dss.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 dss.spec
--- openpkg-src/dss/dss.spec 5 Jun 2003 06:53:41 -0000 1.13
+++ openpkg-src/dss/dss.spec 6 Jun 2003 08:15:43 -0000 1.14
@@ -37,7 +37,7 @@
Group: Video
License: APSL
Version: %{V_opkg}
-Release: 20030605
+Release: 20030606
# list of sources
Source0:
http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz
@@ -64,8 +64,9 @@
%patch -p1
l_hostname=`%{l_shtool} echo -e %h%d`
%{l_shtool} subst \
- -e 's;/etc/streaming/;%{l_prefix}/etc/dss/;' \
- -e 's;/etc/\(streaming.*server.conf\);%{l_prefix}/etc/dss/\1;' \
+ -e 's;/etc/streaming/;%{l_prefix}/etc/dss/;g' \
+ -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/QTSSDemoAuthorizationModule.bproj/QTSSDemoModule.cpp \
APIModules/QTSSReflectorModule/QTSSRelayModule.cpp \
@@ -75,10 +76,19 @@
WebAdmin/src/streamingadminserver.pl \
WebAdmin/streamingadminserver_Darwin.conf
%{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
%{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
%{l_shtool} subst \
-e 's;[ \t]$;;g' \
@@ -97,15 +107,24 @@
-e
's;/Library/QuickTimeStreaming/Config/qtusers;%{l_prefix}/etc/dss/qtusers;g' \
streamingserver.xml
%{l_shtool} subst \
+ -e 's;qtssAutoStart=1;qtssAutoStart=0;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/Playlists;%{l_prefix}/share/dss/playlists;g' \
-e
's;/usr/sbin/QuickTimeStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer -c
%{l_prefix}/etc/dss/streamingserver.xml;g' \
WebAdmin/streamingadminserver.conf
%{l_shtool} subst \
+ -e 's;^#!/.*/perl;#! %{l_prefix}/bin/perl;' \
+ WebAdmin/WebAdminHtml/*.pl \
+ WebAdmin/WebAdminHtml/*.cgi
+ %{l_shtool} subst \
-e 's;@l_prefix@;%{l_prefix};g' \
qtaccess
+
+ %{l_shtool} echo \
+ '# OpenPKG additional' \
+ >>WebAdmin/streamingadminserver.conf
%{l_shtool} echo \
'keyfile=%{l_prefix}/etc/dss/streamingadminserver.pem' \
>>WebAdmin/streamingadminserver.conf
@@ -122,7 +141,7 @@
'qtssMP3Broadcaster=%{l_prefix}/bin/MP3Broadcaster' \
>>WebAdmin/streamingadminserver.conf
%{l_shtool} echo \
- 'pidfile=%{l_prefix}/var/dss/streamingadminserver.pid' \
+ 'pidfile=%{l_prefix}/var/dss/dssadmin.pid' \
>>WebAdmin/streamingadminserver.conf
%build
@@ -220,9 +239,10 @@
%{l_shtool} install -s -c -m 755 \
DarwinStreamingServer $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{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/
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
%{l_shtool} install -s -c -m 755 \
@@ -242,6 +262,7 @@
(
cd $RPM_BUILD_ROOT%{l_prefix}/etc/dss/
mv -f relayconfig.xml-Sample relayconfig.xml
+ mv -f streamingadminserver.conf streamingadmin.conf
)
# install run commands
@@ -263,7 +284,7 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/share/dss/qtaccess' \
+ '%config %{l_prefix}/share/dss/movies/qtaccess' \
'%config %{l_prefix}/etc/dss/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dss/rc.dss
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.dss
--- openpkg-src/dss/rc.dss 7 May 2003 15:40:35 -0000 1.2
+++ openpkg-src/dss/rc.dss 6 Jun 2003 08:15:43 -0000 1.3
@@ -4,26 +4,40 @@
##
%config
- dss_enable="yes"
+ dssadmin_enable="yes"
+ dssdaemon_enable="yes"
%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 &
- echo $! >@l_prefix@/var/dss/dss.pid
+ echo $! >@l_prefix@/var/dss/dssdaemon.pid
%stop -p 200 -u @l_susr@
- opServiceEnabled dss || exit 0
- if [ -f @l_prefix@/var/dss/dss.pid ]; then
- kill -TERM `cat @l_prefix@/var/dss/dss.pid`
- rm @l_prefix@/var/dss/dss.pid
+ opServiceEnabled dssadmin || exit 0
+ if [ -f @l_prefix@/var/dss/dssadmin.pid ]; then
+ kill -TERM `cat @l_prefix@/var/dss/dssadmin.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
%restart -p 200 -u @l_susr@
- opServiceEnabled dss || exit 0
- if [ -f @l_prefix@/var/dss/dss.pid ]; then
- kill -TERM `cat @l_prefix@/var/dss/dss.pid`
- rm @l_prefix@/var/dss/dss.pid
+ opServiceEnabled dssadmin || exit 0
+ if [ -f @l_prefix@/var/dss/dssadmin.pid ]; then
+ kill -TERM `cat @l_prefix@/var/dss/dssadmin.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
@l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
- echo $! >@l_prefix@/var/dss/dss.pid
+ echo $! >@l_prefix@/var/dss/dssdaemon.pid
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4749 -r1.4750 news.txt
--- openpkg-web/news.txt 6 Jun 2003 08:06:09 -0000 1.4749
+++ openpkg-web/news.txt 6 Jun 2003 08:15:42 -0000 1.4750
@@ -1,3 +1,4 @@
+06-Jun-2003: Upgraded package: P<dss-4.1.3-20030606>
06-Jun-2003: Upgraded package: P<perl-xml-20030606-20030606>
06-Jun-2003: Upgraded package: P<rt-3.0.2-20030606>
06-Jun-2003: Upgraded package: P<multitail-2.7.2-20030606>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
