Development October 2016

development@lists.ipfire.org

10 participants
79 discussions

[PATCHv2] net-tools: Drop SELinux support.
by Stefan Schantl 26 Oct '16

26 Oct '16

Fixes #11217. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- net-tools/config.make | 2 +- net-tools/net-tools.nm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/net-tools/config.make b/net-tools/config.make index 5cde36b..18907a5 100644 --- a/net-tools/config.make +++ b/net-tools/config.make @@ -34,4 +34,4 @@ HAVE_HWIB=1 HAVE_FW_MASQUERADE=1 HAVE_IP_TOOLS=1 HAVE_MII=1 -HAVE_SELINUX=1 +HAVE_SELINUX=0 diff --git a/net-tools/net-tools.nm b/net-tools/net-tools.nm index fa61d05..24ae372 100644 --- a/net-tools/net-tools.nm +++ b/net-tools/net-tools.nm @@ -6,7 +6,7 @@ name = net-tools version = 2.0 git_rev = e5f1be13 -release = 1.%{git_rev} +release = 2.%{git_rev} groups = System/Base url = http://net-tools.berlios.de/ @@ -24,7 +24,6 @@ sources = %{thisapp}-%{git_rev}.tar.xz build requires gettext - libselinux-devel end prepare_cmds -- 2.7.4

1 0

[PATCH] net-tools: Drop SELinux support.
by Stefan Schantl 26 Oct '16

26 Oct '16

Fixes #11217. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- net-tools/net-tools.nm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net-tools/net-tools.nm b/net-tools/net-tools.nm index fa61d05..24ae372 100644 --- a/net-tools/net-tools.nm +++ b/net-tools/net-tools.nm @@ -6,7 +6,7 @@ name = net-tools version = 2.0 git_rev = e5f1be13 -release = 1.%{git_rev} +release = 2.%{git_rev} groups = System/Base url = http://net-tools.berlios.de/ @@ -24,7 +24,6 @@ sources = %{thisapp}-%{git_rev}.tar.xz build requires gettext - libselinux-devel end prepare_cmds -- 2.7.4

1 0

[PATCH] vdr_dvbapi: updated to version 2.2.3, changed dependency to, vdr 2.2.0
by Daniel Weismüller 24 Oct '16

24 Oct '16

From 99970f172b1c8fa5eabe379abfd7837946ec7e6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= <daniel.weismueller(a)ipfire.org> Date: Tue, 18 Oct 2016 16:11:24 +0200 Subject: [PATCH] vdr_dvbapi: updated to version 2.2.3, changed dependency to vdr 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel WeismÃ¼ller <daniel.weismueller(a)ipfire.org> --- config/rootfiles/packages/armv5tel/vdr_dvbapi | 2 +- config/rootfiles/packages/i586/vdr_dvbapi | 4 ++-- config/rootfiles/packages/x86_64/vdr_dvbapi | 2 +- lfs/vdr_dvbapi | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi index 0748137..9626e11 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.2.0 diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi index 5e06c12..ca1baae 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.2.0 +usr/lib/vdr/libvdr-dvbapi.so.2.2.0-sse diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/packages/x86_64/vdr_dvbapi index 0748137..9626e11 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.2.0 diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi index 2cf34e7..2104daa 100644 --- a/lfs/vdr_dvbapi +++ b/lfs/vdr_dvbapi @@ -24,7 +24,7 @@ include Config -VER = 1.0.6 +VER = 2.2.3 THISAPP = vdr-plugin-dvbapi-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,17 +32,17 @@ 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.2.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) CXXFLAGS += $(EXTRA_FLAGS) -CSAFLAGS = -O3 -fexpensive-optimizations -funroll-loops +CSAFLAGS = -O3 -fexpensive-optimizations -funroll-loops CSAFLAGS-sse = $(CSAFLAGS) -mmmx -msse -msse2 -msse3 PARALLEL = PARALLEL_64_LONG PARALLEL-sse = PARALLEL_128_SSE2 @@ -68,7 +68,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6a8024b2970beba8eadc1acaa86805e7 +$(DL_FILE)_MD5 = 06e757ec8b847cfc488d68165b0bed6c install : $(TARGET) -- 2.5.5

1 0

[PATCH] vdr_vnsiserver3: Remove left over configuration file
by Daniel Weismüller 24 Oct '16

24 Oct '16

