add package() and service file; update patches

8 files changed, 81 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46fcb40f1f50..be6d4634b099 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,11 @@
+# Generated by mksrcinfo v8
+# Sun Jan 17 13:14:03 UTC 2016
 pkgbase = djmount
 	pkgdesc = A UPnP AV client that mounts media server contents as a filesystem.
 	pkgver = 0.71
-	pkgrel = 4
+	pkgrel = 5
 	url = http://djmount.sourceforge.net/
+	install = djmount.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -10,15 +13,17 @@ pkgbase = djmount
 	depends = libupnp
 	depends = talloc
 	source = http://downloads.sourceforge.net/sourceforge/djmount/djmount-0.71.tar.gz
-	source = http://ftp.de.debian.org/debian/pool/main/d/djmount/djmount_0.71-3.diff.gz
-	source = djmount.rcd
+	source = http://ftp.de.debian.org/debian/pool/main/d/djmount/djmount_0.71-7.debian.tar.xz
 	source = djmount.confd
-	source = libupnp-1.6.9-JonimusPrime.diff
+	source = djmount.service
+	source = djmount.tmpfilesd
+	source = djmount.install
 	md5sums = c922753e706c194bf82a8b6ca77e6a9a
-	md5sums = 00c5b6df865c8ffcd29b37de6f5503bf
-	md5sums = f473b5150df385447f2f58049bfb6199
-	md5sums = 21de4c947c17e8558f1007a20757f254
-	md5sums = c5c86bef5573dada1d1cd38b64b557c8
+	md5sums = cee9b3cbf9dbea62afef72be3a631fd7
+	md5sums = c8315155d514a281388e096d10982033
+	md5sums = c3ead49b87f0c08ff6b9d9edb5deede2
+	md5sums = b516e86eb1afd044913a595804b7144f
+	md5sums = 5913bb8387d4497a96117fba8f2b71f8
 
 pkgname = djmount
 
diff --git a/PKGBUILD b/PKGBUILD
index f5efbe065f6f..f12e1f977db0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,50 @@
-# Maintainer: Erik Johnson <palehose at gmail dot com>
-# Maintainer: Soup <soup a.t soultrap d.o.t n.e.t>
+# Contributor: loserMcloser  <reebydobalina at gmail dot com>
+# Contributor: Erik Johnson <palehose at gmail dot com>
+# Contributor: Soup <soup a.t soultrap d.o.t n.e.t>
 # Contributor: Michele Schäuble <mschaeuble@swissonline.ch>
 
 pkgname=djmount
 pkgver=0.71
-pkgrel=4
-_debpatch=3
+pkgrel=5
+_debpatch=7
 pkgdesc="A UPnP AV client that mounts media server contents as a filesystem."
 arch=('i686' 'x86_64')
 url="http://djmount.sourceforge.net/"
 license=('GPL')
 depends=('fuse' 'libupnp' 'talloc')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        "http://ftp.de.debian.org/debian/pool/main/d/$pkgname/${pkgname}_$pkgver-$_debpatch.diff.gz"
-        'djmount.rcd'
-        'djmount.confd'
-        'libupnp-1.6.9-JonimusPrime.diff')
+source=(
+  "http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+  "http://ftp.de.debian.org/debian/pool/main/d/$pkgname/${pkgname}_$pkgver-$_debpatch.debian.tar.xz"
+  djmount.confd  djmount.service  djmount.tmpfilesd  djmount.install
+)
+install='djmount.install'
 md5sums=('c922753e706c194bf82a8b6ca77e6a9a'
-         '00c5b6df865c8ffcd29b37de6f5503bf'
-         'f473b5150df385447f2f58049bfb6199'
-         '21de4c947c17e8558f1007a20757f254'
-         'c5c86bef5573dada1d1cd38b64b557c8')
+         'cee9b3cbf9dbea62afef72be3a631fd7'
+         'c8315155d514a281388e096d10982033'
+         'c3ead49b87f0c08ff6b9d9edb5deede2'
+         'b516e86eb1afd044913a595804b7144f'
+         '5913bb8387d4497a96117fba8f2b71f8')
 
-build() {
-  cd $srcdir
-  patch -p0 < "${pkgname}_$pkgver-$_debpatch.diff"
-  patch -p0 < "$pkgname-$pkgver/debian/patches/000_djmount.1.diff"
-  patch -p0 < "$pkgname-$pkgver/debian/patches/001-libupnp-1.6.6.diff"
-  patch -p0 < "$srcdir/libupnp-1.6.9-JonimusPrime.diff"
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 < "$srcdir/debian/patches/000_djmount.1.diff"
+  patch -p1 < "$srcdir/debian/patches/001-libupnp-1.6.6.diff"
+  patch -p1 < "$srcdir/debian/patches/002-libupnp-1.6.13.diff"
+  patch -p1 < "$srcdir/debian/patches/003-support-fstab-mounting.diff"
+  patch -p1 < "$srcdir/debian/patches/004-avoid-crash-by-using-size_t.diff"
+}
 
