[PR PATCH] gerbera: runit service fixes

[PR PATCH] gerbera: runit service fixes

[lemmi]

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

There is a new pull request by lemmi against master on the void-packages repository

https://github.com/lemmi/void-packages gerbera
https://github.com/void-linux/void-packages/pull/37903

gerbera: runit service fixes
#### Testing the changes
- I tested the changes in this PR: **briefly**

The `runit` service was missing `exec` and it did not generate a default config. Combined with the fact that there was no `log` service, it was a little inconvenient to get running.

I left the commits separate for now, but the should probably squashed before merge. 

@crater2150 @octeep 

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

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

From ee0477d1d3fe10c132b6ab1212f821c361c9f2ce Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:17:54 +0200
Subject: [PATCH 1/4] gerbera: add log service

---
 srcpkgs/gerbera/files/gerbera/log/run | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/gerbera/files/gerbera/log/run

diff --git a/srcpkgs/gerbera/files/gerbera/log/run b/srcpkgs/gerbera/files/gerbera/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/gerbera/files/gerbera/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d25dd65e01108dd255adce6373caae8fe0d79b41 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:18:18 +0200
Subject: [PATCH 2/4] gerbera: add missing exec to run script

---
 srcpkgs/gerbera/files/gerbera/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index 925a4d7fde23..8b0e78c88041 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera
+exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera

From a02733b93151305970ce3d758f802fb8e6df4b9d Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:23:37 +0200
Subject: [PATCH 3/4] gerbera: generate default config if missing

---
 srcpkgs/gerbera/files/gerbera/run | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index 8b0e78c88041..530ee026ea0e 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,2 +1,9 @@
 #!/bin/sh
+
+if [ ! -d /var/lib/gerbera/.config ]; then
+	mkdir -p /var/lib/gerbera/.config/gerbera
+	chown -R gerbera:gerbera /var/lib/gerbera
+	su -s /bin/sh -c 'gerbera --create-config > /var/lib/gerbera/.config/gerbera/config.xml' - gerbera
+fi
+
 exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera

From d857144144ff2921f639b334331524c258217e87 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:25:25 +0200
Subject: [PATCH 4/4] gerbera: runit fixes

---
 srcpkgs/gerbera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7b4f1a5f1f3d..35136708b3e5 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.11.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

Re: [PR PATCH] [Updated] gerbera: runit service fixes

[lemmi]

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

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

https://github.com/lemmi/void-packages gerbera
https://github.com/void-linux/void-packages/pull/37903

gerbera: runit service fixes
#### Testing the changes
- I tested the changes in this PR: **briefly**

The `runit` service was missing `exec` and it did not generate a default config. Combined with the fact that there was no `log` service, it was a little inconvenient to get running.

I left the commits separate for now, but the should probably squashed before merge. 

@crater2150 @octeep 

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

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

From ee0477d1d3fe10c132b6ab1212f821c361c9f2ce Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:17:54 +0200
Subject: [PATCH 1/4] gerbera: add log service

---
 srcpkgs/gerbera/files/gerbera/log/run | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/gerbera/files/gerbera/log/run

diff --git a/srcpkgs/gerbera/files/gerbera/log/run b/srcpkgs/gerbera/files/gerbera/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/gerbera/files/gerbera/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d25dd65e01108dd255adce6373caae8fe0d79b41 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:18:18 +0200
Subject: [PATCH 2/4] gerbera: add missing exec to run script

---
 srcpkgs/gerbera/files/gerbera/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index 925a4d7fde23..8b0e78c88041 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera
+exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera

From c5b4f415ffa329e505377e6620bdd9c26400a6a4 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:23:37 +0200
Subject: [PATCH 3/4] gerbera: generate default config if missing

---
 srcpkgs/gerbera/files/gerbera/run | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index 8b0e78c88041..cab802769fe9 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,2 +1,9 @@
 #!/bin/sh
+
+if [ ! -d /var/lib/gerbera/.config ]; then
+	mkdir -p /var/lib/gerbera/.config/gerbera
+	chown -R gerbera:gerbera /var/lib/gerbera
+	chpst -u gerbera sh -c 'HOME=/var/lib/gerbera gerbera --create-config > /var/lib/gerbera/.config/gerbera/config.xml'
+fi
+
 exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera

From 28654e8ffd12673bd936a285926a51c1f51468e5 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:25:25 +0200
Subject: [PATCH 4/4] gerbera: runit fixes