From a5d1b77e0a1c310aa323058eca15d37054c47603 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= <daniel.weismueller(a)ipfire.org> Date: Tue, 18 Oct 2016 16:15:44 +0200 Subject: [PATCH] vdr_vnsiserver3: Remove left over configuration file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel WeismÃ¼ller <daniel.weismueller(a)ipfire.org> --- config/vdr/plugins.d/vnsiserver3.conf | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 config/vdr/plugins.d/vnsiserver3.conf diff --git a/config/vdr/plugins.d/vnsiserver3.conf b/config/vdr/plugins.d/vnsiserver3.conf deleted file mode 100644 index 7c9706d..0000000 --- a/config/vdr/plugins.d/vnsiserver3.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration snippet for vdr-vnsiserver3 -*- sh -*- -# -# Add command line options to pass to the vnsiserver3 plugin to PLUGIN_OPTIONS. - -PLUGIN_OPTIONS="" -- 2.5.5

1 0

[PATCH] vdr_vnsiserver: updated to version 1.5.1, changed dependency to vdr, 2.2.0
by Daniel Weismüller 24 Oct '16

24 Oct '16

From c1cfda672e9436718af8cc59f794fa71340d10a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= <daniel.weismueller(a)ipfire.org> Date: Tue, 18 Oct 2016 16:14:20 +0200 Subject: [PATCH] vdr_vnsi: updated to version 1.5.1, changed dependency to vdr 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel WeismÃ¼ller <daniel.weismueller(a)ipfire.org> --- config/rootfiles/packages/vdr_vnsiserver | 4 ++++ config/rootfiles/packages/vdr_vnsiserver5 | 4 ---- config/vdr/plugins.d/vnsiserver.conf | 5 +++++ config/vdr/plugins.d/vnsiserver5.conf | 5 ----- lfs/{vdr_vnsiserver5 => vdr_vnsiserver} | 22 +++++++++++----------- make.sh | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 config/rootfiles/packages/vdr_vnsiserver delete mode 100644 config/rootfiles/packages/vdr_vnsiserver5 create mode 100644 config/vdr/plugins.d/vnsiserver.conf delete mode 100644 config/vdr/plugins.d/vnsiserver5.conf rename lfs/{vdr_vnsiserver5 => vdr_vnsiserver} (86%) diff --git a/config/rootfiles/packages/vdr_vnsiserver b/config/rootfiles/packages/vdr_vnsiserver new file mode 100644 index 0000000..26eef96 --- /dev/null +++ b/config/rootfiles/packages/vdr_vnsiserver @@ -0,0 +1,4 @@ +etc/sysconfig/vdr-plugins.d/vnsiserver.conf +etc/vdr/plugins/vnsiserver +etc/vdr/plugins/vnsiserver/allowed_hosts.conf +usr/lib/vdr/libvdr-vnsiserver.so.2.2.0 diff --git a/config/rootfiles/packages/vdr_vnsiserver5 b/config/rootfiles/packages/vdr_vnsiserver5 deleted file mode 100644 index 9b27e97..0000000 --- a/config/rootfiles/packages/vdr_vnsiserver5 +++ /dev/null @@ -1,4 +0,0 @@ -etc/sysconfig/vdr-plugins.d/vnsiserver5.conf -etc/vdr/plugins/vnsiserver5 -etc/vdr/plugins/vnsiserver5/allowed_hosts.conf -usr/lib/vdr/libvdr-vnsiserver5.so.2.0.0 diff --git a/config/vdr/plugins.d/vnsiserver.conf b/config/vdr/plugins.d/vnsiserver.conf new file mode 100644 index 0000000..b69d4ca --- /dev/null +++ b/config/vdr/plugins.d/vnsiserver.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-vnsiserver -*- sh -*- +# +# Add command line options to pass to the vnsiserver plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/vnsiserver5.conf b/config/vdr/plugins.d/vnsiserver5.conf deleted file mode 100644 index 561552d..0000000 --- a/config/vdr/plugins.d/vnsiserver5.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration snippet for vdr-vnsiserver5 -*- sh -*- -# -# Add command line options to pass to the vnsiserver5 plugin to PLUGIN_OPTIONS. - -PLUGIN_OPTIONS="" diff --git a/lfs/vdr_vnsiserver5 b/lfs/vdr_vnsiserver similarity index 86% rename from lfs/vdr_vnsiserver5 rename to lfs/vdr_vnsiserver index 0416416..1bbd3fe 100644 --- a/lfs/vdr_vnsiserver5 +++ b/lfs/vdr_vnsiserver @@ -24,23 +24,23 @@ include Config -VER = 1.0.0 -THISAPP = vdr-vnsiserver5-$(VER) +VER = 1.5.1 +THISAPP = vdr-plugin-vnsiserver-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = vdr_vnsiserver5 +PROG = vdr_vnsiserver PAK_VER = 1 DEPS = "vdr" -VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.2.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) -CXXFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) -std=gnu++11 ############################################################################### # Top-level Rules @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3d1a0b21d11187e43a56f9e4cf7cb1c9 +$(DL_FILE)_MD5 = 90f53f361e6928915ba3c78e6b5db05a install : $(TARGET) @@ -88,11 +88,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ LOCALEDIR=$$(pwd)/locale all - -mkdir -pv /etc/vdr/plugins/vnsiserver5 - cd $(DIR_APP) && install -m 755 libvdr-vnsiserver5.so \ - /usr/lib/vdr/libvdr-vnsiserver5.so.$(VDRPLUGVER) - ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver5/allowed_hosts.conf - install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver5.conf \ + -mkdir -pv /etc/vdr/plugins/vnsiserver + cd $(DIR_APP) && install -m 755 libvdr-vnsiserver.so \ + /usr/lib/vdr/libvdr-vnsiserver.so.$(VDRPLUGVER) + ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver/allowed_hosts.conf + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver.conf \ /etc/sysconfig/vdr-plugins.d @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 9289d81..d1951d3 100755 --- a/make.sh +++ b/make.sh @@ -730,7 +730,7 @@ buildipfire() { ipfiremake ffmpeg ipfiremake vdr ipfiremake vdr_streamdev - ipfiremake vdr_vnsiserver5 + ipfiremake vdr_vnsiserver ipfiremake vdr_epgsearch ipfiremake vdr_dvbapi ipfiremake vdr_eepg -- 2.5.5

