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 openpkg$ Date: 26-Nov-2003 21:52:59
Branch: HEAD Handle: 2003112620525702
Modified files:
openpkg-re/vcheck vc.dss
openpkg-src/dss dss.spec rc.dss
openpkg-web news.txt
Removed files:
openpkg-src/dss dss.patch
Log:
Major overhaul of package, return to functional state, and upgrading
package: dss 4.1.3 -> 5.0
Summary:
Revision Changes Path
1.3 +2 -2 openpkg-re/vcheck/vc.dss
1.4 +0 -134 openpkg-src/dss/dss.patch
1.36 +75 -60 openpkg-src/dss/dss.spec
1.14 +2 -5 openpkg-src/dss/rc.dss
1.7548 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.dss
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.dss
--- openpkg-re/vcheck/vc.dss 11 Apr 2003 06:46:26 -0000 1.2
+++ openpkg-re/vcheck/vc.dss 26 Nov 2003 20:52:57 -0000 1.3
@@ -2,8 +2,8 @@
}
prog dss = {
- version = 4_1_3
+ version = 5.0
url = http://developer.apple.com/darwin/projects/streaming/
- regex = DSS-(__VER__)\.src\.tar\.gz
+ regex = DarwinStreamingSrc(__VER__)\.zip
}
@@ .
rm -f openpkg-src/dss/dss.patch <<'@@ .'
Index: openpkg-src/dss/dss.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dss/dss.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 dss.spec
--- openpkg-src/dss/dss.spec 17 Nov 2003 21:52:10 -0000 1.35
+++ openpkg-src/dss/dss.spec 26 Nov 2003 20:52:59 -0000 1.36
@@ -24,8 +24,6 @@
##
# package versions
-%define V_opkg 4.1.3
-%define V_dss 4_1_3
# package information
Name: dss
@@ -36,19 +34,18 @@
Distribution: OpenPKG [EVAL]
Group: Video
License: APSL
-Version: %{V_opkg}
-Release: 20031117
+Version: 5.0
+Release: 20031126
# 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/release/DarwinStreamingSrc%{version}.zip
Source1: rc.dss
-Patch0: dss.patch
%NoSource 0
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20031117, perl, make, gcc
+BuildPreReq: OpenPKG, openpkg >= 20031117, perl, sed, infozip, make, gcc
PreReq: OpenPKG, openpkg >= 20031117, perl, perl-ssl
AutoReq: no
AutoReqProv: no
@@ -60,59 +57,61 @@
the same code as Apple's QuickTime Streaming Server.
%prep
- %setup -q -n DSS-%{V_dss}g.src
- %patch -p1
+ # bunch of crap to handle zip format
+ rm -rf DarwinStreamingSrc%{version}
+ %{l_prefix}/bin/unzip -x %{SOURCE0}
+ %setup -D -T -n DarwinStreamingSrc%{version}
- l_hostname=`%{l_shtool} echo -e %h%d`
+ # just a few corrections to source files
%{l_shtool} subst \
- -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' \
- -e 's;streamingadminserver.pl;streamingadminserver;g' \
- APIModules/QTSSAccessModule/QTSSAccessModule.cpp \
- APIModules/QTSSDemoAuthorizationModule.bproj/QTSSDemoModule.cpp \
- APIModules/QTSSReflectorModule/QTSSRelayModule.cpp \
- MP3Broadcaster/MP3Broadcaster.cpp \
- Server.tproj/main.cpp \
- StreamingProxy.tproj/proxy_unix.c \
+ -e 's;/etc/streaming;%{l_prefix}/etc/dss;g' \
+ defaultPaths.h \
WebAdmin/src/streamingadminserver.pl \
WebAdmin/streamingadminserver_Darwin.conf
%{l_shtool} subst \
+ -e 's;streamingadminserver.pl;streamingadminserver;g' \
+ WebAdmin/StartupItems.bproj/QuickTimeStreamingServer \
+ WebAdmin/src/streamingadminserver.pl
+ %{l_shtool} subst \
+ -e 's;#!/usr/bin/perl;#! %{l_prefix}/bin/perl;g' \
-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;/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' \
-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;/etc/streaming/streamingadminserver.pem;%{l_prefix}/etc/dss/streamingadminserver.pem;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/log/StreamingAdmin.log;g'
\
+ -e 's;/var/run/streamingadminserver.pid;%{l_prefix}/var/dss/dssadmin.pid;g'
\
+ -e 's;"runUser", "qtss";"runUser", "%{l_musr}";g' \
+ -e 's;"runGroup", "qtss";"runGroup", "%{l_musr}";g' \
WebAdmin/src/streamingadminserver.pl
%{l_shtool} subst \
- -e 's;/etc/streaming/qtusers;%{l_prefix}/etc/dss/qtusers;g' \
- qtpasswd.tproj/QTSSPasswd.cpp
- %{l_shtool} subst \
- -e 's;[ \t]$;;g' \
-e 's;\t; ;g' \
- streamingserver.xml \
+ -e 's; *$;;g' \
+ qtaccess \
relayconfig.xml-Sample \
- streamingadminserver.conf
+ streamingserver.xml-POSIX \
+ WebAdmin/streamingadminserver.conf
%{l_shtool} subst \
- -e 's;/Library/QuickTimeStreaming/Logs;%{l_prefix}/var/dss/log;g' \
- -e 's;/Library/QuickTimeStreaming/Modules;%{l_prefix}/share/dss/modules;g' \
- -e 's;/Library/QuickTimeStreaming/Movies;%{l_prefix}/share/dss/movies;g' \
- -e
's;/Library/QuickTimeStreaming/Config/relayconfig.xml;%{l_prefix}/etc/dss/relayconfig.xml;g'
\
- -e
's;/Library/QuickTimeStreaming/Config/qtgroups;%{l_prefix}/etc/dss/qtgroups;g' \
- -e
's;/Library/QuickTimeStreaming/Config/qtusers;%{l_prefix}/etc/dss/qtusers;g' \
- -e 's;\("error_logfile_name">\)Error;\1error;g' \
- -e 's;\("request_logfile_name">\)StreamingServer;\1streamingserver;g' \
- -e 's;\("http_logfile_name">\)Http;\1http;g' \
- -e 's;\("bind_ip_addr">\)0;\1127.0.0.1;g' \
- streamingserver.xml
+ -e 's;/var/streaming/logs;%{l_prefix}/var/dss/log;g' \
+ -e
's;/var/run/DarwinStreamingServer.pid;%{l_prefix}/var/dss/dssdaemon.pid;g' \
+ -e
's;/usr/local/sbin/StreamingServerModules;%{l_prefix}/share/dss/modules;g' \
+ -e 's;/usr/local/movies;%{l_prefix}/share/dss/movies;g' \
+ -e 's;/etc/streaming/relayconfig.xml;%{l_prefix}/etc/dss/relayconfig.xml;g'
\
+ -e 's;/etc/streaming/qtgroups;%{l_prefix}/etc/dss/qtgroups;g' \
+ -e 's;/etc/streaming/qtusers;%{l_prefix}/etc/dss/qtusers;g' \
+ -e 's;"error_logfile_name">Error;"error_logfile_name">error;g' \
+ -e
's;"request_logfile_name">StreamingServer;"request_logfile_name">streamingserver;g' \
+ -e 's;http_logfile_name">Http;http_logfile_name">http;g' \
+ -e 's;"bind_ip_addr">0;"bind_ip_addr">127.0.0.1;g' \
+ -e 's;;;g' \
+ streamingserver.xml-POSIX
%{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_shtool} echo -e %h%d`;g" \
-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' \
@@ -121,10 +120,28 @@
%{l_shtool} subst \
-e 's;^#!/.*/perl;#! %{l_prefix}/bin/perl;' \
WebAdmin/WebAdminHtml/*.pl \
- WebAdmin/WebAdminHtml/*.cgi
- %{l_shtool} subst %{l_value -s -a} \
+ WebAdmin/WebAdminHtml/*.cgi \
+ WebAdmin/src/streamingadminserver.pl
+ %{l_shtool} subst \
+ -e 's;^AuthScheme .*;AuthScheme digest;g' \
+ -e 's;^AuthName .*;AuthName "Streaming Server";g' \
+ -e 's;^AuthUserFile .*;AuthUserFile %{l_prefix}/etc/dss/qtusers;g' \
+ -e 's;^AuthGroupFile .*;AuthGroupFile %{l_prefix}/etc/dss/qtgroups;g' \
+ -e 's;^require user.*;require any-user;g' \
+ -e 's;^\(require group .*\=;#\1;g' \
+ -e 's;\(<Limit WRITE>\);#\1;g' \
+ -e 's;^\( AuthName "streaming server broadcaster realm"\);#\1;g' \
+ -e 's;^\( AuthUserFile
/Library/QuickTimeStreaming/Config/qtbroadcastusers\);#\1;g' \
+ -e 's;^\( AuthGroupFile
/Library/QuickTimeStreaming/Config/qtbroadcastgroups\);#\1;g' \
+ -e 's;^ \(require group broadcaster\);#\1;g' \
+ -e 's;\(</Limit>\);#\1;g' \
qtaccess
-
+ %{l_shtool} subst \
+ -e 's;if ($wt == "");if ($wt eq "");g' \
+ WebAdmin/WebAdminHtml/playlist-lib.pl
+ %{l_shtool} subst \
+ -e 's;\(\\r\\nConnection:close\\r\\n\);\\r\\n\1;g' \
+ WebAdmin/WebAdminHtml/cgi-lib.pl
%{l_shtool} echo \
'# OpenPKG additional' \
>>WebAdmin/streamingadminserver.conf
@@ -179,7 +196,7 @@
;;
*-linux* )
COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe"
- CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt -lstdc++"
+ CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"
SHARED=-shared
MODULE_LIBS=
if [ -f /usr/include/socketbits.h ]; then
@@ -188,14 +205,8 @@
fi
;;
* )
- COMPILER_FLAGS="-D__linux__"
- CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt"
- SHARED=-shared
- MODULE_LIBS=
- if [ -f /usr/include/socketbits.h ]; then
- NEED_SOCKETBITS=1
- export NEED_SOCKETBITS
- fi
+ echo "platform %{l_platform -t} not supported" 2>&1
+ exit 1
;;
esac
export COMPILER_FLAGS CORE_LINK_LIBS SHARED MODULE_LIBS
@@ -205,9 +216,11 @@
CommonUtilitiesLib \
QTFileLib \
. \
+ APIModules/QTSSRefMovieModule \
APIModules/QTSSDemoAuthorizationModule.bproj \
APIModules/QTSSRawFileModule.bproj \
APIModules/QTSSSpamDefenseModule.bproj \
+ APIModules/QTSSHomeDirectoryModule \
StreamingProxy.tproj \
qtpasswd.tproj \
PlaylistBroadcaster.tproj \
@@ -242,7 +255,6 @@
%{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;' \
WebAdmin/src/streamingadminserver.pl \
$RPM_BUILD_ROOT%{l_prefix}/sbin/streamingadminserver
cp -rp WebAdmin/WebAdminHtml $RPM_BUILD_ROOT%{l_prefix}/var/dss/webadmin
@@ -257,17 +269,17 @@
# install configuration files
%{l_shtool} install -c -m 644 \
- streamingserver.xml \
relayconfig.xml-Sample \
+ streamingserver.xml-POSIX \
WebAdmin/streamingadminserver.conf \
$RPM_BUILD_ROOT%{l_prefix}/etc/dss/
(
cd $RPM_BUILD_ROOT%{l_prefix}/etc/dss/
mv -f relayconfig.xml-Sample relayconfig.xml
+ mv -f streamingserver.xml-POSIX streamingserver.xml
mv -f streamingadminserver.conf streamingadmin.conf
touch qtusers
touch qtgroups
- echo 'realm Streaming Server' >qtusers
) || exit $?
# install run commands
@@ -287,8 +299,10 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/share/dss/movies/qtaccess' \
- '%config %{l_prefix}/etc/dss/*'
+ '%config %{l_prefix}/etc/dss/*' \
+ '%config %attr(0640,%{l_susr},%{l_sgrp}) %{l_prefix}/etc/dss/qtusers' \
+ '%config %attr(0640,%{l_susr},%{l_sgrp}) %{l_prefix}/etc/dss/qtgroups' \
+ '%config %attr(0640,%{l_susr},%{l_mgrp})
%{l_prefix}/share/dss/movies/qtaccess'
%files -f files
@@ -300,6 +314,7 @@
# password to qtusers and add the new admin username to qtgroups
if [ $1 -eq 1 ]; then
username='ghandi'; password='india'
+ echo "realm Streaming Server" >$RPM_INSTALL_PREFIX/etc/dss/qtusers
$RPM_INSTALL_PREFIX/bin/qtpasswd -p $password $username
echo "admin: $username" >$RPM_INSTALL_PREFIX/etc/dss/qtgroups
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dss/rc.dss
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.dss
--- openpkg-src/dss/rc.dss 21 Oct 2003 15:22:35 -0000 1.13
+++ openpkg-src/dss/rc.dss 26 Nov 2003 20:52:59 -0000 1.14
@@ -35,20 +35,17 @@
%start -u @l_susr@
rcService dss enable yes || exit 0
rcService dss active yes && exit 0
- @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
- echo $! >$dss_daemon_pidfile
+ @l_prefix@/sbin/DarwinStreamingServer >/dev/null 2>&1
if rcVarIsYes dss_admin; then
@l_prefix@/sbin/streamingadminserver \
-c @l_prefix@/etc/dss/streamingadmin.conf \
- >/dev/null 2>&1 &
- echo $! >$dss_admin_pidfile
+ >/dev/null 2>&1
fi
%stop -u @l_susr@
rcService dss enable yes || exit 0
rcService dss active no && exit 0
dss_signal TERM
- rm -f $dss_daemon_pidfile 2>/dev/null || true
rm -f $dss_admin_pidfile 2>/dev/null || true
%restart -u @l_susr@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7547 -r1.7548 news.txt
--- openpkg-web/news.txt 26 Nov 2003 17:04:17 -0000 1.7547
+++ openpkg-web/news.txt 26 Nov 2003 20:52:57 -0000 1.7548
@@ -1,3 +1,4 @@
+26-Nov-2003: Upgraded package: P<dss-5.0-20031126>
26-Nov-2003: Upgraded package: P<bind8-8.4.3-20031126>
26-Nov-2003: Upgraded package: P<tomcat-3.3.1a-20031126>
26-Nov-2003: Upgraded package: P<libnet-1.1.1-20031126>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
