public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/
@ 2019-12-13  0:16 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2019-12-13  0:16 UTC (permalink / raw
  To: gentoo-commits

commit:     acda3bd459aa5d4f24c457c1dd715a1902829fd8
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 20:31:24 2019 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 00:14:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acda3bd4

games-server/bedrock-server: drop old version

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-server/bedrock-server/Manifest               |  1 -
 .../bedrock-server/bedrock-server-1.13.3.0.ebuild  | 52 ----------------------
 .../bedrock-server/files/bedrock-server.initd      | 47 -------------------
 3 files changed, 100 deletions(-)

diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 9b8bae6f44d..60563fd1d8b 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,2 +1 @@
-DIST bedrock-server-1.13.3.0.zip 48812104 BLAKE2B 052e2445268c1e313139a6291aa8e5ef623a30f8dd26c32ed604f73318af75ae4f3f5c22ea3e73d18d6989388ff5da2600c5b0b019f3120db1779e49cad9d8c7 SHA512 2319f160ac69088c9420b1b6c999d576216c5a4b7034182e31572b2ece5f7bab3da049ee06f9b99b152da618a25f53df608c1eca23eab61b8ca9dbff24b78d6e
 DIST bedrock-server-1.14.0.9.zip 49343697 BLAKE2B eecc771b1722629f924fbf8b9e981ff72d541c4a297fa02c6e951331859bc2240c4c471966176c5bb6f39f7f643f6a4f43447aa978f10a8f53403aeaff29d9cd SHA512 2e11261abd60a36fec029e0297b5e3de9fb0935947e04ee19c43ea3803cf365e2984e231b81d074f25bc7ff08013cc4a961899665f24501c75d3c8817e60e97c

diff --git a/games-server/bedrock-server/bedrock-server-1.13.3.0.ebuild b/games-server/bedrock-server/bedrock-server-1.13.3.0.ebuild
deleted file mode 100644
index 78c6aa517c1..00000000000
--- a/games-server/bedrock-server/bedrock-server-1.13.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/screen
-	dev-libs/openssl:0/1.1
-	net-misc/curl[ssl]
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="
-	opt/bedrock-server/bedrock_server
-	opt/bedrock-server/libCrypto.so
-"
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server libCrypto.so
-
-	insinto /opt/bedrock-server
-	doins {permissions,whitelist}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd bedrock-server
-
-	einstalldocs
-}

