Re: [PR PATCH] [Updated] New package : serviio-2.1

[pandom79 <pandom79@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

There is an updated pull request by pandom79 against master on the void-packages repository

https://github.com/pandom79/void-packages serviio
https://github.com/void-linux/void-packages/pull/23341

New package : serviio-2.1
Xlint hasn't get error. I marked as restricted.


A patch file from https://github.com/void-linux/void-packages/pull/23341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-serviio-23341.patch --]
[-- Type: text/x-diff, Size: 4291 bytes --]

From 25a5276b506e7a28d082ad9cd281d2eb3c2f894a Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Wed, 1 Jul 2020 16:27:31 +0200
Subject: [PATCH 1/3] New package : serviio-2.1

New package : serviio-2.1

New package : serviio-2.1

New package : serviio-2.1
---
 srcpkgs/serviio/files/serviio/run |  2 ++
 srcpkgs/serviio/template          | 44 +++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100755 srcpkgs/serviio/files/serviio/run
 create mode 100755 srcpkgs/serviio/template

diff --git a/srcpkgs/serviio/files/serviio/run b/srcpkgs/serviio/files/serviio/run
new file mode 100755
index 00000000000..555e6e36135
--- /dev/null
+++ b/srcpkgs/serviio/files/serviio/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/share/java/serviio/bin/serviio.sh 2>&1
diff --git a/srcpkgs/serviio/template b/srcpkgs/serviio/template
new file mode 100755
index 00000000000..95a4e43f9fd
--- /dev/null
+++ b/srcpkgs/serviio/template
@@ -0,0 +1,44 @@
+# Template file for 'serviio'
+pkgname=serviio
+version=2.1
+revision=1
+archs="x86_64"
+depends="openjdk11 ffmpeg"
+short_desc="Free DLNA media server"
+maintainer="Domenico Panella <pandom79@gmail.com>"
+license="custom:serviio"
+homepage="http://www.serviio.org/"
+distfiles="http://download.serviio.org/releases/${pkgname}-${version}-linux.tar.gz"
+checksum=51748160b38e31ba54db1b11381d3d9d705852ed7757ad111e881327a16fb757
+restricted=yes
+make_dirs="/var/log/${pkgname} 0774 root wheel"
+
+do_install() {
+
+	_SERVIIO_HOME=usr/share/java/$pkgname
+	vmkdir  ${_SERVIIO_HOME}
+
+	vmkdir  usr/bin
+	vcopy   bin ${_SERVIIO_HOME}
+	ln -s  /${_SERVIIO_HOME}/bin/${pkgname}-console.sh ${DESTDIR}/usr/bin/${pkgname}-console
+
+	vcopy config ${_SERVIIO_HOME}
+
+	vcopy lib ${_SERVIIO_HOME}
+
+	vcopy library ${_SERVIIO_HOME}
+
+	vcopy plugins ${_SERVIIO_HOME}
+
+	vmkdir /var/log/${pkgname}
+	ln -s /var/log/${pkgname} ${DESTDIR}/${_SERVIIO_HOME}/log
+
+	vsv ${pkgname}
+
+	vlicense LICENCE.txt
+
+	vdoc README.txt
+	vdoc NOTICE.txt
+	vdoc RELEASE_NOTES.txt
+
+}

From c66672294fd09eb7bd716e7f30beea4b090f8c7e Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Sat, 4 Jul 2020 11:37:30 +0200
Subject: [PATCH 2/3] New package : serviio-2.1

---
 srcpkgs/serviio/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/serviio/template b/srcpkgs/serviio/template
index 95a4e43f9fd..c79b4aecebc 100755
--- a/srcpkgs/serviio/template
+++ b/srcpkgs/serviio/template
@@ -6,21 +6,21 @@ archs="x86_64"
 depends="openjdk11 ffmpeg"
 short_desc="Free DLNA media server"
 maintainer="Domenico Panella <pandom79@gmail.com>"
-license="custom:serviio"
+license="custom:Proprietary"
 homepage="http://www.serviio.org/"
 distfiles="http://download.serviio.org/releases/${pkgname}-${version}-linux.tar.gz"
 checksum=51748160b38e31ba54db1b11381d3d9d705852ed7757ad111e881327a16fb757
+repository=nonfree
 restricted=yes
 make_dirs="/var/log/${pkgname} 0774 root wheel"
 
 do_install() {
 
 	_SERVIIO_HOME=usr/share/java/$pkgname
-	vmkdir  ${_SERVIIO_HOME}
+	vmkdir ${_SERVIIO_HOME}
 
-	vmkdir  usr/bin
-	vcopy   bin ${_SERVIIO_HOME}
-	ln -s  /${_SERVIIO_HOME}/bin/${pkgname}-console.sh ${DESTDIR}/usr/bin/${pkgname}-console
+	vcopy bin ${_SERVIIO_HOME}
+	vbin bin/${pkgname}-console.sh ${pkgname}-console
 
 	vcopy config ${_SERVIIO_HOME}
 
@@ -30,7 +30,6 @@ do_install() {
 
 	vcopy plugins ${_SERVIIO_HOME}
 
-	vmkdir /var/log/${pkgname}
 	ln -s /var/log/${pkgname} ${DESTDIR}/${_SERVIIO_HOME}/log
 
 	vsv ${pkgname}

From c6be18ee75d52fbebf616dc90664d8be7e9730c4 Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Sat, 4 Jul 2020 11:58:08 +0200
Subject: [PATCH 3/3] New package : serviio-2.1

---
 srcpkgs/serviio/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/serviio/template b/srcpkgs/serviio/template
index c79b4aecebc..53cd3fc7da8 100755
--- a/srcpkgs/serviio/template
+++ b/srcpkgs/serviio/template
@@ -19,7 +19,8 @@ do_install() {
 	_SERVIIO_HOME=usr/share/java/$pkgname
 	vmkdir ${_SERVIIO_HOME}
 
-	vcopy bin ${_SERVIIO_HOME}
+	vmkdir ${_SERVIIO_HOME}/bin
+	vinstall bin/serviio.sh 0755 ${_SERVIIO_HOME}/bin/
 	vbin bin/${pkgname}-console.sh ${pkgname}-console
 
 	vcopy config ${_SERVIIO_HOME}