Prep 1.9.9 Release

NJRoadfan · Oct 14, 2024 · 3d8f053 · 3d8f053
1 parent c5afdbf
commit 3d8f053
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/files/macipgw-start.sh.txt b/files/macipgw-start.sh.txt
@@ -5,18 +5,15 @@ atalkd_if=$(grep "^[^ # t]" /etc/netatalk/atalkd.conf | tail -1 | cut -d " " -f
 sysctl -w net.ipv4.ip_forward=1 > /dev/null
 macipgw -n 8.8.8.8 192.168.151.0 255.255.255.0
 # Enable IP NAT forwarding
+nft flush ruleset
 nft 'add table ip filter'
 nft 'add chain ip filter INPUT { type filter hook input priority 0; policy accept; }'
 nft 'add chain ip filter FORWARD { type filter hook forward priority 0; policy accept; }'
 nft 'add chain ip filter OUTPUT { type filter hook output priority 0; policy accept; }'
 nft add rule ip filter FORWARD iifname "$atalkd_if" oifname "tun0" ct state related,established  counter accept
-nft add rule ip filter FORWARD iifname "tun1" oifname "$atalkd_if" counter accept
-nft add rule ip filter FORWARD iifname "$atalkd_if" oifname "$atalkd_if" ct state related,established  counter accept
-nft add rule ip filter FORWARD iifname "tun1" oifname "$atalkd_if" counter accept
 nft 'add table ip nat'
 nft 'add chain ip nat PREROUTING { type nat hook prerouting priority -100; policy accept; }'
 nft 'add chain ip nat INPUT { type nat hook input priority 100; policy accept; }'
 nft 'add chain ip nat OUTPUT { type nat hook output priority -100; policy accept; }'
 nft 'add chain ip nat POSTROUTING { type nat hook postrouting priority 100; policy accept; }'
 nft add rule ip nat POSTROUTING oifname "$atalkd_if" counter masquerade
-nft add rule ip nat POSTROUTING oifname "$atalkd_if" counter masquerade
diff --git a/scripts/a2server-2-tools.txt b/scripts/a2server-2-tools.txt
@@ -11,7 +11,7 @@ case "$A2SERVER_SCRIPT_URL" in
 esac
 case "$A2SERVER_BINARY_URL" in
 	*/) binaryURL="$A2SERVER_BINARY_URL" ;;
-	*) binaryURL="${A2SERVER_BINARY_URL:-http://appleii.ivanx.com/a2server/files}/" ;;
+	*) binaryURL="${A2SERVER_BINARY_URL:-https://appleii.ivanx.com/a2server/files}/" ;;
 esac
 useExternalURL=1
 [[ $A2SERVER_NO_EXTERNAL ]] && useExternalURL=

diff --git a/scripts/a2server-3-sharing.txt b/scripts/a2server-3-sharing.txt
@@ -21,7 +21,7 @@ case "$A2SERVER_SCRIPT_URL" in
 esac
 case "$A2SERVER_BINARY_URL" in
     */) binaryURL="$A2SERVER_BINARY_URL" ;;
-    *) binaryURL="${A2SERVER_BINARY_URL:-http://appleii.ivanx.com/a2server/files}/" ;;
+    *) binaryURL="${A2SERVER_BINARY_URL:-https://appleii.ivanx.com/a2server/files}/" ;;
 esac
 useExternalURL=1
 [[ $A2SERVER_NO_EXTERNAL ]] && useExternalURL=
@@ -495,10 +495,10 @@ if ! hash ciopfs &> /dev/null; then
         rm -rf /tmp/ciopfs
     fi
     if ! grep -q '^ciopfs' /etc/fstab; then
-        echo "ciopfs#/srv/A2SERVER/.a2files /srv/A2SERVER/A2FILES fuse allow_other 0 0" | sudo tee -a /etc/fstab > /dev/null
+        echo "ciopfs#/srv/A2SERVER/.a2files /srv/A2SERVER/A2FILES fuse allow_other,use_ino 0 0" | sudo tee -a /etc/fstab > /dev/null
     fi
     if ! mount | grep '^ciopfs.*A2FILES'; then
