wok-6.x rev 25044

*/stuff/bootloader.S: fix VCPI case
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jun 02 15:48:36 2022 +0000 (2022-06-02)
parents 76c41f0eab0e
children 232ba43d30af
files ipxe/stuff/bootloader.S memtest/stuff/bootloader.S plop/stuff/bootloader.S snort/receipt squidguard/receipt
line diff
     1.1 --- a/ipxe/stuff/bootloader.S	Wed Jun 01 16:50:09 2022 +0000
     1.2 +++ b/ipxe/stuff/bootloader.S	Thu Jun 02 15:48:36 2022 +0000
     1.3 @@ -30,7 +30,7 @@
     1.4  #define FLOPPY_HAS_2_SIDES	hardcoded heads count to 2	-15
     1.5  //#define NO_CMDLINE_SHRINK	remove heading spaces ?		-6-21
     1.6  //#define  NO_CMDLINE_FILE	remove @cmdline file support ?	-21
     1.7 -//#define NO_DOTS		show progression dots ?		-5
     1.8 +#define NO_DOTS			show progression dots ?		-5
     1.9  #ifndef BZIMAGE
    1.10  //#define TINY_ZIMAGE		system < 64Kb ?			-11
    1.11  //#define NO_MINSETUP		default setup (dos only) ?	-4
    1.12 @@ -458,6 +458,8 @@
    1.13  	movb	$0x0C,%al	// DE0C switchpm(ESI)
    1.14  	jmp	call_vcpi
    1.15  pm_code:
    1.16 +	.byte	0x6A, SEL_DATA	// pushw	$SEL_DATA
    1.17 +	popw	%ss
    1.18  	movl	%cr0,%eax
    1.19  	andl	$0x7FFFFFFE,%eax
    1.20  	movl	%eax,%cr0
    1.21 @@ -633,9 +635,10 @@
    1.22  gdt_vcpi2	=	gdt_abs-16
    1.23  gdt_vcpi3	=	gdt_abs-8
    1.24  gdt_abs:
    1.25 +SEL_DATA	= gdt_abs-gdt_null
    1.26  	.word	0xFFFF
    1.27  	.long	0x92000000
    1.28 -	.byte	0xCF,0
    1.29 +	.byte	0x8F,0
    1.30  gdt_code:
    1.31  	.word	0xFFFF
    1.32  gdt_code_base:
     2.1 --- a/memtest/stuff/bootloader.S	Wed Jun 01 16:50:09 2022 +0000
     2.2 +++ b/memtest/stuff/bootloader.S	Thu Jun 02 15:48:36 2022 +0000
     2.3 @@ -458,6 +458,8 @@
     2.4  	movb	$0x0C,%al	// DE0C switchpm(ESI)
     2.5  	jmp	call_vcpi
     2.6  pm_code:
     2.7 +	.byte	0x6A, SEL_DATA	// pushw	$SEL_DATA
     2.8 +	popw	%ss
     2.9  	movl	%cr0,%eax
    2.10  	andl	$0x7FFFFFFE,%eax
    2.11  	movl	%eax,%cr0
    2.12 @@ -633,9 +635,10 @@
    2.13  gdt_vcpi2	=	gdt_abs-16
    2.14  gdt_vcpi3	=	gdt_abs-8
    2.15  gdt_abs:
    2.16 +SEL_DATA	= gdt_abs-gdt_null
    2.17  	.word	0xFFFF
    2.18  	.long	0x92000000
    2.19 -	.byte	0xCF,0
    2.20 +	.byte	0x8F,0
    2.21  gdt_code:
    2.22  	.word	0xFFFF
    2.23  gdt_code_base:
     3.1 --- a/plop/stuff/bootloader.S	Wed Jun 01 16:50:09 2022 +0000
     3.2 +++ b/plop/stuff/bootloader.S	Thu Jun 02 15:48:36 2022 +0000
     3.3 @@ -458,6 +458,8 @@
     3.4  	movb	$0x0C,%al	// DE0C switchpm(ESI)
     3.5  	jmp	call_vcpi
     3.6  pm_code:
     3.7 +	.byte	0x6A, SEL_DATA	// pushw	$SEL_DATA
     3.8 +	popw	%ss
     3.9  	movl	%cr0,%eax
    3.10  	andl	$0x7FFFFFFE,%eax
    3.11  	movl	%eax,%cr0
    3.12 @@ -633,9 +635,10 @@
    3.13  gdt_vcpi2	=	gdt_abs-16
    3.14  gdt_vcpi3	=	gdt_abs-8
    3.15  gdt_abs:
    3.16 +SEL_DATA	= gdt_abs-gdt_null
    3.17  	.word	0xFFFF
    3.18  	.long	0x92000000
    3.19 -	.byte	0xCF,0
    3.20 +	.byte	0x8F,0
    3.21  gdt_code:
    3.22  	.word	0xFFFF
    3.23  gdt_code_base:
     4.1 --- a/snort/receipt	Wed Jun 01 16:50:09 2022 +0000
     4.2 +++ b/snort/receipt	Thu Jun 02 15:48:36 2022 +0000
     4.3 @@ -9,7 +9,7 @@
     4.4  WEB_SITE="https://github.com/snort3/snort3"
     4.5  
     4.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
     4.7 -WGET_URL="https://www.snort.org/downloads/$PACKAGE/$TARBALL"
     4.8 +WGET_URL="https://distfiles.macports.org/$PACKAGE/$TARBALL"
     4.9  
    4.10  DEPENDS="libdaq libdnet openssl pcre"
    4.11  BUILD_DEPENDS="flex libdaq-dev libdnet-dev libpcap-dev luajit-dev 
    4.12 @@ -19,7 +19,7 @@
    4.13  current_version()
    4.14  {
    4.15  	wget -O - ${WGET_URL%/*/*} 2>/dev/null | \
    4.16 -	sed "/openappid/d;/latest/d;/$PACKAGE-/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
    4.17 +	sed "/$PACKAGE-/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
    4.18  }
    4.19  
    4.20  # Rules to configure and make the package.
     5.1 --- a/squidguard/receipt	Wed Jun 01 16:50:09 2022 +0000
     5.2 +++ b/squidguard/receipt	Thu Jun 02 15:48:36 2022 +0000
     5.3 @@ -1,15 +1,14 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="squidguard"
     5.7 -VERSION="1.4"
     5.8 +VERSION="1.4.0"
     5.9  CATEGORY="network"
    5.10  SHORT_DESC="Web filter."
    5.11  MAINTAINER="pascal.bellard@slitaz.org"
    5.12  LICENSE="GPL"
    5.13 -SOURCE="squidGuard"
    5.14 -TARBALL="$SOURCE-$VERSION.tar.gz"
    5.15 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.16  WEB_SITE="http://www.squidguard.org/"
    5.17 -WGET_URL="${WEB_SITE}Downloads/$TARBALL"
    5.18 +WGET_URL="https://www.joonet.de/sources/$PACKAGE/$TARBALL"
    5.19  DEPENDS="squid libdb"
    5.20  BUILD_DEPENDS="db-dev"
    5.21  
    5.22 @@ -17,7 +16,7 @@
    5.23  current_version()
    5.24  {
    5.25  	wget -O - ${WGET_URL%/*}/ 2>/dev/null | \
    5.26 -	sed "/latest/d;/$SOURCE-[0-9]/!d;/tar/!d;s|.*$SOURCE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
    5.27 +	sed "/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
    5.28  }
    5.29  
    5.30  # Rules to configure and make the package.