From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Apr 2022 13:07:24 +0100 Subject: gentoo resync : 16.04.2022 --- games-server/Manifest.gz | Bin 1896 -> 1898 bytes games-server/bedrock-server/Manifest | 4 +- .../bedrock-server-1.18.12.01-r1.ebuild | 53 ------------------ .../bedrock-server-1.18.12.01-r2.ebuild | 53 ++++++++++++++++++ .../bedrock-server/files/bedrock-server.initd-r3 | 62 --------------------- .../bedrock-server/files/bedrock-server.initd-r4 | 62 +++++++++++++++++++++ 6 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild create mode 100644 games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild delete mode 100644 games-server/bedrock-server/files/bedrock-server.initd-r3 create mode 100644 games-server/bedrock-server/files/bedrock-server.initd-r4 (limited to 'games-server') diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz index 3d38358978a9..5f0fcd55b87a 100644 Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest index 06f92925ba36..64b9aef12e86 100644 --- a/games-server/bedrock-server/Manifest +++ b/games-server/bedrock-server/Manifest @@ -1,5 +1,5 @@ AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58 -AUX bedrock-server.initd-r3 2026 BLAKE2B dcc17638e3c6bcb62a3a88e975fe379efe17241e72c78718562216c7ab9321cf421035310b1afa90636645579b6143b36d20b99e56f05c6962c598febb9521d8 SHA512 f72902c0ca653a5867dca55e521d5229a58ececf50479eb0e46c3c10c3ed8bd4c9330416c88f4523988bda0191fcbe6eedf881ffabb97e625f9854190defc964 +AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea788a50dc834ea761ef8dcbf21696214ff3370f43de3218e202a5ad786b972c77a679a7cd0d2d1ef38f43db67de SHA512 3281e15bf7a4b87cd1b53b755c1695d77f2de0b7ea23ebdedf0bea60013c5d79f563fdbab3de421bfa50c3d2f24e93c39f49525d8157ca9e649d206a1cb80dfd DIST bedrock-server-1.18.12.01.zip 67706215 BLAKE2B 8047a014d01fef4e5e438ecfe5886b154fe424599d72e6c3405c8a7663df883e250e20ffa46e0eb6e9df5e867d22e5e193a0e389049cd67d355873cb0e68a798 SHA512 fe0bade92143759b4d0eccd4586a15b62083d95606cd62a7fb1fe5ec1a36496512a4414493c210f09c42b8c117db760236861913bbf6d17bc024cdfb83e5d1e2 -EBUILD bedrock-server-1.18.12.01-r1.ebuild 1086 BLAKE2B bd0561324ddf88b42a8a537671467a1e1302fcdbfb70fb247b163fc9e8070e122ff66ada43fa27b859e7f1e1bcd0ee1eb13f5cbe386d96311b4ea13504966f98 SHA512 42d8b65f10853230dd748e5578f837fb0a00e30c93e0ccf44790a2da3583b684056ddc5aa497c83a62c730d23b70f04f24e740246fc630678274488d24f3a33c +EBUILD bedrock-server-1.18.12.01-r2.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7 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-r1.ebuild deleted file mode 100644 index 13bf440c68d3..000000000000 --- a/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 structures - - dodir /opt/bin - dosym ../bedrock-server/bedrock_server /opt/bin/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/bedrock-server-1.18.12.01-r2.ebuild b/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild new file mode 100644 index 000000000000..520bc15c7abd --- /dev/null +++ b/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 structures + + 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 + + einstalldocs +} diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r3 b/games-server/bedrock-server/files/bedrock-server.initd-r3 deleted file mode 100644 index 6c2e7cb5e9f9..000000000000 --- a/games-server/bedrock-server/files/bedrock-server.initd-r3 +++ /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}" = "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=( "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}" - 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 -} diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r4 b/games-server/bedrock-server/files/bedrock-server.initd-r4 new file mode 100644 index 000000000000..2bc351490e96 --- /dev/null +++ b/games-server/bedrock-server/files/bedrock-server.initd-r4 @@ -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}" + + 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 + + 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 + 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 +} -- cgit v1.2.3