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: 27-Nov-2003 14:40:41 Branch: HEAD Handle: 2003112713403902 Modified files: openpkg-src/dss dss.spec rc.dss openpkg-web news.txt Log: Fix some substitution errors, and allow more flexibilty in rc daemon manipulation Summary: Revision Changes Path 1.37 +6 -5 openpkg-src/dss/dss.spec 1.15 +32 -16 openpkg-src/dss/rc.dss 1.7563 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/dss/dss.spec ============================================================================ $ cvs diff -u -r1.36 -r1.37 dss.spec --- openpkg-src/dss/dss.spec 26 Nov 2003 20:52:59 -0000 1.36 +++ openpkg-src/dss/dss.spec 27 Nov 2003 13:40:41 -0000 1.37 @@ -35,7 +35,7 @@ Group: Video License: APSL Version: 5.0 -Release: 20031126 +Release: 20031127 # list of sources Source0: http://www.opensource.apple.com/projects/streaming/release/DarwinStreamingSrc%{version}.zip @@ -45,8 +45,8 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20031117, perl, sed, infozip, make, gcc -PreReq: OpenPKG, openpkg >= 20031117, perl, perl-ssl +BuildPreReq: OpenPKG, openpkg >= 20031127, perl, sed, infozip, make, gcc +PreReq: OpenPKG, openpkg >= 20031127, perl, perl-ssl AutoReq: no AutoReqProv: no @@ -77,7 +77,7 @@ -e 's;/var/streaming/AdminHtml;%{l_prefix}/var/dss/webadmin;g' \ -e 's;/var/streaming/playlists/;%{l_prefix}/share/dss/playlists;g' \ -e 's;"realm", "DSS Admin Server";"realm", "Streaming Admin Server";g' \ - -e 's;/usr/local/sbin/DarwinStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer -c %{l_prefix}/etc/dss/streamingadmin.conf;g' \ + -e 's;/usr/local/sbin/DarwinStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer;g' \ -e 's;/var/streaming/logs/streamingadminserver.log;%{l_prefix}/var/dss/log/StreamingAdmin.log;g' \ -e 's;/usr/local/bin/qtpasswd;%{l_prefix}/bin/qtpasswd;g' \ -e 's;/usr/local/bin/PlaylistBroadcaster;%{l_prefix}/bin/PlaylistBroadcaster;g' \ @@ -115,7 +115,8 @@ -e 's;/Library/QuickTimeStreaming/Logs/streamingadminserver.log;%{l_prefix}/var/dss/log/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' \ + -e 's;/usr/sbin/QuickTimeStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer;g' \ + -e 's;streamingadminserver.conf;streamingadmin.conf;g' \ WebAdmin/streamingadminserver.conf %{l_shtool} subst \ -e 's;^#!/.*/perl;#! %{l_prefix}/bin/perl;' \ @@ . patch -p0 <<'@@ .' Index: openpkg-src/dss/rc.dss ============================================================================ $ cvs diff -u -r1.14 -r1.15 rc.dss --- openpkg-src/dss/rc.dss 26 Nov 2003 20:52:59 -0000 1.14 +++ openpkg-src/dss/rc.dss 27 Nov 2003 13:40:41 -0000 1.15 @@ -11,23 +11,25 @@ dss_daemon_pidfile="@l_prefix@/var/dss/dssdaemon.pid" dss_admin_pidfile="@l_prefix@/var/dss/dssadmin.pid" dss_signal () { - [ -f $dss_daemon_pidfile ] \ - && kill -$1 `cat $dss_daemon_pidfile` - local rc=$? - if rcVarIsYes dss_admin; then - [ -f $dss_admin_pidfile ] \ - && kill -$1 `cat $dss_admin_pidfile` \ - && [ $rc -eq 0 ] - rc=$? + if [ ".$2" = ".daemon" ]; then + [ -f $dss_daemon_pidfile ] && kill -$1 `cat $dss_daemon_pidfile` + elif [ ".$2" = ".admin" ]; then + [ -f $dss_admin_pidfile ] && kill -$1 `cat $dss_admin_pidfile` + else + [ -f $dss_daemon_pidfile ] && kill -$1 `cat $dss_daemon_pidfile` + local rc=$? + [ -f $dss_admin_pidfile ] && kill -$1 `cat $dss_admin_pidfile` && [ $rc -eq 0 ] + [ $? -eq 0 ] fi - [ $rc -eq 0 ] } %status -u @l_susr@ -o dss_usable="unknown" dss_active="no" rcService dss enable yes && \ - dss_signal 0 && dss_active="yes" + dss_signal 0 daemon && dss_active="yes" + rcService dss enable yes && \ + dss_signal 0 admin && dss_active="yes" echo "dss_enable=\"$dss_enable\"" echo "dss_usable=\"$dss_usable\"" echo "dss_active=\"$dss_active\"" @@ -35,18 +37,18 @@ %start -u @l_susr@ rcService dss enable yes || exit 0 rcService dss active yes && exit 0 - @l_prefix@/sbin/DarwinStreamingServer >/dev/null 2>&1 + @l_prefix@/sbin/DarwinStreamingServer if rcVarIsYes dss_admin; then - @l_prefix@/sbin/streamingadminserver \ - -c @l_prefix@/etc/dss/streamingadmin.conf \ - >/dev/null 2>&1 + rc dss startadmin fi %stop -u @l_susr@ rcService dss enable yes || exit 0 rcService dss active no && exit 0 - dss_signal TERM - rm -f $dss_admin_pidfile 2>/dev/null || true + dss_signal TERM daemon + if rcVarIsYes dss_admin; then + rc dss stopadmin + fi %restart -u @l_susr@ rcService dss enable yes || exit 0 @@ -54,4 +56,18 @@ rc dss stop sleep 2 rc dss start + +%startadmin -u @l_musr@ + rcService dss enable yes || exit 0 + rcService dss active yes && exit 0 + @l_prefix@/sbin/streamingadminserver + +%stopadmin -u @l_musr@ + rcService dss enable yes || exit 0 + rcService dss active no && exit 0 + dss_signal TERM admin + rm -f $dss_admin_pidfile >/dev/null 2>&1 || true + +# The %daily logfile rotation logic is handled by the DSS daemon itself. +# Modify the error_logfile_* variables in streamingserver.xml to adjust. @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.7562 -r1.7563 news.txt --- openpkg-web/news.txt 27 Nov 2003 13:37:56 -0000 1.7562 +++ openpkg-web/news.txt 27 Nov 2003 13:40:39 -0000 1.7563 @@ -1,3 +1,4 @@ +27-Nov-2003: Upgraded package: P<dss-5.0-20031127> 27-Nov-2003: Upgraded package: P<imapd-2.1.16-20031127> 27-Nov-2003: Upgraded package: P<openpkg-20031127-20031127> 27-Nov-2003: Upgraded package: P<php3-3.0.18-20031127> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]