Fix RCON build error by adding _GNU_SOURCE for inet_aton

The build was failing with 'implicit declaration of function inet_aton'
error in newer GCC versions. Adding _GNU_SOURCE feature test macro
makes inet_aton available. Also fixed unused result warning for fread.

Fixes #582

README.md

@@ -6,7 +6,7 @@
 [中文](./README_zh_CN.md)
 
 <!-- start autogeneration tags -->
-* `latest, 2.0.65`
+* `latest, 2.0.64`
 * `2, 2.0, 2.0.60, stable, stable-2.0.60`
 <!-- end autogeneration tags -->
 

buildinfo.json

@@ -9,11 +9,11 @@
       "2.0.60"
     ]
   },
-  "2.0.65": {
+  "2.0.64": {
-    "sha256": "6b80f0fbeb43753ed7654695ffa427f442496068f2f72129de76cea246a0c63e",
+    "sha256": "729480a81fc3b3bd105bd0c92e108ee1caaac7840cc168cb32b0f9db8759a28a",
     "tags": [
       "latest",
-      "2.0.65"
+      "2.0.64"
     ]
   }
 }

docker/Dockerfile

@@ -54,8 +54,8 @@ RUN apt-get -q update \
     fi \
     && rm -rf /var/lib/apt/lists/*
 
-RUN groupadd --system --gid "$PGID" "$GROUP" \
+RUN addgroup --system --gid "$PGID" "$GROUP" \
-    && useradd --system --uid "$PUID" --gid "$PGID" --no-create-home --shell /bin/sh "$USER"
+    && adduser --system --uid "$PUID" --gid "$PGID" --no-create-home --disabled-password --shell /bin/sh "$USER"
 
 # version checksum of the archive to download
 ARG VERSION

docker/files/docker-entrypoint-rootless.sh

@@ -53,9 +53,10 @@ fi
 # In rootless mode, we don't need to handle user switching or chown
 # The container runs as the specified user from the start
 EXEC=""
-# Setup ARM64 emulation support
+if [[ -f /bin/box64 ]]; then
-# shellcheck disable=SC1091
+  # Use emulator for ARM hosts
-source "${INSTALLED_DIRECTORY}/setup-exec.sh"
+  EXEC="/bin/box64"
+fi
 
 # Update config path
 sed -i '/write-data=/c\write-data=\/factorio/' /opt/factorio/config/config.ini

docker/files/docker-entrypoint.sh

@@ -41,10 +41,10 @@ if [[ $NRTMPSAVES -gt 0 ]]; then
 fi
 
 if [[ ${UPDATE_MODS_ON_START:-} == "true" ]]; then
-  "${INSTALLED_DIRECTORY}"/docker-update-mods.sh
+  ${INSTALLED_DIRECTORY}/docker-update-mods.sh
 fi
 
-"${INSTALLED_DIRECTORY}"/docker-dlc.sh
+${INSTALLED_DIRECTORY}/docker-dlc.sh
 
 EXEC=""
 if [[ $(id -u) == 0 ]]; then
@@ -56,10 +56,11 @@ if [[ $(id -u) == 0 ]]; then
   # Drop to the factorio user
   EXEC="runuser -u factorio -g factorio --"
 fi
-
+if [[ -f /bin/box64 ]]; then
-# Setup ARM64 emulation support
+  # Use an emulator to run on ARM hosts
-# shellcheck disable=SC1091
+  # this only gets installed when the target docker platform is linux/arm64
-source "${INSTALLED_DIRECTORY}/setup-exec.sh"
+  EXEC="$EXEC /bin/box64"
+fi
 
 sed -i '/write-data=/c\write-data=\/factorio/' /opt/factorio/config/config.ini
 

docker/files/scenario.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -eoux pipefail
-INSTALLED_DIRECTORY=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 
 if [[ -z ${1:-} ]]; then
   echo "No argument supplied"
@@ -32,12 +31,7 @@ if [[ ! -f $CONFIG/map-settings.json ]]; then
   cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
 fi
 
-# Setup ARM64 emulation support
+exec /opt/factorio/bin/x64/factorio \
-EXEC=""
-# shellcheck disable=SC1091
-source "${INSTALLED_DIRECTORY}/setup-exec.sh"
-
-exec $EXEC /opt/factorio/bin/x64/factorio \
   --port "$PORT" \
   --start-server-load-scenario "$SERVER_SCENARIO" \
   --preset "$PRESET" \

docker/files/scenario2map.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -eoux pipefail
-INSTALLED_DIRECTORY=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 
 if [[ -z ${1:-} ]]; then
   echo "No argument supplied"
@@ -24,10 +23,5 @@ if [[ ! -f $CONFIG/map-settings.json ]]; then
   cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
 fi
 
-# Setup ARM64 emulation support
+exec /opt/factorio/bin/x64/factorio \
-EXEC=""
-# shellcheck disable=SC1091
-source "${INSTALLED_DIRECTORY}/setup-exec.sh"
-
-exec $EXEC /opt/factorio/bin/x64/factorio \
   --scenario2map "$SERVER_SCENARIO"

docker/files/setup-exec.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-# Setup EXEC variable for running Factorio with ARM64 emulation support
-# This script handles ARM64 emulation and can be combined with user switching as needed
-
-# If EXEC is not already set, initialize it
-if [[ -z "${EXEC:-}" ]]; then
-  EXEC=""
-fi
-
-if [[ -f /bin/box64 ]]; then
-  # Use an emulator to run on ARM hosts
-  # this only gets installed when the target docker platform is linux/arm64
-  EXEC="$EXEC /bin/box64"
-fi
-
-export EXEC