got X11 working without xauth tokens, changed vga mode to 24 colors

9 files changed, 31 insertions, 26 deletions

diff --git a/README b/README
index f58a386..d9d9c4c 100644
--- a/README
+++ b/README
@@ -512,6 +512,7 @@ Call Trace:
 - 'cd DIR' used everywhere without 'cd DIR || exit 1'
 - can we do a crunch binary for X apps, they get 400k when linked statically
   with X libraries1
+- depth 16 -> 24 on Xfbdev?
   
 tools
 -----
diff --git a/configs/versions b/configs/versions
index 85aaa81..7139308 100644
--- a/configs/versions
+++ b/configs/versions
@@ -26,8 +26,8 @@ BDFTOPCF_VERSION="1.1"
 FONT_CURSOR_MISC_VERSION="1.0.4"
 FONT_MISC_MISC_VERSION="1.1.3"
 RXVT_VERSION="2.6.4"
-XHOST_VERSION="1.0.9"
-XAUTH_VERSION="1.1.2"
+XHOST_VERSION="1.0.8"
+XAUTH_VERSION="1.0.9"
 LUA_VERSION="5.1.5"
 NOTION_VERSION="435631f"
 WORDGRINDER_VERSION="0.8"
diff --git a/local/root/.xinitrc b/local/root/.xinitrc
index 319672f..333edd2 100644
--- a/local/root/.xinitrc
+++ b/local/root/.xinitrc
@@ -1 +1,5 @@
-rxvt
+#!/bin/oksh
+
+rxvt &
+exec notion
+
diff --git a/patches/uflbbl-boot-options.patch b/patches/uflbbl-boot-options.patch
index ec4f51d..875814d 100644
--- a/patches/uflbbl-boot-options.patch
+++ b/patches/uflbbl-boot-options.patch
@@ -1,6 +1,6 @@
 diff -rauN uflbbl/src/boot.asm uflbbl-boot-options/src/boot.asm
 --- uflbbl/src/boot.asm	2023-07-13 08:47:23.000000000 +0200
-+++ uflbbl-boot-options/src/boot.asm	2023-07-22 15:26:45.599157847 +0200
++++ uflbbl-boot-options/src/boot.asm	2023-08-03 13:31:12.056701916 +0200
 @@ -468,10 +468,10 @@
  	mov [READ_STATE], byte STATE_READ_INITRD
  ; qemu initrd start location 7fab000, 133869568 (this is 128MB) too high for us,
@@ -20,7 +20,7 @@ diff -rauN uflbbl/src/boot.asm uflbbl-boot-options/src/boot.asm
  
  KERNEL_CMD_LINE:
 -	db "debug loglevel=7 earlycon=uart8250,io,0x3f8,9600n8 console=tty0 console=ttyS0,9600n8 rdinit=/bin/sinit root=/dev/ram0 rootfstype=ramfs iommu=off", 0
-+	db "vga=ask debug loglevel=7 earlycon=vga earlycon=uart8250,io,0x3f8,9600n8 console=tty0 console=ttyS0,9600n8 init=/init iommu=off", 0
++	db "debug loglevel=7 earlycon=vga earlycon=uart8250,io,0x3f8,9600n8 console=tty0 console=ttyS0,9600n8 init=/init iommu=off vga=ask", 0
  
  KERNEL_CMD_SIZE equ $-KERNEL_CMD_LINE
  
diff --git a/patches/xhost-ipv6.patch b/patches/xhost-ipv6.patch
index 67ec92a..3e0dbbe 100644
--- a/patches/xhost-ipv6.patch
+++ b/patches/xhost-ipv6.patch
@@ -1,6 +1,6 @@
 diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c
---- xhost/xhost.c	2022-12-13 00:44:28.000000000 +0100
-+++ xhost-ipv6-patch/xhost.c	2023-08-03 12:17:50.820246665 +0200
+--- xhost/xhost.c	2019-02-19 23:51:09.000000000 +0100
++++ xhost-ipv6-patch/xhost.c	2023-08-03 13:13:43.035163326 +0200
 @@ -119,6 +119,9 @@
  #endif
  #endif
@@ -8,10 +8,10 @@ diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c
 +#undef IPv6
 +#define _X_UNUSED
 +
- #ifdef USE_GETTEXT
- # include <locale.h>	/* setlocale()  */
- # include <libintl.h>	/* gettext(), textdomain(), etc. */
-@@ -232,9 +235,11 @@
+ static int change_host(Display *dpy, char *name, Bool add);
+ static const char *get_hostname(XHostAddress *ha);
+ static int local_xerror(Display *dpy, XErrorEvent *rep);
+@@ -211,9 +214,11 @@
  		    case FamilyInternet:
  			printf("INET:");
  			break;
@@ -23,7 +23,7 @@ diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c
  		    case FamilyDECnet:
  			printf("DNET:");
  			break;
-@@ -247,9 +252,11 @@
+@@ -226,9 +231,11 @@
  		    case FamilyLocalHost:
  			printf("LOCAL:");
  			break;
@@ -33,9 +33,9 @@ diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c
  			break;
 +#endif
  		    default:
- 			printf(gettext("<unknown family type %d>:"), list[i].family);
+ 			printf("<unknown family type %d>:", list[i].family);
  			break;
