[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eb7066388b9df1db40afec42a3d4a36a14421994 - IPFire-SCM

16 Feb 2020

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  eb7066388b9df1db40afec42a3d4a36a14421994 (commit)
      from  06fc566a0aea5c4a5e45c4ddc0233fa008375ff2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eb7066388b9df1db40afec42a3d4a36a14421994
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Feb 16 11:48:22 2020 +0100
vdr: update to 2.4.1
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 .../packages/{armv5tel => aarch64}/vdr_dvbapi      |  2 +-
 config/rootfiles/packages/armv5tel/vdr_dvbapi      |  2 +-
 config/rootfiles/packages/i586/vdr_dvbapi          |  4 +-
 config/rootfiles/packages/vdr                      |  5 ++
 config/rootfiles/packages/vdr_eepg                 |  2 +-
 config/rootfiles/packages/vdr_epgsearch            |  8 +--
 config/rootfiles/packages/vdr_streamdev            |  3 +-
 config/rootfiles/packages/x86_64/vdr_dvbapi        |  2 +-
 lfs/vdr                                            | 12 ++--
 lfs/vdr_dvbapi                                     | 11 ++-
 lfs/vdr_eepg                                       | 11 ++-
 lfs/vdr_epgsearch                                  | 17 +++--
 lfs/vdr_streamdev                                  | 17 +++--
 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch  | 82 ----------------------
 src/patches/vdr-epgsearch-2.4.0-debian-paths.patch | 82 ++++++++++++++++++++++
 src/patches/vdr-streamdev_recordings-64.patch      | 29 --------
 16 files changed, 129 insertions(+), 160 deletions(-)
 copy config/rootfiles/packages/{armv5tel => aarch64}/vdr_dvbapi (64%)
 delete mode 100644 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
 create mode 100644 src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
 delete mode 100644 src/patches/vdr-streamdev_recordings-64.patch
Difference in files:

diff --git a/config/rootfiles/packages/aarch64/vdr_dvbapi b/config/rootfiles/packages/aarch64/vdr_dvbapi
new file mode 100644
index 000000000..2dd21fe99
--- /dev/null
+++ b/config/rootfiles/packages/aarch64/vdr_dvbapi
@@ -0,0 +1,3 @@
+etc/sysconfig/vdr-plugins.d/dvbapi.conf
+etc/vdr/plugins/dvbapi
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1
diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi
index 074813795..2dd21fe99 100644
--- a/config/rootfiles/packages/armv5tel/vdr_dvbapi
+++ b/config/rootfiles/packages/armv5tel/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1
diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi
index 5e06c12a4..db2bc1ee6 100644
--- a/config/rootfiles/packages/i586/vdr_dvbapi
+++ b/config/rootfiles/packages/i586/vdr_dvbapi
@@ -1,4 +1,4 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0-sse
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1-sse
diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr
index 4b6eaffe2..b08f1f04d 100644
--- a/config/rootfiles/packages/vdr
+++ b/config/rootfiles/packages/vdr
@@ -5,7 +5,9 @@ etc/rc.d/rc6.d/K40vdr
 etc/sysconfig/vdr
 #etc/sysconfig/vdr-plugins.d
 etc/vdr
+etc/vdr/camresponses.conf
 etc/vdr/channels.conf
+etc/vdr/conf.d
 etc/vdr/diseqc.conf
 etc/vdr/keymacros.conf
 etc/vdr/scr.conf
@@ -19,6 +21,7 @@ usr/bin/svdrpsend
 #usr/include/libsi/si.h
 #usr/include/libsi/util.h
 #usr/include/vdr
+#usr/include/vdr/args.h
 #usr/include/vdr/audio.h
 #usr/include/vdr/channels.h
 #usr/include/vdr/ci.h
@@ -42,12 +45,14 @@ usr/bin/svdrpsend
 #usr/include/vdr/lirc.h
 #usr/include/vdr/menu.h
 #usr/include/vdr/menuitems.h
+#usr/include/vdr/mtd.h
 #usr/include/vdr/nit.h
 #usr/include/vdr/osd.h
 #usr/include/vdr/osdbase.h
 #usr/include/vdr/pat.h
 #usr/include/vdr/player.h
 #usr/include/vdr/plugin.h
+#usr/include/vdr/positioner.h
 #usr/include/vdr/receiver.h
 #usr/include/vdr/recorder.h
 #usr/include/vdr/recording.h
diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
index 17f7bc4af..8355a4614 100644
--- a/config/rootfiles/packages/vdr_eepg
+++ b/config/rootfiles/packages/vdr_eepg
@@ -1,2 +1,2 @@
 etc/vdr/plugins/eepg
-usr/lib/vdr/libvdr-eepg.so.2.0.0
+usr/lib/vdr/libvdr-eepg.so.2.4.1
diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch
index 193d79f9c..2402626dd 100644
--- a/config/rootfiles/packages/vdr_epgsearch
+++ b/config/rootfiles/packages/vdr_epgsearch
@@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf
 etc/vdr/plugins/epgsearch
 etc/vdr/plugins/epgsearch/conf.d
 usr/bin/createcats
-usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0
-usr/lib/vdr/libvdr-epgsearch.so.2.0.0
-usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0
-usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.1
+usr/lib/vdr/libvdr-epgsearch.so.2.4.1
+usr/lib/vdr/libvdr-epgsearchonly.so.2.4.1
+usr/lib/vdr/libvdr-quickepgsearch.so.2.4.1
 #var/lib/vdr
 #var/lib/vdr/data
 var/lib/vdr/data/epgsearch
diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev
index 458e7d810..bd17db85c 100644
--- a/config/rootfiles/packages/vdr_streamdev
+++ b/config/rootfiles/packages/vdr_streamdev
@@ -2,7 +2,6 @@ etc/sysconfig/vdr-plugins.d/streamdev-server.conf
 #etc/vdr/plugins
 etc/vdr/plugins/streamdev-server
 etc/vdr/plugins/streamdev-server/streamdevhosts.conf
-#usr/lib/vdr
 #usr/lib/vdr/bin
 usr/lib/vdr/bin/externremux.sh
-usr/lib/vdr/libvdr-streamdev-server.so.2.0.0
+usr/lib/vdr/libvdr-streamdev-server.so.2.4.1
diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/packages/x86_64/vdr_dvbapi
index 074813795..2dd21fe99 100644
--- a/config/rootfiles/packages/x86_64/vdr_dvbapi
+++ b/config/rootfiles/packages/x86_64/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1
diff --git a/lfs/vdr b/lfs/vdr
index f82df19fe..d444ae935 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,11 +24,11 @@
include Config
-VER        = 2.0.5
+VER        = 2.4.1
# VDRPLUGVER must match with APIVERSION in config.h
 # after change this update also all vdr plugins
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,9 +37,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 9
-
-SUP_ARCH   = none
+PAK_VER    = 10
DEPS       = "vdr_streamdev"
@@ -67,7 +65,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d
+$(DL_FILE)_MD5 = b2897fe6b6e6711d512a69642b1b8ec1
install : $(TARGET)
diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
index d11a4b4dd..eed576124 100644
--- a/lfs/vdr_dvbapi
+++ b/lfs/vdr_dvbapi
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,8 +24,7 @@
include Config
-VER        = 1.0.6
-SUP_ARCHES =
+VER        = 2.2.5
THISAPP    = vdr-plugin-dvbapi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,11 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_dvbapi
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       = ""
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
@@ -70,7 +69,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6a8024b2970beba8eadc1acaa86805e7
+$(DL_FILE)_MD5 = cf35ed8a787c09676338ec16d231b61a
install : $(TARGET)
diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
index 4a3f811d8..75c70d521 100644
--- a/lfs/vdr_eepg
+++ b/lfs/vdr_eepg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,9 +24,8 @@
include Config
-GIT_VER    = 69b47ba4bf0195fd6820beb2cf4f7c7ea31f4011
+GIT_VER    = 32b4e669bf8bc6e3336073616c121f10b8518fe8
 VER        = master
-SUP_ARCHES =
THISAPP    = vdr-plugin-eepg-$(VER)
 DL_FILE    = vdr-plugin-eepg-$(GIT_VER).tar.bz2
@@ -37,11 +36,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_eepg
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       = ""
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
@@ -55,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5  = 0d8049949263f9a2b8deb2ae9919bc49
+$(DL_FILE)_MD5  = 53c5ec7358da2ce740a764f9d429d96f
install : $(TARGET)
diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index 1a202b34b..7836d7c7d 100644
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -24,21 +24,20 @@
include Config
-VER        = 1.0.1.beta5
-SUP_ARCHES =
+VER        = 2.4.0+git20191101
-THISAPP    = vdr-epgsearch-$(VER)
-DL_FILE    = $(THISAPP).tgz
+THISAPP    = vdr-plugin-epgsearch_$(VER).orig
+DL_FILE    = $(THISAPP).tar.gz
DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/epgsearch-$(VER)
+DIR_APP    = $(DIR_SRC)/vdr-plugin-epgsearch
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_epgsearch
-PAK_VER    = 7
+PAK_VER    = 8
DEPS       = ""
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
@@ -52,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5  = 6e63cc29df02f48fabf6e12e1e71b2fc
+$(DL_FILE)_MD5  = cf7e8ca02af3068df2fa71c026c92390
install : $(TARGET)
@@ -85,7 +84,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
    	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev
index c6d21f110..9e4cf7bdc 100644
--- a/lfs/vdr_streamdev
+++ b/lfs/vdr_streamdev
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,21 +25,20 @@
 include Config
VER        = 0.6.1
-GIT_VER    = 10db11ac
-SUP_ARCHES =
+GIT_VER    = e2a9b979d3fb92967c7a6a8221e674eb7e55c813
-THISAPP    = vdr-streamdev-$(GIT_VER)
-DL_FILE    = $(THISAPP).tar.xz
+THISAPP    = vdr-plugin-streamdev-$(GIT_VER)
+DL_FILE    = $(THISAPP).tar.bz2
DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_streamdev
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       = ""
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)
@@ -53,7 +52,7 @@ objects = $(DL_FILE)
$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5  = e5011fd1a4b0624b192911f37c6040e3
+$(DL_FILE)_MD5  = 2ac0a951d47808d00e97d42d59182e36
install : $(TARGET)
@@ -87,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch
cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile
    cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
