rogman

I've been reading up on this fix Foz has made; it looks amazing, and I very badly need it since I'm trying to back up an initial 14TB, but I fear the wait could be months for his merge to be accepted if it does. So I talked with AI to help implement this patch, and it generated a script you can run in the container. I have run it and confirmed the server/sock.c file is using the modified one. From initial testing, my uploads still seem to be sitting at around 10mbs which is horrible with 1gb fiber. However, maybe this will work better for others. It's possible I didn't do something right, but I pulled the merge straight from the git page. If this is not allowed to be posted here, then please remove it, and I apologize. I know there are many other frustrated people out there waiting on uploads. Create a /scripts/ folder in the containers root appdata folder and save the script there as "patch-wineserver.sh", then in your Unraid terminal just run [docker exec Backblaze64 /config/scripts/patch-wineserver.sh] ######start script####### #!/bin/bash # # patch-wineserver.sh # # Rebuilds wineserver from Wine 11.0 source with the fix for WineHQ # bug 59893 (upload speed capped at ~140 KB/s under Wine — libcurl # apps like Backblaze's bztransmit) and installs it in place of the # container's stock wineserver. # # USAGE (run inside the Wine container, as root): # docker cp patch-wineserver.sh CONTAINER_NAME:/tmp/patch-wineserver.sh # docker exec -it CONTAINER_NAME bash /tmp/patch-wineserver.sh # # Safe to re-run any time — e.g. after the container restarts and # reverts to the stock wineserver. It rebuilds from scratch each run # and will not overwrite a good backup with an already-patched binary. set -e echo "==> Installing build dependencies..." apt-get update apt-get install -y --no-install-recommends \ git build-essential flex bison pkg-config mingw-w64 echo "==> Fetching Wine 11.0 source..." rm -rf /tmp/wine git clone --branch wine-11.0 --depth 1 https://gitlab.winehq.org/wine/wine.git /tmp/wine cd /tmp/wine echo "==> Setting a throwaway git identity (needed for cherry-pick to commit)..." git config user.email "patch-script@localhost" git config user.name "patch-wineserver script" # Exact commit for MR !11272 / bug 59893 ("server: Report a stream socket # writable while its send buffer has room."). Pinned by SHA rather than a # branch-range diff — with a shallow wine-11.0 clone, comparing two branch # tips has no shared history to work from and silently pulls in years of # unrelated changes instead of just the fix. FIX_COMMIT="35952c3f" echo "==> Fetching the fix branch (to pull in the exact commit)..." git fetch https://gitlab.winehq.org/foz/wine.git sock-writable echo "==> Applying the exact fix commit ($FIX_COMMIT)..." if ! git cherry-pick "$FIX_COMMIT"; then echo " cherry-pick hit a real conflict — falling back to a scoped diff of server/sock.c" git cherry-pick --abort || true git show "$FIX_COMMIT" -- server/sock.c > /tmp/sock-fix.patch git apply /tmp/sock-fix.patch fi echo "==> Configuring (64-bit only, skipping unrelated optional libs)..." ./configure --enable-archs=x86_64 CROSSCC=x86_64-w64-mingw32-gcc \ --without-x --without-freetype --without-vulkan --without-opengl \ --without-gstreamer --without-pulse --without-alsa --without-oss \ --without-cups --without-sane --without-usb --without-udev \ --without-dbus --without-gphoto --without-krb5 --without-gettext echo "==> Building wineserver..." make -C server if [ ! -f server/wineserver ]; then echo "ERROR: build did not produce server/wineserver — check the output above." exit 1 fi echo "==> Installing patched wineserver..." WINESERVER_PATH="$(which wineserver)" if [ ! -f "${WINESERVER_PATH}.orig-backup" ]; then cp "$WINESERVER_PATH" "${WINESERVER_PATH}.orig-backup" fi rm -f "$WINESERVER_PATH" cp server/wineserver "$WINESERVER_PATH" chmod +x "$WINESERVER_PATH" echo "==> Stopping any running wineserver so the new one takes over..." pkill -9 -x wineserver || true echo "==> Done. Patched wineserver installed at $WINESERVER_PATH" echo " Original backed up at ${WINESERVER_PATH}.orig-backup" #######end script#########