-@@ -411,10 +418,12 @@
+@@ -389,10 +396,12 @@
      else if (!strncmp("local:", lname, 6)) {
  	family = FamilyLocalHost;
      }
@@ -46,9 +46,9 @@ diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c
      }
 +#endif
      if (family == FamilyWild && (cp = strchr(lname, ':'))) {
- #ifdef IPv6
- 	/*
-@@ -434,6 +443,7 @@
+ 	*cp = '\0';
+ 	fprintf (stderr, "%s: unknown address family \"%s\"\n",
+@@ -402,6 +411,7 @@
      }
      free(lname);
  
@@ -56,7 +56,7 @@ diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c
      if (family == FamilyServerInterpreted) {
  	XServerInterpretedAddress siaddr;
  	int rc;
-@@ -461,6 +471,7 @@
+@@ -429,6 +439,7 @@
  	    return 0;
  	return 1;
      }
@@ -64,7 +64,7 @@ diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c
  
  #ifdef K5AUTH
      if (family == FamilyKrb5Principal) {
-@@ -826,6 +837,7 @@
+@@ -794,6 +805,7 @@
      if (ha->family == FamilyLocalHost) {
  	return "";
      }
@@ -72,7 +72,7 @@ diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c
      if (ha->family == FamilyServerInterpreted) {
  	XServerInterpretedAddress *sip;
  	static char *addressString;
-@@ -854,6 +866,7 @@
+@@ -822,6 +834,7 @@
  	}
  	return addressString;
      }
diff --git a/scripts/build.sh b/scripts/build.sh
index 9718b5b..f934722 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -726,7 +726,7 @@ if [ ! -f "${BASE}/floppy.img" ]; then
 	touch EOF
 	cp "${BASE}/build/stage1/boot/bzImage" .
 	# old way of setting video mode on boot into real mode (0x317)
-	tools/rdev -v bzImage 791
+	tools/rdev -v bzImage 792
 	tar cvf data.tar -b1 bzImage ramdisk.img EOF
 	cat "${BASE}/build/stage1/boot/boot.img" data.tar > "${BASE}/floppy.img"
 	split -d -b 1474560 floppy.img floppy
diff --git a/scripts/download.sh b/scripts/download.sh
index b791872..49d43ca 100755
--- a/scripts/download.sh
+++ b/scripts/download.sh
@@ -150,12 +150,12 @@ fi
 
 if [ ! -f "${BASE}/downloads/xhost-${XHOST_VERSION}.tar.gz" ]; then
 	wget -O "${BASE}/downloads/xhost-${XHOST_VERSION}.tar.gz" \
-		"https://www.x.org/archive//individual/app/xhost-${XHOST_VERSION}.tar.xz"
+		"https://www.x.org/archive//individual/app/xhost-${XHOST_VERSION}.tar.gz"
 fi
 
 if [ ! -f "${BASE}/downloads/xauth-${XAUTH_VERSION}.tar.gz" ]; then
 	wget -O "${BASE}/downloads/xauth-${XAUTH_VERSION}.tar.gz" \
-		"https://www.x.org/archive//individual/app/xauth-${XAUTH_VERSION}.tar.xz"
+		"https://www.x.org/archive//individual/app/xauth-${XAUTH_VERSION}.tar.gz"
 fi
 
 if [ ! -f "${BASE}/downloads/bdftopcf-${BDFTOPCF_VERSION}.tar.gz" ]; then
diff --git a/scripts/run_qemu.sh b/scripts/run_qemu.sh
index 739d790..87a9740 100755
--- a/scripts/run_qemu.sh
+++ b/scripts/run_qemu.sh
@@ -4,7 +4,7 @@ qemu-nbd -f raw root.img -x ROOT &
 sleep 2 && \
 qemu-system-i386 -cpu 486 -m 18M -machine isapc \
 	-drive "file=floppy00,if=floppy,format=raw" \
-	-netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16,hostfwd=tcp::2222-:22 \
+	-netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16,hostfwd=tcp::2222-:22,hostfwd=tcp::6001-:6000 \
 	-vga std \
 	-device ne2k_isa,iobase=0x300,irq=10,netdev=net0
 pkill qemu-nbd
diff --git a/scripts/run_qemu_direct.sh b/scripts/run_qemu_direct.sh
index 603650e..186308c 100755
--- a/scripts/run_qemu_direct.sh
+++ b/scripts/run_qemu_direct.sh
@@ -4,8 +4,8 @@ qemu-nbd -f raw root.img -x ROOT &
 sleep 2 && \
 qemu-system-i386 -cpu 486 -m 24M -machine isapc \
  	-kernel bzImage -initrd ramdisk.img \
- 	-append	"debug loglevel=7 earlycon=vga earlycon=uart8250,io,0x3f8,9600n8 console=tty0 console=ttyS0,9600n8 iommu=off init=/init vga=0x317" \
-	-netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16,hostfwd=tcp::2222-:22 \
+ 	-append	"debug loglevel=7 earlycon=vga earlycon=uart8250,io,0x3f8,9600n8 console=tty0 console=ttyS0,9600n8 iommu=off init=/init vga=0x318" \
+	-netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16,hostfwd=tcp::2222-:22,hostfwd=tcp::6001-:6000 \
 	-vga std \
 	-device ne2k_isa,iobase=0x300,irq=10,netdev=net0
 pkill qemu-nbd