From e336b1e25e92b736d0f9f98084243093ac9f0668 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 15:10:42 +0000
Subject: [PATCH] dmapd: merge r28446, r28531, r29058, r29872

SVN-Revision: 30203
---
 net/dmapd/Makefile                     |  8 ++++----
 net/dmapd/files/dmapd.init             | 26 ++++++++++++++++++++------
 net/dmapd/patches/001-dmapd_conf.patch |  7 ++++---
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/net/dmapd/Makefile b/net/dmapd/Makefile
index a16e73760..0a047a81b 100644
--- a/net/dmapd/Makefile
+++ b/net/dmapd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dmapd
-PKG_VERSION:=0.0.42
-PKG_RELEASE:=2
+PKG_VERSION:=0.0.46
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd
-PKG_MD5SUM:=f343b09d2e3e0da589c11e07abb6e879
+PKG_MD5SUM:=2bbd2378f90866b603e8b82c3c3cb929
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
diff --git a/net/dmapd/files/dmapd.init b/net/dmapd/files/dmapd.init
index b2f17c732..e76b0ef3e 100644
--- a/net/dmapd/files/dmapd.init
+++ b/net/dmapd/files/dmapd.init
@@ -1,16 +1,30 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-2012 OpenWrt.org
 
 START=60
 
 start() {
-	mkdir -p /var/cache/dmapd/
-	mkdir -p /var/run/dmapd/
-	mkdir -p /var/lock/subsys/
+	user_exists dmapd 56 || user_add dmapd 56
+	group_exists dmapd 56 || group_add dmapd 56
+	[ -d /var/run/dmapd ] || {
+		mkdir -m 0755 -p /var/run/dmapd
+		chown dmapd:dmapd /var/run/dmapd
+	}
+	[ -d /var/db/dmapd/DAAP ] || {
+		mkdir -m 0755 -p /var/db/dmapd/DAAP
+		chown dmapd:dmapd /var/db/dmapd/DAAP
+	}
+	[ -d /var/db/dmapd/DPAP ] || {
+		mkdir -m 0755 -p /var/db/dmapd/DPAP
+		chown dmapd:dmapd /var/db/dmapd/DPAP
+	}
+	mkdir -m 0755 -p /var/lock/subsys
+	mkdir -m 0755 -p /var/media/music
+	mkdir -m 0755 -p /var/media/pictures
 
-	DMAPD_DB_MODULE=bdb /usr/sbin/dmapd --vips-disc-threshold 64k
+	service_start /usr/sbin/dmapd -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k
 }
 
 stop() {
-	killall dmapd 2> /dev/null
+	service_stop /usr/sbin/dmapd
 }
diff --git a/net/dmapd/patches/001-dmapd_conf.patch b/net/dmapd/patches/001-dmapd_conf.patch
index 8300feec8..9c1e60a33 100644
--- a/net/dmapd/patches/001-dmapd_conf.patch
+++ b/net/dmapd/patches/001-dmapd_conf.patch
@@ -1,10 +1,11 @@
 --- a/distro/dmapd.conf
 +++ b/distro/dmapd.conf
-@@ -1,6 +1,6 @@
- [General]
+@@ -3,7 +3,7 @@
+ Database-Dir=/var/db/dmapd
+ 
  # Name that will be used to identify share:
 -Share-Name=dmapd
 +Share-Name=OpenWrt
  
  # User that dmapd will run as, current user if undefined:
- # User=dmapd
+ User=dmapd
-- 
2.30.2