[SCM] mediatomb/master: d/p/symlinks.patch: avoids ignoring symlinks. #677964

[zumbi at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit db16bcf43fdaa302e29e3b3f4c4e619e43fac02b
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Fri Sep 26 20:30:26 2014 +0200

    d/p/symlinks.patch: avoids ignoring symlinks. #677964
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 5df5787..2054a5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mediatomb (0.12.1-6) UNRELEASED; urgency=medium
+
+  * d/p/symlinks.patch: avoids ignoring symlinks
+    Thanks Jona Schuman for patch.
+    (Closes: #677964)
+
+ -- Hector Oron <zumbi at debian.org>  Fri, 26 Sep 2014 20:27:08 +0200
+
 mediatomb (0.12.1-5) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/series b/debian/patches/series
index 404e199..3920bc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 0009b_fix_ffmpeg_metadata.patch
 0010_fix_libmp4v2_build.patch
 0011_libav_9_support.patch
+symlinks.patch
diff --git a/debian/patches/symlinks.patch b/debian/patches/symlinks.patch
new file mode 100644
index 0000000..1094bdc
--- /dev/null
+++ b/debian/patches/symlinks.patch
@@ -0,0 +1,42 @@
+--- mediatomb-0.12.1.orig/src/autoscan_inotify.cc	2010-03-25 10:58:11.000000000 -0400
++++ mediatomb-0.12.1/src/autoscan_inotify.cc	2012-06-18 02:40:11.000000000 -0400
+@@ -281,7 +281,7 @@
+                     }
+                 }
+                 
+-                if (adir != nil && mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_MOVED_FROM | IN_MOVED_TO | IN_UNMOUNT))
++                if (adir != nil && mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_MOVED_FROM | IN_MOVED_TO | IN_UNMOUNT | IN_CREATE))
+                 {
+                     String fullPath;
+                     if (mask & IN_ISDIR)
+@@ -312,16 +312,17 @@
+                         if (objectID != INVALID_OBJECT_ID)
+                             cm->removeObject(objectID);
+                     }
+-                    if (mask & (IN_CLOSE_WRITE | IN_MOVED_TO))
++                    if (mask & (IN_CLOSE_WRITE | IN_MOVED_TO | IN_CREATE))
+                     {
+                         log_debug("adding %s\n", path.c_str());
+                         // path, recursive, async, hidden, low priority, cancellable
+                         cm->addFile(fullPath, adir->getRecursive(), true, adir->getHidden(), true, false);
+                         
+-                        if (mask & IN_ISDIR)
++                        if (mask & IN_ISDIR && !(mask & IN_CREATE))
+                             monitorUnmonitorRecursive(path, false, adir, watchAs->getNormalizedAutoscanPath(), false);
+                     }
+                 }
++
+                 if (mask & IN_IGNORED)
+                 {
+                     removeWatchMoves(wd);
+--- mediatomb-0.12.1.orig/src/content_manager.cc	2010-03-25 10:58:11.000000000 -0400
++++ mediatomb-0.12.1/src/content_manager.cc	2012-06-18 02:03:55.000000000 -0400
+@@ -202,7 +202,7 @@
+ #ifdef HAVE_MAGIC
+     if (! ignore_unknown_extensions)
+     {
+-        ms = magic_open(MAGIC_MIME);
++        ms = magic_open(MAGIC_MIME|MAGIC_SYMLINK);
+         if (ms == NULL)
+         {
+			 log_error("magic_open failed\n");

-- 
MediaTomb packaging