1 0

[PATCH] vdr_streamdev: changed dependency to vdr 2.2.0
by Daniel Weismüller 24 Oct '16

24 Oct '16

From 40172654ddcf1976b4070fb7ef813a5a6ea1d181 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= <daniel.weismueller(a)ipfire.org> Date: Tue, 18 Oct 2016 16:08:18 +0200 Subject: [PATCH] vdr_streamdev: changed dependency to vdr 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel WeismÃ¼ller <daniel.weismueller(a)ipfire.org> --- config/rootfiles/packages/vdr_streamdev | 2 +- lfs/vdr_streamdev | 15 ++++++-------- src/patches/vdr-streamdev_recordings-64.patch | 29 --------------------------- 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 src/patches/vdr-streamdev_recordings-64.patch diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev index 458e7d8..887383f 100644 --- a/config/rootfiles/packages/vdr_streamdev +++ b/config/rootfiles/packages/vdr_streamdev @@ -5,4 +5,4 @@ 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.2.0 diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index c230a69..aae82f0 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -25,19 +25,19 @@ include Config VER = 0.6.1 -GIT_VER = 10db11ac -THISAPP = vdr-streamdev-$(GIT_VER) -DL_FILE = $(THISAPP).tar.xz +GIT_VER = 674bb5b +THISAPP = vdr-plugin-streamdev-$(VER)-$(GIT_VER) +DL_FILE = $(THISAPP).tar.gz 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.2.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3 +$(DL_FILE)_MD5 = 7eb0c36bb46d8b5d0aabd30f4b67e99a install : $(TARGET) @@ -84,9 +84,6 @@ $(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 -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 \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch deleted file mode 100644 index 2dc5250..0000000 --- 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 ""; - } - -- 2.5.5

1 0

[PATCH] vdr_epgsearch: changed dependency to vdr 2.2.0 and fixed, compatibility with vdr > 2.1.2
by Daniel Weismüller 24 Oct '16

24 Oct '16

From 6f545bfccf08d53834958a5f61b11cf02ae37bfb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= <daniel.weismueller(a)ipfire.org> Date: Tue, 18 Oct 2016 16:01:57 +0200 Subject: [PATCH] vdr_epgsearch: changed dependency to vdr 2.2.0 and fixed compatibility with vdr > 2.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel WeismÃ¼ller <daniel.weismueller(a)ipfire.org> --- config/rootfiles/packages/vdr_epgsearch | 8 ++++---- lfs/vdr_epgsearch | 5 +++-- src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch index 193d79f..7c5b86c 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.2.0 +usr/lib/vdr/libvdr-epgsearch.so.2.2.0 +usr/lib/vdr/libvdr-epgsearchonly.so.2.2.0 +usr/lib/vdr/libvdr-quickepgsearch.so.2.2.0 #var/lib/vdr #var/lib/vdr/data var/lib/vdr/data/epgsearch diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index e621670..ba1c751 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -32,11 +32,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/epgsearch-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_epgsearch -PAK_VER = 7 +PAK_VER = 8 DEPS = "" -VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.2.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -84,6 +84,7 @@ $(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-vdr-2.1.2-compat.patch cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ diff --git a/src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch b/src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch new file mode 100644 index 0000000..ac90f4f --- /dev/null +++ b/src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch @@ -0,0 +1,15 @@ +diff -ruN epgsearch-1.0.1.beta5/uservars.h epgsearch-1.0.1.beta5.edit/uservars.h +--- epgsearch-1.0.1.beta5/uservars.h 2013-03-25 20:30:59.000000000 +0100 ++++ epgsearch-1.0.1.beta5.edit/uservars.h 2013-10-19 13:55:15.458605893 +0200 +@@ -538,7 +538,11 @@ + cVideodirVar() : cInternalVar("videodir") {} + string Evaluate(const cEvent*, bool escapeStrings = false) + { ++#if APIVERSNUM > 20101 ++ return cVideoDirectory::Name(); ++#else + return VideoDirectory; ++#endif + } + }; + -- 2.5.5