diff --git a/games-server/bedrock-server/files/bedrock-server.initd b/games-server/bedrock-server/files/bedrock-server.initd
deleted file mode 100644
index 9157b610a1f..00000000000
--- a/games-server/bedrock-server/files/bedrock-server.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "bedrock-server" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#*.}"
-fi
-
-bedrock_command="/opt/bin/bedrock-server"
-bedrock_path="/var/lib/bedrock-server"
-bedrock_path_data="/opt/bedrock-server"
-bedrock_path_instance="${bedrock_path}/${instance}"
-name="Minecraft Bedrock server (${instance})"
-pidfile="/run/bedrock-server.${instance}.pid"
-screen_name="bedrock-server.${instance}"
-start_stop_daemon_args="--chdir ${bedrock_path_instance}"
-
-command="/usr/bin/screen"
-command_args="-DmUS ${screen_name} ${bedrock_command}"
-command_background="true"
-command_group="bedrock"
-command_user="bedrock"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}"
-
-	local bedrock_configs=( "permissions.json" "server.properties" "whitelist.json" )
-	for bedrock_config in ${bedrock_configs[@]}; do
-		if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then
-			cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}"
-			checkpath -f -o "${command_user}:${command_group}" -q "${bedrock_path_instance}/${bedrock_config}"
-		fi
-	done
-
-	local bedrock_ressources=( "behavior_packs" "definitions" "resource_packs" "structures" )
-	for bedrock_ressource in ${bedrock_ressources[@]}; do
-		if [ ! -L "${bedrock_path_instance}/${bedrock_ressource}" ]; then
-			ln -sf "${bedrock_path_data}/${bedrock_ressource}" "${bedrock_path_instance}"
-		fi
-	done
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/
@ 2020-08-23 18:14 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2020-08-23 18:14 UTC (permalink / raw
  To: gentoo-commits

commit:     994460e2b528685f89fc41ba0df32768ee9553a0
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 16:55:54 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 17:21:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994460e2

games-server/bedrock-server: add custom attach command

Since the bedrock-server is running as an interactive console process
in background, this custom command 'attach' enables the possibility to
connect with dtach to that interactive console and send commands to
the running server.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../bedrock-server-1.16.20.03-r1.ebuild            | 53 ++++++++++++++++++
 .../bedrock-server/files/bedrock-server.confd      |  7 +++
 .../bedrock-server/files/bedrock-server.initd-r2   | 62 ++++++++++++++++++++++
 3 files changed, 122 insertions(+)

diff --git a/games-server/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild b/games-server/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild
new file mode 100644
index 00000000000..a60cb02addb
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	acct-group/bedrock
+	acct-user/bedrock
+	app-misc/dtach
+	dev-libs/openssl:0/1.1
+	net-misc/curl[ssl]
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+DOCS=(
+	"bedrock_server_how_to.html"
+	"release-notes.txt"
+)
+
+QA_PREBUILT="
+	opt/bedrock-server/bedrock_server
+	opt/bedrock-server/libCrypto.so
+"
+
+src_install() {
+	exeinto /opt/bedrock-server
+	doexe bedrock_server libCrypto.so
+
+	insinto /opt/bedrock-server
+	doins {permissions,whitelist}.json server.properties
+	doins -r {behavior,resource}_packs definitions structures
+
+	dodir /opt/bin
+	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
+
+	newinitd "${FILESDIR}"/bedrock-server.initd-r2 bedrock-server
+	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
+
+	einstalldocs
+}

diff --git a/games-server/bedrock-server/files/bedrock-server.confd b/games-server/bedrock-server/files/bedrock-server.confd
new file mode 100644
index 00000000000..d4185934e06
--- /dev/null
+++ b/games-server/bedrock-server/files/bedrock-server.confd
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Dtach options, which will used, when the `attach` extra command is called.
+# By default, CTRL+D is used, and no redraw is done,
+# when you want to detach from the attached console.
+DTACH_OPTS="-e '^D' -r none"

diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r2 b/games-server/bedrock-server/files/bedrock-server.initd-r2
new file mode 100644
index 00000000000..1ff60aa7816
--- /dev/null
+++ b/games-server/bedrock-server/files/bedrock-server.initd-r2
@@ -0,0 +1,62 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "bedrock-server" ]; then
+	instance="main"
+else
+	instance="${SVCNAME#*.}"
+fi
+
+bedrock_command="/opt/bin/bedrock-server"
+bedrock_path="/var/lib/bedrock-server"
+bedrock_path_data="/opt/bedrock-server"
+bedrock_path_instance="${bedrock_path}/${instance}"
+dtach_tmpfile="$(mktemp -u)"
+name="Minecraft Bedrock server (${instance})"
+pidfile="/run/bedrock-server.${instance}.pid"
+start_stop_daemon_args="--chdir ${bedrock_path_instance}"
+
+description_attach="Attaches to the session (interactive console) of the Minecraft Bedrock server"
+extra_started_commands="attach"
+
+command="/usr/bin/dtach"
+command_background="true"
+command_args="-N ${dtach_tmpfile} ${bedrock_command}"
+command_group="bedrock"
+command_user="bedrock"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}"
+
+	local bedrock_configs=( "permissions.json" "server.properties" "whitelist.json" )
+	for bedrock_config in ${bedrock_configs[@]}; do
+		if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then
+			cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}"
+			checkpath -f -o "${command_user}:${command_group}" -q "${bedrock_path_instance}/${bedrock_config}"
+		fi
+	done
+
+	local bedrock_ressources=( "behavior_packs" "definitions" "resource_packs" "structures" )
+	for bedrock_ressource in ${bedrock_ressources[@]}; do
+		if [ ! -L "${bedrock_path_instance}/${bedrock_ressource}" ]; then
+			ln -sf "${bedrock_path_data}/${bedrock_ressource}" "${bedrock_path_instance}"
+		fi
+	done
+}
+
+attach() {
+	pidnumber="$(cat ${pidfile})"
+	dtach_tmpfile="$(cat /proc/${pidnumber}/cmdline | tr '\0' ' ' | awk '{print $3}')"
+
+	if [ -S "${dtach_tmpfile}" ]; then
+		eval "${command}" -a "${dtach_tmpfile}" "${DTACH_OPTS}"
+	else
+		eerror "The determined socket file for dtach could not be found!"
+		eerror "Did the process crash?"
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/
@ 2022-04-03 15:00 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2022-04-03 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     f65ae824e515ea9041f9feb3d0a0ee621bed50ec
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 14:58:59 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 14:58:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65ae824

games-server/bedrock-server: fix json install

The file 'whitelist.json' has been renamed to 'allowlist.json'.

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...ock-server-1.18.12.01.ebuild => bedrock-server-1.18.12.01-r1.ebuild} | 2 +-
 .../files/{bedrock-server.initd-r2 => bedrock-server.initd-r3}          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild b/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
