From dc6cbcea5025ab8bd47a69fab1af76be7c26d68e Mon Sep 17 00:00:00 2001 From: MicLieg <38057464+MicLieg@users.noreply.github.com> Date: Sun, 5 May 2024 22:55:52 +0200 Subject: [PATCH 1/5] fix(mcserver): change required jdk to 21 (#4562) * fix(mcserver): change required jdk to 21 * update java on other distros --------- Co-authored-by: Daniel Gibbs --- lgsm/data/almalinux-8.csv | 8 ++++---- lgsm/data/almalinux-9.csv | 12 ++++++------ lgsm/data/centos-7.csv | 2 +- lgsm/data/centos-8.csv | 2 +- lgsm/data/centos-9.csv | 4 ++-- lgsm/data/rhel-8.csv | 12 ++++++------ lgsm/data/rhel-9.csv | 12 ++++++------ lgsm/data/rocky-8.csv | 12 ++++++------ lgsm/data/rocky-9.csv | 12 ++++++------ lgsm/data/ubuntu-20.04.csv | 10 +++++----- lgsm/data/ubuntu-22.04.csv | 12 ++++++------ lgsm/data/ubuntu-23.04.csv | 2 +- lgsm/data/ubuntu-23.10.csv | 2 +- 13 files changed, 51 insertions(+), 51 deletions(-) diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv index e73fcfaa0d..4d6c05ca5f 100644 --- a/lgsm/data/almalinux-8.csv +++ b/lgsm/data/almalinux-8.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,java-17-openjdk +mc,java-21-openjdk mcb,libnsl mh mohaa,compat-libstdc++-33.i686 @@ -82,7 +82,7 @@ onset,mariadb-connector-c opfor pc pc2 -pmc,java-17-openjdk +pmc,java-21-openjdk ps,GConf2 pvkii pvr,libcxx @@ -128,11 +128,11 @@ ut3 ut99 vh,glibc-devel vints,aspnetcore-runtime-7.0 -vpmc,java-17-openjdk +vpmc,java-21-openjdk vs wet wf -wmc,java-17-openjdk +wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/almalinux-9.csv b/lgsm/data/almalinux-9.csv index f5b5b5fc52..2cdd36575a 100644 --- a/lgsm/data/almalinux-9.csv +++ b/lgsm/data/almalinux-9.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,java-17-openjdk +mc,java-21-openjdk mcb,libnsl mh mohaa,compat-libstdc++-33.i686 @@ -82,12 +82,12 @@ onset,mariadb-connector-c opfor pc pc2 -pmc,java-17-openjdk +pmc,java-21-openjdk ps,GConf2 pvkii pvr,libcxx pw -pz,java-11-openjdk rng-tools +pz,java-21-openjdk rng-tools q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,zlib-devel -rw,java-11-openjdk +rw,java-21-openjdk samp sb sbots @@ -128,11 +128,11 @@ ut3 ut99 vh,glibc-devel vints,aspnetcore-runtime-7.0 -vpmc,java-17-openjdk +vpmc,java-21-openjdk vs wet wf -wmc,java-17-openjdk +wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv index a800433462..df7422526e 100644 --- a/lgsm/data/centos-7.csv +++ b/lgsm/data/centos-7.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,java-11-openjdk +mc,java-21-openjdk mcb,libnsl mh mohaa,compat-libstdc++-33.i686 diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv index e73fcfaa0d..831bc38e93 100644 --- a/lgsm/data/centos-8.csv +++ b/lgsm/data/centos-8.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,java-17-openjdk +mc,java-21-openjdk mcb,libnsl mh mohaa,compat-libstdc++-33.i686 diff --git a/lgsm/data/centos-9.csv b/lgsm/data/centos-9.csv index f5b5b5fc52..4d49ee66ec 100644 --- a/lgsm/data/centos-9.csv +++ b/lgsm/data/centos-9.csv @@ -87,7 +87,7 @@ ps,GConf2 pvkii pvr,libcxx pw -pz,java-11-openjdk rng-tools +pz,java-21-openjdk rng-tools q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,zlib-devel -rw,java-11-openjdk +rw,java-21-openjdk samp sb sbots diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv index e73fcfaa0d..a378694b29 100644 --- a/lgsm/data/rhel-8.csv +++ b/lgsm/data/rhel-8.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,java-17-openjdk +mc,java-21-openjdk mcb,libnsl mh mohaa,compat-libstdc++-33.i686 @@ -82,12 +82,12 @@ onset,mariadb-connector-c opfor pc pc2 -pmc,java-17-openjdk +pmc,java-21-openjdk ps,GConf2 pvkii pvr,libcxx pw -pz,java-11-openjdk rng-tools +pz,java-21-openjdk rng-tools q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,zlib-devel -rw,java-11-openjdk +rw,java-21-openjdk samp sb sbots @@ -128,11 +128,11 @@ ut3 ut99 vh,glibc-devel vints,aspnetcore-runtime-7.0 -vpmc,java-17-openjdk +vpmc,java-21-openjdk vs wet wf -wmc,java-17-openjdk +wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/rhel-9.csv b/lgsm/data/rhel-9.csv index f5b5b5fc52..2cdd36575a 100644 --- a/lgsm/data/rhel-9.csv +++ b/lgsm/data/rhel-9.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,java-17-openjdk +mc,java-21-openjdk mcb,libnsl mh mohaa,compat-libstdc++-33.i686 @@ -82,12 +82,12 @@ onset,mariadb-connector-c opfor pc pc2 -pmc,java-17-openjdk +pmc,java-21-openjdk ps,GConf2 pvkii pvr,libcxx pw -pz,java-11-openjdk rng-tools +pz,java-21-openjdk rng-tools q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,zlib-devel -rw,java-11-openjdk +rw,java-21-openjdk samp sb sbots @@ -128,11 +128,11 @@ ut3 ut99 vh,glibc-devel vints,aspnetcore-runtime-7.0 -vpmc,java-17-openjdk +vpmc,java-21-openjdk vs wet wf -wmc,java-17-openjdk +wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv index e73fcfaa0d..a378694b29 100644 --- a/lgsm/data/rocky-8.csv +++ b/lgsm/data/rocky-8.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,java-17-openjdk +mc,java-21-openjdk mcb,libnsl mh mohaa,compat-libstdc++-33.i686 @@ -82,12 +82,12 @@ onset,mariadb-connector-c opfor pc pc2 -pmc,java-17-openjdk +pmc,java-21-openjdk ps,GConf2 pvkii pvr,libcxx pw -pz,java-11-openjdk rng-tools +pz,java-21-openjdk rng-tools q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,zlib-devel -rw,java-11-openjdk +rw,java-21-openjdk samp sb sbots @@ -128,11 +128,11 @@ ut3 ut99 vh,glibc-devel vints,aspnetcore-runtime-7.0 -vpmc,java-17-openjdk +vpmc,java-21-openjdk vs wet wf -wmc,java-17-openjdk +wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/rocky-9.csv b/lgsm/data/rocky-9.csv index f5b5b5fc52..2cdd36575a 100644 --- a/lgsm/data/rocky-9.csv +++ b/lgsm/data/rocky-9.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,java-17-openjdk +mc,java-21-openjdk mcb,libnsl mh mohaa,compat-libstdc++-33.i686 @@ -82,12 +82,12 @@ onset,mariadb-connector-c opfor pc pc2 -pmc,java-17-openjdk +pmc,java-21-openjdk ps,GConf2 pvkii pvr,libcxx pw -pz,java-11-openjdk rng-tools +pz,java-21-openjdk rng-tools q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,zlib-devel -rw,java-11-openjdk +rw,java-21-openjdk samp sb sbots @@ -128,11 +128,11 @@ ut3 ut99 vh,glibc-devel vints,aspnetcore-runtime-7.0 -vpmc,java-17-openjdk +vpmc,java-21-openjdk vs wet wf -wmc,java-17-openjdk +wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv index 4a41435c29..8d4cc6e521 100644 --- a/lgsm/data/ubuntu-20.04.csv +++ b/lgsm/data/ubuntu-20.04.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,openjdk-17-jre +mc,openjdk-21-jre mcb mh mohaa,libstdc++5:i386 @@ -82,12 +82,12 @@ onset,libmariadb-dev opfor pc pc2 -pmc,openjdk-17-jre +pmc,openjdk-21-jre ps,libgconf-2-4 pvkii pvr,libc++1 pw -pz,openjdk-17-jre,rng-tools +pz,openjdk-21-jre,rng-tools q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,lib32z1 -rw,openjdk-17-jre +rw,openjdk-21-jre samp sb sbots @@ -132,7 +132,7 @@ vpmc,openjdk-11-jre vs wet wf -wmc,openjdk-17-jre +wmc,openjdk-21-jre wurm,xvfb zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv index 323b82a088..67d28b5e93 100644 --- a/lgsm/data/ubuntu-22.04.csv +++ b/lgsm/data/ubuntu-22.04.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,openjdk-17-jre +mc,openjdk-21-jre mcb mh mohaa,libstdc++5:i386 @@ -82,12 +82,12 @@ onset,libmariadb-dev opfor pc pc2 -pmc,openjdk-17-jre +pmc,openjdk-21-jre ps,libgconf-2-4 pvkii pvr,libc++1 pw -pz,openjdk-17-jre,rng-tools5 +pz,openjdk-21-jre,rng-tools5 q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,lib32z1 -rw,openjdk-17-jre +rw,openjdk-21-jre samp sb sbots @@ -128,11 +128,11 @@ ut3 ut99 vh,libc6-dev vints,aspnetcore-runtime-7.0 -vpmc,openjdk-17-jre +vpmc,openjdk-21-jre vs wet wf -wmc,openjdk-17-jre +wmc,openjdk-21-jre wurm,xvfb zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-23.04.csv b/lgsm/data/ubuntu-23.04.csv index e249a2968c..8b22464024 100644 --- a/lgsm/data/ubuntu-23.04.csv +++ b/lgsm/data/ubuntu-23.04.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,openjdk-17-jre +mc,openjdk-21-jre mcb mh mohaa,libstdc++5:i386 diff --git a/lgsm/data/ubuntu-23.10.csv b/lgsm/data/ubuntu-23.10.csv index e249a2968c..8b22464024 100644 --- a/lgsm/data/ubuntu-23.10.csv +++ b/lgsm/data/ubuntu-23.10.csv @@ -65,7 +65,7 @@ kf kf2 l4d l4d2 -mc,openjdk-17-jre +mc,openjdk-21-jre mcb mh mohaa,libstdc++5:i386 From 1c596972ff77d5de40e0a60f6f8459547ebcbf6a Mon Sep 17 00:00:00 2001 From: BertBrenner <42405825+BertBrenner@users.noreply.github.com> Date: Sun, 5 May 2024 22:56:07 +0200 Subject: [PATCH 2/5] Update update_mc.sh (#4563) If the executable variable is modified, fn_update_dl does not update minecraft_server.jar and which is used in fn_update_localbuild. In addition this creates a problem if a alternative executable is used to launch minecraft by overwriting it. Co-authored-by: Daniel Gibbs --- lgsm/modules/update_mc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/modules/update_mc.sh b/lgsm/modules/update_mc.sh index 4a0bdde37e..40038ddebe 100644 --- a/lgsm/modules/update_mc.sh +++ b/lgsm/modules/update_mc.sh @@ -10,7 +10,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_dl() { # Download and extract files to serverfiles. fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "${remotebuildfilename}" "chmodx" "norun" "noforce" "nohash" - cp -f "${tmpdir}/${remotebuildfilename}" "${serverfiles}/${executable#./}" + cp -f "${tmpdir}/${remotebuildfilename}" "${serverfiles}/minecraft_server.jar" fn_clear_tmp } From c89cc62bb65b4b041919df8fdfc571df6b5c330f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 21:56:23 +0100 Subject: [PATCH 3/5] build(deps): bump actions/add-to-project from 1.0.0 to 1.0.1 (#4558) Bumps [actions/add-to-project](https://github.com/actions/add-to-project) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](https://github.com/actions/add-to-project/compare/v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-to-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index e6f6ee9be9..fb092b649f 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Add to Project - uses: actions/add-to-project@v1.0.0 + uses: actions/add-to-project@v1.0.1 with: project-url: https://github.com/orgs/GameServerManagers/projects/11 github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} From 3da072cae4a8e6a96b69c39ca6fbe6e992b48663 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 5 May 2024 21:57:16 +0100 Subject: [PATCH 4/5] Release v24.2.1 --- lgsm/modules/core_modules.sh | 2 +- linuxgsm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/modules/core_modules.sh b/lgsm/modules/core_modules.sh index 6fda8c2ca4..f083a48936 100644 --- a/lgsm/modules/core_modules.sh +++ b/lgsm/modules/core_modules.sh @@ -8,7 +8,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -modulesversion="v24.2.0" +modulesversion="v24.2.1" # Core diff --git a/linuxgsm.sh b/linuxgsm.sh index 23ca9f88fe..8db9a57c94 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v24.2.0" +version="v24.2.1" shortname="core" gameservername="core" commandname="CORE" From 0b8a2237232d1948ebb49216bd17fadf687247e9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 5 May 2024 23:32:04 +0100 Subject: [PATCH 5/5] feat(deps): add Ubuntu 24.04 --- lgsm/data/ubuntu-23.04.csv | 10 +-- lgsm/data/ubuntu-23.10.csv | 10 +-- lgsm/data/ubuntu-24.04.csv | 138 +++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 10 deletions(-) create mode 100644 lgsm/data/ubuntu-24.04.csv diff --git a/lgsm/data/ubuntu-23.04.csv b/lgsm/data/ubuntu-23.04.csv index 8b22464024..1b50ed7efb 100644 --- a/lgsm/data/ubuntu-23.04.csv +++ b/lgsm/data/ubuntu-23.04.csv @@ -82,12 +82,12 @@ onset,libmariadb-dev opfor pc pc2 -pmc,openjdk-17-jre +pmc,openjdk-21-jre ps,libgconf-2-4 pvkii pvr,libc++1 pw -pz,openjdk-17-jre,rng-tools5 +pz,openjdk-21-jre,rng-tools5 q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,lib32z1 -rw,openjdk-17-jre +rw,openjdk-21-jre samp sb sbots @@ -128,11 +128,11 @@ ut3 ut99 vh,libc6-dev vints,aspnetcore-runtime-7.0 -vpmc,openjdk-17-jre +vpmc,openjdk-21-jre vs wet wf -wmc,openjdk-17-jre +wmc,openjdk-21-jre wurm,xvfb zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-23.10.csv b/lgsm/data/ubuntu-23.10.csv index 8b22464024..1b50ed7efb 100644 --- a/lgsm/data/ubuntu-23.10.csv +++ b/lgsm/data/ubuntu-23.10.csv @@ -82,12 +82,12 @@ onset,libmariadb-dev opfor pc pc2 -pmc,openjdk-17-jre +pmc,openjdk-21-jre ps,libgconf-2-4 pvkii pvr,libc++1 pw -pz,openjdk-17-jre,rng-tools5 +pz,openjdk-21-jre,rng-tools5 q2 q3 q4 @@ -97,7 +97,7 @@ ricochet ro rtcw rust,lib32z1 -rw,openjdk-17-jre +rw,openjdk-21-jre samp sb sbots @@ -128,11 +128,11 @@ ut3 ut99 vh,libc6-dev vints,aspnetcore-runtime-7.0 -vpmc,openjdk-17-jre +vpmc,openjdk-21-jre vs wet wf -wmc,openjdk-17-jre +wmc,openjdk-21-jre wurm,xvfb zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-24.04.csv b/lgsm/data/ubuntu-24.04.csv new file mode 100644 index 0000000000..1b50ed7efb --- /dev/null +++ b/lgsm/data/ubuntu-24.04.csv @@ -0,0 +1,138 @@ +all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat-openbsd,pigz,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils +steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd +ac +ahl +ahl2 +ark +arma3 +armar,libcurl4 +ats +av +bb +bb2,libcurl4-gnutls-dev:i386 +bd +bf1942,libncurses5:i386,libtinfo5:i386 +bfv,libncurses5:i386,libstdc++5:i386 +bmdm,libncurses5:i386 +bo +bs +bt,libicu-dev,dos2unix,libxml2-utils +btl +cc +ck,xvfb,libxi6 +cmw +cod,libstdc++5:i386 +cod2,libstdc++5:i386 +cod4 +coduo,libstdc++5:i386 +codwaw +col +cs +cs2 +cscz +csgo +css,libtinfo5:i386 +ct +dab +dayz +dmc +dod +dodr +dods +doi +dst,libcurl4-gnutls-dev:i386 +dys +eco,libgdiplus +em +etl +ets2 +fctr +fof +gmod,libtinfo5:i386 +hcu +hl2dm +hldm +hldms +hw,lib32z1 +hz +ins +inss +ios +jc2 +jc3 +jk2 +kf +kf2 +l4d +l4d2 +mc,openjdk-21-jre +mcb +mh +mohaa,libstdc++5:i386 +mom +mta,libncursesw5,libxml2-utils +nd +nec +nmrih,libtinfo5:i386 +ns +ns2,speex,libtbb2 +ns2c,speex:i386,libtbb2 +ohd +onset,libmariadb-dev +opfor +pc +pc2 +pmc,openjdk-21-jre +ps,libgconf-2-4 +pvkii +pvr,libc++1 +pw +pz,openjdk-21-jre,rng-tools5 +q2 +q3 +q4 +ql +qw +ricochet +ro +rtcw +rust,lib32z1 +rw,openjdk-21-jre +samp +sb +sbots +scpsl,mono-complete +scpslsm,mono-complete +sdtd,telnet,expect,libxml2-utils +sf +sfc,libtinfo5:i386 +sof2 +sol +squad +st,libxml2-utils +stn +sven,libssl1.1:i386,zlib1g:i386 +terraria +tf +tf2,libcurl4-gnutls-dev:i386 +tfc +ti +ts +ts3 +tu +tw +unt +ut +ut2k4 +ut3 +ut99 +vh,libc6-dev +vints,aspnetcore-runtime-7.0 +vpmc,openjdk-21-jre +vs +wet +wf +wmc,openjdk-21-jre +wurm,xvfb +zmr,libtinfo5:i386 +zps,libtinfo5:i386