---
 srcpkgs/gerbera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7b4f1a5f1f3d..35136708b3e5 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.11.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

Re: [PR PATCH] [Updated] gerbera: runit service fixes

[lemmi]

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

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

https://github.com/lemmi/void-packages gerbera
https://github.com/void-linux/void-packages/pull/37903

gerbera: runit service fixes
#### Testing the changes
- I tested the changes in this PR: **briefly**

The `runit` service was missing `exec` and it did not generate a default config. Combined with the fact that there was no `log` service, it was a little inconvenient to get running.

I left the commits separate for now, but the should probably squashed before merge. 

@crater2150 @octeep 

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

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

From e4e3a3f6fbe514f62bb14f82b30005543a5cdf46 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:17:54 +0200
Subject: [PATCH 1/4] gerbera: add log service

---
 srcpkgs/gerbera/files/gerbera/log/run | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/gerbera/files/gerbera/log/run

diff --git a/srcpkgs/gerbera/files/gerbera/log/run b/srcpkgs/gerbera/files/gerbera/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/gerbera/files/gerbera/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From f176495d2aaffd8c940658cff6ece0eb02875d70 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:18:18 +0200
Subject: [PATCH 2/4] gerbera: add missing exec to run script

---
 srcpkgs/gerbera/files/gerbera/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index 925a4d7fde23..8b0e78c88041 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera
+exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera

From a3db7fac955e8f9124c5251901ececa1b18d9cea Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:23:37 +0200
Subject: [PATCH 3/4] gerbera: generate default config if missing

---
 srcpkgs/gerbera/files/gerbera/run | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index 8b0e78c88041..cab802769fe9 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,2 +1,9 @@
 #!/bin/sh
+
+if [ ! -d /var/lib/gerbera/.config ]; then
+	mkdir -p /var/lib/gerbera/.config/gerbera
+	chown -R gerbera:gerbera /var/lib/gerbera
+	chpst -u gerbera sh -c 'HOME=/var/lib/gerbera gerbera --create-config > /var/lib/gerbera/.config/gerbera/config.xml'
+fi
+
 exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera

From bd007d21225207615387e6e10825ba0cc41d263d Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:25:25 +0200
Subject: [PATCH 4/4] gerbera: runit fixes

---
 srcpkgs/gerbera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7b4f1a5f1f3d..35136708b3e5 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.11.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

Re: [PR PATCH] [Updated] gerbera: runit service fixes

[lemmi]

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

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

https://github.com/lemmi/void-packages gerbera
https://github.com/void-linux/void-packages/pull/37903

gerbera: runit service fixes
#### Testing the changes
- I tested the changes in this PR: **briefly**

The `runit` service was missing `exec` and it did not generate a default config. Combined with the fact that there was no `log` service, it was a little inconvenient to get running.

I left the commits separate for now, but the should probably squashed before merge. 

@crater2150 @octeep 

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

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

From 672cc56c4a9cd2160fc89a41e9966fa3d749a401 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 6 Jul 2022 20:17:54 +0200
Subject: [PATCH] gerbera: runit fixes

---
 srcpkgs/gerbera/files/gerbera/log/run | 1 +
 srcpkgs/gerbera/files/gerbera/run     | 9 ++++++++-
 srcpkgs/gerbera/template              | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/gerbera/files/gerbera/log/run

diff --git a/srcpkgs/gerbera/files/gerbera/log/run b/srcpkgs/gerbera/files/gerbera/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/gerbera/files/gerbera/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index 925a4d7fde23..cab802769fe9 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,2 +1,9 @@
 #!/bin/sh
-chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera
+
+if [ ! -d /var/lib/gerbera/.config ]; then
+	mkdir -p /var/lib/gerbera/.config/gerbera
+	chown -R gerbera:gerbera /var/lib/gerbera
+	chpst -u gerbera sh -c 'HOME=/var/lib/gerbera gerbera --create-config > /var/lib/gerbera/.config/gerbera/config.xml'
+fi
+
+exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7b4f1a5f1f3d..35136708b3e5 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.11.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

Re: [PR PATCH] [Merged]: gerbera: runit service fixes

[lemmi]

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

There's a merged pull request on the void-packages repository

gerbera: runit service fixes
https://github.com/void-linux/void-packages/pull/37903

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

The `runit` service was missing `exec` and it did not generate a default config. Combined with the fact that there was no `log` service, it was a little inconvenient to get running.

I left the commits separate for now, but the should probably squashed before merge. 

@crater2150 @octeep