diff --git a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
deleted file mode 100644
index d8319c0af..000000000
--- a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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>
- 
diff --git a/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch b/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
new file mode 100644
index 000000000..99b7a8bcf
--- /dev/null
+++ b/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
@@ -0,0 +1,82 @@
+diff -Naur vdr-plugin-epgsearch.org/epgsearch.c vdr-plugin-epgsearch/epgsearch.c
+--- vdr-plugin-epgsearch.org/epgsearch.c	2020-02-16 07:56:33.307310006 +0100
++++ vdr-plugin-epgsearch/epgsearch.c	2020-02-16 07:50:53.826938247 +0100
+@@ -465,16 +465,16 @@
+     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(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchchangrps.conf"), true);
++    Blacklists.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchblacklists.conf"));
++    SearchExts.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearch.conf"));
++    SearchTemplates.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchtemplates.conf"));
++    RecsDone.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchdone.data"));
++    SwitchTimers.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchswitchtimers.conf"));
++    NoAnnounces.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "noannounce.conf"));
++    DefTimerCheckModes.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "deftimerchkmodes.conf"));
++    TimersDone.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "timersdone.conf"));
++    PendingNotifications.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "pendingnotifications.conf"));
+ 
+     cSearchTimerThread::Init(this);
+     cSwitchTimerThread::Init();
+diff -Naur vdr-plugin-epgsearch.org/epgsearchcfg.c vdr-plugin-epgsearch/epgsearchcfg.c
+--- vdr-plugin-epgsearch.org/epgsearchcfg.c	2020-02-16 07:56:33.323310490 +0100
++++ vdr-plugin-epgsearch/epgsearchcfg.c	2020-02-16 07:51:58.065261524 +0100
+@@ -76,7 +76,7 @@
+     strcpy(MailAuthUser, "");
+     strcpy(MailAuthPass, "");
+     strcpy(LastMailConflicts, "");
+-    mailViaScript = 1;
++    mailViaScript = 0;
+     manualTimerCheckDefault = 0;
+     noAnnounceWhileReplay = 0;
+     TimerProgRepeat = 0;
+diff -Naur vdr-plugin-epgsearch.org/scripts/recordingdone.sh vdr-plugin-epgsearch/scripts/recordingdone.sh
+--- vdr-plugin-epgsearch.org/scripts/recordingdone.sh	2020-02-16 07:56:33.319310370 +0100
++++ vdr-plugin-epgsearch/scripts/recordingdone.sh	2020-02-16 07:53:37.255598512 +0100
+@@ -60,10 +60,10 @@
+ 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 -Naur vdr-plugin-epgsearch.org/scripts/recrep.sh vdr-plugin-epgsearch/scripts/recrep.sh
+--- vdr-plugin-epgsearch.org/scripts/recrep.sh	2020-02-16 07:56:33.319310370 +0100
++++ vdr-plugin-epgsearch/scripts/recrep.sh	2020-02-16 07:54:21.508751492 +0100
+@@ -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 -Naur vdr-plugin-epgsearch.org/scripts/timercmds-auxinfo.sh vdr-plugin-epgsearch/scripts/timercmds-auxinfo.sh
+--- vdr-plugin-epgsearch.org/scripts/timercmds-auxinfo.sh	2020-02-16 07:56:33.319310370 +0100
++++ vdr-plugin-epgsearch/scripts/timercmds-auxinfo.sh	2020-02-16 07:54:58.685432309 +0100
+@@ -15,7 +15,7 @@
+ #<Configuration>
+ 
+ # Your timers.conf
+-TIMERS="/video/timers.conf"
++TIMERS="/etc/vdr/timers.conf"
+ 
+ #</Configuration>
+ 
diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch
deleted file mode 100644
index 2dc5250b4..000000000
--- a/src/patches/vdr-streamdev_recordings-64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 "";
- }
-
hooks/post-receive
--
IPFire 2.x development tree

    