[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/files/

[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/files/

[Conrad Kostecki]

commit:     e54bbe3e6366a6b14a6b99c4b4aef900d8705727
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Dec 13 19:02:38 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 21:32:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54bbe3e

games-server/minecraft-server: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/23290
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/minecraft-server.initd-r4                | 62 ----------------------
 1 file changed, 62 deletions(-)

diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r4 b/games-server/minecraft-server/files/minecraft-server.initd-r4
deleted file mode 100644
index e81337a7d19f..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.initd-r4
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "minecraft-server" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#minecraft-server.}"
-fi
-
-dtach_tmpfile="$(mktemp -u)"
-minecraft_command="/usr/bin/minecraft-server"
-minecraft_logs="/var/log/minecraft-server"
-minecraft_logs_instance="${minecraft_logs}/${instance}"
-minecraft_path="/var/lib/minecraft-server"
-minecraft_path_instance="${minecraft_path}/${instance}"
-name="Minecraft Server (World: ${instance})"
-pidfile="/run/minecraft-server.${instance}.pid"
-start_stop_daemon_args="--chdir ${minecraft_path_instance} --env JAVA_OPTS='${MINECRAFT_OPTS}'"
-
-description_attach="Attaches to the session (interactive console) of the Minecraft server"
-extra_started_commands="attach"
-
-command="/usr/bin/dtach"
-command_background="true"
-command_args="-N ${dtach_tmpfile} ${minecraft_command}"
-command_group="minecraft"
-command_user="minecraft"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}" "${minecraft_path_instance}"
-
-	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path_instance}"/eula.txt
-	echo "eula=true" > "${minecraft_path_instance}"/eula.txt
-
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}" "${minecraft_logs_instance}"
-
-	if [ ! -L "${minecraft_path_instance}"/logs ]; then
-		cd "${minecraft_path_instance}" && ln -s ../../../log/minecraft-server/"${instance}" logs
-	fi
-
-	if [ -z "${MINECRAFT_OPTS}" ]; then
-		eerror "You must define 'MINECRAFT_OPTS' in '/etc/conf.d/${SVCNAME}'!"
-		return 1
-	fi
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/files/

[Conrad Kostecki]

commit:     9607b827c39b33c230e47eafdd16b9f09dbc2e30
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 20:54:02 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 20:54:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9607b827

games-server/minecraft-server/files: restore files

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

 .../files/{minecraft-server.initd-r6 => minecraft-server.initd-r5} | 7 +------
 .../{minecraft-server.service-r1 => minecraft-server.service}      | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r6 b/games-server/minecraft-server/files/minecraft-server.initd-r5
similarity index 88%
rename from games-server/minecraft-server/files/minecraft-server.initd-r6
rename to games-server/minecraft-server/files/minecraft-server.initd-r5
index dc4ecc84a997..bfaad750b8c7 100644
--- a/games-server/minecraft-server/files/minecraft-server.initd-r6
+++ b/games-server/minecraft-server/files/minecraft-server.initd-r5
@@ -10,7 +10,6 @@ fi
 
 dtach_tmpfile="$(mktemp -u)"
 minecraft_command="/usr/bin/minecraft-server"
-minecraft_log4j="log4j2_112-116.xml"
 minecraft_logs="/var/log/minecraft-server"
 minecraft_logs_instance="${minecraft_logs}/${instance}"
 minecraft_path="/var/lib/minecraft-server"
@@ -24,7 +23,7 @@ extra_started_commands="attach"
 
 command="/usr/bin/dtach"
 command_background="true"
-command_args="-N ${dtach_tmpfile} ${minecraft_command}"
+command_args="-N ${dtach_tmpfile} ${minecraft_command} ${MINECRAFT_OPTS}"
 command_group="minecraft"
 command_user="minecraft"
 
@@ -35,10 +34,6 @@ depend() {
 start_pre() {
 	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}" "${minecraft_path_instance}"
 
-	if [ ! -L "${minecraft_path_instance}/${minecraft_log4j}" ]; then
-		ln -s ../../../../usr/share/minecraft-server/"${minecraft_log4j}" "${minecraft_path_instance}"
-	fi
-
 	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path_instance}"/eula.txt
 	echo "eula=true" > "${minecraft_path_instance}"/eula.txt
 

diff --git a/games-server/minecraft-server/files/minecraft-server.service-r1 b/games-server/minecraft-server/files/minecraft-server.service
similarity index 83%
rename from games-server/minecraft-server/files/minecraft-server.service-r1
rename to games-server/minecraft-server/files/minecraft-server.service
index fac26368a043..ad9167e5b1c9 100644
--- a/games-server/minecraft-server/files/minecraft-server.service-r1
+++ b/games-server/minecraft-server/files/minecraft-server.service
@@ -9,7 +9,6 @@ WorkingDirectory=-/var/lib/minecraft-server/%I
 PIDFile=/run/minecraft-server.%I.pid
 ExecStartPre=!/bin/mkdir -p /var/lib/minecraft-server/%I
 ExecStartPre=!/bin/chown -R minecraft:minecraft /var/lib/minecraft-server/%I
-ExecStartPre=!/bin/ln -s /usr/share/minecraft-server/log4j2_112-116.xml /var/lib/minecraft-server/%I
 ExecStartPre=/bin/sh -c 'echo "eula=true" > /var/lib/minecraft-server/%I/eula.txt'
 ExecStart=/bin/sh -c '/usr/bin/dtach -N $(mktemp -u) /usr/bin/minecraft-server'
 

[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/files/

[Conrad Kostecki]

commit:     f5248226e7537d42b843218998560ec658056dfd
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 12:46:39 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 12:50:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5248226

games-server/minecraft-server: fix message

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

 games-server/minecraft-server/files/minecraft-server-bin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-server/minecraft-server/files/minecraft-server-bin b/games-server/minecraft-server/files/minecraft-server-bin
index eb81aaf02103..1dda3bc48797 100644
--- a/games-server/minecraft-server/files/minecraft-server-bin
+++ b/games-server/minecraft-server/files/minecraft-server-bin
@@ -9,7 +9,7 @@ MINECRAFT_OPTS="nogui"
 set -- /opt/openjdk-bin-21.* /usr/lib*/openjdk-21
 while ! [ -d "${1}" ]; do
 	if [ ${#} -eq 1 ]; then
-		echo "Error: No JAVA 17 runtime found!"
+		echo "Error: No JAVA 21 runtime found!"
 		exit 1
 	fi