Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/f745825e2cb0cd9c0b6565372223f66e91f52630)

4 files changed, 42 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94bb1f49ab0e..f32fb2cffe7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-# Generated by makepkg 5.0.2
-# Fri Sep  8 20:59:00 UTC 2017
+# Generated by makepkg 5.1.1
+# Tue Dec 25 15:38:28 UTC 2018
 pkgbase = vdr-epg-daemon
-	pkgver = 1.1.90
+	pkgver = 1.1.124
 	pkgrel = 1
 	url = http://projects.vdr-developer.org/projects/vdr-epg-daemon
 	arch = x86_64
@@ -20,8 +20,12 @@ pkgbase = vdr-epg-daemon
 	makedepends = libmicrohttpd
 	makedepends = libxslt
 	makedepends = python
-	source = https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/vdr-epg-daemon-1.1.90.tar.bz2
-	md5sums = 6d959f9a0ed8556f8bf1b4885dfb0d46
+	source = https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/vdr-epg-daemon-1.1.124.tar.bz2
+	source = epgd.service
+	source = epghttpd.service
+	md5sums = f8dc626a271dd913d4fe1711bff4d3e1
+	md5sums = c1b7f66bc84dbedba2ec4104ebefaba4
+	md5sums = d84f1a9383e22baa922455eaf9dd60b6
 
 pkgname = epgd
 	pkgdesc = write epg data to a mysql database
diff --git a/PKGBUILD b/PKGBUILD
index 1a95e7b92b32..bc78ae290295 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,18 @@
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgbase=vdr-epg-daemon
 pkgname=('epgd' 'mariadb-epglv')
-pkgver=1.1.90
+pkgver=1.1.124
 pkgrel=1
 url='http://projects.vdr-developer.org/projects/vdr-epg-daemon'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 makedepends=('curl' 'git' 'imlib2' 'jansson' 'libarchive' 'libjpeg' 'libmariadbclient' 'libmicrohttpd' 'libxslt' 'python')
-source=("https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/$pkgbase-$pkgver.tar.bz2")
-md5sums=('6d959f9a0ed8556f8bf1b4885dfb0d46')
+source=("https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/$pkgbase-$pkgver.tar.bz2"
+        "epgd.service"
+        "epghttpd.service")
+md5sums=('f8dc626a271dd913d4fe1711bff4d3e1'
+         'c1b7f66bc84dbedba2ec4104ebefaba4'
+         'd84f1a9383e22baa922455eaf9dd60b6')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
@@ -21,8 +25,10 @@ package_epgd() {
   pkgdesc='write epg data to a mysql database'
   depends=('curl' 'imlib2' 'jansson' 'libarchive' 'libmariadbclient' 'libmicrohttpd' 'libxslt' 'python')
   cd "$srcdir/$pkgbase-$pkgver"
-  make PREFIX=/usr INIT_SYSTEM=none DESTDIR="$pkgdir" install
-  install -Dm644 contrib/epgd.service "$pkgdir/usr/lib/systemd/system/epgd.service"
+  make -j1 PREFIX=/usr INIT_SYSTEM=none DESTDIR="$pkgdir" install
+  install -Dm644 "${srcdir}/epgd.service" $pkgdir/usr/lib/systemd/system/epgd.service
+  install -Dm644 "${srcdir}/epghttpd.service" $pkgdir/usr/lib/systemd/system/epghttpd.service
+
   rm "$pkgdir/usr/lib/mysql/plugin/mysqlepglv.so"
   cd $pkgdir
   backup=($(find etc -type f))
diff --git a/epgd.service b/epgd.service
new file mode 100644
index 000000000000..ac905995115c
--- /dev/null
+++ b/epgd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description = Database driven EPG Data collector
+After = mariadb.service
+
+[Service]
+Type = forking
+ExecStart = /usr/bin/epgd
+Restart = always
+
+[Install]
+WantedBy = multi-user.target
diff --git a/epghttpd.service b/epghttpd.service
new file mode 100644
index 000000000000..0839c45568b1
--- /dev/null
+++ b/epghttpd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description = EPG HTTP Daemon that provides a web interface
+After = epgd.service
+
+[Service]
+Type = forking
+ExecStart = /usr/bin/epghttpd
+Restart = always
+
+[Install]
+WantedBy = multi-user.target