rpms/vdr/FC-6 vdr-shutdown.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vdr-README.package, 1.1, 1.2 vdr-runvdr.sh, 1.1, 1.2 vdr-udev.rules, 1.1, 1.2 vdr.init, 1.1, 1.2 vdr.spec, 1.2, 1.3 vdr.sysconfig, 1.1, 1.2
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Jan 7 16:32:40 UTC 2007
Author: scop
Update of /cvs/extras/rpms/vdr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31363/FC-6
Modified Files:
.cvsignore sources vdr-README.package vdr-runvdr.sh
vdr-udev.rules vdr.init vdr.spec vdr.sysconfig
Added Files:
vdr-shutdown.sh
Log Message:
* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-1
- 1.4.5, Darren Salt's 1.4.4-1.ds.
- Make it possible to disable installed plugins in plugin sysconfig snippet.
- Add shutdown script, document ACPI wakeup usage in README.package.
- Shut down earlier by default for better experience with the -s option.
- Include INSTALL in docs, it contains useful post-install info.
- Improve remote control examples in udev rules snippet.
- Honor $TMPDIR when running with core dumps enabled.
- Add read only root/temporary state config.
- Add ttxtsubs to default plugin order list.
- Include log dir for plugins.
--- NEW FILE vdr-shutdown.sh ---
#!/bin/sh
# To enable this script, pass it to vdr with the -s option, eg.
# "-s vdr-shutdown.sh" (sans quotes) in VDR_OPTIONS in /etc/sysconfig/vdr.
# See also below for additional required sudo configuration, and
# README.package for information how to get the time written to ACPI and
# thus getting the system to wake up at the correct time.
# How many minutes before the next timer event should the system wake up,
# ie. how long does it take to boot until VDR is running?
delay=3
file=/var/lib/vdr/acpi-wakeup
rm -f $file
if [ ${1:-0} -gt 0 -a -e /proc/acpi/alarm ] ; then
date -d "1970-01-01 UTC $1 sec -$delay min" +"%Y-%m-%d %H:%M:%S" > $file
fi
# In order to make this work, the vdr user needs to be allowed to run
# /sbin/shutdown -h now with sudo as root, without giving a password and
# without a tty. Example sudoers(5) configuration to accomplish that:
# Defaults:vdr !requiretty
# vdr ALL = (root) NOPASSWD: /sbin/shutdown -h now
exec sudo /sbin/shutdown -h now
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 4 Nov 2006 18:20:48 -0000 1.3
+++ .cvsignore 7 Jan 2007 16:32:10 -0000 1.4
@@ -1,3 +1,3 @@
-vdr_1.4.3-1.ds.diff.gz
vdr-1.4.4.tar.bz2
vdr-1.4.4-liemikuutio-1.13.diff.gz
+vdr_1.4.4-1.ds.diff.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 4 Nov 2006 18:20:49 -0000 1.3
+++ sources 7 Jan 2007 16:32:10 -0000 1.4
@@ -1,3 +1,3 @@
-a0f1441e534715a190e4507c2f58268f vdr_1.4.3-1.ds.diff.gz
3d5dbacda725f769099b774577d2e3af vdr-1.4.4.tar.bz2
967281c1f666b24cbc3f46cd17dffe98 vdr-1.4.4-liemikuutio-1.13.diff.gz
+1b960579d3564eb7969812ed6a493777 vdr_1.4.4-1.ds.diff.gz
Index: vdr-README.package
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr-README.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-README.package 16 Oct 2006 18:50:35 -0000 1.1
+++ vdr-README.package 7 Jan 2007 16:32:10 -0000 1.2
@@ -27,6 +27,14 @@
line options for each plugin in their respective config snippets, in
the PLUGIN_OPTIONS environment variable.
+The vdr user should have access to the majority of needed hardware
+devices out of the package, either directly or through the video
+group. However some setups may need additional configuration in order
+to allow VDR or some plugins to use for example certain remote
+controllers or optical drives. See the /etc/udev/rules.d/*-vdr.rules
+and /etc/security/console.perms.d/*-vdr.perms files for some usual
+suspects and examples.
+
Additional plugins
------------------
@@ -48,3 +56,33 @@
If the plugin needs command line options, add them to
/etc/sysconfig/vdr-plugins.d/<pluginname>.conf into PLUGIN_OPTIONS
(see previous chapter).
+
+The /usr/lib*/vdr/bin directory is in vdr's $PATH by default;
+additional VDR specific scripts such as those needed by some plugins,
+or things executed from commands.conf or reccmds.conf can be dropped
+there instead of having to pollute the usual system $PATH with them.
+
+Shutdown and ACPI wakeup
+------------------------
+
+A sample shutdown script, vdr-shutdown.sh, is shipped in the
+/usr/lib*/vdr/bin directory. If enabled, the script writes a time
+slightly before the next configured timer (given by VDR, see the file
+INSTALL) to /var/lib/vdr/acpi-wakeup in a format suitable for catting
+to /proc/acpi/alarm, and shuts down the machine. See commentary in
+the script for how to enable it and how to grant the required
+permissions to the vdr user so it can carry out these tasks.
+
+To use the ACPI alarm feature present in many recent systems, adding a
+script like this to /sbin/halt.local (remember to make it executable!)
+will cause the system to wake up at the time set by the above
+vdr-shutdown.sh, allowing one to shut down the system without having
+to manually start it for the next timed recording.
+
+ #!/bin/bash
+ wakeupfile=/var/lib/vdr/acpi-wakeup
+ trap "rm -f $wakeupfile" EXIT
+ if [ -s $wakeupfile -a -w /proc/acpi/alarm ] ; then
+ echo -n "Setting ACPI wakeup for next VDR timer: " ; cat $wakeupfile
+ cat $wakeupfile > /proc/acpi/alarm
+ fi
Index: vdr-runvdr.sh
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr-runvdr.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-runvdr.sh 16 Oct 2006 18:50:35 -0000 1.1
+++ vdr-runvdr.sh 7 Jan 2007 16:32:10 -0000 1.2
@@ -17,10 +17,11 @@
plugconf()
{
- local plugin="$1" PLUGIN_OPTIONS=
+ local plugin="$1" PLUGIN_OPTIONS= PLUGIN_ENABLED=
if [ -e "/etc/sysconfig/vdr-plugins.d/$plugin.conf" ] ; then
. "/etc/sysconfig/vdr-plugins.d/$plugin.conf"
fi
+ case "$PLUGIN_ENABLED" in no|false|0) return ;; esac
VDR_OPTIONS[${#VDR_OPTIONS[@]}]=-P
if [ -z "$PLUGIN_OPTIONS" ] ; then
VDR_OPTIONS[${#VDR_OPTIONS[@]}]="$plugin"
@@ -73,7 +74,8 @@
if [ -n "$VDR_INIT" ] ; then
[ -f /etc/sysconfig/vdr ] && . /etc/sysconfig/vdr
if [ -n "$DAEMON_COREFILE_LIMIT" ] ; then
- ulimit -S -c $DAEMON_COREFILE_LIMIT >/dev/null 2>&1 && cd /tmp
+ ulimit -S -c $DAEMON_COREFILE_LIMIT >/dev/null 2>&1 && \
+ cd ${TMPDIR:-/tmp}
fi
build_cmdline ${PLUGINVER:+.$PLUGINVER}
fi
Index: vdr-udev.rules
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr-udev.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-udev.rules 16 Oct 2006 18:50:35 -0000 1.1
+++ vdr-udev.rules 7 Jan 2007 16:32:10 -0000 1.2
@@ -9,10 +9,16 @@
# Remote controller, serial port 1 (eg. vdr --rcu=/dev/ttyS0):
#KERNEL=="ttyS0", GROUP="VDR_GROUP", MODE="0660"
-# Remote controller, /dev/input/event2 (using the remote plugin):
+# Remote controller, /dev/input/event2 (using the remote plugin). Change
+# event2 to event-remote if you're using the predictable naming rule below.
#KERNEL=="event2", GROUP="VDR_GROUP", MODE="0660"
-# Example rule for predictable event device name (/dev/input/event-remote;
-# reported to work with a Hauppauge Nexus-S, "name" needs to be adjusted to
-# match the device name for other remote controllers):
+# Example rule for predictable event device name (/dev/input/event-remote).
+# Adjust the sysfs name according to your setup, see
+# /sys/class/input/input*/name. Examples:
+
+# Hauppauge Nexus-S, some other Hauppauge/Technotrend cards:
#SUBSYSTEM=="input", SYSFS{../name}=="DVB on-card IR receiver", SYMLINK+="input/event-remote"
+
+# Some Hauppauge Nova-T cards:
+#SUBSYSTEM=="input", SYSFS{../name}=="cx88 IR (Hauppauge Nova-T DVB-T", SYMLINK+="input/event-remote"
Index: vdr.init
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr.init 16 Oct 2006 18:50:35 -0000 1.1
+++ vdr.init 7 Jan 2007 16:32:10 -0000 1.2
@@ -2,7 +2,7 @@
#
# vdr Video Disk Recorder
#
-# chkconfig: - 30 70
+# chkconfig: - 30 09
# description: Video Disk Recorder (VDR) implements a complete digital \
# set-top-box and video recorder. It can work with signals \
# received from satellites (DVB-S) as well as cable (DVB-C) \
Index: vdr.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr.spec 4 Nov 2006 18:20:49 -0000 1.2
+++ vdr.spec 7 Jan 2007 16:32:10 -0000 1.3
@@ -1,7 +1,7 @@
# TODO, maybe some day:
# - livebuffer patch, http://www.vdr-portal.de/board/thread.php?threadid=37309
# - channelfilter patch, http://www.u32.de/vdr.html#patches
-# - UTF-8 patch
+# - UTF-8 patch, http://www.free-x.de/utf8/
%define videodir /srv/vdr
%define audiodir /srv/audio
@@ -11,13 +11,14 @@
%define cachedir %{_var}/cache/vdr
%define rundir %{_var}/run/vdr
%define vardir %{_var}/lib/vdr
+%define logdir %{_var}/log/vdr
%define vdr_user vdr
%define vdr_group video
# From APIVERSION in config.h
-%define apiver 1.4.4
+%define apiver 1.4.5
Name: vdr
-Version: 1.4.4
+Version: 1.4.5
Release: 1%{?dist}
Summary: Video Disk Recorder
@@ -37,8 +38,9 @@
Source11: %{name}-skincurses.conf
Source12: %{name}-sky.conf
Source13: %{name}-timercmds.conf
+Source14: %{name}-shutdown.sh
Patch0: %{name}-channel+epg.patch
-Patch1: http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.3-1.ds.diff.gz
+Patch1: http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.4-1.ds.diff.gz
Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.4-liemikuutio-1.13.diff.gz
Patch3: %{name}-1.4.1-paths.patch
Patch4: %{name}-1.4.1-dumpable.patch
@@ -122,6 +124,8 @@
patch -i debian/patches/opt-20_epgsearch.dpatch
#patch -i debian/patches/opt-20_liemikuutio.dpatch
patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch
+sed -i -e 's/!cPluginManager::Active() && //' \
+ debian/patches/opt-20_suspend.dpatch # adapt for 1.4.5
patch -i debian/patches/opt-20_suspend.dpatch
patch -i debian/patches/opt-20_vdr-timer-info.dpatch
%patch2 -p1
@@ -161,6 +165,15 @@
install -pm 644 %{SOURCE10} README.package
+# Would like to do "files {channels,setup,timers}.conf" from config dir
+# only, but rename() in cSafeFile barks "device or resource busy", cf.
+# http://lists.suse.com/archive/suse-programming-e/2003-Mar/0051.html
+cat << EOF > %{name}.rwtab
+dirs %{cachedir}
+files %{configdir}
+files %{vardir}
+EOF
+
%build
@@ -177,6 +190,7 @@
cachedir=%{cachedir}
rundir=%{rundir}
vardir=%{vardir}
+logdir=%{logdir}
user=%{vdr_user}
group=%{vdr_group}
apiversion=$apiver
@@ -243,6 +257,7 @@
sed -i \
-e 's|/usr/sbin/|%{_sbindir}/|' \
-e 's|/etc/vdr/|%{configdir}/|g' \
+ -e 's|/var/lib/vdr/|%{vardir}/|' \
-e 's|VDR_USER|%{vdr_user}|' \
-e 's|VDR_GROUP|%{vdr_group}|' \
$RPM_BUILD_ROOT%{_initrddir}/vdr
@@ -264,11 +279,16 @@
install -dm 755 $RPM_BUILD_ROOT%{audiodir}
install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
+sed -e 's|/var/lib/vdr/|%{vardir}/|' < %{SOURCE14} \
+ > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
+chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
install -dm 755 $RPM_BUILD_ROOT%{cachedir}
touch $RPM_BUILD_ROOT%{cachedir}/epg.data
install -dm 755 $RPM_BUILD_ROOT%{datadir}/logos
install -dm 755 $RPM_BUILD_ROOT%{rundir}
install -dm 755 $RPM_BUILD_ROOT%{vardir}
+touch $RPM_BUILD_ROOT%{vardir}/acpi-wakeup
+install -dm 755 $RPM_BUILD_ROOT%{logdir}
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE4} \
@@ -280,6 +300,8 @@
> $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/95-%{name}.perms
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/*%{name}.perms
+install -Dpm 644 %{name}.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
+
# devel
install -Dpm 644 vdr.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vdr.pc
install -pm 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vdr-config
@@ -340,10 +362,11 @@
%files
%defattr(-,root,root,-)
-%doc CONTRIBUTORS COPYING HISTORY* MANUAL README* UPDATE-1.[24].0
+%doc CONTRIBUTORS COPYING HISTORY* INSTALL MANUAL README* UPDATE-1.[24].0
%config(noreplace) %{_sysconfdir}/sysconfig/vdr
%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
+%config(noreplace) %{_sysconfdir}/rwtab.d/%{name}
%config %{_sysconfdir}/sysconfig/vdr-plugins.d/
%{_initrddir}/vdr
%{_bindir}/epg2html
@@ -352,11 +375,11 @@
%{_sbindir}/vdr
%dir %{plugindir}/
%dir %{plugindir}/bin/
+%{plugindir}/bin/%{name}-shutdown.sh
%{datadir}/
%{_mandir}/man[58]/vdr.[58]*
%defattr(-,%{vdr_user},%{vdr_group},-)
%dir %{rundir}/
-%dir %{vardir}/
# TODO: tighten this (root:root ownership to some files/dirs)?
%dir %{configdir}/
%dir %{configdir}/plugins/
@@ -365,6 +388,10 @@
%config(noreplace) %{configdir}/*.conf
%dir %{videodir}/
%dir %{audiodir}/
+%defattr(-,%{vdr_user},root,-)
+%dir %{logdir}/
+%dir %{vardir}/
+%ghost %{vardir}/acpi-wakeup
%dir %{cachedir}/
%ghost %{cachedir}/epg.data
@@ -399,6 +426,18 @@
%endif
%changelog
+* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-1
+- 1.4.5, Darren Salt's 1.4.4-1.ds.
+- Make it possible to disable installed plugins in plugin sysconfig snippet.
+- Add shutdown script, document ACPI wakeup usage in README.package.
+- Shut down earlier by default for better experience with the -s option.
+- Include INSTALL in docs, it contains useful post-install info.
+- Improve remote control examples in udev rules snippet.
+- Honor $TMPDIR when running with core dumps enabled.
+- Add read only root/temporary state config.
+- Add ttxtsubs to default plugin order list.
+- Include log dir for plugins.
+
* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.4-1
- 1.4.4.
- Apply epgsearch and timer info patches.
Index: vdr.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr.sysconfig 16 Oct 2006 18:50:35 -0000 1.1
+++ vdr.sysconfig 7 Jan 2007 16:32:10 -0000 1.2
@@ -22,6 +22,7 @@
tvonscreen
osdteletext
subtitles
+ttxtsubs
osdpip
femon
sudoku
More information about the scm-commits
mailing list