1 0

[PATCH] vdr_eepg: changed dependency to vdr 2.2.0
by Daniel Weismüller 24 Oct '16

24 Oct '16

From 67ca8869ee8c5243198b39d21b3a17320f562973 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= <daniel.weismueller(a)ipfire.org> Date: Tue, 18 Oct 2016 15:59:18 +0200 Subject: [PATCH] vdr_eepg: changed dependency to vdr 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel WeismÃ¼ller <daniel.weismueller(a)ipfire.org> --- config/rootfiles/packages/vdr_eepg | 2 +- lfs/vdr_eepg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg index 17f7bc4..fc00122 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.2.0 diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg index 3a91256..2f1280d 100644 --- a/lfs/vdr_eepg +++ b/lfs/vdr_eepg @@ -35,11 +35,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.2.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) -- 2.5.5

1 0

[PATCH] vdr: updated to version 2.2.0
by Daniel Weismüller 24 Oct '16

24 Oct '16

From 74b5d9f056d73e004f1a61f83b2efd40feeb5eb1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= <daniel.weismueller(a)ipfire.org> Date: Tue, 18 Oct 2016 15:55:20 +0200 Subject: [PATCH] =?utf8?q?vdr:=20updated=20to=20version=202.2.0=20Signed-o?= =?utf8?q?ff-by:=20Daniel=20Weism=C3=BCller=20<daniel.weismueller(a)ipfire.o?= =?utf8?q?rg>?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/rootfiles/packages/vdr | 3 +++ lfs/vdr | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr index 4b6eaff..c79fb2b 100644 --- a/config/rootfiles/packages/vdr +++ b/config/rootfiles/packages/vdr @@ -6,6 +6,7 @@ etc/sysconfig/vdr #etc/sysconfig/vdr-plugins.d etc/vdr etc/vdr/channels.conf +etc/vdr/conf.d etc/vdr/diseqc.conf etc/vdr/keymacros.conf etc/vdr/scr.conf @@ -19,6 +20,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 @@ -48,6 +50,7 @@ usr/bin/svdrpsend #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/lfs/vdr b/lfs/vdr index 52ecdd5..2b07b4b 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -24,11 +24,11 @@ include Config -VER = 2.0.5 +VER = 2.2.0 # VDRPLUGVER must match with APIVERSION in config.h # after change this update also all vdr plugins -VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.2.0 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -37,7 +37,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 9 +PAK_VER = 10 DEPS = "vdr_streamdev" @@ -65,7 +65,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d +$(DL_FILE)_MD5 = 8853f64c0fc3d41ffd3b4bfc6f0a14b7 install : $(TARGET) -- 2.5.5

1 0

htpasswd: message digest algorithm (was: Re: Question concerning commit #eef9b2529c3cab522dac4f4bcfa1a0075376514e)
by IT Superhack 23 Oct '16

23 Oct '16

Hello Michael, hello Development-List (in CC), sorry for rehashing the issue: At 2016-10-06 I summarized my findings about htpasswd and its lack of bcrypt. Unfortunately, the bcrypt message digest algorithm is only available in the htpasswd version provided by the Apache Web Server (version 2.4.4 or later). Since it uses SHA *without any salt*, it seems to be more secure in my point of view to use the MD5 method instead, where a salt is used. Thereof I kindly ask you to revert the commit #eef9b2529c3cab522dac4f4bcfa1a0075376514e, where these changes were introduced. I know the developers are busy because of Core Update 106, and it can always happen that something slips through the fingers. :-) Thanks and best regards, Timmothy Wilson

2 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development October 2016