From 48eae36a603874b0d88ae7e5789946da2a7a4c27 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Wed, 31 Aug 2005 13:40:07 +0000 Subject: Removing ac-sources. Pretty much all of Alan's work is included in 2.6.13 and this tree seems unmaintained now. Suggested migration path: gentoo-sources-2.6.13 --- sys-kernel/ac-sources/ChangeLog | 136 --------------------- sys-kernel/ac-sources/Manifest | 16 --- sys-kernel/ac-sources/ac-sources-2.6.11-r7.ebuild | 25 ---- .../ac-sources/files/ac-sources-2.6.10.75963.patch | 32 ----- .../ac-sources/files/ac-sources-2.6.10.77094.patch | 107 ---------------- .../ac-sources/files/digest-ac-sources-2.6.11-r7 | 3 - sys-kernel/ac-sources/metadata.xml | 12 -- 7 files changed, 331 deletions(-) delete mode 100644 sys-kernel/ac-sources/ChangeLog delete mode 100644 sys-kernel/ac-sources/Manifest delete mode 100644 sys-kernel/ac-sources/ac-sources-2.6.11-r7.ebuild delete mode 100644 sys-kernel/ac-sources/files/ac-sources-2.6.10.75963.patch delete mode 100644 sys-kernel/ac-sources/files/ac-sources-2.6.10.77094.patch delete mode 100644 sys-kernel/ac-sources/files/digest-ac-sources-2.6.11-r7 delete mode 100644 sys-kernel/ac-sources/metadata.xml (limited to 'sys-kernel/ac-sources') diff --git a/sys-kernel/ac-sources/ChangeLog b/sys-kernel/ac-sources/ChangeLog deleted file mode 100644 index c4ff988b1319..000000000000 --- a/sys-kernel/ac-sources/ChangeLog +++ /dev/null @@ -1,136 +0,0 @@ -# ChangeLog for sys-kernel/ac-sources -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ChangeLog,v 1.55 2005/06/21 17:06:34 marineam Exp $ - -*ac-sources-2.6.11-r7 (21 Jun 2005) - - 21 Jun 2005; Michael Marineau - -ac-sources-2.6.10-r12.ebuild, -ac-sources-2.6.11-r1.ebuild, - +ac-sources-2.6.11-r7.ebuild: - Bump to 2.6.11-ac7 and added a patch to include all the -stable updates up - to 2.6.11.12 - -*ac-sources-2.6.11-r1 (08 Mar 2005) - - 08 Mar 2005; Brandon Low - +ac-sources-2.6.11-r1.ebuild: - Bump - -*ac-sources-2.6.10-r12 (09 Feb 2005) - - 09 Feb 2005; Michael Marineau - -ac-sources-2.6.10-r11.ebuild, +ac-sources-2.6.10-r12.ebuild: - Version bump, closes bug 80997 - -*ac-sources-2.6.10-r11 (05 Feb 2005) - - 05 Feb 2005; Michael Marineau - -ac-sources-2.6.10-r10.ebuild, +ac-sources-2.6.10-r11.ebuild: - Version bump :-) - -*ac-sources-2.6.10-r10 (18 Jan 2005) - - 18 Jan 2005; Michael Marineau - files/ac-sources-2.6.10.77094.patch, - -files/ac-sources-2.6.10.brk-locked.patch, +ac-sources-2.6.10-r10.ebuild, - -ac-sources-2.6.10-r7.ebuild, -ac-sources-2.6.9-r16.ebuild: - Bump to ac10, closing #78245 - -*ac-sources-2.6.10-r7 (08 Jan 2005) - - 08 Jan 2005; -ac-sources-2.6.10-r6.ebuild, - +ac-sources-2.6.10-r7.ebuild, +files/ac-sources-2.6.10.75963.patch, - +files/ac-sources-2.6.10.77094.patch, - +files/ac-sources-2.6.10.brk-locked.patch, - -files/ac-sources-2.6.9.CAN-2004-1016.patch, - -files/ac-sources-2.6.9.CAN-2004-1056.patch, - -files/ac-sources-2.6.9.CAN-2004-1137.patch, - -files/ac-sources-2.6.9.CAN-2004-1151.patch, - -files/ac-sources-2.6.9.binfmt_elf.patch, - -files/ac-sources-2.6.9.shmLocking.patch, -files/ac-sources-2.6.9.vma.patch: - Security bump; bugs #75963, #77025, #77094. - -*ac-sources-2.6.10-r6 (08 Jan 2005) - - 08 Jan 2005; +ac-sources-2.6.10-r6.ebuild, - -ac-sources-2.6.9-r1.ebuild, -ac-sources-2.6.9-r10.ebuild, - -ac-sources-2.6.9-r12.ebuild, -ac-sources-2.6.9-r2.ebuild, - -ac-sources-2.6.9-r5.ebuild, -ac-sources-2.6.9-r6.ebuild, - -ac-sources-2.6.9-r7.ebuild, -ac-sources-2.6.9-r8.ebuild, - -ac-sources-2.6.9-r9.ebuild: - Version bump; purging old revisions. - - 07 Jan 2005; Daniel Drake ac-sources-2.6.9-r8.ebuild, - ac-sources-2.6.9-r9.ebuild: - Update to use KV_FULL - -*ac-sources-2.6.9-r16 (21 Dec 2004) - - 21 Dec 2004; Brandon Low - +ac-sources-2.6.9-r16.ebuild: - Bump - - 20 Dec 2004; ac-sources-2.6.9-r12.ebuild, - +files/ac-sources-2.6.9.CAN-2004-1016.patch, - +files/ac-sources-2.6.9.CAN-2004-1056.patch, - +files/ac-sources-2.6.9.CAN-2004-1137.patch, - +files/ac-sources-2.6.9.CAN-2004-1151.patch, - +files/ac-sources-2.6.9.shmLocking.patch: - Security fixes - bugs #73000, #74384, #74392, #74464, #74465. - - 03 Dec 2004; ac-sources-2.6.9-r12.ebuild, - +files/ac-sources-2.6.9.vma.patch: - Adding overwrapping VMA security fix, bug #72452. - -*ac-sources-2.6.9-r12 (27 Nov 2004) - - 27 Nov 2004; Brandon Low - +ac-sources-2.6.9-r12.ebuild: - Bump - -*ac-sources-2.6.9-r10 (18 Nov 2004) - - 18 Nov 2004; Brandon Low - +ac-sources-2.6.9-r10.ebuild: - Bump - -*ac-sources-2.6.9-r9 (16 Nov 2004) - - 16 Nov 2004; Brandon Low - +ac-sources-2.6.9-r8.ebuild, +ac-sources-2.6.9-r9.ebuild: - Bump - - 12 Nov 2004; ac-sources-2.6.9-r7.ebuild, - +files/ac-sources-2.6.9.binfmt_elf.patch: - Patching for binfmt_elf security vulnerability, bug #70681. - -*ac-sources-2.6.9-r7 (09 Nov 2004) - - 09 Nov 2004; Brandon Low - +ac-sources-2.6.9-r7.ebuild: - Bump - -*ac-sources-2.6.9-r6 (01 Nov 2004) - - 01 Nov 2004; Brandon Low - +ac-sources-2.6.9-r6.ebuild: - bump - -*ac-sources-2.6.9-r5 (29 Oct 2004) - - 29 Oct 2004; Brandon Low - +ac-sources-2.6.9-r5.ebuild: - Bump - -*ac-sources-2.6.9-r2 (21 Oct 2004) - - 21 Oct 2004; Brandon Low - +ac-sources-2.6.9-r2.ebuild: - Bump - -*ac-sources-2.6.9-r1 (21 Oct 2004) - - 21 Oct 2004; Brandon Low +metadata.xml, - +files/2.6.9-ac1-fix-extraversion.patch, +ac-sources-2.6.9-r1.ebuild: - Resurrect this package, because AC is making kernels again - diff --git a/sys-kernel/ac-sources/Manifest b/sys-kernel/ac-sources/Manifest deleted file mode 100644 index cb5de643241b..000000000000 --- a/sys-kernel/ac-sources/Manifest +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 ea75dc2613005c210729876d50f7dfb8 ac-sources-2.6.11-r7.ebuild 785 -MD5 8f0a7d14e89b6c42b9e8671cfbc2574f ChangeLog 4419 -MD5 2b0cfdcefc398952a818684668e808f1 metadata.xml 384 -MD5 655251f31f0bdc85bdd0cd0280af22b7 files/ac-sources-2.6.10.75963.patch 979 -MD5 1642828ee921eeb793b21733b50acdb7 files/ac-sources-2.6.10.77094.patch 3711 -MD5 3afb3c781323e65775ced58cd4feefd5 files/digest-ac-sources-2.6.11-r7 205 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCuEk0nVkA0cTr1F4RAqAhAJ9UGaRs5KYLZ6PodNmbRWb7KRLE4gCdFJmD -v1I3wKEVwHOvW9lojAvstjQ= -=xqn5 ------END PGP SIGNATURE----- diff --git a/sys-kernel/ac-sources/ac-sources-2.6.11-r7.ebuild b/sys-kernel/ac-sources/ac-sources-2.6.11-r7.ebuild deleted file mode 100644 index a1bed6cd3b9c..000000000000 --- a/sys-kernel/ac-sources/ac-sources-2.6.11-r7.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ac-sources-2.6.11-r7.ebuild,v 1.1 2005/06/21 17:06:34 marineam Exp $ - -K_PREPATCHED="yes" -UNIPATCH_STRICTORDER="yes" -ETYPE="sources" -inherit kernel-2 -detect_version -K_NOSETEXTRAVERSION="don't_set_it" - -UPDATE_TO="2.6.11.12" -UPDATE_PATCH="patch-${KV}-${UPDATE_TO}.gz" - -UNIPATCH_LIST=" - ${DISTDIR}/patch-${KV}.bz2 - ${DISTDIR}/${UPDATE_PATCH}" - -DESCRIPTION="Alan Cox's kernel, mostly stuff destined for the mainline or RedHat's vendor kernel" -SRC_URI="${KERNEL_URI} mirror://gentoo/${UPDATE_PATCH} - mirror://kernel/linux/kernel/people/alan/linux-2.6/${KV/-ac*/}/patch-${KV}.bz2" - -KEYWORDS="~x86 ~amd64 ~ia64 ~ppc -*" -IUSE="" - diff --git a/sys-kernel/ac-sources/files/ac-sources-2.6.10.75963.patch b/sys-kernel/ac-sources/files/ac-sources-2.6.10.75963.patch deleted file mode 100644 index 80390f13bd73..000000000000 --- a/sys-kernel/ac-sources/files/ac-sources-2.6.10.75963.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- linux-2.6.10/security/dummy.c 2004-12-24 21:34:26.000000000 +0000 -+++ linux-2.6.10.plasmaroo/security/dummy.c 2005-01-07 20:13:50.763073872 +0000 -@@ -74,11 +74,8 @@ - - static int dummy_capable (struct task_struct *tsk, int cap) - { -- if (cap_is_fs_cap (cap) ? tsk->fsuid == 0 : tsk->euid == 0) -- /* capability granted */ -+ if (cap_raised (tsk->cap_effective, cap)) - return 0; -- -- /* capability denied */ - return -EPERM; - } - -@@ -191,6 +188,8 @@ - - current->suid = current->euid = current->fsuid = bprm->e_uid; - current->sgid = current->egid = current->fsgid = bprm->e_gid; -+ -+ dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted); - } - - static int dummy_bprm_set_security (struct linux_binprm *bprm) -@@ -550,6 +549,7 @@ - - static int dummy_task_post_setuid (uid_t id0, uid_t id1, uid_t id2, int flags) - { -+ dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted); - return 0; - } - diff --git a/sys-kernel/ac-sources/files/ac-sources-2.6.10.77094.patch b/sys-kernel/ac-sources/files/ac-sources-2.6.10.77094.patch deleted file mode 100644 index fe414143aa4b..000000000000 --- a/sys-kernel/ac-sources/files/ac-sources-2.6.10.77094.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -urNp linux-2.6.10/drivers/char/moxa.c linux-2.6.10-new/drivers/char/moxa.c ---- linux-2.6.10/drivers/char/moxa.c 2005-01-07 10:51:23 -0500 -+++ linux-2.6.10-new/drivers/char/moxa.c 2005-01-07 10:51:33 -0500 -@@ -1668,6 +1668,8 @@ int MoxaDriverIoctl(unsigned int cmd, un - return -EFAULT; - if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS) - return -EINVAL; -+ if(dltmp.len < 0 || dltmp.len > sizeof(moxaBuff)) -+ return -EINVAL; - - switch(cmd) - { -@@ -2822,8 +2824,6 @@ static int moxaload320b(int cardno, unsi - void __iomem *baseAddr; - int i; - -- if(len > sizeof(moxaBuff)) -- return -EINVAL; - if(copy_from_user(moxaBuff, tmp, len)) - return -EFAULT; - baseAddr = moxaBaseAddr[cardno]; -diff -urNp linux-2.6.10/include/linux/writeback.h linux-2.6.10-new/include/linux/writeback.h ---- linux-2.6.10/include/linux/writeback.h 2005-01-07 10:51:22 -0500 -+++ linux-2.6.10-new/include/linux/writeback.h 2005-01-07 10:51:33 -0500 -@@ -86,6 +86,7 @@ static inline void wait_on_inode(struct - int wakeup_bdflush(long nr_pages); - void laptop_io_completion(void); - void laptop_sync_completion(void); -+void throttle_vm_writeout(void); - - /* These are exported to sysctl. */ - extern int dirty_background_ratio; -diff -urNp linux-2.6.10/mm/mmap.c linux-2.6.10-new/mm/mmap.c ---- linux-2.6.10/mm/mmap.c 2004-12-24 22:35:00.000000000 +0100 -+++ linux-2.6.10-new/mm/mmap.c 2004-12-27 16:37:47.000000000 +0100 -@@ -1360,6 +1360,13 @@ int expand_stack(struct vm_area_struct * - vm_unacct_memory(grow); - return -ENOMEM; - } -+ if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) && -+ ((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) > -+ current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) { -+ anon_vma_unlock(vma); -+ vm_unacct_memory(grow); -+ return -ENOMEM; -+ } - vma->vm_end = address; - vma->vm_mm->total_vm += grow; - if (vma->vm_flags & VM_LOCKED) -@@ -1422,6 +1429,13 @@ int expand_stack(struct vm_area_struct * - vm_unacct_memory(grow); - return -ENOMEM; - } -+ if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) && -+ ((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) > -+ current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) { -+ anon_vma_unlock(vma); -+ vm_unacct_memory(grow); -+ return -ENOMEM; -+ } - vma->vm_start = address; - vma->vm_pgoff -= grow; - vma->vm_mm->total_vm += grow; -diff -urNp linux-2.6.10/mm/page-writeback.c linux-2.6.10-new/mm/page-writeback.c ---- linux-2.6.10/mm/page-writeback.c 2005-01-07 10:51:24 -0500 -+++ linux-2.6.10-new/mm/page-writeback.c 2005-01-07 10:51:33 -0500 -@@ -276,6 +276,28 @@ void balance_dirty_pages_ratelimited(str - } - EXPORT_SYMBOL(balance_dirty_pages_ratelimited); - -+void throttle_vm_writeout(void) -+{ -+ struct writeback_state wbs; -+ long background_thresh; -+ long dirty_thresh; -+ -+ for ( ; ; ) { -+ get_dirty_limits(&wbs, &background_thresh, &dirty_thresh); -+ -+ /* -+ * Boost the allowable dirty threshold a bit for page -+ * allocators so they don't get DoS'ed by heavy writers -+ */ -+ dirty_thresh += dirty_thresh / 10; /* wheeee... */ -+ -+ if (wbs.nr_unstable + wbs.nr_writeback <= dirty_thresh) -+ break; -+ blk_congestion_wait(WRITE, HZ/10); -+ } -+} -+ -+ - /* - * writeback at least _min_pages, and keep writing until the amount of dirty - * memory is less than the background threshold, or until we're all clean. -diff -urNp linux-2.6.10/mm/vmscan.c linux-2.6.10-new/mm/vmscan.c ---- linux-2.6.10/mm/vmscan.c 2005-01-07 10:51:24 -0500 -+++ linux-2.6.10-new/mm/vmscan.c 2005-01-07 10:51:33 -0500 -@@ -825,6 +825,8 @@ shrink_zone(struct zone *zone, struct sc - break; - } - } -+ -+ throttle_vm_writeout(); - } - - /* diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.6.11-r7 b/sys-kernel/ac-sources/files/digest-ac-sources-2.6.11-r7 deleted file mode 100644 index bbe69429b8d2..000000000000 --- a/sys-kernel/ac-sources/files/digest-ac-sources-2.6.11-r7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679 -MD5 5657d9922d504d0226464128984f958f patch-2.6.11-ac7-2.6.11.12.gz 13182 -MD5 b4954996afa34b1aac5caf7fd93c81a4 patch-2.6.11-ac7.bz2 141637 diff --git a/sys-kernel/ac-sources/metadata.xml b/sys-kernel/ac-sources/metadata.xml deleted file mode 100644 index 8263f239f62f..000000000000 --- a/sys-kernel/ac-sources/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - -x86-kernel - -This kernel is based on Alan Cox's tree. -It includes a small number of patches to vanilla 2.6, -generally these are patches that Alan wants tested -before they are released by RedHat. - - - -- cgit v1.2.3-65-gdbad