webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-09 08:48:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vdr-next' into next

Browse Source 
Conflicts:
	config/rootfiles/core/68/filelists/files
This commit is contained in:
Michael Tremer
2013-04-30 12:11:16 +02:00
parent fd073ae240 ea3224abc7
commit c5259fab54
36 changed files with 996 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/initscripts/init.d/vdr
View File

@@ -18,23 +18,13 @@
case "${1}" in
start)
boot_mesg "Starting Video Disk Recorder..."
if [ "$(ps -A | grep runvdr)" != "" ]; then
boot_mesg "Error! Already running!"
echo_failure
exit 1;
fi
if [ ! -e /dev/dvb/adapter0/frontend0 ]; then
boot_mesg "Error! No DVB tuner found."
echo_failure
exit 0;
fi
loadproc screen -dmS vdr /opt/vdr/bin/runvdr
/usr/sbin/runvdr >/dev/null 2>&1 &
evaluate_retval
;;
stop)
boot_mesg "Stopping Video Disk Recorder..."
killall -s KILL -w runvdr
killproc /opt/vdr/bin/vdr
killproc /usr/sbin/vdr
;;
restart)
@@ -44,8 +34,8 @@ case "${1}" in
;;
status)
statusproc /opt/vdr/bin/runvdr
statusproc /opt/vdr/bin/vdr
statusproc /usr/sbin/runvdr
statusproc /usr/sbin/vdr
;;
*)

115
src/paks/vdr/install.sh Normal file
View File

@@ -0,0 +1,115 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
# Automatically add the GREEN network to svdrphosts.conf
(
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
GREEN_PREFIX=
case "${GREEN_NETMASK}" in
255.255.255.252)
GREEN_PREFIX=30
;;
255.255.255.248)
GREEN_PREFIX=29
;;
255.255.255.240)
GREEN_PREFIX=28
;;
255.255.255.224)
GREEN_PREFIX=27
;;
255.255.255.192)
GREEN_PREFIX=26
;;
255.255.255.128)
GREEN_PREFIX=25
;;
255.255.255.0)
GREEN_PREFIX=24
;;
255.255.254.0)
GREEN_PREFIX=23
;;
255.255.252.0)
GREEN_PREFIX=22
;;
255.255.248.0)
GREEN_PREFIX=21
;;
255.255.240.0)
GREEN_PREFIX=20
;;
255.255.224.0)
GREEN_PREFIX=19
;;
255.255.192.0)
GREEN_PREIFX=18
;;
255.255.128.0)
GREEN_PREFIX=17
;;
255.255.0.0)
GREEN_PREFIX=16
;;
255.254.0.0)
GREEN_PREFIX=15
;;
255.252.0.0)
GREEN_PREFIX=14
;;
255.248.0.0)
GREEN_PREFIX=13
;;
255.240.0.0)
GREEN_PREFIX=12
;;
255.224.0.0)
GREEN_PREFIX=11
;;
255.192.0.0)
GREEN_PREFIX=10
;;
255.128.0.0)
GREEN_PREFIX=9
;;
255.0.0.0)
GREEN_PREFIX=8
;;
esac
if [ -n "${GREEN_NETADDRESS}" ] && [ -n "${GREEN_PREFIX}" ]; then
echo "${GREEN_NETADDRESS}/${GREEN_PREFIX}" >> /etc/vdr/svdrphosts.conf
fi
) || :
start_service --background ${NAME}
# Create video directory if it does not exist, yet.
if [ ! -e "/var/video" ]; then
mkdir -p /var/video
fi

27
src/paks/vdr/uninstall.sh Normal file
View File

@@ -0,0 +1,27 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
make_backup ${NAME}
remove_files

36
src/paks/vdr/update.sh Normal file
View File

@@ -0,0 +1,36 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh
OLD_DIR="/opt/vdr/etc"
NEW_DIR="/etc/vdr"
for conf in ${OLD_DIR}/*.conf; do
[ -f "${conf}" ] && continue
conf="$(basename ${conf})"
mv -b "${OLD_DIR}/${conf}" "${NEW_DIR}/${conf}"
done

27
src/paks/vdradmin/install.sh Normal file
View File

@@ -0,0 +1,27 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
start_service --background ${NAME}

27
src/paks/vdradmin/uninstall.sh Normal file
View File

@@ -0,0 +1,27 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
make_backup ${NAME}
remove_files

37
src/paks/vdradmin/update.sh Normal file
View File

@@ -0,0 +1,37 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh
# Update configuration options for new versions of VDR.
stop_service ${NAME}
sed -i /etc/vdradmin/vdradmind.conf \
-e "s@^LANG = .*@LANG = en_US.utf8@g" \
-e "s@^VDR_PORT = .*@VDR_PORT = 6419@g" \
-e "s@^VDRCONFDIR = .*@VDRCONFDIR = /etc/vdr@g"
start_service ${NAME}

82
src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch Normal file
View File

@@ -0,0 +1,82 @@
diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c
--- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300
+++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300
@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void)
LoadConfD();
LoadUserVars();
- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
+ ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true);
+ Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf");
+ SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf");
+ SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf");
+ RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data");
+ SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf");
+ NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf");
+ DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf");
+ TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf");
+ PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf");
cSearchTimerThread::Init(this);
cSwitchTimerThread::Init();
diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c
--- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300
+++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300
@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void)
strcpy(MailAuthUser, "");
strcpy(MailAuthPass, "");
strcpy(LastMailConflicts, "");
- mailViaScript = 1;
+ mailViaScript = 0;
manualTimerCheckDefault = 0;
noAnnounceWhileReplay = 0;
TimerProgRepeat = 0;
diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh
--- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300
+++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300
@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes
SVDRPSEND=svdrpsend
# Home of EPGsearch
-EPGSEARCH_HOME="/etc/vdr/plugins"
+EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch"
# Video root
-VIDEO_ROOT="/video"
+VIDEO_ROOT="/var/video"
# do not edit below this line
#------------------------------------------------------------------------------
diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh
--- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300
+++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300
@@ -15,7 +15,7 @@
# adjust the following lines to your config
# your plugins config dir
-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch
+PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
# path to svdrpsend
SVDRPSEND=svdrpsend
# the key used to call epgsearch
diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh
--- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300
+++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300
@@ -15,7 +15,7 @@
#<Configuration>
# Your timers.conf
-TIMERS="/video/timers.conf"
+TIMERS="/etc/vdr/timers.conf"
#</Configuration>

29
src/patches/vdr-streamdev_recordings-64.patch Normal file
View File

@@ -0,0 +1,29 @@
diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c
--- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100
+++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200
@@ -455,11 +455,11 @@
return NULL;
char *p = NULL;
- unsigned long l = strtoul(FileBase, &p, 0);
+ unsigned long long l = strtoull(FileBase, &p, 0);
if (p != FileBase && l > 0L) {
if (*p == ':') {
// get recording by dev:inode
- unsigned long inode = strtoul(p + 1, &p, 0);
+ unsigned long long inode = strtoull(p + 1, &p, 0);
if (*p == 0 && inode > 0) {
struct stat st;
cThreadLock RecordingsLock(&Recordings);
diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c
--- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100
+++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200
@@ -28,7 +28,7 @@
{
struct stat st;
if (stat(current->FileName(), &st) == 0)
- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino);
+ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino);
return "";
}