[SCM] vdr packaging repository branch, e-tobi, updated. vdr-1.7.16-364-gc4e989c

[etobi]

The following commit has been merged in the e-tobi branch:
commit 9b0d6a30e146b9babbc9f741fcc21ddd85913fb2
Author: etobi <git at e-tobi.net>
Date:   Sat Jan 1 18:19:09 2011 +0100

    Added 99_fix-deleting.dpatch to fix an issue with deleting recordings from video.01, video.02, ...

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index bf698a9..2faa01f 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -8,3 +8,4 @@ debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
 debian/patches/06_default_svdrp_port_0.dpatch:653e14e8ab093c456f9bbd8faa5e1ff7
 debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
 debian/patches/82_valgrind.dpatch:503ddba49c243fff798a36a1c12bb5ae
+debian/patches/99_fix-deleting.dpatch:798aa6bc4941759a9e28666798ec4fff
diff --git a/debian/.vdr-patches.multipatch b/debian/.vdr-patches.multipatch
index 9fdb41d..8cc785f 100644
--- a/debian/.vdr-patches.multipatch
+++ b/debian/.vdr-patches.multipatch
@@ -19,6 +19,7 @@ debian/patches/99_add-language-to-po.dpatch:98572846a526dcde511c1163ea3eacb5
 debian/patches/81_Make_config.dpatch:da281b9af48273bcbd19f3052ee993fd
 debian/patches/opt-51_cuttime.dpatch:5459582bf3c6d95895d7e0ca18b52213
 debian/patches/opt-48-x_pin.dpatch:3dd524fa2c484cd03fa2f46194ceff18
+debian/patches/99_fix-deleting.dpatch:798aa6bc4941759a9e28666798ec4fff
 debian/patches/opt-37-x_menuorg.dpatch:9fb02cc8bd848add50b3866b6f476644
 debian/patches/opt-45_yaepg.dpatch:fbac27f726253a228d7fe15c1cdabeb2
 debian/patches/opt-27_ttxtsubs.dpatch:af553c89b0f4cb7f75fb38768c0ab72a
diff --git a/debian/changelog b/debian/changelog
index 22094d8..f6f3cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-vdr (1.7.16-1ctvdr1) UNRELEASED; urgency=low
+vdr (1.7.16-1.ctvdr1) UNRELEASED; urgency=low
 
   * Dropped extensions patch
   * Updated commands.ctvdr.conf to new upstream format
+  * Added 99_fix-deleting.dpatch to fix an issue with deleting recordings
+    from video.01, video.02, ...
 
  -- Tobias Grimm <etobi at debian.org>  Sun, 28 Nov 2010 19:54:03 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index f30a8e3..0ca8eab 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -10,6 +10,7 @@
 99_add-language-to-po
 99_ncursesw-include
 99_vdr-workaround-broken-sys-capability
+99_fix-deleting
 
 # Patch collection (replaces enAIO).
 # opt-20_liemikuutio
diff --git a/debian/patches/00list.multipatch b/debian/patches/00list.multipatch
index 9f6c188..c741ad3 100644
--- a/debian/patches/00list.multipatch
+++ b/debian/patches/00list.multipatch
@@ -10,6 +10,7 @@
 99_add-language-to-po
 99_ncursesw-include
 99_vdr-workaround-broken-sys-capability
+99_fix-deleting
 
 # Patch collection (replaces enAIO).
 opt-20_liemikuutio
diff --git a/debian/patches/99_fix-deleting.dpatch b/debian/patches/99_fix-deleting.dpatch
new file mode 100644
index 0000000..ee6d1d9
--- /dev/null
+++ b/debian/patches/99_fix-deleting.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_fix-deleting.dpatch by Steffen Barszus <steffenbpunkt at googlemail.com>
+## http://www.linuxtv.org/pipermail/vdr/2010-October/023774.html
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes problem with deleting records from video.01, video.02, ...
+
+ at DPATCH@
+diff -urNad vdr-1.7.16~/tools.c vdr-1.7.16/tools.c
+--- vdr-1.7.16~/tools.c	2010-08-29 17:03:08.000000000 +0200
++++ vdr-1.7.16/tools.c	2010-10-14 23:55:22.622829123 +0200
+@@ -368,7 +368,7 @@
+                     cString buffer = AddDirectory(FileName, e->d_name);
+                     if (FollowSymlinks) {
+                        struct stat st2;
+-                       if (stat(buffer, &st2) == 0) {
++                       if (lstat(buffer, &st2) == 0) {
+                           if (S_ISLNK(st2.st_mode)) {
+                              int size = st2.st_size + 1;
+                              char *l = MALLOC(char, size);
+@@ -377,14 +377,12 @@
+                                 if (errno != EINVAL)
+                                    LOG_ERROR_STR(*buffer);
+                                 }
+-                             else if (n < size) {
++                             else {
+                                 l[n] = 0;
+                                 dsyslog("removing %s", l);
+                                 if (remove(l) < 0)
+                                    LOG_ERROR_STR(l);
+                                 }
+-                             else
+-                                esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
+                              free(l);
+                              }
+                           }

-- 
vdr packaging repository