aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormi <mi@FreeBSD.org>2012-05-08 10:31:27 +0800
committermi <mi@FreeBSD.org>2012-05-08 10:31:27 +0800
commitcc736218f3da6d6ed3bd8ce681ee1bd60bb17b2c (patch)
tree61821812b2d0953696fa67acdde3aa880f1ae8c2
parent825fdd071e7ba18fdbc05e1a242892f1bb0b0a84 (diff)
downloadfreebsd-ports-gnome-cc736218f3da6d6ed3bd8ce681ee1bd60bb17b2c.tar.gz
freebsd-ports-gnome-cc736218f3da6d6ed3bd8ce681ee1bd60bb17b2c.tar.zst
freebsd-ports-gnome-cc736218f3da6d6ed3bd8ce681ee1bd60bb17b2c.zip
Minor fix-ups quick on the heels of the upgrade:
* run rescan as `dlna' (rather than as `root') * SQLite does not understand ALL of printf's formatting...
-rw-r--r--net/minidlna/files/minidlna.sh.in2
-rw-r--r--net/minidlna/files/patch-warnings9
2 files changed, 1 insertions, 10 deletions
diff --git a/net/minidlna/files/minidlna.sh.in b/net/minidlna/files/minidlna.sh.in
index b19a94be5fec..b2803349c32c 100644
--- a/net/minidlna/files/minidlna.sh.in
+++ b/net/minidlna/files/minidlna.sh.in
@@ -28,7 +28,7 @@ stop_postcmd=$start_precmd
command_args="-P $pidfile -u $minidlna_uid"
extra_commands=rescan
-rescan_cmd="$command -R"
+rescan_cmd="$command -R -u $minidlna_uid"
required_dirs="/var/db/minidlna"
run_rc_command $1
diff --git a/net/minidlna/files/patch-warnings b/net/minidlna/files/patch-warnings
index 5138378835c5..a3038bbc7b7a 100644
--- a/net/minidlna/files/patch-warnings
+++ b/net/minidlna/files/patch-warnings
@@ -319,15 +319,6 @@
+ (int64_t)parentID);
last_genreArtist.objectID = objectID;
strcpy(last_genreArtist.name, artist?artist:_("Unknown Artist"));
-@@ -636,6 +646,6 @@
- ret = sql_exec(db, "INSERT into OBJECTS (OBJECT_ID, PARENT_ID, DETAIL_ID, CLASS, NAME)"
- " values "
-- "('%s', '%s', %lld, 'container.storageFolder', '%q')",
-- containers[i], containers[i+1], GetFolderMetadata(containers[i+2], NULL, NULL, NULL, 0), containers[i+2]);
-+ "('%s', '%s', %jd, 'container.storageFolder', '%q')",
-+ containers[i], containers[i+1], (intmax_t)GetFolderMetadata(containers[i+2], NULL, NULL, NULL, 0), containers[i+2]);
- if( ret != SQLITE_OK )
- goto sql_failed;
@@ -656,5 +666,5 @@
}