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

3 files changed, 28 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 544c07080de6..7a0b7e05280f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = vdradmin-am
 	pkgdesc = Web user interface for VDR
-	pkgver = 3.6.10
-	pkgrel = 5
-	url = http://andreas.vdr-developer.org/vdradmin-am
+	pkgver = 3.6.13
+	pkgrel = 1
+	url = https://github.com/vdr-projects/vdradmin-am
 	arch = any
 	license = GPL2
 	makedepends = perl-authen-sasl
@@ -15,17 +15,18 @@ pkgbase = vdradmin-am
 	depends = perl-template-plugin-javascript
 	depends = perl-template-toolkit
 	depends = perl-uri
+	depends = perl-http-daemon
+	depends = perl-http-daemon-ssl
 	depends = vdr
 	optdepends = perl-authen-sasl: Required for AutoTimer email notification
 	optdepends = perl-digest-hmac: Required for AutoTimer email notification and CRAM-MD5 authentication
 	optdepends = perl-io-socket-inet6: Required for IPv6 support
 	optdepends = perl-io-socket-ssl: Required for SSL support (https)
-	source = http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.10.tar.bz2
+	source = vdradmin-am-3.6.13.tar.gz::https://github.com/vdr-projects/vdradmin-am/archive/refs/tags/v3.6.13.tar.gz
 	source = fix-install.sh.diff
 	source = vdradmin-am.service
-	md5sums = 467ff4a482be2a5331ad4224a1cb9d8e
-	md5sums = f898ed796cc823286c9897dd72999017
-	md5sums = 8261c77e1f110bd89614d6c90647436e
+	sha256sums = eda3bdd947b27fc2ff73df3e68ba12aeb80cb2c5aecc63f30815eb68187c9e3e
+	sha256sums = 06d731235c03d94b5b6bb872e7be92bad587642e26eec38dd78daf0256602141
+	sha256sums = 2a33bbdac1ba7c80139d17e5d7cca7ccbf2a2945aeaf0777d0dd6fbe594bfe54
 
 pkgname = vdradmin-am
-
diff --git a/PKGBUILD b/PKGBUILD
index 9fc02c774d5a..30b69d27a435 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,30 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdradmin-am
-pkgver=3.6.10
-pkgrel=5
+pkgver=3.6.13
+pkgrel=1
 pkgdesc="Web user interface for VDR"
-url="http://andreas.vdr-developer.org/vdradmin-am"
+url="https://github.com/vdr-projects/vdradmin-am"
 arch=('any')
 license=('GPL2')
-depends=('perl-cgi' 'perl-http-date' 'perl-locale-gettext' 'perl-template-plugin-javascript' 'perl-template-toolkit' 'perl-uri' 'vdr')
+depends=('perl-cgi' 'perl-http-date' 'perl-locale-gettext' 'perl-template-plugin-javascript' 'perl-template-toolkit' 'perl-uri' 'perl-http-daemon' 'perl-http-daemon-ssl' 'vdr')
 optdepends=('perl-authen-sasl: Required for AutoTimer email notification'
             'perl-digest-hmac: Required for AutoTimer email notification and CRAM-MD5 authentication'
             'perl-io-socket-inet6: Required for IPv6 support'
             'perl-io-socket-ssl: Required for SSL support (https)')
 makedepends=('perl-authen-sasl' 'perl-digest-hmac' 'perl-io-socket-inet6' 'perl-io-socket-ssl')
-source=("http://andreas.vdr-developer.org/vdradmin-am/download/$pkgname-$pkgver.tar.bz2"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/vdr-projects/vdradmin-am/archive/refs/tags/v$pkgver.tar.gz"
         'fix-install.sh.diff'
         'vdradmin-am.service')
-md5sums=('467ff4a482be2a5331ad4224a1cb9d8e'
-         'f898ed796cc823286c9897dd72999017'
-         '8261c77e1f110bd89614d6c90647436e')
+sha256sums=('eda3bdd947b27fc2ff73df3e68ba12aeb80cb2c5aecc63f30815eb68187c9e3e'
+            '06d731235c03d94b5b6bb872e7be92bad587642e26eec38dd78daf0256602141'
+            '2a33bbdac1ba7c80139d17e5d7cca7ccbf2a2945aeaf0777d0dd6fbe594bfe54')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 -i "$srcdir/fix-install.sh.diff"
 }
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   rm -r lib/*
diff --git a/fix-install.sh.diff b/fix-install.sh.diff
index 10ea301ec4e1..fa00cdd1bb5a 100644
--- a/fix-install.sh.diff
+++ b/fix-install.sh.diff
@@ -4,16 +4,16 @@ diff -ruN vdradmin-am-3.6.10.orig/install.sh vdradmin-am-3.6.10/install.sh
 @@ -8,15 +8,15 @@
  
  PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin
- DESTDIR=${DESTDIR}
--LIBDIR=${LIBDIR:-$DESTDIR/usr/share/vdradmin}
--ETCDIR=${ETCDIR:-$DESTDIR/etc/vdradmin}
--DOCDIR=${DOCDIR:-$DESTDIR/usr/share/doc/vdradmin}
--BINDIR=${BINDIR:-$DESTDIR/usr/bin}
--LOCDIR=${LOCDIR:-$DESTDIR/usr/share/locale}
--MANDIR=${MANDIR:-$DESTDIR/usr/share/man}
--LOGDIR=${LOGDIR:-$DESTDIR/var/log/vdradmin}
--CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin}
--PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmin/vdradmind.pid}
+ PREFIX=${PREFIX}
+-LIBDIR=${LIBDIR:-$PREFIX/usr/share/vdradmin}
+-ETCDIR=${ETCDIR:-$PREFIX/etc/vdradmin}
+-DOCDIR=${DOCDIR:-$PREFIX/usr/share/doc/vdradmin}
+-BINDIR=${BINDIR:-$PREFIX/usr/bin}
+-LOCDIR=${LOCDIR:-$PREFIX/usr/share/locale}
+-MANDIR=${MANDIR:-$PREFIX/usr/share/man}
+-LOGDIR=${LOGDIR:-$PREFIX/var/log/vdradmin}
+-CACHEDIR=${CACHEDIR:-$PREFIX/var/cache/vdradmin}
+-PIDFILE=${PIDFILE:-$PREFIX/var/run/vdradmin/vdradmind.pid}
 +LIBDIR=${LIBDIR:-/usr/share/vdradmin}
 +ETCDIR=${ETCDIR:-/etc/vdradmin}
 +DOCDIR=${DOCDIR:-/usr/share/doc/vdradmin}