diff options
| author |   Daniel Drake <dsd@gentoo.org> | 2004-10-11 20:14:39 +0000 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2004-10-11 20:14:39 +0000 |
| commit | f9706df67216ed9e6e80950b47c7e3ebc2b139ec (patch) | |
| tree | a8cb43ecb8cf0502a837205e5f93b30cc41c736d /sys-kernel | |
| parent | use faster server (Manifest recommit) (diff) | |
| download | gentoo-2-f9706df67216ed9e6e80950b47c7e3ebc2b139ec.tar.gz gentoo-2-f9706df67216ed9e6e80950b47c7e3ebc2b139ec.tar.bz2 gentoo-2-f9706df67216ed9e6e80950b47c7e3ebc2b139ec.zip | |
Removing package from portage
Diffstat (limited to 'sys-kernel')
23 files changed, 0 insertions, 1767 deletions
diff --git a/sys-kernel/gs-sources/ChangeLog b/sys-kernel/gs-sources/ChangeLog deleted file mode 100644 index dfbfbe08a018..000000000000 --- a/sys-kernel/gs-sources/ChangeLog +++ /dev/null @@ -1,296 +0,0 @@ -# ChangeLog for sys-kernel/gs-sources -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.51 2004/10/11 20:12:11 dsd Exp $ - - 11 Oct 2004; Daniel Drake<dsd@gentoo.org>: - Removing package from portage, as its unmaintained/broken. Please use - gentoo-sources or gentoo-dev-sources now. - -*gs-sources-2.4.25_pre7-r11 (10 Aug 2004) - - 10 Aug 2004; <plasmaroo@gentoo.org> -gs-sources-2.4.25_pre7-r10.ebuild, - +gs-sources-2.4.25_pre7-r11.ebuild, +files/gs-sources.cmdlineLeak.patch: - Version bump for the /proc/cmdline leak vulnerability; bug #59905. - -*gs-sources-2.4.25_pre7-r10 (08 Aug 2004) - - 08 Aug 2004; <plasmaroo@gentoo.org> +gs-sources-2.4.25_pre7-r10.ebuild, - -gs-sources-2.4.25_pre7-r9.ebuild, +files/gs-sources.CAN-2004-0685.patch: - Version bump for CAN-2004-0685, bug #59769. - -*gs-sources-2.4.25_pre7-r9 (04 Aug 2004) - - 04 Aug 2004; <plasmaroo@gentoo.org> -gs-sources-2.4.25_pre7-r8.ebuild, - +gs-sources-2.4.25_pre7-r9.ebuild: - Added a patch for the CAN-2004-0415 vulnerability, bug #59378. - -*gs-sources-2.4.25_pre7-r8 (09 Jul 2004) - - 09 Jul 2004; <plasmaroo@gentoo.org> -gs-sources-2.4.25_pre7-r7.ebuild, - +gs-sources-2.4.25_pre7-r8.ebuild, +files/gs-sources.CAN-2004-0497.patch: - Version bump for kernel attribute vulnerabilities, bug #56479. - - 29 Jun 2004; Daniel Drake <dsd@gentoo.org> gs-sources-2.4.25_pre7-r7.ebuild: - Fix installation path - - 29 Jun 2004; Daniel Drake <dsd@gentoo.org> gs-sources-2.4.25_pre7-r7.ebuild, - files/gs-sources.MKI.CompileFix.patch: - Fix compilation of mki-adapter - - 25 Jun 2004; Aron Griffis <agriffis@gentoo.org> - gs-sources-2.4.25_pre7-r7.ebuild: - QA - fix use invocation - -*gs-sources-2.4.25_pre7-r7 (24 Jun 2004) - - 24 Jun 2004; <plasmaroo@gentoo.org> -gs-sources-2.4.25_pre7-r6.ebuild, - +gs-sources-2.4.25_pre7-r7.ebuild, +files/gs-sources.CAN-2004-0495.patch, - +files/gs-sources.CAN-2004-0535.patch: - Security bump for the CAN-2004-0495 and CAN-2004-0535 vulnerabilities. Old - version removed. - - 23 Jun 2004; Aron Griffis <agriffis@gentoo.org> - gs-sources-2.4.25_pre7-r6.ebuild: - QA - fix use invocation - -*gs-sources-2.4.25_pre7-r6 (14 Jun 2004) - - 14 Jun 2004; <plasmaroo@gentoo.org> -gs-sources-2.4.25_pre7-r5.ebuild, - +gs-sources-2.4.25_pre7-r6.ebuild, +files/gs-sources.FPULockup-53804.patch: - Added a patch for the FPU-lockup issue; please see bug #58304 for details. - Old sources removed. - -*gs-sources-2.4.25_pre7-r5 (31 May 2004) - - 31 May 2004; <plasmaroo@gentoo.org> +gs-sources-2.4.25_pre7-r5.ebuild, - +files/gs-sources.CAN-2004-...patch: - Added patches for the CAN-2004-0133, CAN-2004-0181, CAN-2004-0394, and - CAN-2004-0427 vulnerabilities. Bug #47881. Old versions of sources removed. - - 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> - gs-sources-2.4.23_pre8-r1.ebuild, gs-sources-2.4.23_pre8-r2.ebuild: - Add inherit eutils - -*gs-sources-2.4.25_pre7-r4 (17 Apr 2004) - - 17 Apr 2004; <plasmaroo@gentoo.org> +files/gs-sources.CAN-2004-0177.patch, - +files/gs-sources.CAN-2004-0178.patch, +gs-sources-2.4.25_pre7-r4.ebuild: - Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities. - Stale versions removed. - -*gs-sources-2.4.25_pre7-r3 (15 Apr 2004) - - 15 Apr 2004; <plasmaroo@gentoo.org> +files/gs-sources.CAN-2004-0109.patch, - +gs-sources-2.4.25_pre7-r3.ebuild: - Version bump for the CAN-2004-0109 issue; bug #47881. - - 12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> - gs-sources-2.4.25_pre7-r2.ebuild: - Add eutils to inherit. - -*gs-sources-2.4.25_pre7-r2 (18 Feb 2004) - - 18 Feb 2004; <plasmaroo@gentoo.org> gs-sources-2.4.25_pre7-r2.ebuild, - files/gs-sources.munmap.patch: - Added the patch for the mremap/munmap vulnerability. Bug #42024. - -*gs-sources-2.4.25_pre7-r1 (24 Jan 2004) - - 24 Jan 2004; <livewire@gentoo.org> gs-sources-2.4.24_pre7-r1.ebuild - add devicemapper for evms2/lvm2 support (evms 1.2.1 is still present). - -*gs-sources-2.4.25_pre7 (23 Jan 2004) - - 23 Jan 2004; <livewire@gentoo.org> gs-sources-2.4.24_pre7.ebuild - bump to 2.4.25_pre7 - -*gs-sources-2.4.25_pre6 (19 Jan 2004) - - 19 Jan 2004; <livewire@gentoo.org> gs-sources-2.4.24_pre6.ebuild - bump to 2.4.25_pre6 - -*gs-sources-2.4.23_pre8-r2 (06 Jan 2004) - - 06 Jan 2004; <plasmaroo@gentoo.org> gs-sources-2.4.23_pre8-r2.ebuild, - files/gs-sources.CAN-2003-0985.patch, files/gs-sources.rtc_fix.patch: - Added the 2.4.24 security patches for the mremap() vulnerability and - the RTC leaks. Please see bug #37292 and bug #37292. - - 12 Dec 2003; <plasmaroo@gentoo.org> gs-sources-2.4.23_pre8-r1.ebuild, - files/gs-sources-2.4.23_pre8-af_irda.patch: - Added a patch to fix a slight typo in the linux-2.4.23 pre-patch; thanks to - Brian Harring for filing the bug. Bug #35646 is resolved as a result. - -*gs-sources-2.4.23_pre8-r1 (02 Dec 2003) - - 02 Dec 2003; Brian Jackson <iggy@gentoo.org> - gs-sources-2.4.23_pre8-r1.ebuild: - Version bump for the 'do_brk' vulnerability. - - 01 Dec 2003; Brian Jackson <iggy@gentoo.org> gs-sources-2.4.22_pre2.ebuild, - files/do_brk_fix.patch: Fix for the 'do_brk' vulnerability. - -*gs-sources-2.4.23_pre8 (26 Oct 2003) - 26 Oct 2003; Bob Johnson <livewire@gentoo.org> - - Bumped to pre8. - - Bumped freeswan to 2.03. - - Added v4l2. - -*gs-sources-2.4.23_pre7 (14 Oct 2003) - 14 Oct 2003; Bob Johnson <livewire@gentoo.org> - - Bumped to pre7. - - Win4Lin compile fix added. - -*gs-sources-2.4.23_pre6-r1 (04 Oct 2003) - 04 Oct; Bob Johnson <livewire@gentoo.org> - - Added miscellaneous finishing touches. - -*gs-sources-2.4.23_pre6 (04 Oct 2003) - - 04 Oct; Bob Johnson <livewire@gentoo.org> - - New patchset to get rolling again... - - freeswan-2.02,evms,3.5-useraddress,preempt,xfs,ecc,bootsplash,win4lin - -gs-sources-2.4.22_pre2 (29 June 2003) - -*gs-sources-2.4.21_rc1-r1 (08 Sep 2003) - - 08 Sep 2003; Martin Holzer <mholzer@gentoo.org> - gs-sources-2.4.21_pre7-r1.ebuild, gs-sources-2.4.21_pre7.ebuild, - gs-sources-2.4.21_rc1-r1.ebuild, gs-sources-2.4.21_rc1.ebuild, - gs-sources-2.4.21_rc2.ebuild, gs-sources-2.4.21_rc6.ebuild, - gs-sources-2.4.21_rc8.ebuild, gs-sources-2.4.22_pre2.ebuild: - SRC now uses mirror://kernel - - 29 June 2003; Bob Johnson <livewire@gentoo.org> - - Bumped to 2.4.22_pre2. - - Updated xfs to 2.4.21 stable. - -gs-sources-2.4.21_rc8 (11 June 2003) - - 11 June 2003; Bob Johnson <livewire@gentoo.org> - - Updated to SuperFreeswan 1.99.7.3. - - Updated to 2.4.21-rc8. - - Updated xfs-snapshot to 2003-06-10. - - Updated acpi to 20030523. - - Added cpu-freq back. - - 3.5 useraddress added. - -gs-sources-2.4.21_rc6 (01 June 2003) - - 01 June 2003; Bob Johnson <livewire@gentoo.org> - - Updated to 2.4.21-rc6. - - Updated mki-adapter. - - Updated Win4lin. - - Updated SuperFreeswan 1.99.7. - - Removed highmem vesa fix (breaks bootsplash silent). - -gs-sources-2.4.21_rc2 (15 May 2003) - - 15 May 2003; Bob Johnson <livewire@gentoo.org> - - Updated to -rc2. - - Added 5-13-2003 XFS (may be temporary addition). - - Updated ACPI 20030512. - - Updated ecc 20030225. - - Updated vl42-api-2.4.20. - - Updated super-freeswan 1.99.7. - - Added nforce2 agp patch. - - Added lm_sensors 2.7.0. - - Added highmem vesa framebuffer fix. - - Removed proconfig until I can fix vanilla's broken xconfig. - -gs-sources-2.4.21_rc1 (01 May 2003) - - 01 May 2003; Bob Johnson <livewire@gentoo.org> - - Added cset-1.1122-to-1.1141.patch. - - Added gcc_optimizations (fixed pfeifer). - - Added cpu_frequency patch. - - Added genkernel kernel_config. - -*gs-sources-2.4.21_rc1 (21 April 2003) - - 21 Apr 2003; Bob Johnson <livewire@gentoo.org> - - Bumped to -rc1. - -*gs-sources-2.4.21_pre7-r1 (19 April 2003) - - 19 Apr 2003; Bob Johnson <livewire@gentoo.org> - - Added latest cset from bkbits (many fixes). - - Bumped bootsplash to 3.0.7. - -*gs-sources-2.4.21_pre7 (05 April 2003) - - 05 Apr 2003; Bob Johnson <livewire@gentoo.org> - - Bumped to 2.4.21_pre7. - - Pulled aic79xx (now in vanilla) - -*gs-sources-2.4.21_pre6 (05 May 2003) - - 29 March 2003: Bob Johnson <livewire@gentoo.org> - - Updated to 2.4.21_pre6. - - Updated acpi to acpi-20030328-2.4.21-pre6. - - Updated aic79xx-linux-2.4-20030318. - -*gs-sources-2.4.21_pre5-r1 (18 March 2003) - - 18 March 2003: Bob Johnson <livewire@gentoo.org> - - Updated acpi to acpi-20030228-2.4.21-pre4. - - Updated Aic79xx to aic79xx-linux-2.4-20030318. - - Ptrace exploit patch . - - 27 Feb 2003: Bob Johnson <livewire@gentoo.org> - - Bumped to 2.4.21_pre5. - -*gs-sources-2.4.21_pre4 (18 Feb 2003) - - 18 Feb 2003: Bob Johnson <livewire@gentoo.org> - - Bumped to 2.4.21_pre4 - -*gs-sources-2.4.21_pre3-r3 (24 Jan 2003) - - 24 Jan 2003: Bob Johnson <livewire@gentoo.org> - - Updated acpi (Jan 23, 2003) with compile fixes. - - Updated aic79xx (Jan 22, 2003). - - bcm4400 nic drivers added. - - bcm5700 nic drivers added. - - Thinkpad support added. - - Experimental hpt370 fix. - - Sim710 compile fixes. - -*gs-sources-2.4.21_pre3-r2 (18 Jan 2003) - - 18 Jan 2003: Bob Johnson <livewire@gentoo.org> - - Newer Nforce2 patch, fixes 80wire detection. - - Preemptible Kernel Support added. - - Low Latency Support added. - - bkbits cset 1.884.1.87 to 1.903 (many many fixes). - - PDC202xx ide patches. - -*gs-sources-2.4.21_pre3-r1 (16 Jan 2003) - - 16 Jan 2003; Bob Johnson <livewire@gentoo.org> - - Nforce2 support finally (only to ATA100). - - ASUS 3c59x fix. - -*gs-sources-2.4.21_pre3 (15 Jan 2003) - - 15 Jan 2003; Bob Johnson <livewire@gentoo.org>: - Initial Release Gentoo Stable Sources -gss - - 2.4.20 patched up to 2.4.21pre3. - - 3.5G address-space. - - ACPI pre3. - - EVMS 1.2.1. - - proconfig 9.7. - - NTFS 2.10a. - - A few Nvidia nforce bitkeeper patches. - - Win4Lin. - - Futexes. - - Imon. - - I2C-2.7.0. - - New aic79xx drivers. - - ecc-20020904. - - v4l2-api. - - Super freeswan 1.99. - - GCC31 compile opts. - - Gentoo framebuffer. - - 3c59x fix for asus/nforce2?. diff --git a/sys-kernel/gs-sources/Manifest b/sys-kernel/gs-sources/Manifest deleted file mode 100644 index 80463de6bc35..000000000000 --- a/sys-kernel/gs-sources/Manifest +++ /dev/null @@ -1,22 +0,0 @@ -MD5 a5287c535ba2ed169a05ca943bbc15f9 ChangeLog 9614 -MD5 4df72e65b139d3e4c18bec81f3a561df metadata.xml 227 -MD5 786b51a8bb6f88ead71a1ca63c9a73c5 gs-sources-2.4.25_pre7-r11.ebuild 3557 -MD5 517fc1b71501382d041ce0bdfe304511 files/00_3.5-useraddress.patch 7247 -MD5 21f3a4f186017d925067335e24db36a1 files/gs-sources.CAN-2004-0109.patch 1877 -MD5 d1ccc2047be533c992f67270a150a210 files/gs-sources.cmdlineLeak.patch 388 -MD5 174438d215b70cad5ffb00ca8123c062 files/gs-sources.munmap.patch 837 -MD5 d4a740ae56c2049247083af387a22a85 files/gs-sources.CAN-2004-0394.patch 350 -MD5 60d25ff310fc6abfdce39ec9e47345af files/gs-sources.CAN-2004-0685.patch 2809 -MD5 0f66013f643c79c97fda489618a4e2fd files/gs-sources.CAN-2004-0535.patch 476 -MD5 de75cfa969ed092578d9ddda6c5be334 files/gs-sources.CAN-2004-0181.patch 1233 -MD5 dc18e982f8149588a291956481885a8c files/gs-sources.CAN-2004-0495.patch 17549 -MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gs-sources.CAN-2004-0177.patch 384 -MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/gs-sources.CAN-2004-0497.patch 707 -MD5 a3ec1083055b245758b2262dd2245145 files/pci.ids.patch 3376 -MD5 e77a93fdf26f06cf3ea5080b27211725 files/gs-sources.CAN-2003-0985.patch 414 -MD5 5bf9836a632a861728d33f9736bb7431 files/gs-sources.CAN-2004-0133.patch 427 -MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gs-sources.CAN-2004-0427.patch 460 -MD5 ac42024b6e6ee1e2165914db4b22a61c files/gs-sources.CAN-2004-0178.patch 424 -MD5 b1a5808ce9f7266bcca1f8de769ac9ac files/gs-sources.MKI.CompileFix.patch 445 -MD5 351ec4910935b0191a59117f1ecfa561 files/digest-gs-sources-2.4.25_pre7-r11 223 -MD5 c9da1bc82b906f6abc648c056e7bf662 files/gs-sources.FPULockup-53804.patch 354 diff --git a/sys-kernel/gs-sources/files/00_3.5-useraddress.patch b/sys-kernel/gs-sources/files/00_3.5-useraddress.patch deleted file mode 100644 index a74b1ca69e70..000000000000 --- a/sys-kernel/gs-sources/files/00_3.5-useraddress.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff -uNr orig/Rules.make linux-2.4.21_rc6-gss/Rules.make ---- orig/Rules.make 2003-06-01 14:33:49.000000000 -0500 -+++ linux-2.4.21_rc6-gss/Rules.make 2003-06-01 14:39:47.000000000 -0500 -@@ -215,6 +215,7 @@ - # - # Added the SMP separator to stop module accidents between uniprocessor - # and SMP Intel boxes - AC - from bits by Michael Chastain -+# Added separator for different PAGE_OFFSET memory models - Ingo. - # - - ifdef CONFIG_SMP -@@ -223,6 +224,22 @@ - genksyms_smp_prefix := - endif - -+ifdef CONFIG_2GB -+ifdef CONFIG_SMP -+ genksyms_smp_prefix := -p smp_2gig_ -+else -+ genksyms_smp_prefix := -p 2gig_ -+endif -+endif -+ -+ifdef CONFIG_3GB -+ifdef CONFIG_SMP -+ genksyms_smp_prefix := -p smp_3gig_ -+else -+ genksyms_smp_prefix := -p 3gig_ -+endif -+endif -+ - $(MODINCL)/%.ver: %.c - @if [ ! -r $(MODINCL)/$*.stamp -o $(MODINCL)/$*.stamp -ot $< ]; then \ - echo '$(CC) $(CFLAGS) $(EXTRA_CFLAGS_nostdinc) -E -D__GENKSYMS__ $<'; \ -diff -uNr orig/arch/i386/Makefile linux-2.4.21_rc6-gss/arch/i386/Makefile ---- orig/arch/i386/Makefile 2003-06-01 14:33:28.000000000 -0500 -+++ linux-2.4.21_rc6-gss/arch/i386/Makefile 2003-06-01 14:39:47.000000000 -0500 -@@ -171,6 +171,9 @@ - - MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot - -+arch/i386/vmlinux.lds: arch/i386/vmlinux.lds.S FORCE -+ $(CPP) -C -P -I$(HPATH) -imacros $(HPATH)/asm-i386/page_offset.h -Ui386 arch/i386/vmlinux.lds.S >arch/i386/vmlinux.lds -+ - vmlinux: arch/i386/vmlinux.lds - - FORCE: ; -@@ -207,6 +210,7 @@ - @$(MAKEBOOT) clean - - archmrproper: -+ rm -f arch/i386/vmlinux.lds - - archdep: - @$(MAKEBOOT) dep -diff -uNr orig/arch/i386/config.in linux-2.4.21_rc6-gss/arch/i386/config.in ---- orig/arch/i386/config.in 2003-06-01 14:33:28.000000000 -0500 -+++ linux-2.4.21_rc6-gss/arch/i386/config.in 2003-06-01 14:39:47.000000000 -0500 -@@ -297,6 +297,16 @@ - fi - if [ "$CONFIG_HIGHMEM64G" = "y" ]; then - define_bool CONFIG_X86_PAE y -+ choice 'User address space size' \ -+ "3GB CONFIG_1GB \ -+ 2GB CONFIG_2GB \ -+ 1GB CONFIG_3GB" 3GB -+else -+ choice 'User address space size' \ -+ "3GB CONFIG_1GB \ -+ 2GB CONFIG_2GB \ -+ 1GB CONFIG_3GB \ -+ 3.5GB CONFIG_05GB" 3GB - fi - - if [ "$CONFIG_HIGHMEM" = "y" ]; then -diff -uNr orig/arch/i386/vmlinux.lds.S linux-2.4.21_rc6-gss/arch/i386/vmlinux.lds.S ---- orig/arch/i386/vmlinux.lds.S 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21_rc6-gss/arch/i386/vmlinux.lds.S 2003-06-01 14:39:49.000000000 -0500 -@@ -0,0 +1,82 @@ -+/* ld script to make i386 Linux kernel -+ * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>; -+ */ -+OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") -+OUTPUT_ARCH(i386) -+ENTRY(_start) -+SECTIONS -+{ -+ . = PAGE_OFFSET_RAW + 0x100000; -+ _text = .; /* Text and read-only data */ -+ .text : { -+ *(.text) -+ *(.fixup) -+ *(.gnu.warning) -+ } = 0x9090 -+ -+ _etext = .; /* End of text section */ -+ -+ .rodata : { *(.rodata) *(.rodata.*) } -+ .kstrtab : { *(.kstrtab) } -+ -+ . = ALIGN(16); /* Exception table */ -+ __start___ex_table = .; -+ __ex_table : { *(__ex_table) } -+ __stop___ex_table = .; -+ -+ __start___ksymtab = .; /* Kernel symbol table */ -+ __ksymtab : { *(__ksymtab) } -+ __stop___ksymtab = .; -+ -+ .data : { /* Data */ -+ *(.data) -+ CONSTRUCTORS -+ } -+ -+ _edata = .; /* End of data section */ -+ -+ . = ALIGN(8192); /* init_task */ -+ .data.init_task : { *(.data.init_task) } -+ -+ . = ALIGN(4096); /* Init code and data */ -+ __init_begin = .; -+ .text.init : { *(.text.init) } -+ .data.init : { *(.data.init) } -+ . = ALIGN(16); -+ __setup_start = .; -+ .setup.init : { *(.setup.init) } -+ __setup_end = .; -+ __initcall_start = .; -+ .initcall.init : { *(.initcall.init) } -+ __initcall_end = .; -+ . = ALIGN(4096); -+ __init_end = .; -+ -+ . = ALIGN(4096); -+ .data.page_aligned : { *(.data.idt) } -+ -+ . = ALIGN(32); -+ .data.cacheline_aligned : { *(.data.cacheline_aligned) } -+ -+ __bss_start = .; /* BSS */ -+ .bss : { -+ *(.bss) -+ } -+ _end = . ; -+ -+ /* Sections to be discarded */ -+ /DISCARD/ : { -+ *(.text.exit) -+ *(.data.exit) -+ *(.exitcall.exit) -+ } -+ -+ /* Stabs debugging sections. */ -+ .stab 0 : { *(.stab) } -+ .stabstr 0 : { *(.stabstr) } -+ .stab.excl 0 : { *(.stab.excl) } -+ .stab.exclstr 0 : { *(.stab.exclstr) } -+ .stab.index 0 : { *(.stab.index) } -+ .stab.indexstr 0 : { *(.stab.indexstr) } -+ .comment 0 : { *(.comment) } -+} -diff -uNr orig/include/asm-i386/page.h linux-2.4.21_rc6-gss/include/asm-i386/page.h ---- orig/include/asm-i386/page.h 2003-06-01 14:34:04.000000000 -0500 -+++ linux-2.4.21_rc6-gss/include/asm-i386/page.h 2003-06-01 14:39:49.000000000 -0500 -@@ -78,7 +78,9 @@ - * and CONFIG_HIGHMEM64G options in the kernel configuration. - */ - --#define __PAGE_OFFSET (0xC0000000) -+#include <asm/page_offset.h> -+ -+#define __PAGE_OFFSET (PAGE_OFFSET_RAW) - - /* - * This much address space is reserved for vmalloc() and iomap() -diff -uNr orig/include/asm-i386/page_offset.h linux-2.4.21_rc6-gss/include/asm-i386/page_offset.h ---- orig/include/asm-i386/page_offset.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21_rc6-gss/include/asm-i386/page_offset.h 2003-06-01 14:39:49.000000000 -0500 -@@ -0,0 +1,10 @@ -+#include <linux/config.h> -+#ifdef CONFIG_05GB -+#define PAGE_OFFSET_RAW 0xE0000000 -+#elif defined(CONFIG_1GB) -+#define PAGE_OFFSET_RAW 0xC0000000 -+#elif defined(CONFIG_2GB) -+#define PAGE_OFFSET_RAW 0x80000000 -+#elif defined(CONFIG_3GB) -+#define PAGE_OFFSET_RAW 0x40000000 -+#endif -diff -uNr orig/include/asm-i386/processor.h linux-2.4.21_rc6-gss/include/asm-i386/processor.h ---- orig/include/asm-i386/processor.h 2003-06-01 14:34:04.000000000 -0500 -+++ linux-2.4.21_rc6-gss/include/asm-i386/processor.h 2003-06-01 14:39:49.000000000 -0500 -@@ -275,7 +275,11 @@ - /* This decides where the kernel will search for a free chunk of vm - * space during mmap's. - */ -+#ifndef CONFIG_05GB - #define TASK_UNMAPPED_BASE (TASK_SIZE / 3) -+#else -+#define TASK_UNMAPPED_BASE (TASK_SIZE / 16) -+#endif - - /* - * Size of io_bitmap in longwords: 32 is ports 0-0x3ff. -diff -uNr orig/mm/memory.c linux-2.4.21_rc6-gss/mm/memory.c ---- orig/mm/memory.c 2003-06-01 14:33:25.000000000 -0500 -+++ linux-2.4.21_rc6-gss/mm/memory.c 2003-06-01 14:39:49.000000000 -0500 -@@ -108,8 +108,7 @@ - - static inline void free_one_pgd(pgd_t * dir) - { -- int j; -- pmd_t * pmd; -+ pmd_t * pmd, * md, * emd; - - if (pgd_none(*dir)) - return; -@@ -120,9 +119,23 @@ - } - pmd = pmd_offset(dir, 0); - pgd_clear(dir); -- for (j = 0; j < PTRS_PER_PMD ; j++) { -- prefetchw(pmd+j+(PREFETCH_STRIDE/16)); -- free_one_pmd(pmd+j); -+ -+ /* -+ * Beware if changing the loop below. It once used int j, -+ * for (j = 0; j < PTRS_PER_PMD; j++) -+ * free_one_pmd(pmd+j); -+ * but some older i386 compilers (e.g. egcs-2.91.66, gcc-2.95.3) -+ * terminated the loop with a _signed_ address comparison -+ * using "jle", when configured for HIGHMEM64GB (X86_PAE). -+ * If also configured for 3GB of kernel virtual address space, -+ * if page at physical 0x3ffff000 virtual 0x7ffff000 is used as -+ * a pmd, when that mm exits the loop goes on to free "entries" -+ * found at 0x80000000 onwards. The loop below compiles instead -+ * to be terminated by unsigned address comparison using "jb". -+ */ -+ for (md = pmd, emd = pmd + PTRS_PER_PMD; md < emd; md++) { -+ prefetchw(md+(PREFETCH_STRIDE/16)); -+ free_one_pmd(md); - } - pmd_free(pmd); - } diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r11 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r11 deleted file mode 100644 index 6e0a8e42bbb2..000000000000 --- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r11 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818 -MD5 b495ed667a518227f82e76229b9f23e6 patches-2.4.25_pre7-gss-r1.tar.bz2 2475971 -MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145 diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2003-0985.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2003-0985.patch deleted file mode 100644 index dacf6ed810f9..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2003-0985.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- linux/mm/mremap.c.orig 2004-01-05 17:01:21.382104120 +0000 -+++ linux/mm/mremap.c 2004-01-05 17:15:25.689749848 +0000 -@@ -315,6 +315,10 @@ - old_len = PAGE_ALIGN(old_len); - new_len = PAGE_ALIGN(new_len); - -+ /* Don't allow the degenerate cases */ -+ if (!old_len || !new_len) -+ goto out; -+ - /* new_addr is only valid if MREMAP_FIXED is specified */ - if (flags & MREMAP_FIXED) { - if (new_addr & ~PAGE_MASK) diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0109.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0109.patch deleted file mode 100644 index d02b51c57fc6..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0109.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- linux/fs/isofs/rock.c.orig -+++ linux/fs/isofs/rock.c -@@ -14,6 +14,7 @@ - #include <linux/slab.h> - #include <linux/pagemap.h> - #include <linux/smp_lock.h> -+#include <asm/page.h> - - #include "rock.h" - -@@ -419,7 +420,7 @@ - return 0; - } - --static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr) -+static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit) - { - int slen; - int rootflag; -@@ -431,16 +432,25 @@ - rootflag = 0; - switch (slp->flags & ~1) { - case 0: -+ if (slp->len > plimit - rpnt) -+ return NULL; - memcpy(rpnt, slp->text, slp->len); - rpnt+=slp->len; - break; -+ case 2: -+ if (rpnt >= plimit) -+ return NULL; -+ *rpnt++='.'; -+ break; - case 4: -+ if (2 > plimit - rpnt) -+ return NULL; - *rpnt++='.'; -- /* fallthru */ -- case 2: - *rpnt++='.'; - break; - case 8: -+ if (rpnt >= plimit) -+ return NULL; - rootflag = 1; - *rpnt++='/'; - break; -@@ -457,17 +467,23 @@ - * If there is another SL record, and this component - * record isn't continued, then add a slash. - */ -- if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1)) -+ if ((!rootflag) && (rr->u.SL.flags & 1) && -+ !(oldslp->flags & 1)) { -+ if (rpnt >= plimit) -+ return NULL; - *rpnt++='/'; -+ } - break; - } - - /* - * If this component record isn't continued, then append a '/'. - */ -- if (!rootflag && !(oldslp->flags & 1)) -+ if (!rootflag && !(oldslp->flags & 1)) { -+ if (rpnt >= plimit) -+ return NULL; - *rpnt++='/'; -- -+ } - } - return rpnt; - } -@@ -548,7 +564,10 @@ - CHECK_SP(goto out); - break; - case SIG('S', 'L'): -- rpnt = get_symlink_chunk(rpnt, rr); -+ rpnt = get_symlink_chunk(rpnt, rr, -+ link + (PAGE_SIZE - 1)); -+ if (rpnt == NULL) -+ goto out; - break; - case SIG('C', 'E'): - /* This tells is if there is a continuation record */ - diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0133.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0133.patch deleted file mode 100644 index c756bc328bf2..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0133.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.22/fs/xfs/xfs_log.c.can-2004-0133 2004-03-23 12:28:11.000000000 -0700 -+++ linux-2.4.22/fs/xfs/xfs_log.c 2004-03-23 12:58:59.000000000 -0700 -@@ -1251,7 +1251,7 @@ - kmem_zalloc(sizeof(xlog_in_core_t), KM_SLEEP); - iclog = *iclogp; - iclog->hic_data = (xlog_in_core_2_t *) -- kmem_alloc(iclogsize, KM_SLEEP); -+ kmem_zalloc(iclogsize, KM_SLEEP); - - iclog->ic_prev = prev_iclog; - prev_iclog = iclog; diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0177.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0177.patch deleted file mode 100644 index da6b7e190685..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0177.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-2.4.26-pre3/fs/jbd/journal.c 2004-02-18 05:36:31.000000000 -0800 -+++ linux-2.4.26-pre4/fs/jbd/journal.c 2004-03-16 09:59:36.000000000 -0800 -@@ -671,6 +671,7 @@ - - bh = getblk(journal->j_dev, blocknr, journal->j_blocksize); - lock_buffer(bh); -+ memset(bh->b_data, 0, journal->j_blocksize); - BUFFER_TRACE(bh, "return this buffer"); - return journal_add_journal_head(bh); - } diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0178.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0178.patch deleted file mode 100644 index 19e57268c2fa..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0178.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.26-pre2/drivers/sound/sb_audio.c 2002-02-25 11:38:06.000000000 -0800 -+++ linux-2.4.26-pre3/drivers/sound/sb_audio.c 2004-03-13 07:43:23.000000000 -0800 -@@ -879,7 +879,7 @@ - c -= locallen; p += locallen; - } - /* used = ( samples * 16 bits size ) */ -- *used = len << 1; -+ *used = max_in > ( max_out << 1) ? (max_out << 1) : max_in; - /* returned = ( samples * 8 bits size ) */ - *returned = len; - } diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0181.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0181.patch deleted file mode 100644 index 5f7f1441b268..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0181.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- linux-2.4.22/fs/jfs/jfs_logmgr.c.jfs-sec 2004-03-23 12:30:35.000000000 -0700 -+++ linux-2.4.22/fs/jfs/jfs_logmgr.c 2004-03-23 13:01:51.000000000 -0700 -@@ -1693,7 +1693,7 @@ - if (lbuf == 0) - goto error; - lbuf->l_bh.b_data = lbuf->l_ldata = -- (char *) __get_free_page(GFP_KERNEL); -+ (char *) get_zeroed_page(GFP_KERNEL); - if (lbuf->l_ldata == 0) { - kfree(lbuf); - goto error; ---- linux-2.4.22/fs/jfs/jfs_metapage.c.jfs-sec 2004-03-23 12:30:48.000000000 -0700 -+++ linux-2.4.22/fs/jfs/jfs_metapage.c 2004-03-23 13:01:51.000000000 -0700 -@@ -375,6 +375,10 @@ - } - mp->data = kmap(mp->page) + page_offset; - } -+ -+ if (new) -+ memset(mp->data, 0, PSIZE); -+ - jfs_info("__get_metapage: returning = 0x%p", mp); - return mp; - ---- linux-2.4.22/fs/jfs/super.c.jfs-sec 2004-03-23 12:31:10.000000000 -0700 -+++ linux-2.4.22/fs/jfs/super.c 2004-03-23 13:01:51.000000000 -0700 -@@ -423,10 +423,10 @@ - - if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) == - SLAB_CTOR_CONSTRUCTOR) { -+ memset(jfs_ip, 0, sizeof(struct jfs_inode_info)); - INIT_LIST_HEAD(&jfs_ip->anon_inode_list); - init_rwsem(&jfs_ip->rdwrlock); - init_MUTEX(&jfs_ip->commit_sem); -- jfs_ip->atlhead = 0; - jfs_ip->active_ag = -1; - } - } diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0394.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0394.patch deleted file mode 100644 index 273f1a52046f..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0394.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.22-oM3-orig/kernel/panic.c Tue Mar 30 15:37:18 2004 -+++ linux-2.4.22-oM3-mod/kernel/panic.c Mon May 17 18:44:01 2004 -@@ -51,7 +51,7 @@ - - bust_spinlocks(1); - va_start(args, fmt); -- vsprintf(buf, fmt, args); -+ vsnprintf(buf, sizeof(buf), fmt, args); - va_end(args); - printk(KERN_EMERG "Kernel panic: %s\n",buf); - if (in_interrupt()) diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0427.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0427.patch deleted file mode 100644 index ddc9610f67f8..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0427.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nar -U 4 linux-2.4.25/kernel/fork.c linux-2.4.25-new/kernel/fork.c ---- linux-2.4.25/kernel/fork.c 2004-02-18 05:36:32.000000000 -0800 -+++ linux-2.4.25-new/kernel/fork.c 2004-04-07 17:43:29.000000000 -0700 -@@ -825,8 +825,10 @@ - bad_fork_cleanup_namespace: - exit_namespace(p); - bad_fork_cleanup_mm: - exit_mm(p); -+ if (p->active_mm) -+ mmdrop(p->active_mm); - bad_fork_cleanup_sighand: - exit_sighand(p); - bad_fork_cleanup_fs: - exit_fs(p); /* blocking */ diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0495.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0495.patch deleted file mode 100644 index bea80eac69a9..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0495.patch +++ /dev/null @@ -1,655 +0,0 @@ ---- linux/net/decnet/dn_dev.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/net/decnet/dn_dev.c Wed Jun 16 14:42:34 2004 -@@ -1070,31 +1070,39 @@ int dnet_gifconf(struct net_device *dev, - { - struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr; - struct dn_ifaddr *ifa; -- struct ifreq *ifr = (struct ifreq *)buf; -+ char buffer[DN_IFREQ_SIZE]; -+ struct ifreq *ifr = (struct ifreq *)buffer; -+ struct sockaddr_dn *addr = (struct sockaddr_dn *)&ifr->ifr_addr; - int done = 0; - - if ((dn_db == NULL) || ((ifa = dn_db->ifa_list) == NULL)) - return 0; - - for(; ifa; ifa = ifa->ifa_next) { -- if (!ifr) { -+ if (!buf) { - done += sizeof(DN_IFREQ_SIZE); - continue; - } - if (len < DN_IFREQ_SIZE) - return done; -- memset(ifr, 0, DN_IFREQ_SIZE); -+ memset(buffer, 0, DN_IFREQ_SIZE); - - if (ifa->ifa_label) - strcpy(ifr->ifr_name, ifa->ifa_label); - else - strcpy(ifr->ifr_name, dev->name); - -- (*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_family = AF_DECnet; -- (*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_len = 2; -- (*(dn_address *)(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_addr) = ifa->ifa_local; -+ addr->sdn_family = AF_DECnet; -+ addr->sdn_add.a_len = 2; -+ memcpy(addr->sdn_add.a_addr, &ifa->ifa_local, -+ sizeof(dn_address)); - -- ifr = (struct ifreq *)((char *)ifr + DN_IFREQ_SIZE); -+ if (copy_to_user(buf, buffer, DN_IFREQ_SIZE)) { -+ done = -EFAULT; -+ break; -+ } -+ -+ buf += DN_IFREQ_SIZE; - len -= DN_IFREQ_SIZE; - done += DN_IFREQ_SIZE; - } ---- linux-2.4.21/drivers/net/wireless/airo.c 2003-06-13 15:51:35.000000000 +0100 -+++ linux-2.4.21/drivers/net/wireless/airo.c.plasmaroo 2004-06-24 11:09:08.260352168 +0100 -@@ -3012,19 +3012,22 @@ - size_t len, - loff_t *offset ) - { -- int i; -- int pos; -+ loff_t pos = *offset; - struct proc_data *priv = (struct proc_data*)file->private_data; - -- if( !priv->rbuffer ) return -EINVAL; -+ if (!priv->rbuffer) -+ return -EINVAL; - -- pos = *offset; -- for( i = 0; i+pos < priv->readlen && i < len; i++ ) { -- if (put_user( priv->rbuffer[i+pos], buffer+i )) -- return -EFAULT; -- } -- *offset += i; -- return i; -+ if (pos < 0) -+ return -EINVAL; -+ if (pos >= priv->readlen) -+ return 0; -+ if (len > priv->readlen - pos) -+ len = priv->readlen - pos; -+ if (copy_to_user(buffer, priv->rbuffer + pos, len)) -+ return -EFAULT; -+ *offset = pos + len; -+ return len; - } - - /* -@@ -3036,24 +3039,24 @@ - size_t len, - loff_t *offset ) - { -- int i; -- int pos; -+ loff_t pos = *offset; - struct proc_data *priv = (struct proc_data*)file->private_data; - -- if ( !priv->wbuffer ) { -+ if (!priv->wbuffer) - return -EINVAL; -- } -- -- pos = *offset; - -- for( i = 0; i + pos < priv->maxwritelen && -- i < len; i++ ) { -- if (get_user( priv->wbuffer[i+pos], buffer + i )) -- return -EFAULT; -- } -- if ( i+pos > priv->writelen ) priv->writelen = i+file->f_pos; -- *offset += i; -- return i; -+ if (pos < 0) -+ return -EINVAL; -+ if (pos >= priv->maxwritelen) -+ return 0; -+ if (len > priv->maxwritelen - pos) -+ len = priv->maxwritelen - pos; -+ if (copy_from_user(priv->wbuffer + pos, buffer, len)) -+ return -EFAULT; -+ if (pos + len > priv->writelen) -+ priv->writelen = pos + len; -+ *offset = pos + len; -+ return len; - } - - static int proc_status_open( struct inode *inode, struct file *file ) { ---- linux/drivers/sound/mpu401.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/mpu401.c Wed Jun 16 14:42:34 2004 -@@ -1493,14 +1493,16 @@ static unsigned long mpu_timer_get_time( - static int mpu_timer_ioctl(int dev, unsigned int command, caddr_t arg) - { - int midi_dev = sound_timer_devs[dev]->devlink; -+ int *p = (int *)arg; - - switch (command) - { - case SNDCTL_TMR_SOURCE: - { - int parm; -- -- parm = *(int *) arg; -+ -+ if (get_user(parm, p)) -+ return -EFAULT; - parm &= timer_caps; - - if (parm != 0) -@@ -1512,7 +1514,9 @@ static int mpu_timer_ioctl(int dev, unsi - else if (timer_mode & TMR_MODE_SMPTE) - mpu_cmd(midi_dev, 0x3d, 0); /* Use SMPTE sync */ - } -- return (*(int *) arg = timer_mode); -+ if (put_user(timer_mode, p)) -+ return -EFAULT; -+ return timer_mode; - } - break; - -@@ -1537,10 +1541,13 @@ static int mpu_timer_ioctl(int dev, unsi - { - int val; - -- val = *(int *) arg; -+ if (get_user(val, p)) -+ return -EFAULT; - if (val) - set_timebase(midi_dev, val); -- return (*(int *) arg = curr_timebase); -+ if (put_user(curr_timebase, p)) -+ return -EFAULT; -+ return curr_timebase; - } - break; - -@@ -1549,7 +1556,8 @@ static int mpu_timer_ioctl(int dev, unsi - int val; - int ret; - -- val = *(int *) arg; -+ if (get_user(val, p)) -+ return -EFAULT; - - if (val) - { -@@ -1564,7 +1572,9 @@ static int mpu_timer_ioctl(int dev, unsi - } - curr_tempo = val; - } -- return (*(int *) arg = curr_tempo); -+ if (put_user(curr_tempo, p)) -+ return -EFAULT; -+ return curr_tempo; - } - break; - -@@ -1572,18 +1582,25 @@ static int mpu_timer_ioctl(int dev, unsi - { - int val; - -- val = *(int *) arg; -+ if (get_user(val, p)) -+ return -EFAULT; - if (val != 0) /* Can't change */ - return -EINVAL; -- return (*(int *) arg = ((curr_tempo * curr_timebase) + 30) / 60); -+ val = (curr_tempo * curr_timebase + 30) / 60; -+ if (put_user(val, p)) -+ return -EFAULT; -+ return val; - } - break; - - case SNDCTL_SEQ_GETTIME: -- return (*(int *) arg = curr_ticks); -+ if (put_user(curr_ticks, p)) -+ return -EFAULT; -+ return curr_ticks; - - case SNDCTL_TMR_METRONOME: -- metronome_mode = *(int *) arg; -+ if (get_user(metronome_mode, p)) -+ return -EFAULT; - setup_metronome(midi_dev); - return 0; - ---- linux/drivers/sound/msnd.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/msnd.c Wed Jun 16 14:42:34 2004 -@@ -155,13 +155,10 @@ void msnd_fifo_make_empty(msnd_fifo *f) - f->len = f->tail = f->head = 0; - } - --int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user) -+int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len) - { - int count = 0; - -- if (f->len == f->n) -- return 0; -- - while ((count < len) && (f->len != f->n)) { - - int nwritten; -@@ -177,11 +174,7 @@ int msnd_fifo_write(msnd_fifo *f, const - nwritten = len - count; - } - -- if (user) { -- if (copy_from_user(f->data + f->tail, buf, nwritten)) -- return -EFAULT; -- } else -- isa_memcpy_fromio(f->data + f->tail, (unsigned long) buf, nwritten); -+ isa_memcpy_fromio(f->data + f->tail, (unsigned long) buf, nwritten); - - count += nwritten; - buf += nwritten; -@@ -193,13 +186,10 @@ int msnd_fifo_write(msnd_fifo *f, const - return count; - } - --int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user) -+int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len) - { - int count = 0; - -- if (f->len == 0) -- return f->len; -- - while ((count < len) && (f->len > 0)) { - - int nread; -@@ -215,11 +205,7 @@ int msnd_fifo_read(msnd_fifo *f, char *b - nread = len - count; - } - -- if (user) { -- if (copy_to_user(buf, f->data + f->head, nread)) -- return -EFAULT; -- } else -- isa_memcpy_toio((unsigned long) buf, f->data + f->head, nread); -+ isa_memcpy_toio((unsigned long) buf, f->data + f->head, nread); - - count += nread; - buf += nread; ---- linux/drivers/sound/msnd.h.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/msnd.h Wed Jun 16 14:42:34 2004 -@@ -266,8 +266,8 @@ void msnd_fifo_init(msnd_fifo *f); - void msnd_fifo_free(msnd_fifo *f); - int msnd_fifo_alloc(msnd_fifo *f, size_t n); - void msnd_fifo_make_empty(msnd_fifo *f); --int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user); --int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user); -+int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len); -+int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len); - - int msnd_wait_TXDE(multisound_dev_t *dev); - int msnd_wait_HC0(multisound_dev_t *dev); ---- linux/drivers/sound/msnd_pinnacle.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/msnd_pinnacle.c Wed Jun 16 14:42:34 2004 -@@ -804,7 +804,7 @@ static int dev_release(struct inode *ino - - static __inline__ int pack_DARQ_to_DARF(register int bank) - { -- register int size, n, timeout = 3; -+ register int size, timeout = 3; - register WORD wTmp; - LPDAQD DAQD; - -@@ -825,13 +825,10 @@ static __inline__ int pack_DARQ_to_DARF( - /* Read data from the head (unprotected bank 1 access okay - since this is only called inside an interrupt) */ - outb(HPBLKSEL_1, dev.io + HP_BLKS); -- if ((n = msnd_fifo_write( -+ msnd_fifo_write( - &dev.DARF, - (char *)(dev.base + bank * DAR_BUFF_SIZE), -- size, 0)) <= 0) { -- outb(HPBLKSEL_0, dev.io + HP_BLKS); -- return n; -- } -+ size); - outb(HPBLKSEL_0, dev.io + HP_BLKS); - - return 1; -@@ -853,21 +850,16 @@ static __inline__ int pack_DAPF_to_DAPQ( - if (protect) { - /* Critical section: protect fifo in non-interrupt */ - spin_lock_irqsave(&dev.lock, flags); -- if ((n = msnd_fifo_read( -+ n = msnd_fifo_read( - &dev.DAPF, - (char *)(dev.base + bank_num * DAP_BUFF_SIZE), -- DAP_BUFF_SIZE, 0)) < 0) { -- spin_unlock_irqrestore(&dev.lock, flags); -- return n; -- } -+ DAP_BUFF_SIZE); - spin_unlock_irqrestore(&dev.lock, flags); - } else { -- if ((n = msnd_fifo_read( -+ n = msnd_fifo_read( - &dev.DAPF, - (char *)(dev.base + bank_num * DAP_BUFF_SIZE), -- DAP_BUFF_SIZE, 0)) < 0) { -- return n; -- } -+ DAP_BUFF_SIZE); - } - if (!n) - break; -@@ -894,30 +886,43 @@ static __inline__ int pack_DAPF_to_DAPQ( - static int dsp_read(char *buf, size_t len) - { - int count = len; -+ char *page = (char *)__get_free_page(PAGE_SIZE); -+ -+ if (!page) -+ return -ENOMEM; - - while (count > 0) { -- int n; -+ int n, k; - unsigned long flags; - -+ k = PAGE_SIZE; -+ if (k > count) -+ k = count; -+ - /* Critical section: protect fifo in non-interrupt */ - spin_lock_irqsave(&dev.lock, flags); -- if ((n = msnd_fifo_read(&dev.DARF, buf, count, 1)) < 0) { -- printk(KERN_WARNING LOGNAME ": FIFO read error\n"); -- spin_unlock_irqrestore(&dev.lock, flags); -- return n; -- } -+ n = msnd_fifo_read(&dev.DARF, page, k); - spin_unlock_irqrestore(&dev.lock, flags); -+ if (copy_to_user(buf, page, n)) { -+ free_page((unsigned long)page); -+ return -EFAULT; -+ } - buf += n; - count -= n; - -+ if (n == k && count) -+ continue; -+ - if (!test_bit(F_READING, &dev.flags) && dev.mode & FMODE_READ) { - dev.last_recbank = -1; - if (chk_send_dsp_cmd(&dev, HDEX_RECORD_START) == 0) - set_bit(F_READING, &dev.flags); - } - -- if (dev.rec_ndelay) -+ if (dev.rec_ndelay) { -+ free_page((unsigned long)page); - return count == len ? -EAGAIN : len - count; -+ } - - if (count > 0) { - set_bit(F_READBLOCK, &dev.flags); -@@ -926,41 +931,57 @@ static int dsp_read(char *buf, size_t le - get_rec_delay_jiffies(DAR_BUFF_SIZE))) - clear_bit(F_READING, &dev.flags); - clear_bit(F_READBLOCK, &dev.flags); -- if (signal_pending(current)) -+ if (signal_pending(current)) { -+ free_page((unsigned long)page); - return -EINTR; -+ } - } - } -- -+ free_page((unsigned long)page); - return len - count; - } - - static int dsp_write(const char *buf, size_t len) - { - int count = len; -+ char *page = (char *)__get_free_page(GFP_KERNEL); -+ -+ if (!page) -+ return -ENOMEM; - - while (count > 0) { -- int n; -+ int n, k; - unsigned long flags; - -+ k = PAGE_SIZE; -+ if (k > count) -+ k = count; -+ -+ if (copy_from_user(page, buf, k)) { -+ free_page((unsigned long)page); -+ return -EFAULT; -+ } -+ - /* Critical section: protect fifo in non-interrupt */ - spin_lock_irqsave(&dev.lock, flags); -- if ((n = msnd_fifo_write(&dev.DAPF, buf, count, 1)) < 0) { -- printk(KERN_WARNING LOGNAME ": FIFO write error\n"); -- spin_unlock_irqrestore(&dev.lock, flags); -- return n; -- } -+ n = msnd_fifo_write(&dev.DAPF, page, k); - spin_unlock_irqrestore(&dev.lock, flags); - buf += n; - count -= n; - -+ if (count && n == k) -+ continue; -+ - if (!test_bit(F_WRITING, &dev.flags) && (dev.mode & FMODE_WRITE)) { - dev.last_playbank = -1; - if (pack_DAPF_to_DAPQ(1) > 0) - set_bit(F_WRITING, &dev.flags); - } - -- if (dev.play_ndelay) -+ if (dev.play_ndelay) { -+ free_page((unsigned long)page); - return count == len ? -EAGAIN : len - count; -+ } - - if (count > 0) { - set_bit(F_WRITEBLOCK, &dev.flags); -@@ -968,11 +989,14 @@ static int dsp_write(const char *buf, si - &dev.writeblock, - get_play_delay_jiffies(DAP_BUFF_SIZE)); - clear_bit(F_WRITEBLOCK, &dev.flags); -- if (signal_pending(current)) -+ if (signal_pending(current)) { -+ free_page((unsigned long)page); - return -EINTR; -+ } - } - } - -+ free_page((unsigned long)page); - return len - count; - } - ---- linux/drivers/sound/pss.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/pss.c Wed Jun 16 14:42:34 2004 -@@ -450,20 +450,36 @@ static void pss_mixer_reset(pss_confdata - } - } - --static void arg_to_volume_mono(unsigned int volume, int *aleft) -+static int set_volume_mono(caddr_t p, int *aleft) - { - int left; -+ unsigned volume; -+ if (get_user(volume, (unsigned *)p)) -+ return -EFAULT; - -- left = volume & 0x00ff; -+ left = volume & 0xff; - if (left > 100) - left = 100; - *aleft = left; -+ return 0; - } - --static void arg_to_volume_stereo(unsigned int volume, int *aleft, int *aright) -+static int set_volume_stereo(caddr_t p, int *aleft, int *aright) - { -- arg_to_volume_mono(volume, aleft); -- arg_to_volume_mono(volume >> 8, aright); -+ int left, right; -+ unsigned volume; -+ if (get_user(volume, (unsigned *)p)) -+ return -EFAULT; -+ -+ left = volume & 0xff; -+ if (left > 100) -+ left = 100; -+ right = (volume >> 8) & 0xff; -+ if (right > 100) -+ right = 100; -+ *aleft = left; -+ *aright = right; -+ return 0; - } - - static int ret_vol_mono(int left) -@@ -510,33 +526,38 @@ static int pss_mixer_ioctl (int dev, uns - return call_ad_mixer(devc, cmd, arg); - else - { -- if (*(int *)arg != 0) -+ int v; -+ if (get_user(v, (int *)arg)) -+ return -EFAULT; -+ if (v != 0) - return -EINVAL; - return 0; - } - case SOUND_MIXER_VOLUME: -- arg_to_volume_stereo(*(unsigned int *)arg, &devc->mixer.volume_l, -- &devc->mixer.volume_r); -+ if (set_volume_stereo(arg, -+ &devc->mixer.volume_l, -+ &devc->mixer.volume_r)) -+ return -EFAULT; - set_master_volume(devc, devc->mixer.volume_l, - devc->mixer.volume_r); - return ret_vol_stereo(devc->mixer.volume_l, - devc->mixer.volume_r); - - case SOUND_MIXER_BASS: -- arg_to_volume_mono(*(unsigned int *)arg, -- &devc->mixer.bass); -+ if (set_volume_mono(arg, &devc->mixer.bass)) -+ return -EFAULT; - set_bass(devc, devc->mixer.bass); - return ret_vol_mono(devc->mixer.bass); - - case SOUND_MIXER_TREBLE: -- arg_to_volume_mono(*(unsigned int *)arg, -- &devc->mixer.treble); -+ if (set_volume_mono(arg, &devc->mixer.treble)) -+ return -EFAULT; - set_treble(devc, devc->mixer.treble); - return ret_vol_mono(devc->mixer.treble); - - case SOUND_MIXER_SYNTH: -- arg_to_volume_mono(*(unsigned int *)arg, -- &devc->mixer.synth); -+ if (set_volume_mono(arg, &devc->mixer.synth)) -+ return -EFAULT; - set_synth_volume(devc, devc->mixer.synth); - return ret_vol_mono(devc->mixer.synth); - -@@ -546,54 +567,67 @@ static int pss_mixer_ioctl (int dev, uns - } - else - { -+ int val, and_mask = 0, or_mask = 0; - /* - * Return parameters - */ - switch (cmdf) - { -- - case SOUND_MIXER_DEVMASK: - if (call_ad_mixer(devc, cmd, arg) == -EINVAL) -- *(int *)arg = 0; /* no mixer devices */ -- return (*(int *)arg |= SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH); -+ break; -+ and_mask = ~0; -+ or_mask = SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH; -+ break; - - case SOUND_MIXER_STEREODEVS: - if (call_ad_mixer(devc, cmd, arg) == -EINVAL) -- *(int *)arg = 0; /* no stereo devices */ -- return (*(int *)arg |= SOUND_MASK_VOLUME); -+ break; -+ and_mask = ~0; -+ or_mask = SOUND_MASK_VOLUME; -+ break; - - case SOUND_MIXER_RECMASK: - if (devc->ad_mixer_dev != NO_WSS_MIXER) - return call_ad_mixer(devc, cmd, arg); -- else -- return (*(int *)arg = 0); /* no record devices */ -+ break; - - case SOUND_MIXER_CAPS: - if (devc->ad_mixer_dev != NO_WSS_MIXER) - return call_ad_mixer(devc, cmd, arg); -- else -- return (*(int *)arg = SOUND_CAP_EXCL_INPUT); -+ or_mask = SOUND_CAP_EXCL_INPUT; -+ break; - - case SOUND_MIXER_RECSRC: - if (devc->ad_mixer_dev != NO_WSS_MIXER) - return call_ad_mixer(devc, cmd, arg); -- else -- return (*(int *)arg = 0); /* no record source */ -+ break; - - case SOUND_MIXER_VOLUME: -- return (*(int *)arg = ret_vol_stereo(devc->mixer.volume_l, devc->mixer.volume_r)); -+ or_mask = ret_vol_stereo(devc->mixer.volume_l, devc->mixer.volume_r); -+ break; - - case SOUND_MIXER_BASS: -- return (*(int *)arg = ret_vol_mono(devc->mixer.bass)); -+ or_mask = ret_vol_mono(devc->mixer.bass); -+ break; - - case SOUND_MIXER_TREBLE: -- return (*(int *)arg = ret_vol_mono(devc->mixer.treble)); -+ or_mask = ret_vol_mono(devc->mixer.treble); -+ break; - - case SOUND_MIXER_SYNTH: -- return (*(int *)arg = ret_vol_mono(devc->mixer.synth)); -+ or_mask = ret_vol_mono(devc->mixer.synth); -+ break; - default: - return -EINVAL; - } -+ if (get_user(val, (int *)arg)) -+ return -EFAULT; -+ val &= and_mask; -+ val |= or_mask; -+ if (put_user(val, (int *)arg)) -+ return -EFAULT; -+ return val; - } - } - diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0497.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0497.patch deleted file mode 100644 index 9503e9efe57b..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0497.patch +++ /dev/null @@ -1,23 +0,0 @@ -# ChangeSet -# -# fs/attr.c -# 2004/07/03 18:28:30-03:00 marcelo@logos.cnet +1 -0 -# Thomas Biege: Fix missing DAC check on sys_chown -# -# fs/attr.c -# 2004/07/03 19:28:29-03:00 marcelo@logos.cnet +1 -1 -# Add missing bracket to inode_change_ok() fix -# -diff -Nru a/fs/attr.c b.plasmaroo/fs/attr.c ---- a/fs/attr.c 2004-07-08 17:05:20 -07:00 -+++ b.plasmaroo/fs/attr.c 2004-07-08 17:05:20 -07:00 -@@ -35,7 +35,8 @@ - - /* Make sure caller can chgrp. */ - if ((ia_valid & ATTR_GID) && -- (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) && -+ (current->fsuid != inode->i_uid || -+ (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) && - !capable(CAP_CHOWN)) - goto error; - diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0535.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0535.patch deleted file mode 100644 index 669fc5fd32fb..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0535.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- drivers/net/e1000/e1000_ethtool.c 2003-06-13 15:51:34.000000000 +0100 -+++ drivers/net/e1000/e1000_ethtool.c.plasmaroo 2004-06-24 11:23:32.524963976 +0100 -@@ -468,6 +468,9 @@ - - if(copy_from_user(®s, addr, sizeof(regs))) - return -EFAULT; -+ memset(regs_buff, 0, sizeof(regs_buff)); -+ if (regs.len > E1000_REGS_LEN) -+ regs.len = E1000_REGS_LEN; - e1000_ethtool_gregs(adapter, ®s, regs_buff); - if(copy_to_user(addr, ®s, sizeof(regs))) - return -EFAULT; diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0685.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0685.patch deleted file mode 100644 index d1be834cc8a5..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0685.patch +++ /dev/null @@ -1,83 +0,0 @@ -# This is a BitKeeper generated diff -Nru style patch. -# -# ChangeSet -# 2004/07/26 19:14:16-03:00 mjc@redhat.com -# [PATCH] USB: more sparse fixes -# -# Back in October 2003 Arnaldo commited some fixes prior to 2.6 for some leaking info to userspace in the -# usb drivers: -# http://linux.bkbits.net:8080/linux-2.6/cset@3f986b35LyBKc-OxB8G6k22oOjgYTQ -# -# The corresponding changes have not been commited to 2.4, or included in -# the previous sparse fixes. -# -# drivers/usb/audio.c -# 2004/07/15 08:46:52-03:00 mjc@redhat.com +4 -0 -# USB: more sparse fixes -# -# drivers/usb/brlvger.c -# 2004/07/15 08:47:27-03:00 mjc@redhat.com +1 -0 -# USB: more sparse fixes -# -# drivers/usb/serial/io_edgeport.c -# 2004/07/15 08:48:06-03:00 mjc@redhat.com +1 -0 -# USB: more sparse fixes -# -# drivers/usb/vicam.c -# 2004/07/15 08:47:13-03:00 mjc@redhat.com +1 -0 -# USB: more sparse fixes -# -diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c ---- a/drivers/usb/audio.c 2004-08-08 07:41:30 -07:00 -+++ b/drivers/usb/audio.c 2004-08-08 07:41:30 -07:00 -@@ -2141,6 +2141,8 @@ - - if (cmd == SOUND_MIXER_INFO) { - mixer_info info; -+ -+ memset(&info, 0, sizeof(info)); - strncpy(info.id, "USB_AUDIO", sizeof(info.id)); - strncpy(info.name, "USB Audio Class Driver", sizeof(info.name)); - info.modify_counter = ms->modcnt; -@@ -2150,6 +2152,8 @@ - } - if (cmd == SOUND_OLD_MIXER_INFO) { - _old_mixer_info info; -+ -+ memset(&info, 0, sizeof(info)); - strncpy(info.id, "USB_AUDIO", sizeof(info.id)); - strncpy(info.name, "USB Audio Class Driver", sizeof(info.name)); - if (copy_to_user((void *)arg, &info, sizeof(info))) -diff -Nru a/drivers/usb/brlvger.c b/drivers/usb/brlvger.c ---- a/drivers/usb/brlvger.c 2004-08-08 07:41:30 -07:00 -+++ b/drivers/usb/brlvger.c 2004-08-08 07:41:30 -07:00 -@@ -743,6 +743,7 @@ - case BRLVGER_GET_INFO: { - struct brlvger_info vi; - -+ memset(&vi, 0, sizeof(vi)); - strncpy(vi.driver_version, DRIVER_VERSION, - sizeof(vi.driver_version)); - vi.driver_version[sizeof(vi.driver_version)-1] = 0; -diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c ---- a/drivers/usb/serial/io_edgeport.c 2004-08-08 07:41:30 -07:00 -+++ b/drivers/usb/serial/io_edgeport.c 2004-08-08 07:41:30 -07:00 -@@ -1913,6 +1913,7 @@ - - case TIOCGICOUNT: - cnow = edge_port->icount; -+ memset(&icount, 0, sizeof(icount)); - icount.cts = cnow.cts; - icount.dsr = cnow.dsr; - icount.rng = cnow.rng; -diff -Nru a/drivers/usb/vicam.c b/drivers/usb/vicam.c ---- a/drivers/usb/vicam.c 2004-08-08 07:41:30 -07:00 -+++ b/drivers/usb/vicam.c 2004-08-08 07:41:30 -07:00 -@@ -481,6 +481,7 @@ - struct video_capability b; - - DBG("VIDIOCGCAP\n"); -+ memset(&b, 0, sizeof(b)); - strcpy(b.name, "ViCam-based Camera"); - b.type = VID_TYPE_CAPTURE; - b.channels = 1; diff --git a/sys-kernel/gs-sources/files/gs-sources.FPULockup-53804.patch b/sys-kernel/gs-sources/files/gs-sources.FPULockup-53804.patch deleted file mode 100644 index 1dd5ed87b520..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.FPULockup-53804.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4/include/asm-i386/i387.h 2004-06-13 20:06:05.044881328 +0100 -+++ linux-2.4/include/asm-i386/i387.h 2004-06-13 20:25:42.836829736 +0100 -@@ -34,7 +34,7 @@ - - #define clear_fpu( tsk ) do { \ - if ( tsk->flags & PF_USEDFPU ) { \ -- asm volatile("fwait"); \ -+ asm volatile("fnclex ; fwait"); \ - tsk->flags &= ~PF_USEDFPU; \ - stts(); \ - } \ diff --git a/sys-kernel/gs-sources/files/gs-sources.MKI.CompileFix.patch b/sys-kernel/gs-sources/files/gs-sources.MKI.CompileFix.patch deleted file mode 100644 index e472c0819030..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.MKI.CompileFix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-2.4.25_pre7-gss-r6/include/asm-i386/mki.h.orig 2004-06-29 21:24:45.720584416 +0100 -+++ linux-2.4.25_pre7-gss-r6/include/asm-i386/mki.h 2004-06-29 21:24:30.119956072 +0100 -@@ -37,6 +37,7 @@ extern void (*mhi_hooks[])(void *, void - /* Definitions for MKI_HOOK_SWAP */ - #define MKI_HARD_PRIORITY 1 - #define MKI_NORMAL_PRIORITY 6 -+#define MM_CONTEXT_HAS_LDT_FIELD 1 - - #endif /* INCLUDE_MKI_H */ - #endif /* CONFIG_MKI */ diff --git a/sys-kernel/gs-sources/files/gs-sources.cmdlineLeak.patch b/sys-kernel/gs-sources/files/gs-sources.cmdlineLeak.patch deleted file mode 100644 index 5f26f7f388f6..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.cmdlineLeak.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4/fs/proc/base.c 2004-04-15 07:09:32.000000000 +0100 -+++ linux-2.4/fs/proc/base.c.plasmaroo 2004-08-09 23:30:43.869195800 +0100 -@@ -187,7 +187,7 @@ static int proc_pid_cmdline(struct task_ - if (mm) - atomic_inc(&mm->mm_users); - task_unlock(task); -- if (mm) { -+ if (mm && mm->arg_end) { - int len = mm->arg_end - mm->arg_start; - if (len > PAGE_SIZE) - len = PAGE_SIZE; diff --git a/sys-kernel/gs-sources/files/gs-sources.munmap.patch b/sys-kernel/gs-sources/files/gs-sources.munmap.patch deleted file mode 100644 index e120b35b7adb..000000000000 --- a/sys-kernel/gs-sources/files/gs-sources.munmap.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c ---- linux-2.4.25-rc3/mm/mremap.c 2004-02-18 13:56:01.000000000 +0000 -+++ linux-2.4.25-rc4/mm/mremap.c 2004-02-18 13:49:08.000000000 +0000 -@@ -258,16 +258,20 @@ - if ((addr <= new_addr) && (addr+old_len) > new_addr) - goto out; - -- do_munmap(current->mm, new_addr, new_len); -+ ret = do_munmap(current->mm, new_addr, new_len); -+ if (ret && new_len) -+ goto out; - } - - /* - * Always allow a shrinking remap: that just unmaps - * the unnecessary pages.. - */ -- ret = addr; - if (old_len >= new_len) { -- do_munmap(current->mm, addr+new_len, old_len - new_len); -+ ret = do_munmap(current->mm, addr+new_len, old_len - new_len); -+ if (ret && old_len != new_len) -+ goto out; -+ ret = addr; - if (!(flags & MREMAP_FIXED) || (new_addr == addr)) - goto out; - } diff --git a/sys-kernel/gs-sources/files/pci.ids.patch b/sys-kernel/gs-sources/files/pci.ids.patch deleted file mode 100644 index 1c4087f787c1..000000000000 --- a/sys-kernel/gs-sources/files/pci.ids.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -uNr orig/drivers/pci/pci.ids linux-2.4.21_pre3-gss-r2/drivers/pci/pci.ids ---- orig/drivers/pci/pci.ids 2003-01-18 18:23:57.000000000 -0500 -+++ linux-2.4.21_pre3-gss-r2/drivers/pci/pci.ids 2003-01-18 18:25:02.000000000 -0500 -@@ -629,8 +629,8 @@ - 1014 1010 CS4610 SoundFusion Audio Accelerator - 6003 CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator] - 1013 4280 Crystal SoundFusion PCI Audio Accelerator -- 1681 0050 Hercules Game Theater XP -- 1681 a011 Hercules Fortissimo III 7.1 -+ 1681 0050 Game Theater XP -+ 1681 a011 Fortissimo III 7.1 - 6004 CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator] - 6005 Crystal CS4281 PCI Audio - 1013 4281 Crystal CS4281 PCI Audio -@@ -2744,7 +2744,7 @@ - 10fa Truevision - 000c TARGA 1000 - 10fb Thesys Gesellschaft für Mikroelektronik mbH --186f TH 6255 -+ 186f TH 6255 - 10fc I-O Data Device, Inc. - # What's in the cardbus end of a Sony ACR-A01 card, comes with newer Vaio CD-RW drives - 0003 Cardbus IDE Controller -@@ -2814,10 +2814,10 @@ - 0501 VT8501 [Apollo MVP4] - 0505 VT82C505 - 0561 VT82C561 -- 0571 VT82C586B PIPC Bus Master IDE -+ 0571 VT82C586/B/686A/B PIPC Bus Master IDE - 1043 8052 VT8233A Bus Master ATA100/66/33 IDE -- 1106 0571 VT8235 Bus Master ATA133/100/66/33 IDE -- 1458 5002 GA-7VAX Mainboard -+ 1106 0571 VT8235 Bus Master ATA133/100/66/33 IDE -+ 1458 5002 GA-7VAX Mainboard - 0576 VT82C576 3V [Apollo Master] - 0585 VT82C585VP [Apollo VP1/VPX] - 0586 VT82C586/A/B PCI-to-ISA [Apollo VP] -@@ -2867,18 +2867,18 @@ - 1462 3091 MS-6309 Onboard Audio - 15dd 7609 Onboard Audio - 3059 VT8233 AC97 Audio Controller -- 1458 a002 GA-7VAX Onboard Audio (Realtek ALC650) -+ 1458 a002 GA-7VAX Onboard Audio (Realtek ALC650) - 3065 VT6102 [Rhine-II] -- 1106 0102 VT6102 [Rhine II] Embeded Ethernet Controller on VT8235 -+ 1106 0102 VT6102 [Rhine II] Embeded Ethernet Controller on VT8235 - 1186 1400 DFE-530TX rev A - 1186 1401 DFE-530TX rev B -- 3068 AC97 Modem Controller -+ 3068 Intel 537 [AC97 Modem] - 3074 VT8233 PCI to ISA Bridge - 1043 8052 VT8233A - 3091 VT8633 [Apollo Pro266] -- 3099 VT8367 [KT266] -- 1043 8064 A7V266-E -- 1043 807f A7V333 -+ 3099 VT8366/A/7 [Apollo KT266/A/333] -+ 1043 8064 A7V266-E Mainboard -+ 1043 807f A7V333 Mainboard - 3101 VT8653 Host Bridge - 3102 VT8662 Host Bridge - 3103 VT8615 Host Bridge -@@ -2894,10 +2894,10 @@ - 3148 P4M266 Host Bridge - 3156 P/KN266 Host Bridge - 3168 VT8374 P4X400 Host Controller/AGP Bridge -- 3177 VT8233A ISA Bridge -- 1458 5001 GA-7VAX Mainboard -+ 3177 VT8235 ISA Bridge -+ 1458 5001 GA-7VAX Mainboard - 3189 VT8377 [KT400 AGP] Host Bridge -- 1458 5000 GA-7VAX Mainboard -+ 1458 5000 GA-7VAX Mainboard - 5030 VT82C596 ACPI [Apollo PRO] - 6100 VT85C100A [Rhine II] - 8231 VT8231 [PCI-to-ISA Bridge] -@@ -2913,7 +2913,7 @@ - 8691 VT82C691 [Apollo Pro] - 8693 VT82C693 [Apollo Pro Plus] PCI Bridge - b091 VT8633 [Apollo Pro266 AGP] -- b099 VT8367 [KT333 AGP] -+ b099 VT8366/A/7 [Apollo KT266/A/333 AGP] - b101 VT8653 AGP Bridge - b102 VT8362 AGP Bridge - b103 VT8615 AGP Bridge -@@ -3182,8 +3182,8 @@ - 1144 Cincinnati Milacron - 0001 Noservo controller - 1145 Workbit Corporation -- f007 NinjaSCSI-32 KME - 8007 NinjaSCSI-32 Workbit -+ f007 NinjaSCSI-32 KME - f010 NinjaSCSI-32 Workbit - f012 NinjaSCSI-32 Logitec - f013 NinjaSCSI-32 Logitec diff --git a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r11.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r11.ebuild deleted file mode 100644 index e0e7e55a175c..000000000000 --- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r11.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r11.ebuild,v 1.1 2004/08/09 23:38:45 plasmaroo Exp $ - -IUSE="crypt" - -# OKV=original kernel version, KV=patched kernel version. They can be the same. - -# Kernel ebuilds using the kernel.eclass can remove any patch that you -# do not want to apply by simply setting the KERNEL_EXCLUDE shell -# variable to the string you want to exclude (for instance -# KERNEL_EXCLUDE="evms" would not patch any patches whose names match -# *evms*). Kernels are only tested in the default configuration, but -# this may be useful if you know that a particular patch is causing a -# conflict with a patch you personally want to apply, or some other -# similar situation. - -ETYPE="sources" - -inherit kernel eutils -PROVIDE="virtual/linux-sources virtual/winkernel" -OKV='2.4.24' -EXTRAVERSION="_pre7-gss-${PR}" -KV="2.4.25_pre7-gss-${PR}" -S=${WORKDIR}/linux-${KV} - -# Documentation on the patches contained in this kernel will be installed -# to /usr/share/doc/gs-sources-${PV}/patches.txt.gz - -DESCRIPTION="This kernel stays up to date with current kernel -pre's, with recent ACPI, - EVMS, Win4Lin, aic79xx, Super FreeS/WAN, preempt, and various hardware fixes." -SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - mirror://gentoo/patches-${KV/r11/r1}.tar.bz2 - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.26-CAN-2004-0415.patch" -KEYWORDS="x86 -ppc -sparc" -SLOT="${KV}" - -src_unpack() { - unpack ${A} - mv linux-${OKV} linux-${KV} || die - cd ${KV/r11/r1} || die - # Kill patches we aren't suppposed to use, don't worry about - # failures, if they aren't there that is a good thing! - # This is the ratified crypt USE flag, enables IPSEC and patch-int - if ! use crypt; then - einfo "No Cryptographic support, dropping patches..." - for file in 8*;do - einfo "Dropping ${file}..." - rm -f ${file} - done - else - einfo "Cryptographic support enabled..." - fi - - kernel_src_unpack - epatch ${FILESDIR}/${PN}.munmap.patch || die "Failed to apply munmap patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to add the CAN-2004-0109 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0133 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!" - epatch ${DISTDIR}/linux-2.4.26-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!" - epatch ${FILESDIR}/${PN}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!" - epatch ${FILESDIR}/${PN}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" - epatch ${FILESDIR}/${PN}.MKI.CompileFix.patch || die "Failed to apply MKI compilefix patch!" - epatch ${FILESDIR}/${PN}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!" -} diff --git a/sys-kernel/gs-sources/metadata.xml b/sys-kernel/gs-sources/metadata.xml deleted file mode 100644 index deb16f399ae4..000000000000 --- a/sys-kernel/gs-sources/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>x86-kernel</herd> -<maintainer> - <email>livewire@gentoo.org</email> -</maintainer> -</pkgmetadata> |