Merge pull request #17 from ruscher/main

New fix warsaw

Author: ruscher

.gitignore

@@ -0,0 +1,9 @@
+# makepkg build artifacts
+pkgbuild/src/
+pkgbuild/pkg/
+pkgbuild/*.pkg.tar
+pkgbuild/*.pkg.tar.*
+pkgbuild/*.tar.zst
+pkgbuild/*.tar.xz
+pkgbuild/*.tar.gz
+pkgbuild/biglinux-improve-compatibility/

biglinux-improve-compatibility/usr/lib/systemd/system/glibc2-41-fix.service

@@ -1,9 +1,12 @@
 [Unit]
 Description=Fix apps broken with this bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32653
+# Note: This service uses setarch instead of execstack because Warsaw binary has no section headers
+# The hook biglinux-improve-compatibility-warsaw creates a systemd override with Type=forking
+# This service is kept for compatibility but the hook is the primary fix mechanism
 
 [Service]
 Type=oneshot
-ExecStart=execstack -s /usr/local/bin/warsaw/core
+ExecStart=/bin/true
 
 [Install]
 WantedBy=default.target

biglinux-improve-compatibility/usr/share/libalpm/hooks/biglinux-improve-compatibility-warsaw-remove.hook

@@ -0,0 +1,9 @@
+[Trigger]
+Type = Package
+Operation = Remove
+Target = warsaw
+
+[Action]
+Description = Removing Warsaw glibc 2.41 fix
+When = PreTransaction
+Exec = /usr/share/libalpm/scripts/biglinux-improve-compatibility-warsaw-remove

biglinux-improve-compatibility/usr/share/libalpm/hooks/biglinux-improve-compatibility-warsaw.hook

@@ -0,0 +1,10 @@
+[Trigger]
+Type = Package
+Operation = Install
+Operation = Upgrade
+Target = warsaw
+
+[Action]
+Description = Applying glibc 2.41 fix for Warsaw (setarch)
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/biglinux-improve-compatibility-warsaw

biglinux-improve-compatibility/usr/share/libalpm/scripts/biglinux-improve-compatibility-warsaw

@@ -0,0 +1,58 @@
+#!/bin/bash
+# Fix for Warsaw binary compatibility issues
+# - Old versions (1.x) have no section headers - execstack doesn't work, use setarch
+# - New versions (2.x) work correctly with proper systemd Type=forking
+# - Remove conflicting service files from /etc/systemd/system/
+# Bug reference: https://sourceware.org/bugzilla/show_bug.cgi?id=32653
+
+OVERRIDE_DIR="/etc/systemd/system/warsaw.service.d"
+OVERRIDE_FILE="${OVERRIDE_DIR}/fix-glibc241.conf"
+CONFLICTING_SERVICE="/etc/systemd/system/warsaw.service"
+
+# Find Warsaw binary location (new version uses /usr/local/bin, old uses /usr/bin)
+WARSAW_BINARY=""
+if [[ -f /usr/local/bin/warsaw/core ]]; then
+    WARSAW_BINARY="/usr/local/bin/warsaw/core"
+elif [[ -f /usr/bin/warsaw/core ]]; then
+    WARSAW_BINARY="/usr/bin/warsaw/core"
+fi
+
+# Exit if no Warsaw binary found
+[[ -z "$WARSAW_BINARY" ]] && exit 0
+
+# Remove conflicting service file in /etc/systemd/system if it exists
+# This file can override the correct service from the package
+if [[ -f "$CONFLICTING_SERVICE" ]]; then
+    rm -f "$CONFLICTING_SERVICE"
+fi
+
+# Check if binary has section headers (old version doesn't)
+if ! readelf -S "$WARSAW_BINARY" &>/dev/null; then
+    # Old version without section headers - needs setarch fix
+    mkdir -p "$OVERRIDE_DIR"
+    
+    # Determine correct paths based on installation
+    WSCERTMGR=""
+    if [[ -f /usr/bin/warsaw/wscertmgr ]]; then
+        WSCERTMGR="/usr/bin/warsaw/wscertmgr"
+    fi
+    
+    cat > "$OVERRIDE_FILE" << EOF
+[Service]
+Type=forking
+$(if [[ -n "$WSCERTMGR" ]]; then echo "ExecStartPre="; echo "ExecStartPre=/usr/bin/setarch x86_64 --read-implies-exec $WSCERTMGR"; fi)
+ExecStart=
+ExecStart=/usr/bin/setarch x86_64 --read-implies-exec $WARSAW_BINARY
+EOF
+else
+    # New version works correctly - remove any old override
+    [[ -d "$OVERRIDE_DIR" ]] && rm -rf "$OVERRIDE_DIR"
+fi
+
+# Reload systemd configuration
+systemctl daemon-reload
+
+# Restart warsaw service if it's active
+if systemctl is-active --quiet warsaw; then
+    systemctl restart warsaw
+fi

biglinux-improve-compatibility/usr/share/libalpm/scripts/biglinux-improve-compatibility-warsaw-remove

@@ -0,0 +1,19 @@
+#!/bin/bash
+# Remove Warsaw glibc 2.41 fix and cleanup
+
+OVERRIDE_DIR="/etc/systemd/system/warsaw.service.d"
+CONFLICTING_SERVICE="/etc/systemd/system/warsaw.service"
+
+# Stop warsaw service before removing
+if systemctl is-active --quiet warsaw; then
+    systemctl stop warsaw
+fi
+
+# Remove override directory and files
+[[ -d "$OVERRIDE_DIR" ]] && rm -rf "$OVERRIDE_DIR"
+
+# Remove conflicting service file if it exists
+[[ -f "$CONFLICTING_SERVICE" ]] && rm -f "$CONFLICTING_SERVICE"
+
+# Reload systemd configuration
+systemctl daemon-reload

pkgbuild/PKGBUILD

@@ -5,7 +5,7 @@ pkgver=$(date +%y.%m.%d_1)
 pkgrel=$(date +%H%M)
 arch=('any')
 license=('GPL')
-depends=('start-stop-daemon' 'wxgtk3-runtime' 'ld-lsb' 'openssl-1.1' 'kdotool-git' 'linux-firmware' 'execstack')
+depends=('start-stop-daemon' 'wxgtk3-runtime' 'ld-lsb' 'openssl-1.1' 'kdotool-git' 'linux-firmware')
 provides=('wxwidgets3.0=3.0.5-3')
 conflicts=('wxwidgets3.0')
 replaces=('wxwidgets3.0')