Attachment 251301 Details for Bug 279204 – Update from 1.20.4 to 1.20.6 (updated)

[patch] Update from 1.20.4 to 1.20.6 (updated)

minecraft-server.diff (text/plain), 6.67 KB, created by Alexandre Labarre on 2024-06-08 19:58:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre Labarre

Created: 2024-06-08 19:58:10 UTC

Size: 6.67 KB

patch

obsolete

>diff -ur minecraft-server.orig/Makefile minecraft-server/Makefile
>--- minecraft-server.orig/Makefile	2024-05-21 15:54:10.654264000 +0200
>+++ minecraft-server/Makefile	2024-06-08 14:41:22.398917000 +0200
>@@ -1,7 +1,7 @@
> PORTNAME=	minecraft-server
>-PORTVERSION=	1.20.4
>+PORTVERSION=	1.20.6
> CATEGORIES=	games java
>-MASTER_SITES=	https://piston-data.mojang.com/v1/objects/8dd1a28015f51b1803213892b50b7b4fc76e594d/
>+MASTER_SITES=	https://piston-data.mojang.com/v1/objects/145ff0858209bcfc164859ba735d4199aafa1eea/
> DISTNAME=	server
> EXTRACT_SUFX=	.jar
> DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
>@@ -17,7 +17,7 @@
> LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
> 
> USE_JAVA=	yes
>-JAVA_VERSION=	17
>+JAVA_VERSION=	21
> 
> NO_ARCH=	yes
> NO_BUILD=	yes
>diff -ur minecraft-server.orig/distinfo minecraft-server/distinfo
>--- minecraft-server.orig/distinfo	2024-05-21 15:54:10.656314000 +0200
>+++ minecraft-server/distinfo	2024-05-21 16:04:54.994272000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1708874498
>-SHA256 (minecraft-server-1.20.4/server.jar) = c03fa6f39daa69ddf413c965a3a83084db746a7a138ce535a693293b5472d363
>-SIZE (minecraft-server-1.20.4/server.jar) = 49150256
>+TIMESTAMP = 1716300294
>+SHA256 (minecraft-server-1.20.6/server.jar) = c6d01d018ca782e506f0ec60652d47fd565078be9122b625c1681bc86c29c7ec
>+SIZE (minecraft-server-1.20.6/server.jar) = 51420480
>diff -ur minecraft-server.orig/files/minecraft-server.in minecraft-server/files/minecraft-server.in
>--- minecraft-server.orig/files/minecraft-server.in	2024-05-21 15:54:10.661915000 +0200
>+++ minecraft-server/files/minecraft-server.in	2024-06-08 14:23:39.788335000 +0200
>@@ -5,6 +5,10 @@
> 	exit 1
> fi
> 
>-export JAVA_VERSION=17
>+if [ -z "${JAVA_VERSION}" ]; then
>+        JAVA_VERSION=21
>+fi
>+export JAVA_VERSION
>+
> cd %%PREFIX%%/minecraft-server
> su -m mcserver -c "%%LOCALBASE%%/bin/java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar server.jar nogui"
>diff -ur minecraft-server.orig/files/minecraft.in minecraft-server/files/minecraft.in
>--- minecraft-server.orig/files/minecraft.in	2024-05-21 15:54:10.663699000 +0200
>+++ minecraft-server/files/minecraft.in	2024-06-08 14:23:08.455540000 +0200
>@@ -28,7 +28,7 @@
> status_cmd="${name}_status"
> kill_cmd="${name}_kill"
> 
>-export JAVA_VERSION=17
>+export JAVA_VERSION=${minecraft_java_version:-"21"}
> 
> is_running()
> {
>diff -ur minecraft-server.orig/pkg-plist minecraft-server/pkg-plist
>--- minecraft-server.orig/pkg-plist	2024-05-21 15:54:10.670917000 +0200
>+++ minecraft-server/pkg-plist	2024-05-21 21:09:15.423133000 +0200
>@@ -17,15 +17,15 @@
> @dir minecraft-server
> @dir /var/db/minecraft-server
> @dir /var/log/minecraft-server
>-@rmtry minecraft-server/libraries/com/github/oshi/oshi-core/6.4.5/oshi-core-6.4.5.jar
>+@rmtry minecraft-server/libraries/com/github/oshi/oshi-core/6.4.10/oshi-core-6.4.10.jar
> @rmtry minecraft-server/libraries/com/google/code/gson/gson/2.10.1/gson-2.10.1.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/32.1.2-jre/guava-32.1.2-jre.jar
>-@rmtry minecraft-server/libraries/com/mojang/authlib/6.0.52/authlib-6.0.52.jar
>+@rmtry minecraft-server/libraries/com/mojang/authlib/6.0.54/authlib-6.0.54.jar
> @rmtry minecraft-server/libraries/com/mojang/brigadier/1.2.9/brigadier-1.2.9.jar
>-@rmtry minecraft-server/libraries/com/mojang/datafixerupper/6.0.8/datafixerupper-6.0.8.jar
>-@rmtry minecraft-server/libraries/com/mojang/logging/1.1.1/logging-1.1.1.jar
>-@rmtry minecraft-server/libraries/commons-io/commons-io/2.13.0/commons-io-2.13.0.jar
>+@rmtry minecraft-server/libraries/com/mojang/datafixerupper/7.0.14/datafixerupper-7.0.14.jar
>+@rmtry minecraft-server/libraries/com/mojang/logging/1.2.7/logging-1.2.7.jar
>+@rmtry minecraft-server/libraries/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar
> @rmtry minecraft-server/libraries/io/netty/netty-buffer/4.1.97.Final/netty-buffer-4.1.97.Final.jar
> @rmtry minecraft-server/libraries/io/netty/netty-codec/4.1.97.Final/netty-codec-4.1.97.Final.jar
> @rmtry minecraft-server/libraries/io/netty/netty-common/4.1.97.Final/netty-common-4.1.97.Final.jar
>@@ -34,18 +34,19 @@
> @rmtry minecraft-server/libraries/io/netty/netty-transport/4.1.97.Final/netty-transport-4.1.97.Final.jar
> @rmtry minecraft-server/libraries/io/netty/netty-transport-classes-epoll/4.1.97.Final/netty-transport-classes-epoll-4.1.97.Final.jar
> @rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-aarch_64.jar
>-@rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar
>+@rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar																																				 
> @rmtry minecraft-server/libraries/io/netty/netty-transport-native-unix-common/4.1.97.Final/netty-transport-native-unix-common-4.1.97.Final.jar
> @rmtry minecraft-server/libraries/it/unimi/dsi/fastutil/8.5.12/fastutil-8.5.12.jar
>-@rmtry minecraft-server/libraries/net/java/dev/jna/jna/5.13.0/jna-5.13.0.jar
>-@rmtry minecraft-server/libraries/net/java/dev/jna/jna-platform/5.13.0/jna-platform-5.13.0.jar
>+@rmtry minecraft-server/libraries/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar
>+@rmtry minecraft-server/libraries/net/java/dev/jna/jna-platform/5.14.0/jna-platform-5.14.0.jar
> @rmtry minecraft-server/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar
>-@rmtry minecraft-server/libraries/org/apache/commons/commons-lang3/3.13.0/commons-lang3-3.13.0.jar
>-@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-api/2.19.0/log4j-api-2.19.0.jar
>-@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-core/2.19.0/log4j-core-2.19.0.jar
>-@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.19.0/log4j-slf4j2-impl-2.19.0.jar
>+@rmtry minecraft-server/libraries/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar
>+@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-api/2.22.1/log4j-api-2.22.1.jar
>+@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-core/2.22.1/log4j-core-2.22.1.jar
>+@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.22.1/log4j-slf4j2-impl-2.22.1.jar
> @rmtry minecraft-server/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar
>-@rmtry minecraft-server/libraries/org/slf4j/slf4j-api/2.0.7/slf4j-api-2.0.7.jar
>-@rmtry minecraft-server/versions/1.20.4/server-1.20.4.jar
>+@rmtry minecraft-server/libraries/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
>+@rmtry minecraft-server/versions/1.20.6/server-1.20.6.jar
>+@rmtry minecraft-server/libraries/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar
> @owner
> @group

Actions: View | Diff

Attachments on bug 279204: 250860 | 251301 | 251312