[SCM] gerbera/master: Refresh symlinks patch

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 22a8db636ed4300870dd29804c78b98a2057554e
Author: James Cowgill <jcowgill at debian.org>
Date:   Wed May 31 22:10:34 2017 +0100

    Refresh symlinks patch

diff --git a/debian/patches/0008_symlinks.patch b/debian/patches/0008_symlinks.patch
index 5d8c665..8642370 100644
--- a/debian/patches/0008_symlinks.patch
+++ b/debian/patches/0008_symlinks.patch
@@ -1,42 +1,11 @@
---- a/src/autoscan_inotify.cc
-+++ b/src/autoscan_inotify.cc
-@@ -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);
 --- a/src/content_manager.cc
 +++ b/src/content_manager.cc
-@@ -202,7 +202,7 @@
+@@ -178,7 +178,7 @@ ContentManager::ContentManager()
+ /* init filemagic */
  #ifdef HAVE_MAGIC
-     if (! ignore_unknown_extensions)
-     {
+     if (!ignore_unknown_extensions) {
 -        ms = magic_open(MAGIC_MIME);
 +        ms = magic_open(MAGIC_MIME|MAGIC_SYMLINK);
-         if (ms == NULL)
-         {
+         if (ms == nullptr) {
              log_error("magic_open failed\n");
+         } else {

-- 
gerbera packaging