From nobody Sun Dec 26 13:54:41 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DE1A71908603; Sun, 26 Dec 2021 13:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JMMjs3rlxz4cfQ; Sun, 26 Dec 2021 13:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 651733258; Sun, 26 Dec 2021 13:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BQDsfd9086722; Sun, 26 Dec 2021 13:54:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BQDsfkN086721; Sun, 26 Dec 2021 13:54:41 GMT (envelope-from git) Date: Sun, 26 Dec 2021 13:54:41 GMT Message-Id: <202112261354.1BQDsfkN086721@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Juraj Lutter Subject: git: 190d1538adeb - 2021Q4 - games/minecraft-server: Update to 1.18.1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 190d1538adeb123e49ee12569960158f3b75d228 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640526881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3jo73LD/31n44+91dlwbcxq8ryqq128TlEMX//xUJg=; b=Vx3p1UBcIJJEsG1Nai3QEsjakQH+7T0biDsLJGwbII8gpZyQUTVn1MxSTzv88Ud03wfi4n te+R5kW0Sq6GimR5KKnNpO5N3nJXT2lU3n7hhtEWuEhl8XNU60Y8lk771PBX6p6rH7nhg0 ysTGKQF6ua2udFB5UWcKwYSpehcAiSZrn3EebOqC6Whfv7U2hhnhm5SvHyo9mL360KCOcx dLT2HXpMB0fw2Ukr6OXO1LKH8ydtC9geNyNyZ3HR4OWSHh7XZ5GC9Kh40KvbHpWFPV93RT 13N5Ex5z5Bqujr8tCOJOCxZuj1cun+/ZximsT9JTy2jMmaJHW1pTAq+G0rUq7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640526881; a=rsa-sha256; cv=none; b=DG8198hCiL2lZqNTQK7UP073ZI+szfBdOWONRCjoq2D4MaLl/Vbf7kr1QtFEz/gVtjMZww mAYURzlx42iO5yD1fMxP5DhUN9oiZ8nvpaeuIUYoSSUVi6GGmK7xm8jX9T6J0+TCdfLu0O qtagya/LArxnSCyIX4jb1cWOgvnjvIjxLw9gY+0YJJcV25jeK2D24C55J4zmtzlWyRPQ1A Eoz3LaeaRGWj3LA/6TzvdFEXORJ0pvW4mqjmqQhShmNc9YkQweqc+NvP4n26Q47j0rxr3e PII8vD8IEtQOQLA6o96JqpCWgrULER8lZCu2vyS9OPJSgpT9DJR1lbFIwsdOsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=190d1538adeb123e49ee12569960158f3b75d228 commit 190d1538adeb123e49ee12569960158f3b75d228 Author: Jonathan Price AuthorDate: 2021-12-26 13:40:41 +0000 Commit: Juraj Lutter CommitDate: 2021-12-26 13:53:47 +0000 games/minecraft-server: Update to 1.18.1 PR: 260452 (cherry picked from commit 9b7bf0835c59594c983a54034f3fa04d95d5fc3e) --- games/minecraft-server/Makefile | 5 +++-- games/minecraft-server/distinfo | 6 +++--- games/minecraft-server/files/minecraft-server.in | 3 ++- games/minecraft-server/files/minecraft.in | 2 ++ games/minecraft-server/files/pkg-deinstall.in | 3 +++ games/minecraft-server/pkg-plist | 21 +++++++++++++++++++++ 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile index 7059ef1e7fe8..580585f60577 100644 --- a/games/minecraft-server/Makefile +++ b/games/minecraft-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= minecraft-server -PORTVERSION= 1.17.1 +PORTVERSION= 1.18.1 CATEGORIES= games java -MASTER_SITES= https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/ +MASTER_SITES= https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/ DISTNAME= server EXTRACT_SUFX= .jar DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} @@ -29,6 +29,7 @@ GROUPS= ${USERS} NO_BUILD= yes USE_JAVA= yes +JAVA_VERSION= 17 SUB_FILES= minecraft-server pkg-deinstall pkg-message SUB_LIST= VERSION=${PORTVERSION} PLIST_SUB= VERSION=${PORTVERSION} diff --git a/games/minecraft-server/distinfo b/games/minecraft-server/distinfo index 7531f96bd4ab..4bdaff9f1088 100644 --- a/games/minecraft-server/distinfo +++ b/games/minecraft-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626387031 -SHA256 (minecraft-server-1.17.1/server.jar) = e8c211b41317a9f5a780c98a89592ecb72eb39a6e475d4ac9657e5bc9ffaf55f -SIZE (minecraft-server-1.17.1/server.jar) = 43626592 +TIMESTAMP = 1639124790 +SHA256 (minecraft-server-1.18.1/server.jar) = ebcd120ad81480b968a548df6ffb83b88075e95195c8ff63d461c9df4df5dbdf +SIZE (minecraft-server-1.18.1/server.jar) = 46324407 diff --git a/games/minecraft-server/files/minecraft-server.in b/games/minecraft-server/files/minecraft-server.in index 44e8dfab8f5a..907ff1806c7d 100644 --- a/games/minecraft-server/files/minecraft-server.in +++ b/games/minecraft-server/files/minecraft-server.in @@ -5,5 +5,6 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi +export JAVA_VERSION=17 cd %%PREFIX%%/minecraft-server -su -m mcserver -c "java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar server.jar nogui" +su -m mcserver -c "%%LOCALBASE%%/bin/java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar server.jar nogui" diff --git a/games/minecraft-server/files/minecraft.in b/games/minecraft-server/files/minecraft.in index 4745899af7e1..6eeaf0d09cae 100644 --- a/games/minecraft-server/files/minecraft.in +++ b/games/minecraft-server/files/minecraft.in @@ -28,6 +28,8 @@ console_cmd="${name}_console" status_cmd="${name}_status" kill_cmd="${name}_kill" +export JAVA_VERSION=17 + is_running() { pgrep -qu mcserver java diff --git a/games/minecraft-server/files/pkg-deinstall.in b/games/minecraft-server/files/pkg-deinstall.in index 786763611306..12946b6a016a 100644 --- a/games/minecraft-server/files/pkg-deinstall.in +++ b/games/minecraft-server/files/pkg-deinstall.in @@ -4,6 +4,9 @@ if [ "$2" != "POST-DEINSTALL" ]; then exit 0 fi +find "%%PREFIX%%/minecraft-server/libraries" -type d -empty -delete +find "%%PREFIX%%/minecraft-server/versions" -type d -empty -delete + echo echo "NOTE: The game world has not been deleted. It is still in" echo "/var/db/minecraft-server. If it is no longer required, it will" diff --git a/games/minecraft-server/pkg-plist b/games/minecraft-server/pkg-plist index 98953a4cc201..b5af99880ca4 100644 --- a/games/minecraft-server/pkg-plist +++ b/games/minecraft-server/pkg-plist @@ -17,5 +17,26 @@ minecraft-server/world @dir minecraft-server @dir /var/db/minecraft-server @dir /var/log/minecraft-server +@rmtry minecraft-server/libraries/commons-io/commons-io/2.11.0/commons-io-2.11.0.jar +@rmtry minecraft-server/libraries/it/unimi/dsi/fastutil/8.5.6/fastutil-8.5.6.jar +@rmtry minecraft-server/libraries/org/slf4j/slf4j-api/1.8.0-beta4/slf4j-api-1.8.0-beta4.jar +@rmtry minecraft-server/libraries/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar +@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-core/2.14.1/log4j-core-2.14.1.jar +@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-slf4j18-impl/2.14.1/log4j-slf4j18-impl-2.14.1.jar +@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-api/2.14.1/log4j-api-2.14.1.jar +@rmtry minecraft-server/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar +@rmtry minecraft-server/libraries/net/java/dev/jna/jna/5.9.0/jna-5.9.0.jar +@rmtry minecraft-server/libraries/net/java/dev/jna/jna-platform/5.9.0/jna-platform-5.9.0.jar +@rmtry minecraft-server/libraries/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar +@rmtry minecraft-server/libraries/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar +@rmtry minecraft-server/libraries/com/google/code/gson/gson/2.8.8/gson-2.8.8.ja +@rmtry minecraft-server/libraries/com/google/code/gson/gson/2.8.8/gson-2.8.8.jar +@rmtry minecraft-server/libraries/com/mojang/datafixerupper/4.0.26/datafixerupper-4.0.26.jar +@rmtry minecraft-server/libraries/com/mojang/brigadier/1.0.18/brigadier-1.0.18.jar +@rmtry minecraft-server/libraries/com/mojang/authlib/3.2.38/authlib-3.2.38.jar +@rmtry minecraft-server/libraries/com/mojang/javabridge/1.2.24/javabridge-1.2.24.jar +@rmtry minecraft-server/libraries/com/github/oshi/oshi-core/5.8.2/oshi-core-5.8.2.jar +@rmtry minecraft-server/libraries/io/netty/netty-all/4.1.68.Final/netty-all-4.1.68.Final.jar +@rmtry minecraft-server/versions/1.18.1/server-1.18.1.jar @owner @group