# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1654184916 0
# Node ID 8e505f99deb3033b0414200b94b6453e9889180c
# Parent  76c41f0eab0ed802c678ce18c130b6fd0375ea0a
*/stuff/bootloader.S: fix VCPI case

diff -r 76c41f0eab0e -r 8e505f99deb3 ipxe/stuff/bootloader.S
--- a/ipxe/stuff/bootloader.S	Wed Jun 01 16:50:09 2022 +0000
+++ b/ipxe/stuff/bootloader.S	Thu Jun 02 15:48:36 2022 +0000
@@ -30,7 +30,7 @@
 #define FLOPPY_HAS_2_SIDES	hardcoded heads count to 2	-15
 //#define NO_CMDLINE_SHRINK	remove heading spaces ?		-6-21
 //#define  NO_CMDLINE_FILE	remove @cmdline file support ?	-21
-//#define NO_DOTS		show progression dots ?		-5
+#define NO_DOTS			show progression dots ?		-5
 #ifndef BZIMAGE
 //#define TINY_ZIMAGE		system < 64Kb ?			-11
 //#define NO_MINSETUP		default setup (dos only) ?	-4
@@ -458,6 +458,8 @@
 	movb	$0x0C,%al	// DE0C switchpm(ESI)
 	jmp	call_vcpi
 pm_code:
+	.byte	0x6A, SEL_DATA	// pushw	$SEL_DATA
+	popw	%ss
 	movl	%cr0,%eax
 	andl	$0x7FFFFFFE,%eax
 	movl	%eax,%cr0
@@ -633,9 +635,10 @@
 gdt_vcpi2	=	gdt_abs-16
 gdt_vcpi3	=	gdt_abs-8
 gdt_abs:
+SEL_DATA	= gdt_abs-gdt_null
 	.word	0xFFFF
 	.long	0x92000000
-	.byte	0xCF,0
+	.byte	0x8F,0
 gdt_code:
 	.word	0xFFFF
 gdt_code_base:
diff -r 76c41f0eab0e -r 8e505f99deb3 memtest/stuff/bootloader.S
--- a/memtest/stuff/bootloader.S	Wed Jun 01 16:50:09 2022 +0000
+++ b/memtest/stuff/bootloader.S	Thu Jun 02 15:48:36 2022 +0000
@@ -458,6 +458,8 @@
 	movb	$0x0C,%al	// DE0C switchpm(ESI)
 	jmp	call_vcpi
 pm_code:
+	.byte	0x6A, SEL_DATA	// pushw	$SEL_DATA
+	popw	%ss
 	movl	%cr0,%eax
 	andl	$0x7FFFFFFE,%eax
 	movl	%eax,%cr0
@@ -633,9 +635,10 @@
 gdt_vcpi2	=	gdt_abs-16
 gdt_vcpi3	=	gdt_abs-8
 gdt_abs:
+SEL_DATA	= gdt_abs-gdt_null
 	.word	0xFFFF
 	.long	0x92000000
-	.byte	0xCF,0
+	.byte	0x8F,0
 gdt_code:
 	.word	0xFFFF
 gdt_code_base:
diff -r 76c41f0eab0e -r 8e505f99deb3 plop/stuff/bootloader.S
--- a/plop/stuff/bootloader.S	Wed Jun 01 16:50:09 2022 +0000
+++ b/plop/stuff/bootloader.S	Thu Jun 02 15:48:36 2022 +0000
@@ -458,6 +458,8 @@
 	movb	$0x0C,%al	// DE0C switchpm(ESI)
 	jmp	call_vcpi
 pm_code:
+	.byte	0x6A, SEL_DATA	// pushw	$SEL_DATA
+	popw	%ss
 	movl	%cr0,%eax
 	andl	$0x7FFFFFFE,%eax
 	movl	%eax,%cr0
@@ -633,9 +635,10 @@
 gdt_vcpi2	=	gdt_abs-16
 gdt_vcpi3	=	gdt_abs-8
 gdt_abs:
+SEL_DATA	= gdt_abs-gdt_null
 	.word	0xFFFF
 	.long	0x92000000
-	.byte	0xCF,0
+	.byte	0x8F,0
 gdt_code:
 	.word	0xFFFF
 gdt_code_base:
diff -r 76c41f0eab0e -r 8e505f99deb3 snort/receipt
--- a/snort/receipt	Wed Jun 01 16:50:09 2022 +0000
+++ b/snort/receipt	Thu Jun 02 15:48:36 2022 +0000
@@ -9,7 +9,7 @@
 WEB_SITE="https://github.com/snort3/snort3"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://www.snort.org/downloads/$PACKAGE/$TARBALL"
+WGET_URL="https://distfiles.macports.org/$PACKAGE/$TARBALL"
 
 DEPENDS="libdaq libdnet openssl pcre"
 BUILD_DEPENDS="flex libdaq-dev libdnet-dev libpcap-dev luajit-dev 
@@ -19,7 +19,7 @@
 current_version()
 {
 	wget -O - ${WGET_URL%/*/*} 2>/dev/null | \
-	sed "/openappid/d;/latest/d;/$PACKAGE-/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
+	sed "/$PACKAGE-/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
 }
 
 # Rules to configure and make the package.
diff -r 76c41f0eab0e -r 8e505f99deb3 squidguard/receipt
--- a/squidguard/receipt	Wed Jun 01 16:50:09 2022 +0000
+++ b/squidguard/receipt	Thu Jun 02 15:48:36 2022 +0000
@@ -1,15 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="squidguard"
-VERSION="1.4"
+VERSION="1.4.0"
 CATEGORY="network"
 SHORT_DESC="Web filter."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
-SOURCE="squidGuard"
-TARBALL="$SOURCE-$VERSION.tar.gz"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.squidguard.org/"
-WGET_URL="${WEB_SITE}Downloads/$TARBALL"
+WGET_URL="https://www.joonet.de/sources/$PACKAGE/$TARBALL"
 DEPENDS="squid libdb"
 BUILD_DEPENDS="db-dev"
 
@@ -17,7 +16,7 @@
 current_version()
 {
 	wget -O - ${WGET_URL%/*}/ 2>/dev/null | \
-	sed "/latest/d;/$SOURCE-[0-9]/!d;/tar/!d;s|.*$SOURCE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
+	sed "/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
 }
 
 # Rules to configure and make the package.