-        sudo ciopfs /srv/A2SERVER/.a2files /srv/A2SERVER/A2FILES -o allow_other
+        sudo ciopfs /srv/A2SERVER/.a2files /srv/A2SERVER/A2FILES -o allow_other,use_ino
     fi
     sudo systemctl daemon-reload
 else

diff --git a/scripts/a2server-5-netboot.txt b/scripts/a2server-5-netboot.txt
@@ -14,7 +14,7 @@ case "$A2SERVER_SCRIPT_URL" in
 esac
 case "$A2SERVER_BINARY_URL" in
     */) binaryURL="$A2SERVER_BINARY_URL" ;;
-    *) binaryURL="${A2SERVER_BINARY_URL:-http://appleii.ivanx.com/a2server/files}/" ;;
+    *) binaryURL="${A2SERVER_BINARY_URL:-https://appleii.ivanx.com/a2server/files}/" ;;
 esac
 useExternalURL=1
 [[ $A2SERVER_NO_EXTERNAL ]] && useExternalURL=
@@ -29,7 +29,7 @@ diskToolsP8Dir=$p8Dir/Disk.Tools.P8
 
 commDir="/srv/A2SERVER/A2FILES/Comm"
 
-gsosURL="http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Apple_II/Apple_IIGS_System_6.0.1/"
+gsosURL="https://mirrors.apple2.org.za/ftp.info.apple.com/Apple_IIGS_System_6.0.1/"
 # alernate: http://web.archive.org/web/20080907081050/http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Apple_II/Apple_IIGS_System_6.0.1/
 gsosBackupURL="http://archive.org/download/download.info.apple.com.2012.11/download.info.apple.com.2012.11.zip/download.info.apple.com%2FApple_Support_Area%2FApple_Software_Updates%2FEnglish-North_American%2FApple_II%2FApple_IIGS_System_6.0.1%2F"
 

diff --git a/setup/index.txt b/setup/index.txt
@@ -1,7 +1,7 @@
 #! /bin/bash
 # vim: set tabstop=4 shiftwidth=4 expandtab filetype=sh:
 
-# A2SERVER master setup script, last update 08-Oct-23
+# A2SERVER master setup script, last update 08-Oct-24
 # it downloads and executes several scripts related to the setup of
 # netatalk configured for Apple II use on Debian or Raspbian.
 # more info is at http://ivanx.com/a2server
@@ -18,7 +18,7 @@ case "$A2SERVER_SCRIPT_URL" in
 esac
 case "$A2SERVER_BINARY_URL" in
 	*/) binaryURL="$A2SERVER_BINARY_URL" ;;
-	*) binaryURL="${A2SERVER_BINARY_URL:-http://appleii.ivanx.com/a2server/files}/" ;;
+	*) binaryURL="${A2SERVER_BINARY_URL:-https://appleii.ivanx.com/a2server/files}/" ;;
 esac
 useExternalURL=1
 [[ $A2SERVER_NO_EXTERNAL ]] && useExternalURL=
@@ -124,7 +124,7 @@ touch /tmp/a2server-compileAlways
 
 if [[ $isDebian ]]; then # supported Debian?
      debianVersion=$(cat /etc/debian_version)
-     debianSupported="-12.6- -11.10-"
+     debianSupported="-12.7- -11.11-"
      [[ $debianSupported == *-$debianVersion-* ]] && unsupportedOS=
 fi
 

diff --git a/update/versionhistory.txt b/update/versionhistory.txt
@@ -87,7 +87,16 @@
                     fixed appletalk kernel module compilation to work with linux 5.x;
                     updated Marinetti and link Layers to latest releases;
                     updated Spectrum to latest release;
-                    added The Networker2 and Webber installation;
+                    added The Networker2 and Webber installation
+
+1.9.9: Oct 2024:  added AFPBridge, NetDisk, and SMB FST installation;
+                  added TashRouter setup and TashTalk support on RPi;
+                  fixed bugs and updated cppo and afptype to support new
+                  versions of netatalk;
+                  fixed bugs in creation of ATINIT file;
+                  drop support for Debian 10 and older;
+                  updated to netatalk 2.4.10, switched to meson build;
+                  last release to use apple double v2 folders (i hope)
 
 Big thanks to: Anthony Martino, Henry Courbis, Joseph Carter, Jason King,
 Andy McFadden, Steven Hirsch, Geoff Body, Peter Wong, Tony Diaz, David Schmidt,