similarity index 94%
rename from games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild
rename to games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
index dba2b5b775bb..13bf440c68d3 100644
--- a/games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
@@ -46,7 +46,7 @@ src_install() {
 	dodir /opt/bin
 	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
 
-	newinitd "${FILESDIR}"/bedrock-server.initd-r2 bedrock-server
+	newinitd "${FILESDIR}"/bedrock-server.initd-r3 bedrock-server
 	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
 
 	einstalldocs

diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r2 b/games-server/bedrock-server/files/bedrock-server.initd-r3
similarity index 95%
rename from games-server/bedrock-server/files/bedrock-server.initd-r2
rename to games-server/bedrock-server/files/bedrock-server.initd-r3
index 1ff60aa7816f..6c2e7cb5e9f9 100644
--- a/games-server/bedrock-server/files/bedrock-server.initd-r2
+++ b/games-server/bedrock-server/files/bedrock-server.initd-r3
@@ -33,7 +33,7 @@ depend() {
 start_pre() {
 	checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}"
 
-	local bedrock_configs=( "permissions.json" "server.properties" "whitelist.json" )
+	local bedrock_configs=( "allowlist.json" "permissions.json" "server.properties" )
 	for bedrock_config in ${bedrock_configs[@]}; do
 		if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then
 			cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/
@ 2022-04-09 14:40 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2022-04-09 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b40142a2bd955692fa5bcb6d16920d8c1cfd9096
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 14:38:49 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 14:40:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40142a2

games-server/bedrock-server: fix shell script with non-POSIX features

Closes: https://bugs.gentoo.org/836701
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...r-1.18.12.01-r1.ebuild => bedrock-server-1.18.12.01-r2.ebuild} | 2 +-
 .../files/{bedrock-server.initd-r3 => bedrock-server.initd-r4}    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild b/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild
similarity index 94%
rename from games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
rename to games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild
index 13bf440c68d3..520bc15c7abd 100644
--- a/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild
@@ -46,7 +46,7 @@ src_install() {
 	dodir /opt/bin
 	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
 
-	newinitd "${FILESDIR}"/bedrock-server.initd-r3 bedrock-server
+	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
 	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
 
 	einstalldocs

diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r3 b/games-server/bedrock-server/files/bedrock-server.initd-r4
similarity index 86%
rename from games-server/bedrock-server/files/bedrock-server.initd-r3
rename to games-server/bedrock-server/files/bedrock-server.initd-r4
index 6c2e7cb5e9f9..2bc351490e96 100644
--- a/games-server/bedrock-server/files/bedrock-server.initd-r3
+++ b/games-server/bedrock-server/files/bedrock-server.initd-r4
@@ -33,16 +33,16 @@ depend() {
 start_pre() {
 	checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}"
 
-	local bedrock_configs=( "allowlist.json" "permissions.json" "server.properties" )
-	for bedrock_config in ${bedrock_configs[@]}; do
+	set -- "allowlist.json" "permissions.json" "server.properties"
+	for bedrock_config in $@; do
 		if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then
 			cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}"
 			checkpath -f -o "${command_user}:${command_group}" -q "${bedrock_path_instance}/${bedrock_config}"
 		fi
 	done
 
-	local bedrock_ressources=( "behavior_packs" "definitions" "resource_packs" "structures" )
-	for bedrock_ressource in ${bedrock_ressources[@]}; do
+	set -- "behavior_packs" "definitions" "resource_packs" "structures"
+	for bedrock_ressource in $@; do
 		if [ ! -L "${bedrock_path_instance}/${bedrock_ressource}" ]; then
 			ln -sf "${bedrock_path_data}/${bedrock_ressource}" "${bedrock_path_instance}"
 		fi


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/
@ 2023-02-28  0:43 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2023-02-28  0:43 UTC (permalink / raw
  To: gentoo-commits

commit:     ec91a35d8e775b39fb00396eebf4e5c937812261
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 00:41:10 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 00:42:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec91a35d

games-server/bedrock-server: add 1.19.63.01

Closes: https://bugs.gentoo.org/895492
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-server/bedrock-server/Manifest               |  1 +
 .../bedrock-server-1.19.63.01.ebuild               | 56 ++++++++++++++++++++++
 .../bedrock-server/files/bedrock-server.service    | 22 +++++++++
 3 files changed, 79 insertions(+)

diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index d31150c7a61a..c666e63329c1 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,2 +1,3 @@
 DIST bedrock-server-1.19.51.01.zip 76976732 BLAKE2B 30ed7a0ba1d2d13b91c5400e17a4facf92a540bf96216dd2fd6cce2d67e5576a8dc73e1c534bb7d0c3afff54cfd3a2715b1c10ecbde3129880003a55fd58fa5e SHA512 b4554cb0fe66bc742d80e2c6143faa6ad10412645207a845a84cbd99550888a0e9e80df764419ff50b24abbdd63d1260c2532c79add2dd4e012604e5bff59173
 DIST bedrock-server-1.19.62.01.zip 77824871 BLAKE2B 9b3d875cf798ba0d68e2a95a78ba24ff4635751c910fadb70949bcb395f4f37fef425328a8268045f1ec52f2bc171df461706d549f0e656c46834564feec4c97 SHA512 8ec08145ff7b7ef646084bcb5bd242c762ff3e9ca6e1aedcf04e04f6e6521fb5b52f2cd3c8906af64c23b62b3ab5a0ef422c17428b91b438249870cb0bf15caf
+DIST bedrock-server-1.19.63.01.zip 77829248 BLAKE2B 3df63ef618242afc27245d0cee1b2216722315f268d0be3e2b4f4ca588463603389ec11d97a4b4272327edbd1e7307fa2f42fe0c21cbf00c4a03c72f187e45e9 SHA512 59e52498b2d6e3d97ae588e1910f9adcc0039319738d3ade7539252129d3a4c22014d44aa48ec0feb92776fd611e9b456f6d09e133b23916e84db5899edd8a00

diff --git a/games-server/bedrock-server/bedrock-server-1.19.63.01.ebuild b/games-server/bedrock-server/bedrock-server-1.19.63.01.ebuild
new file mode 100644
index 000000000000..aa93f6d0bc04
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.19.63.01.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	acct-group/bedrock
+	acct-user/bedrock
+	app-misc/dtach
+	dev-libs/openssl:0/1.1
+	sys-libs/zlib
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+DOCS=(
+	"bedrock_server_how_to.html"
+	"release-notes.txt"
+)
+
+QA_PREBUILT="opt/bedrock-server/bedrock_server"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	exeinto /opt/bedrock-server
+	doexe bedrock_server
+
+	insinto /opt/bedrock-server
+	doins {allowlist,permissions}.json server.properties
+	doins -r {behavior,resource}_packs definitions
+
+	dodir /opt/bin
+	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
+
+	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
+	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
+	systemd_newunit "${FILESDIR}"/bedrock-server.service bedrock-server@.service
+
+	einstalldocs
+}

diff --git a/games-server/bedrock-server/files/bedrock-server.service b/games-server/bedrock-server/files/bedrock-server.service
new file mode 100644
index 000000000000..043f2d9e04b1
--- /dev/null
+++ b/games-server/bedrock-server/files/bedrock-server.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Bedrock Server (World: %I)
+After=network.target
+
+[Service]
+User=bedrock
+Group=bedrock
+WorkingDirectory=-/var/lib/bedrock-server/%I
+PIDFile=/run/bedrock-server.%I.pid
+ExecStartPre=!/bin/mkdir -p /var/lib/bedrock-server/%I
+ExecStartPre=!/bin/cp -n /opt/bedrock-server/allowlist.json /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/cp -n /opt/bedrock-server/permissions.json /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/cp -n /opt/bedrock-server/server.properties /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/ln -sf /opt/bedrock-server/behavior_packs /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/ln -sf /opt/bedrock-server/definitions /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/ln -sf /opt/bedrock-server/resource_packs /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/ln -sf /opt/bedrock-server/structures /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/chown -R bedrock:bedrock /var/lib/bedrock-server/%I
+ExecStart=/bin/sh -c '/usr/bin/dtach -N $(mktemp -u) /opt/bin/bedrock-server'
+
+[Install]
+WantedBy=multi-user.target


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/
@ 2023-12-25 13:56 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2023-12-25 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     c8e51359e7627ec908ca3b11ee17f49d8af72981
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 13:56:03 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 13:56:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e51359

games-server/bedrock-server: update init script

This fixes the following warning:
* OPENRC: unnecessary usage of start_stop_daemon_args found:
* --chdir should be replaced with directory="[..]"

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...ock-server-1.20.51.01.ebuild => bedrock-server-1.20.51.01-r1.ebuild} | 2 +-
 .../files/{bedrock-server.initd-r4 => bedrock-server.initd-r5}          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-server/bedrock-server/bedrock-server-1.20.51.01.ebuild b/games-server/bedrock-server/bedrock-server-1.20.51.01-r1.ebuild
similarity index 94%
rename from games-server/bedrock-server/bedrock-server-1.20.51.01.ebuild
rename to games-server/bedrock-server/bedrock-server-1.20.51.01-r1.ebuild
index 885e6a8334b8..694410ea0565 100644
--- a/games-server/bedrock-server/bedrock-server-1.20.51.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.20.51.01-r1.ebuild
@@ -47,7 +47,7 @@ src_install() {
 	dodir /opt/bin
 	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
 
-	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
+	newinitd "${FILESDIR}"/bedrock-server.initd-r5 bedrock-server
 	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
 	systemd_newunit "${FILESDIR}"/bedrock-server.service bedrock-server@.service
 

diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r4 b/games-server/bedrock-server/files/bedrock-server.initd-r5
similarity index 97%
rename from games-server/bedrock-server/files/bedrock-server.initd-r4
rename to games-server/bedrock-server/files/bedrock-server.initd-r5
index 2bc351490e96..40946197b7c5 100644
--- a/games-server/bedrock-server/files/bedrock-server.initd-r4
+++ b/games-server/bedrock-server/files/bedrock-server.initd-r5
@@ -12,10 +12,10 @@ bedrock_command="/opt/bin/bedrock-server"
 bedrock_path="/var/lib/bedrock-server"
 bedrock_path_data="/opt/bedrock-server"
 bedrock_path_instance="${bedrock_path}/${instance}"
+directory="${bedrock_path_instance}/"
 dtach_tmpfile="$(mktemp -u)"
 name="Minecraft Bedrock server (${instance})"
 pidfile="/run/bedrock-server.${instance}.pid"
-start_stop_daemon_args="--chdir ${bedrock_path_instance}"
 
 description_attach="Attaches to the session (interactive console) of the Minecraft Bedrock server"
 extra_started_commands="attach"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-12-25 13:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-28  0:43 [gentoo-commits] repo/gentoo:master commit in: games-server/bedrock-server/, games-server/bedrock-server/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2023-12-25 13:56 Conrad Kostecki
2022-04-09 14:40 Conrad Kostecki
2022-04-03 15:00 Conrad Kostecki
2020-08-23 18:14 Conrad Kostecki
2019-12-13  0:16 Conrad Kostecki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox