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: 10-Jun-2003 12:45:11
Branch: HEAD Handle: 2003061011450802
Modified files:
openpkg-src/dss dss.spec rc.dss
openpkg-web news.txt
Log:
Disable adminserver by default, fix rc script, and bring back specfile
post section with our own admin user to close a potential security
hole
Summary:
Revision Changes Path
1.15 +11 -5 openpkg-src/dss/dss.spec
1.4 +33 -27 openpkg-src/dss/rc.dss
1.4797 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dss/dss.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 dss.spec
--- openpkg-src/dss/dss.spec 6 Jun 2003 08:15:43 -0000 1.14
+++ openpkg-src/dss/dss.spec 10 Jun 2003 10:45:10 -0000 1.15
@@ -37,7 +37,7 @@
Group: Video
License: APSL
Version: %{V_opkg}
-Release: 20030606
+Release: 20030610
# list of sources
Source0:
http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz
@@ -93,8 +93,6 @@
%{l_shtool} subst \
-e 's;[ \t]$;;g' \
-e 's;\t; ;g' \
- qtusers \
- qtgroups \
streamingserver.xml \
relayconfig.xml-Sample \
streamingadminserver.conf
@@ -253,8 +251,6 @@
# install configuration files
%{l_shtool} install -c -m 644 \
- qtusers \
- qtgroups \
streamingserver.xml \
relayconfig.xml-Sample \
WebAdmin/streamingadminserver.conf \
@@ -263,6 +259,8 @@
cd $RPM_BUILD_ROOT%{l_prefix}/etc/dss/
mv -f relayconfig.xml-Sample relayconfig.xml
mv -f streamingadminserver.conf streamingadmin.conf
+ touch qtusers
+ touch qtgroups
)
# install run commands
@@ -291,4 +289,12 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # write a default admin username and password to qtusers
+ username='ghandi'; password='india'
+ $RPM_INSTALL_PREFIX/bin/qtpasswd -p $password $username
+
+ # add the new admin username to {l_prefix}/etc/dss/qtgroupsusers
+ echo admin: $username >$RPM_INSTALL_PREFIX/etc/dss/qtgroups
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dss/rc.dss
============================================================================
$ cvs diff -u -r1.3 -r1.4 rc.dss
--- openpkg-src/dss/rc.dss 6 Jun 2003 08:15:43 -0000 1.3
+++ openpkg-src/dss/rc.dss 10 Jun 2003 10:45:10 -0000 1.4
@@ -4,40 +4,46 @@
##
%config
- dssadmin_enable="yes"
+ dssadmin_enable="no"
dssdaemon_enable="yes"
%start -p 220 -u @l_susr@
- 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/dssdaemon.pid
+ if opServiceEnabled dssadmin; then
+ @l_prefix@/sbin/streamingadminserver.pl -c
@l_prefix@/etc/dss/streamingadmin.conf
+ fi
+ if opServiceEnabled dssdaemon; then
+ @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
+ echo $! >@l_prefix@/var/dss/dssdaemon.pid
+ fi
%stop -p 200 -u @l_susr@
- 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
+ if opServiceEnabled dssadmin; then
+ 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
+ fi
+ if opServiceEnabled dssdaemon; then
+ 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@
- 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
+ if opServiceEnabled dssadmin; then
+ 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
+ fi
+ if opServiceEnabled dssdaemon; then
+ 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/dssdaemon.pid
fi
- @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
- echo $! >@l_prefix@/var/dss/dssdaemon.pid
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4796 -r1.4797 news.txt
--- openpkg-web/news.txt 10 Jun 2003 08:08:35 -0000 1.4796
+++ openpkg-web/news.txt 10 Jun 2003 10:45:08 -0000 1.4797
@@ -1,3 +1,4 @@
+10-Jun-2003: Upgraded package: P<dss-4.1.3-20030610>
10-Jun-2003: Upgraded package: P<xterm-1.79-20030610>
10-Jun-2003: Upgraded package: P<gtk2-2.2.2-20030610>
10-Jun-2003: Upgraded package: P<atk-1.2.4-20030610>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