+build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --with-external-talloc --with-external-libupnp --with-libupnp-prefix=/usr
   make
-  make DESTDIR=$pkgdir install
+}
 
-  install -D -m755 $srcdir/djmount.rcd $pkgdir/etc/rc.d/djmount
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR=$pkgdir install
   install -D -m644 $srcdir/djmount.confd $pkgdir/etc/conf.d/djmount
+  install -D -m644 $srcdir/djmount.service $pkgdir/usr/lib/systemd/system/djmount.service
+  install -D -m644 $srcdir/djmount.tmpfilesd $pkgdir/usr/lib/tmpfiles.d/djmount.conf
   install -D -m644 "$srcdir/$pkgname-$pkgver/djmount.1" ${pkgdir}/usr/share/man/man1/djmount.1
 }
diff --git a/djmount.confd b/djmount.confd
index 079100e21c1e..dfdb645a5ee4 100644
--- a/djmount.confd
+++ b/djmount.confd
@@ -1,2 +1,10 @@
-OPTIONS="-o ro,allow_other"
-MOUNTPOINT="/media/upnp"
+#
+# SEE : man djmount for mount options
+#
+# NOTE: If you change MOUNTPOINT, you should also
+#       copy /usr/lib/tmpfiles.d/djmount.conf
+#       to   /etc/tmpfiles.d/djmount.conf
+#       and edit accordingly.
+#
+MOUNTOPTIONS="ro,allow_other"
+MOUNTPOINT="/media/upnp"
\ No newline at end of file
diff --git a/djmount.install b/djmount.install
new file mode 100644
index 000000000000..800cfe894cff
--- /dev/null
+++ b/djmount.install
@@ -0,0 +1,12 @@
+
+post_install() {
+    echo ">>> Creating mountpoint /media/upnp if necessary."
+    echo ">>> (This mountpoint will be recreated as necessary on boot by systemd.)"
+    systemd-tmpfiles --create djmount.conf
+}
+
+post_upgrade() {
+    echo ">>> Creating mountpoint /media/upnp if necessary."
+    echo ">>> (This mountpoint will be recreated as necessary on boot by systemd.)"
+    systemd-tmpfiles --create djmount.conf
+}
\ No newline at end of file
diff --git a/djmount.rcd b/djmount.rcd
deleted file mode 100755
index 84899dddbb8c..000000000000
--- a/djmount.rcd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
- . /etc/rc.conf
- . /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/djmount ] && . /etc/conf.d/djmount
-
- case "$1" in
-
-   start)
-     stat_busy "Starting djmount"
-     /usr/bin/djmount $OPTIONS $MOUNTPOINT &>/dev/null
-     if [ $? -ne 0 ]; then
-       stat_fail
-     else
-       add_daemon djmount
-       stat_done
-     fi
-   ;;
-
-   stop)
-     stat_busy "Stopping djmount"
-     fusermount -u $MOUNTPOINT
-     kill -9 `pidof /usr/bin/djmount` &>/dev/null
-     rm_daemon djmount
-     stat_done
-   ;;
-
-   restart)
-     stat_busy "Restarting djmount ..."
-     $0 stop
-     $0 start
-     stat_done
-   ;;
-
-   *)
-     echo "usage: $0 {start|stop|restart}"
- esac
diff --git a/djmount.service b/djmount.service
new file mode 100644
index 000000000000..778b3e47bb7b
--- /dev/null
+++ b/djmount.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=UPnP AV client as a filesystem
+Requires=network.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/djmount
+ExecStart=/usr/bin/djmount -o ${MOUNTOPTIONS} ${MOUNTPOINT}
+ExecStop=/usr/bin/fusermount -u ${MOUNTPOINT}
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/djmount.tmpfilesd b/djmount.tmpfilesd
new file mode 100644
index 000000000000..553e93838e9c
--- /dev/null
+++ b/djmount.tmpfilesd
@@ -0,0 +1 @@
+d /media/upnp 0555 root root
\ No newline at end of file
diff --git a/libupnp-1.6.9-JonimusPrime.diff b/libupnp-1.6.9-JonimusPrime.diff
deleted file mode 100644
index cb3348a4375a..000000000000
--- a/libupnp-1.6.9-JonimusPrime.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-djmount-0.71/djmount/upnp_util.h

---- djmount-0.71/djmount/upnp_util.h	2010-11-15 14:05:13.966692446 -0600

-+++ djmount-0.71/djmount/upnp_util.h	2010-11-15 14:03:34.446692447 -0600

-@@ -28,6 +28,7 @@

- 

- 

- #include <upnp/upnptools.h>

-+#include <upnp/upnp.h>

- 

- 

- #ifdef __cplusplus