[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/, games-server/minecraft-server/files/
commit: 9efd7aaf26aae0f3983d42906b9daa9de366ca9a
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Dec 11 17:08:01 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Dec 11 17:08:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efd7aaf
games-server/minecraft-server: add workaround for log4j rce
Bug: https://bugs.gentoo.org/828936
Signed-off-by: Conrad Kostecki gentoo.org>
.../minecraft-server/files/log4j2_112-116.xml | 28 +
.../files/minecraft-server.initd-r6| 67 ++
.../files/minecraft-server.service-r1 | 17 ++
.../minecraft-server-1.16.5-r1.ebuild | 55 ++
4 files changed, 167 insertions(+)
diff --git a/games-server/minecraft-server/files/log4j2_112-116.xml
b/games-server/minecraft-server/files/log4j2_112-116.xml
new file mode 100644
index ..569223572f64
--- /dev/null
+++ b/games-server/minecraft-server/files/log4j2_112-116.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r6
b/games-server/minecraft-server/files/minecraft-server.initd-r6
new file mode 100644
index ..dc4ecc84a997
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.initd-r6
@@ -0,0 +1,67 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 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_log4j="log4j2_112-116.xml"
+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}"
+
+ 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
+
+ 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
+}
diff --git a/games-server/minecraft-server/files/minecraft-server.service-r1
b/games-server/minecraft-server/files/minecraft-server.service-r1
new file mode 100644
index ..fac26368a043
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.service-r1
@@ -0,0 +1,17 @@
+[Unit]
+Description=Minecraft Server (World: %I)
+After=network.target
+
+[Service]
+User=minecraft
+Group=minecraft
+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)
[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/, games-server/minecraft-server/files/
commit: 192d06f996fdd9d536eb6b91595ff6e825a6
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Dec 5 20:48:47 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Dec 5 21:45:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192d06f9
games-server/minecraft-server: drop 1.17.1
Signed-off-by: Conrad Kostecki gentoo.org>
games-server/minecraft-server/Manifest | 1 -
.../minecraft-server/files/minecraft-server-bin| 21 +
.../minecraft-server-1.17.1.ebuild | 54 --
3 files changed, 21 insertions(+), 55 deletions(-)
diff --git a/games-server/minecraft-server/Manifest
b/games-server/minecraft-server/Manifest
index 0d4cb060fd8b..7e5df1a3842c 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,3 +1,2 @@
DIST minecraft-server-1.16.5.jar 37962360 BLAKE2B
355715b809c09581e457f54618bd6ddab91b1c488d709d402fa6690d32244298d44191d439b8d9f27f4853f7e7658bfa2db88b61697a1caeb66da76ab211d9f8
SHA512
8321c50d788c6a3a3e8b2146bf1b20f6a3da87dd21ec4bd1fda0031d26f728d64e56a6a230ba5d857f4d500d7ba281eb4e3c28b6715f29d8dcba79d8c0ddf03f
-DIST minecraft-server-1.17.1.jar 43626592 BLAKE2B
f926c01890faf6904eb38ea14f1affddd32dbe992c4df9d125507325fa11ec98eeaa63622387a3608d89bbf2602a447efc8560a49b24ba517ed55bf2fd18fac9
SHA512
fe6e48e2cee38224d2c88f04c19afca9c21fddbe6077b5538e0a0581c2f6c4478ec99bc369bec5131d709b89273dbd769659f149163f0c284b518a38e58a5bcc
DIST minecraft-server-1.18.jar 46323386 BLAKE2B
f603477f69b0c675cff45585329dfd97f94343655946475b81d272e1ce27e08d79d3f9bdc07a476cfe2794602eaa83e353ebecdbc61043ff4f4b335a55639f08
SHA512
be8face6d0ad94578afa520eb0eecde31c1e3ea711a6f5349e0fa1a26e95069cc3a409435e37adc6a3d871a82ddfb86de8af3395c06b11148921058c220b03d0
diff --git a/games-server/minecraft-server/files/minecraft-server-bin
b/games-server/minecraft-server/files/minecraft-server-bin
new file mode 100644
index ..b2664211f2cf
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server-bin
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Options
+JAVA_JAR="/usr/share/minecraft-server/lib/minecraft-server.jar"
+JAVA_OPTS="$@"
+MINECRAFT_OPTS="nogui"
+
+# Choose JAVA
+set -- /opt/openjdk-bin-17.* /usr/lib*/openjdk-17
+while ! [ -d "${1}" ]; do
+ if [ ${#} -eq 1 ]; then
+ echo "Error: No JAVA 17 runtime found!"
+ exit 1
+ fi
+
+ shift
+done
+JAVA_HOME="${1}"
+
+# Launch Minecraft server
+"${JAVA_HOME}"/bin/java ${JAVA_OPTS} -jar "${JAVA_JAR}" "${MINECRAFT_OPTS}"
diff --git a/games-server/minecraft-server/minecraft-server-1.17.1.ebuild
b/games-server/minecraft-server/minecraft-server-1.17.1.ebuild
deleted file mode 100644
index 3d1fcc0bad1e..
--- a/games-server/minecraft-server/minecraft-server-1.17.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="a16d67e5807f57fc4e550299cf20226194497dc2"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/;
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar ->
${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
- acct-group/minecraft
- acct-user/minecraft
- app-misc/dtach
- || (
- >=virtual/jre-1.8
- >=virtual/jdk-1.8
- )
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
- cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
- :;
-}
-
-src_install() {
- java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
- java-pkg_dolauncher minecraft-server --jar minecraft-server.jar
--java_args "\${JAVA_OPTS}"
-
- newinitd "${FILESDIR}"/minecraft-server.initd-r4 minecraft-server
- newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
- systemd_newunit "${FILESDIR}"/minecraft-server.service
minecraft-server@.service
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/, games-server/minecraft-server/files/
commit: d79058fa965ac6f2737f9a236e3b06678b67169a
Author: Conrad Kostecki gentoo org>
AuthorDate: Thu Dec 12 23:37:20 2019 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Dec 13 00:14:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79058fa
games-server/minecraft-server: bump to version 1.15.0
Also changed from app-misc/screen to app-misc/dtach,
to use a lightweight alternative for the interactive process.
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Conrad Kostecki gentoo.org>
games-server/minecraft-server/Manifest | 1 +
.../files/minecraft-server.initd-r3| 47 +
.../minecraft-server-1.15.0.ebuild | 48 ++
3 files changed, 96 insertions(+)
diff --git a/games-server/minecraft-server/Manifest
b/games-server/minecraft-server/Manifest
index 59a1c2a41bf..8eefe9cc834 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1 +1,2 @@
DIST minecraft-server-1.14.4.jar 35958734 BLAKE2B
058d6609296394e4714a159976d4de0261a552a919e33db1e54d97e3d2ee90cd4356b60190b807050d3c7ab336149d1c9be55093ba002735ccc6a162706c6ee3
SHA512
b3d2852c6fa1b996bbf2fa9fc1fb860c6bca5136bcc5ddd3d236d85789c6bce81620f6b2d69eaa10c41d020fe0bb54de2fa601b3df3093af2691853a4445e1f8
+DIST minecraft-server-1.15.0.jar 36164465 BLAKE2B
e209abacd4a90964b7ccf19333224c0235c91f6f560a9c83f585c92cc973f3dea292032a67ef99aac8e8f17aedd557a0d8f548edda5a187c6a20def091e1ed9a
SHA512
66775b4be5a38fe7e3fc94c50b870d58cc21d4da1b4f4437d749b5b6f93680a2206b5a1eac7e55b42072619686b0bdf16ed5850ce8db9c65f6d2508529bac0a4
diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r3
b/games-server/minecraft-server/files/minecraft-server.initd-r3
new file mode 100644
index 000..a76d6d23e67
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.initd-r3
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 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}'"
+
+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/minecraft.${SVCNAME}!"
+ return 1
+ fi
+}
diff --git a/games-server/minecraft-server/minecraft-server-1.15.0.ebuild
b/games-server/minecraft-server/minecraft-server-1.15.0.ebuild
new file mode 100644
index 000..83a226fa696
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.15.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="e9f105b3c5c7e85c7b445249a93362a22f62442d"
+
+inherit readme.gentoo-r1 java-pkg-2
+
+DESCRIPTION="The official server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/;
+SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar ->
${P}.jar"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ acct-group/minecraft
+ acct-user/minecraft
+ app-misc/dtach
+ || (
+ >=virtual/jre-1.8
+ >=virtual/jdk-1.8
+ )
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ cp "${DISTDIR}"/${A} "${WORKDIR}" || die
+}
+
+src_install() {
+ java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
+ java-pkg_dolauncher minecraft-server --jar minecraft-server.jar
--java_args "\${JAVA_OPTS}"
+
+ newinitd "${FILESDIR}"/minecraft-server.initd-r3
[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/, games-server/minecraft-server/files/
commit: 66628111d13656748437c4043eeaf518f123c6d2
Author: Conrad Kostecki kostecki com>
AuthorDate: Wed Sep 5 21:59:20 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Sep 15 20:09:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66628111
games-server/minecraft-server: drop old version
Bug: https://bugs.gentoo.org/665316
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9789
games-server/minecraft-server/Manifest | 1 -
.../files/minecraft-server-r1.initd| 47 --
.../minecraft-server/minecraft-server-1.13.ebuild | 55 --
3 files changed, 103 deletions(-)
diff --git a/games-server/minecraft-server/Manifest
b/games-server/minecraft-server/Manifest
index f721e094371..08ef8c13b11 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,2 +1 @@
DIST minecraft-server-1.13.1.jar 33832589 BLAKE2B
87f3d1bc0650db52c5053ca58785827b30c845fac42f37a98b463ede8341307a881cb06b9a9f3656c0258fdffa88ab9dd41fe28be51263369f24397d50ea2b79
SHA512
a82805cc0b6ea0c3481405eef1910549623db9b025ff78d228ef9c767950b34d1e8c30452f2f6f9ec22a53445a8dd64ebaec7c13cee1a9eac63bfc80725fcc44
-DIST minecraft-server-1.13.jar 32649675 BLAKE2B
c137e8009ea201fafe148277aa2d81f7683b99653f74f335659ec239a2cdb3b1271eea290bbda58967fd81075f76edf14622d64d4f25e92e92bb186348acea5d
SHA512
726e9775163338660429886dbf940e9ad43d75fa315a8bb2936d23491e8c5717fbd365490b91ff74f876eb498a3674b88f41a526b06a64acbc33d8670b48c342
diff --git a/games-server/minecraft-server/files/minecraft-server-r1.initd
b/games-server/minecraft-server/files/minecraft-server-r1.initd
deleted file mode 100644
index 872885ecd64..000
--- a/games-server/minecraft-server/files/minecraft-server-r1.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "minecraft-server" ]; then
- instance="main"
-else
- instance="${SVCNAME#minecraft-server.}"
-fi
-
-minecraft_command="/usr/bin/minecraft-server"
-minecraft_logs="/var/log/minecraft-server"
-minecraft_path="/var/lib/minecraft-server/${instance}"
-name="Minecraft Server (World: ${instance})"
-pidfile="/run/minecraft-server.${instance}.pid"
-screen_name="minecraft-server.${instance}"
-start_stop_daemon_args="--chdir ${minecraft_path} --env
JAVA_OPTS=\"${MINECRAFT_OPTS}\""
-
-command="screen"
-command_args="-DmUS ${screen_name} ${minecraft_command}"
-command_background="true"
-command_group="minecraft"
-command_user="minecraft"
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath -d -o "${command_user}:${command_group}" -q
"${minecraft_path}"
-
- checkpath -f -o "${command_user}:${command_group}" -q
"${minecraft_path}"/eula.txt
- echo "eula=true" > "${minecraft_path}"/eula.txt
-
- checkpath -d -o "${command_user}:${command_group}" -q
"${minecraft_logs}"/"${instance}"
-
- if [ ! -L "${minecraft_path}"/logs ]; then
- cd "${minecraft_path}" && ln -s
../../../log/minecraft-server/"${instance}" logs
- fi
-
- if [ -z ${MINECRAFT_OPTS} ]; then
- eerror "You must define MINECRAFT_OPTS in
/etc/conf.d/minecraft.${SVCNAME}!"
- return 1
- fi
-
- return 0
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.13.ebuild
b/games-server/minecraft-server/minecraft-server-1.13.ebuild
deleted file mode 100644
index 2ef64c02f1a..000
--- a/games-server/minecraft-server/minecraft-server-1.13.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PV="d0caafb8438ebd206f99930cfaecfa6c9a13dca0"
-
-inherit readme.gentoo-r1 java-pkg-2 user
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/;
-SRC_URI="https://launcher.mojang.com/mc/game/${PV}/server/${MY_PV}/server.jar
-> ${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-misc/screen
- >=virtual/jre-1.8"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
- enewgroup minecraft
- enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
-}
-
-src_unpack() {
- # Don't unpack that jar, just copy it to WORKDIR
- cp "${DISTDIR}"/${A} "${WORKDIR}" || die
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
- java-pkg_dolauncher minecraft-server --jar minecraft-server.jar
--java_args "\${JAVA_OPTS}"
-
- newinitd "${FILESDIR}"/minecraft-server-r1.initd minecraft-server
- newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
-
- diropts -o minecraft -g minecraft
- keepdir
[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/, games-server/minecraft-server/files/
commit: 49828d2b095323265004ce3a9ddca4e25246be43
Author: Conrad Kostecki kostecki com>
AuthorDate: Mon Jul 30 14:07:10 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Aug 5 21:47:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49828d2b
games-server/minecraft-server: drop old version.
Bug: https://bugs.gentoo.org/662434
Package-Manager: Portage-2.3.43, Repoman-2.3.10
games-server/minecraft-server/Manifest | 1 -
.../minecraft-server/files/minecraft-server.initd | 48
.../minecraft-server-1.12.2.ebuild | 67 --
3 files changed, 116 deletions(-)
diff --git a/games-server/minecraft-server/Manifest
b/games-server/minecraft-server/Manifest
index 5d94477231b..b67b5dafa63 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,2 +1 @@
-DIST minecraft-server-1.12.2.jar 30222121 BLAKE2B
91733822789405dbec5d335fc67e47d3278138929280c4fdcf6053fb0824651474c8e2310c342862fc1aefdf74f55d0a21d78b3c34f32484ec8196b7c5921d72
SHA512
327196bfb833160ae6fb7d12b7d372d031bc0ffbac3455481c1635b01e00f0d5502d4698fbc4f8e7ee59cc3902d56c41261c45d1f1c8f3972e192631f504a0fc
DIST minecraft-server-1.13.jar 32649675 BLAKE2B
c137e8009ea201fafe148277aa2d81f7683b99653f74f335659ec239a2cdb3b1271eea290bbda58967fd81075f76edf14622d64d4f25e92e92bb186348acea5d
SHA512
726e9775163338660429886dbf940e9ad43d75fa315a8bb2936d23491e8c5717fbd365490b91ff74f876eb498a3674b88f41a526b06a64acbc33d8670b48c342
diff --git a/games-server/minecraft-server/files/minecraft-server.initd
b/games-server/minecraft-server/files/minecraft-server.initd
deleted file mode 100644
index 630c88871d7..000
--- a/games-server/minecraft-server/files/minecraft-server.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "minecraft-server" ]; then
- instance="main"
-else
- instance="${SVCNAME#minecraft-server.}"
-fi
-
-java="${JAVA_HOME-/usr}"/bin/java
-minecraft_jar="/usr/share/games/minecraft-server/minecraft-server.jar"
-minecraft_logs="/var/log/minecraft-server"
-minecraft_path="/var/lib/minecraft-server/${instance}"
-name="Minecraft Server (World: ${instance})"
-pidfile="/run/minecraft-server.${instance}.pid"
-screen_name="minecraft-server.${instance}"
-start_stop_daemon_args="--chdir ${minecraft_path}"
-
-command="screen"
-command_args="-DmUS ${screen_name} ${java} ${MINECRAFT_OPTS} -jar
${minecraft_jar}"
-command_background="true"
-command_group="minecraft"
-command_user="minecraft"
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath -d -o "${command_user}:${command_group}" -q
"${minecraft_path}"
-
- checkpath -f -o "${command_user}:${command_group}" -q
"${minecraft_path}"/eula.txt
- echo "eula=true" > "${minecraft_path}"/eula.txt
-
- checkpath -d -o "${command_user}:${command_group}" -q
"${minecraft_logs}"/"${instance}"
-
- if [ ! -L "${minecraft_path}"/logs ]; then
- cd "$minecraft_path}" && ln -s
../../../log/minecraft-server/"${instance}" logs
- fi
-
- if [ -z ${MINECRAFT_OPTS} ]; then
- eerror "You must define MINECRAFT_OPTS in
/etc/conf.d/minecraft.${SVCNAME}!"
- return 1
- fi
-
- return 0
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
b/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
deleted file mode 100644
index 5b0f749a455..000
--- a/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="The official server for the sandbox video game Minecraft"
-HOMEPAGE="https://www.minecraft.net/;
-SRC_URI="https://s3.amazonaws.com/Minecraft.Download/versions/${PV}/minecraft_server.${PV}.jar
-> ${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-misc/screen
- virtual/jre"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
- enewgroup minecraft
- enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
-}
-
-src_unpack() {
- # Don't unpack that jar, just copy it to WORKDIR
- cp "${DISTDIR}"/${A} "${WORKDIR}" || die
-}
-
-src_install() {
- insinto /usr/share/games/minecraft-server
- insopts -o minecraft -g minecraft
- newins minecraft-server-${PV}.jar minecraft-server.jar
-
- newinitd "${FILESDIR}"/minecraft-server.initd minecraft-server
- newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
-
- diropts -o minecraft -g minecraft
- keepdir /var/lib/minecraft-server
- keepdir /var/log/minecraft-server
-}
-
-pkg_postinst() {
- elog "This package provides an init
