r352 - in vdr/vdr-xxv/trunk/debian: . patches
Tobias Grimm
pkg-vdr-dvb-changes@lists.alioth.debian.org
Mon, 28 Mar 2005 22:54:46 +0000
Author: tiber-guest
Date: 2005-03-28 22:54:46 +0000 (Mon, 28 Mar 2005)
New Revision: 352
Added:
vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch
Removed:
vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch
Modified:
vdr/vdr-xxv/trunk/debian/TODO.Debian
vdr/vdr-xxv/trunk/debian/changelog
vdr/vdr-xxv/trunk/debian/config
vdr/vdr-xxv/trunk/debian/init
vdr/vdr-xxv/trunk/debian/patches/00list
vdr/vdr-xxv/trunk/debian/postinst
Log:
xxv: run as user/group vdr
Modified: vdr/vdr-xxv/trunk/debian/TODO.Debian
===================================================================
--- vdr/vdr-xxv/trunk/debian/TODO.Debian 2005-03-28 17:38:39 UTC (rev 351)
+++ vdr/vdr-xxv/trunk/debian/TODO.Debian 2005-03-28 22:54:46 UTC (rev 352)
@@ -14,6 +14,10 @@
* do something about the bug in File.pm of libtmeplate-perl:
- &getpwuid
+ getpwuid
+* Make note in debconf and/or README.Debian about default user xxv:xxv after
+ initial installation
+* Test installation with no mysql installed / fresh mysql installation
+* Are the debconf-password-questions descriptive enough?
DONE:
Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog 2005-03-28 17:38:39 UTC (rev 351)
+++ vdr/vdr-xxv/trunk/debian/changelog 2005-03-28 22:54:46 UTC (rev 352)
@@ -2,6 +2,7 @@
* Tobias Grimm <tg@e-tobi.net>
- Run xxv as user 'xxv' in group 'vdr'
+ - low priority for xxv db user questions
-- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Mon, 28 Mar 2005 11:57:45 +0200
Modified: vdr/vdr-xxv/trunk/debian/config
===================================================================
--- vdr/vdr-xxv/trunk/debian/config 2005-03-28 17:38:39 UTC (rev 351)
+++ vdr/vdr-xxv/trunk/debian/config 2005-03-28 22:54:46 UTC (rev 352)
@@ -38,8 +38,8 @@
db_input medium vdr-xxv/db_database || true
db_input critical vdr-xxv/db_admin || true
db_input critical vdr-xxv/db_adminpass || true
- db_input medium vdr-xxv/db_user || true
- db_input medium vdr-xxv/db_userpass || true
+ db_input low vdr-xxv/db_user || true
+ db_input low vdr-xxv/db_userpass || true
db_endblock
;;
5)
Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init 2005-03-28 17:38:39 UTC (rev 351)
+++ vdr/vdr-xxv/trunk/debian/init 2005-03-28 22:54:46 UTC (rev 352)
@@ -9,7 +9,7 @@
#
# Username/Group xxv should run on:
#
-USER=xxv
+USER=vdr
GROUP=vdr
@@ -51,32 +51,13 @@
#
-# Create temp dir owned by xxv, but with write-access by group vdr
-#
-create_grabdir()
-{
- XXV_GRABDIR=`mktemp -d -p /tmp vdr-xxv-XXXXXX`
-
- if getent group | grep -q "^vdr:" ; then
- chgrp vdr $XXV_GRABDIR
- fi
- if getent passwd | grep -q "^xxv:" ; then
- chown xxv $XXV_GRABDIR
- fi
-
- chmod a=,g=rwx,u=rwx $XXV_GRABDIR
-}
-
-
-
-#
# Start the daemon
#
start()
{
create_grabdir
- XXV_GRABDIR=$XXV_GRABDIR start-stop-daemon --start --pidfile $PIDFILE \
- --nicelevel 19 -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
+ start-stop-daemon --start --pidfile $PIDFILE --nicelevel 19 \
+ -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
}
Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list 2005-03-28 17:38:39 UTC (rev 351)
+++ vdr/vdr-xxv/trunk/debian/patches/00list 2005-03-28 22:54:46 UTC (rev 352)
@@ -1,3 +1,2 @@
01_libpath
-02_secure-grab
04_mplayer-log
Deleted: vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch 2005-03-28 17:38:39 UTC (rev 351)
+++ vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch 2005-03-28 22:54:46 UTC (rev 352)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_secure-grab.dpatch by Tobias Grimm <tg@e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm /tmp/dpep.41cLFZ/vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm
---- vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm 2005-03-28 15:35:45.000000000 +0200
-+++ /tmp/dpep.41cLFZ/vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm 2005-03-28 15:45:00.000000000 +0200
-@@ -87,6 +87,10 @@
- },
- );
-
-+ if ($ENV{XXV_GRABDIR}) {
-+ $self->{file} = "$ENV{XXV_GRABDIR}/live.jpg";
-+ }
-+
- return $self;
- }
-
-@@ -107,6 +111,8 @@
- $obj->{ysize},
- );
-
-+ unlink($obj->{file});
-+
- my $erg = $svdrp->command($cmd);
- $console->message($erg)
- if(ref $console);
Added: vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch 2005-03-28 17:38:39 UTC (rev 351)
+++ vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch 2005-03-28 22:54:46 UTC (rev 352)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_secure-grab.dpatch by Tobias Grimm <tg@e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patched vdr does not overwrite images with grab, so remove it first.
+
+@DPATCH@
+diff -urNad vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm /tmp/dpep.41cLFZ/vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm
+--- vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm 2005-03-28 15:35:45.000000000 +0200
++++ /tmp/dpep.41cLFZ/vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm 2005-03-28 15:45:00.000000000 +0200
+@@ -107,6 +111,8 @@
+ $obj->{ysize},
+ );
+
++ unlink($obj->{file});
++
+ my $erg = $svdrp->command($cmd);
+ $console->message($erg)
+ if(ref $console);
Property changes on: vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: vdr/vdr-xxv/trunk/debian/postinst
===================================================================
--- vdr/vdr-xxv/trunk/debian/postinst 2005-03-28 17:38:39 UTC (rev 351)
+++ vdr/vdr-xxv/trunk/debian/postinst 2005-03-28 22:54:46 UTC (rev 352)
@@ -135,38 +135,6 @@
}
#
-# Setup group
-#
-setup_group()
-{
- GROUP=$1
- if ! getent group | grep -q "^$GROUP:" ; then
- echo -n "Adding group $GROUP.."
- addgroup --quiet --system $GROUP
- echo "..done"
- fi
-}
-
-#
-# Setup user in group
-#
-setup_user()
-{
- USER="$1"
- GROUP="$2"
- HOME="$3"
- DESC="$4"
- setup_group $GROUP
- if ! getent passwd | grep -q "^$USER:"; then
- echo -n "Adding user $USER.."
- adduser --system --home "$HOME" --shell /bin/false \
- --gecos "$DESC" --no-create-home --disabled-login \
- --disabled-password --ingroup $GROUP $USER
- echo "...done"
- fi
-}
-
-#
# main()
#
case "$1" in
@@ -188,14 +156,14 @@
db_stop
- # user and group xxv should use
- setup_user "xxv" "xxv" /var/lib/vdr-xxv/ "XXV user"
+ USER="vdr"
+ GROUP="vdr"
- chown -R xxv:xxv /var/lib/vdr-xxv
- chown -R xxv:xxv /var/cache/vdr-xxv/doc
- chown -R xxv:xxv /var/cache/vdr-xxv/preview
- chown -R xxv:xxv /var/log/vdr-xxv
- chown -R xxv:xxv /var/run/vdr-xxv
+ chown -R $USER:$GROUP /var/lib/vdr-xxv
+ chown -R $USER:$GROUP /var/cache/vdr-xxv/doc
+ chown -R $USER:$GROUP /var/cache/vdr-xxv/preview
+ chown -R $USER:$GROUP /var/log/vdr-xxv
+ chown -R $USER:$GROUP /var/run/vdr-xxv
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;