Version bump ( 2.4.28 -> 2.4.29 ) + cleaning files.

14 files changed, 36 insertions, 531 deletions

diff --git a/sys-kernel/rsbac-sources/ChangeLog b/sys-kernel/rsbac-sources/ChangeLog
index 361795869653..043323285ab7 100644
--- a/sys-kernel/rsbac-sources/ChangeLog
+++ b/sys-kernel/rsbac-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/rsbac-sources
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.23 2005/01/18 22:15:48 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.24 2005/01/21 13:33:50 kang Exp $
+
+*rsbac-sources-2.4.29 (21 Jan 2005)
+
+  21 Jan 2005; Guillaume Destuynder <kang@gentoo.org>
+  -files/rsbac-sources-v1.2.3-1.patch, -files/rsbac-sources-v1.2.3-3.patch,
+  -files/rsbac-sources-v1.2.3-4.patch, -files/rsbac-sources-v1.2.3-5.patch,
+  -files/rsbac-sources-v1.2.3-6.patch, -rsbac-sources-2.4.28-r1.ebuild,
+  rsbac-sources-2.4.28-r2.ebuild, +rsbac-sources-2.4.29.ebuild,
+  rsbac-sources-2.6.10-r1.ebuild:
+  Version bump to 2.4.29
+  Fixed double ChangeLog entry (???)
 
   18 Jan 2005; Guillaume Destuynder <kang@gentoo.org>
   -files/rsbac-bugfix-v1.2.3-6.diff, -files/rsbac-bugfix-v1.2.3-ao-01.diff,
@@ -18,15 +29,9 @@
   -files/rsbac-sources-iptables-dos.patch, -rsbac-sources-2.6.10.ebuild,
   -rsbac-sources-2.6.7-r11.ebuild, -rsbac-sources-2.6.9.ebuild,
   +rsbac-sources-2.6.10-r1.ebuild:
-  Security issue: #75963 with LSM fixed. Fixed boudle EXTRAVERSION already
+  Security issue: #75963 with LSM fixed. Fixed double EXTRAVERSION already
   present in newer rsbac patches. Stable x86.
 
-  18 Jan 2005; Guillaume Destuynder <kang@gentoo.org>
-  rsbac-sources-2.6.10.ebuild:
-  Security issue: #75963 with LSM fixed. Fixed boudle EXTRAVERSION already
-  present in newer rsbac patches. Stable x86.cvs add
-  rsbac-sources-2.6.10-r1.ebuild
-
   14 Jan 2005; Guillaume Destuynder <kang@gentoo.org>
   rsbac-sources-2.4.28-r2.ebuild, rsbac-sources-2.6.10.ebuild:
   Fixes #77344: informs the user about rsbac doc project
diff --git a/sys-kernel/rsbac-sources/Manifest b/sys-kernel/rsbac-sources/Manifest
index 436c767e7526..c1903c190915 100644
--- a/sys-kernel/rsbac-sources/Manifest
+++ b/sys-kernel/rsbac-sources/Manifest
@@ -1,15 +1,8 @@
 MD5 fee9abc7797fef753c42454679bae9a7 metadata.xml 456
-MD5 f4de656d7c7ee79a6df605ad681c3278 rsbac-sources-2.4.28-r2.ebuild 1611
-MD5 7c67f1d87ea708150c95bb5e4de440a0 rsbac-sources-2.6.10-r1.ebuild 1615
-MD5 f80da56df43b7c274f75c3095fc883f3 ChangeLog 5127
-MD5 328797650996e7330596351c56cb059e rsbac-sources-2.4.28-r1.ebuild 1452
-MD5 a869ab037c7e264df5f8e899864f08e9 files/rsbac-sources-v1.2.3-3.patch 557
-MD5 b9a94233e1457787352e5f85e3e3582d files/rsbac-sources-2.4.28-dos_mem_disc.patch 2009
-MD5 305a7a9407bd311f3b58d0b7ae505506 files/rsbac-sources-v1.2.3-1.patch 1784
-MD5 d41d8cd98f00b204e9800998ecf8427e files/rsbac-sources-v1.2.3-2.patch 0
-MD5 c1c64783ddf4cce2b21b0b6f96f329d7 files/rsbac-sources-v1.2.3-4.patch 1018
-MD5 ffea7c6daada6d0033ed3996d45fd7ca files/rsbac-sources-v1.2.3-5.patch 625
-MD5 6197e52bf5742c3f61716fe6a681055c files/rsbac-sources-v1.2.3-6.patch 13068
-MD5 665832a4660ee3c3d531dfc2568cc495 files/digest-rsbac-sources-2.4.28-r1 207
+MD5 e28b9815c96a8487f95f11f30195bb3f rsbac-sources-2.4.28-r2.ebuild 1610
+MD5 5ca945aa5b91186c7ff427cdc92633f4 rsbac-sources-2.6.10-r1.ebuild 1620
+MD5 aa3bedcfb4081b37968092b52bda82bf rsbac-sources-2.4.29.ebuild 1548
+MD5 6df0a0ab5c38b6e7b45722fca246e437 ChangeLog 5356
+MD5 be49f4146513891a250629f605aa957d files/digest-rsbac-sources-2.4.29 208
 MD5 ec2ece59690dfeadf50fc0b726137b60 files/digest-rsbac-sources-2.4.28-r2 207
 MD5 bde788e15d428885ef8021a7af885f8c files/digest-rsbac-sources-2.6.10-r1 207
diff --git a/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.28-r1 b/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.28-r1
deleted file mode 100644
index 010465e18d9b..000000000000
--- a/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.28-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 f3759250e9c4bb5ccb773174fafe0ba7 rsbac-v1.2.3.tar.bz2 489127
-MD5 aba31540a309b27201ca821510014b8f rsbac-patches-2.4-28.1.tar.bz2 288671
diff --git a/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.29 b/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.29
new file mode 100644
index 000000000000..4f413cb33c94
--- /dev/null
+++ b/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.29
@@ -0,0 +1,3 @@
+MD5 fcf8b6bb620467f27b657c1c4a60bbff linux-2.4.29.tar.bz2 31124710
+MD5 f3759250e9c4bb5ccb773174fafe0ba7 rsbac-v1.2.3.tar.bz2 489127
+MD5 c7e75c20dc0d4cd25dc8323c355e88f4 rsbac-patches-2.4-29.0.tar.bz2 1104208
diff --git a/sys-kernel/rsbac-sources/files/rsbac-sources-2.4.28-dos_mem_disc.patch b/sys-kernel/rsbac-sources/files/rsbac-sources-2.4.28-dos_mem_disc.patch
deleted file mode 100644
index 4644ae28bce4..000000000000
--- a/sys-kernel/rsbac-sources/files/rsbac-sources-2.4.28-dos_mem_disc.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c
---- linux-2.4.28/fs/exec.c	2004-04-15 10:44:45 -07:00
-+++ linux-2.4.28.plasmaroo/fs/exec.c	2004-11-12 12:02:40 -08:00
-@@ -342,6 +342,7 @@ int setup_arg_pages(struct linux_binprm 
- 	
- 	down_write(&current->mm->mmap_sem);
- 	{
-+		struct vm_area_struct *vma;
- 		mpnt->vm_mm = current->mm;
- 		mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
- 		mpnt->vm_end = STACK_TOP;
-@@ -351,6 +352,12 @@ int setup_arg_pages(struct linux_binprm 
- 		mpnt->vm_pgoff = 0;
- 		mpnt->vm_file = NULL;
- 		mpnt->vm_private_data = (void *) 0;
-+		vma = find_vma(current->mm, mpnt->vm_start);
-+		if (vma) {
-+			up_write(&current->mm->mmap_sem);
-+			kmem_cache_free(vm_area_cachep, mpnt);
-+			return -ENOMEM;
-+		}
- 		insert_vm_struct(current->mm, mpnt);
- 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- 	} 
-diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c
---- linux-2.4.28/fs/binfmt_aout.c	2002-02-04 23:54:04 -08:00
-+++ linux-2.4.28.plasmaroo/fs/binfmt_aout.c	2004-11-12 11:55:14 -08:00
-@@ -39,13 +39,18 @@ static struct linux_binfmt aout_format =
- 	NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE
- };
- 
--static void set_brk(unsigned long start, unsigned long end)
-+#define BAD_ADDR(x)	((unsigned long)(x) >= TASK_SIZE)
-+
-+static int set_brk(unsigned long start, unsigned long end)
- {
- 	start = PAGE_ALIGN(start);
- 	end = PAGE_ALIGN(end);
--	if (end <= start)
--		return;
--	do_brk(start, end - start);
-+	if (end > start) {
-+		unsigned long addr = do_brk(start, end - start);
-+		if (BAD_ADDR(addr))
-+			return addr;
-+	}
-+	return 0;
- }
- 
- /*
-@@ -405,7 +410,11 @@ static int load_aout_binary(struct linux
- beyond_if:
- 	set_binfmt(&aout_format);
- 
--	set_brk(current->mm->start_brk, current->mm->brk);
-+	retval = set_brk(current->mm->start_brk, current->mm->brk);
-+	if (retval < 0) {
-+		send_sig(SIGKILL, current, 0);
-+		return retval;
-+	}
- 
- 	retval = setup_arg_pages(bprm); 
- 	if (retval < 0) { 
diff --git a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-1.patch b/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-1.patch
deleted file mode 100644
index 3b0262a7cccb..000000000000
--- a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- linux-2.6.7-rsbac-v1.2.3/rsbac/adf/ff/ff_main.c~	2004-06-24 12:48:07.000000000 +0200
-+++ linux-2.6.7-rsbac-v1.2.3/rsbac/adf/ff/ff_main.c	2004-06-24 12:48:07.000000000 +0200
-@@ -396,6 +396,9 @@
-                      #ifdef CONFIG_RSBAC_SOFTMODE
-                      && (attr_val.switch_target != SOFTMODE)
-                      #endif
-+                     #ifdef CONFIG_RSBAC_FF_AUTH_PROT
-+                     && (attr_val.switch_target != AUTH)
-+                     #endif
-                     )
-                     return(DO_NOT_CARE);
-                   /* test owner's ff_role */
---- linux-2.6.7-rsbac-v1.2.3/rsbac/adf/rc/rc_main.c~	2004-06-24 12:45:06.000000000 +0200
-+++ linux-2.6.7-rsbac-v1.2.3/rsbac/adf/rc/rc_main.c	2004-06-24 12:45:06.000000000 +0200
-@@ -1366,6 +1366,9 @@
-                      #ifdef CONFIG_RSBAC_SOFTMODE
-                      && (attr_val.switch_target != SOFTMODE)
-                      #endif
-+                     #ifdef CONFIG_RSBAC_RC_AUTH_PROT
-+                     && (attr_val.switch_target != AUTH)
-+                     #endif
-                     )
-                     return(DO_NOT_CARE);
-                   return(check_comp_rc_scd(ST_other, request, caller_pid));
---- linux-2.6.7-rsbac-v1.2.3/rsbac/adf/acl/acl_main.c~	2004-06-24 12:49:01.000000000 +0200
-+++ linux-2.6.7-rsbac-v1.2.3/rsbac/adf/acl/acl_main.c	2004-06-24 12:49:01.000000000 +0200
-@@ -510,6 +510,9 @@
-                        #ifdef CONFIG_RSBAC_SOFTMODE
-                        && (attr_val.switch_target != SOFTMODE)
-                        #endif
-+                       #ifdef CONFIG_RSBAC_ACL_AUTH_PROT
-+                       && (attr_val.switch_target != AUTH)
-+                       #endif
-                       )
-                       return(DO_NOT_CARE);
diff --git a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-2.patch b/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-2.patch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-2.patch
+++ /dev/null
diff --git a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-3.patch b/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-3.patch
deleted file mode 100644
index 90484797584c..000000000000
--- a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-2.4.26-rsbac-v1.2.3/rsbac/adf/jail/jail_main.c.sik	2004-06-08 11:37:30.000000000 +0200
-+++ linux-2.4.26-rsbac-v1.2.3/rsbac/adf/jail/jail_main.c	2004-06-30 09:27:42.000000000 +0200
-@@ -396,6 +396,7 @@
-                   if(   (attr == A_create_data)
-                      && (   S_ISCHR(attr_val.create_data.mode)
-                          || S_ISBLK(attr_val.create_data.mode)
-+                         || (attr_val.create_data.mode & (S_ISUID | S_ISGID))
-                         )
-                     )
-                     return NOT_GRANTED;
diff --git a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-4.patch b/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-4.patch
deleted file mode 100644
index a8938bd9397f..000000000000
--- a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- linux-2.4.26-rsbac-v1.2.3/include/asm-x86_64/unistd.h~	2004-07-21 09:07:21.000000000 +0200
-+++ linux-2.4.26-rsbac-v1.2.3/include/asm-x86_64/unistd.h	2004-07-21 09:07:21.000000000 +0200
-@@ -427,7 +427,13 @@
- __SYSCALL(__NR_tuxcall, sys_ni_syscall)
- 
- #define __NR_security			185 /* reserved for security */
-+/* RSBAC */
-+#ifdef CONFIG_RSBAC
-+#define __NR_rsbac			185 /* reserved for security */
-+__SYSCALL(__NR_rsbac, sys_rsbac)
-+#else
- __SYSCALL(__NR_security, sys_ni_syscall)
-+#endif
- 
- #define __NR_gettid		186
- __SYSCALL(__NR_gettid, sys_gettid)
---- linux-2.4.26-rsbac-v1.2.3/include/asm-x86_64/ia32_unistd.h~	2004-07-21 09:08:41.000000000 +0200
-+++ linux-2.4.26-rsbac-v1.2.3/include/asm-x86_64/ia32_unistd.h	2004-07-21 09:08:41.000000000 +0200
-@@ -250,6 +250,11 @@
- #define __NR_ia32_sched_setaffinity	241
- #define __NR_ia32_sched_getaffinity	242
- 
-+/* RSBAC */
-+#ifdef CONFIG_RSBAC
-+#define __NR_ia32_rsbac __NR_ia32_security
-+#endif
-+
- #define IA32_NR_syscalls 245
- 
- #endif /* _ASM_X86_64_IA32_UNISTD_H_ */
diff --git a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-5.patch b/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-5.patch
deleted file mode 100644
index fea819e62dfb..000000000000
--- a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: rsbac-admin-v1.2.3/src/attr_set_fd.c
-===================================================================
---- rsbac-admin-v1.2.3/src/attr_set_fd.c	(revision 19)
-+++ rsbac-admin-v1.2.3/src/attr_set_fd.c	(working copy)
-@@ -202,6 +202,10 @@
-           case A_res_max:
-             fprintf(stderr, gettext("%s: Attribute %s not supported\n"), progname, argv[3]);
-             exit(1);
-+          case A_pax_flags:
-+            value.pax_flags = pax_strtoflags(argv[3], RSBAC_PAX_DEF_FLAGS);
-+            break;
-+
-           case A_log_array_low:
-           case A_log_array_high:
-             if(strlen(argv[3]) != R_NONE)
diff --git a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-6.patch b/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-6.patch
deleted file mode 100644
index e87509f12cde..000000000000
--- a/sys-kernel/rsbac-sources/files/rsbac-sources-v1.2.3-6.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-Index: linux-2.4.27-rsbac-v1.2.3/include/rsbac/aci_data_structures.h
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/include/rsbac/aci_data_structures.h	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/include/rsbac/aci_data_structures.h	(working copy)
-@@ -1134,7 +1134,7 @@
- #endif
- 
- 
--#define RSBAC_USER_NR_ATTRIBUTES 28
-+#define RSBAC_USER_NR_ATTRIBUTES 24
- #define RSBAC_USER_ATTR_LIST { \
-       A_pseudo, \
-       A_log_user_based, \
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/help/syscalls.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/help/syscalls.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/help/syscalls.c	(working copy)
-@@ -1405,7 +1405,7 @@
- 
- int sys_rsbac_switch(enum rsbac_switch_target_t target, int value)
-   {
--#ifdef CONFIG_RSBAC_SWITCH
-+#if defined(CONFIG_RSBAC_SWITCH) || defined(CONFIG_RSBAC_SOFTMODE)
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
-     char                         * switch_name;
-@@ -1509,6 +1509,7 @@
-               case SOFTMODE: rsbac_softmode = value;
-                   break;
- #endif
-+#ifdef CONFIG_RSBAC_SWITCH
- #ifdef CONFIG_RSBAC_MAC
-               case MAC: rsbac_switch_mac = value;
-                   break;
-@@ -1557,6 +1558,7 @@
-               case RES: rsbac_switch_res = value;
-                   break;
- #endif
-+#endif /* SWITCH */
-               default:
-                 return (-RSBAC_EINVALIDMODULE);
-             }
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/adf/jail/jail_syscalls.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/adf/jail/jail_syscalls.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/adf/jail/jail_syscalls.c	(working copy)
-@@ -41,8 +41,10 @@
- /*          Externally visible functions           */
- /************************************************* */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- extern long sys_chroot(const char * filename);
- extern long sys_chdir(const char * filename);
-+#endif
- 
- /* Create a jail for current process */
- /* Note: It is allowed to create jails within jails, but with restrictions */
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/adf/adf_main.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/adf/adf_main.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/adf/adf_main.c	(working copy)
-@@ -333,6 +333,14 @@
-              && (sb_p->s_magic == PIPEFS_MAGIC)
-             )
-             return DO_NOT_CARE;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+          /* No decision on pseudo sockfs */
-+          if(   (target == T_FILE)
-+             && (!RSBAC_MAJOR(tid.file.device))
-+             && (!RSBAC_MINOR(tid.file.device))
-+            )
-+            return DO_NOT_CARE;
-+#endif
-           switch(request)
-             {
-               case R_GET_STATUS_DATA:
-@@ -1008,6 +1016,7 @@
-         rsbac_pid_t parent_pid = 0;
- 
-         /* Get owner's logging pseudo */
-+        i_tid.user = owner;
-         if (rsbac_get_attr(GEN,T_USER,i_tid,A_pseudo,&i_attr_val,FALSE))
-           {
-             rsbac_ds_get_error("rsbac_adf_request()", A_pseudo);
-@@ -2448,6 +2457,7 @@
- #endif /* SECDEL */
- 
- #ifdef CONFIG_RSBAC_SYM_REDIR
-+EXPORT_SYMBOL(rsbac_symlink_redirect);
- void rsbac_symlink_redirect(struct dentry * dentry_p, char * name)
-   {
-     int                            err;
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/adf/adf_check.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/adf/adf_check.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/adf/adf_check.c	(working copy)
-@@ -439,6 +439,7 @@
-               {
-                 case T_DIR: 
-                 case T_SCD:
-+                case T_IPC:
- #ifdef CONFIG_RSBAC_RW
-                 case T_FILE:
-                 case T_FIFO:
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/rc_data_structures.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/rc_data_structures.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/rc_data_structures.c	(working copy)
-@@ -146,7 +146,7 @@
-     off_t pos   = 0;
-     off_t begin = 0;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "stats_rc_proc_info(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -1540,7 +1540,7 @@
- 
- int rsbac_stats_rc(void)
-   {
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_stats_rc(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/aci_data_structures.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/aci_data_structures.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/aci_data_structures.c	(working copy)
-@@ -9504,10 +9504,11 @@
- /* All functions return 0, if no error occurred, and a negative error code  */
- /* otherwise. The error codes are defined in rsbac_error.h.                 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- /* declare sys_kill */
- extern long sys_kill(int pid, int sig);
-+#endif
- 
--
- #ifdef CONFIG_RSBAC_INIT_DELAY
- int rsbac_init(kdev_t root_dev)
- #else
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/pm_data_structures.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/pm_data_structures.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/pm_data_structures.c	(working copy)
-@@ -90,7 +90,7 @@
-     union rsbac_attribute_value_t rsbac_attribute_value;
- #endif
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
- #ifdef CONFIG_RSBAC_RMSG
-         rsbac_printk(KERN_WARNING "stats_pm_proc_info(): RSBAC not initialized\n");
-@@ -1661,7 +1661,7 @@
-     u_long                                   all_member_count = 0;
-     u_long                               all_count = 0;
-   
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
- #ifdef CONFIG_RSBAC_RMSG
-         rsbac_printk(KERN_WARNING "rsbac_stats_pm(): RSBAC not initialized\n");
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/acl_data_structures.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/acl_data_structures.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/acl_data_structures.c	(working copy)
-@@ -539,7 +539,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
- #ifdef CONFIG_RSBAC_RMSG
-         rsbac_printk(KERN_WARNING "stats_acl_proc_info(): RSBAC not initialized\n");
-@@ -759,7 +759,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
- #ifdef CONFIG_RSBAC_RMSG
-         rsbac_printk(KERN_WARNING "acl_acllist_proc_info(): RSBAC not initialized\n");
-@@ -1697,7 +1697,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
- #ifdef CONFIG_RSBAC_RMSG
-         rsbac_printk(KERN_WARNING "acl_grouplist_proc_info(): RSBAC not initialized\n");
-@@ -3057,7 +3057,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_stats_acl(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/mac_data_structures.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/mac_data_structures.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/mac_data_structures.c	(working copy)
-@@ -483,7 +483,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "stats_mac_proc_info(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -587,7 +587,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "mac_trulist_proc_info(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -1174,7 +1174,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
- #ifdef CONFIG_RSBAC_RMSG
-         rsbac_printk(KERN_WARNING "rsbac_stats_mac(): RSBAC not initialized\n");
-@@ -1771,7 +1771,7 @@
-     struct rsbac_mac_device_list_item_t * device_p;
-     int err=0;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_mac_copy_fp_truset(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -1822,7 +1822,7 @@
- int rsbac_mac_copy_pp_truset(rsbac_pid_t old_p_set_id,
-                               rsbac_pid_t new_p_set_id)
-   {
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_mac_copy_pp_truset(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -1850,7 +1850,7 @@
-     struct rsbac_mac_device_list_item_t * device_p;
-     long count;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_mac_get_f_trulist(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -1904,7 +1904,7 @@
-                             rsbac_uid_t **trulist_p,
-                             rsbac_time_t **ttllist_p)
-   {
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_mac_get_p_trulist(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-Index: linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/auth_data_structures.c
-===================================================================
---- linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/auth_data_structures.c	(revision 16)
-+++ linux-2.4.27-rsbac-v1.2.3/rsbac/data_structures/auth_data_structures.c	(working copy)
-@@ -770,7 +770,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "stats_auth_proc_info(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -940,7 +940,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "auth_caplist_proc_info(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -1908,7 +1908,7 @@
-     union rsbac_target_id_t       rsbac_target_id;
-     union rsbac_attribute_value_t rsbac_attribute_value;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
- #ifdef CONFIG_RSBAC_RMSG
-         rsbac_printk(KERN_WARNING "rsbac_stats_auth(): RSBAC not initialized\n");
-@@ -2940,7 +2940,7 @@
-     struct rsbac_auth_device_list_item_t * device_p;
-     int err=0;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_auth_copy_fp_capset(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -2991,7 +2991,7 @@
- int rsbac_auth_copy_pp_capset(rsbac_pid_t old_p_set_id,
-                               rsbac_pid_t new_p_set_id)
-   {
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_auth_copy_pp_capset(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -3020,7 +3020,7 @@
-     struct rsbac_auth_device_list_item_t * device_p;
-     long count;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_auth_get_f_caplist(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
-@@ -3098,7 +3098,7 @@
-   {
-     long count;
- 
--    if (!rsbac_is_initialized)
-+    if (!rsbac_is_initialized())
-       {
-         printk(KERN_WARNING "rsbac_auth_get_p_caplist(): RSBAC not initialized\n");
-         return(-RSBAC_ENOTINITIALIZED);
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r2.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r2.ebuild
index 79c806ae8980..f62b26b983a0 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r2.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r2.ebuild,v 1.2 2005/01/14 00:21:32 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r2.ebuild,v 1.3 2005/01/21 13:33:50 kang Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -24,7 +24,7 @@ HOMEPAGE="http://hardened.gentoo.org/rsbac"
 DESCRIPTION="RSBAC hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
 SRC_URI="${KERNEL_URI} ${RSBAC_SRC} ${RGPV_SRC} ${CAN_SRC}"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 
 src_unpack() {
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r1.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.4.29.ebuild
index 834257c8d4f3..4d5c19838103 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r1.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-2.4.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.4.28-r1.ebuild,v 1.2 2005/01/12 22:23:18 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.4.29.ebuild,v 1.1 2005/01/21 13:33:50 kang Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -13,35 +13,34 @@ RSBAC_SRC="http://rsbac.org/download/code/v${RSBACV}/rsbac-v${RSBACV}.tar.bz2"
 CAN_SRC=""
 
 # rsbac kernel patches
-RGPV=28.1
+RGPV=29.0
 RGPV_SRC="http://dev.gentoo.org/~kang/rsbac/patches/${RSBACV}/${KV_MAJOR}.${KV_MINOR}/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}.tar.bz2"
 
 UNIPATCH_STRICTORDER="yes"
-UNIPATCH_LIST="
-			${DISTDIR}/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}.tar.bz2
-			${FILESDIR}/${PN}-v1.2.3-1.patch
-			${FILESDIR}/${PN}-v1.2.3-2.patch
-			${FILESDIR}/${PN}-v1.2.3-3.patch
-			${FILESDIR}/${PN}-v1.2.3-4.patch
-			${FILESDIR}/${PN}-v1.2.3-6.patch
-			${FILESDIR}/${PN}-${OKV}-dos_mem_disc.patch"
+UNIPATCH_LIST="${DISTDIR}/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}.tar.bz2"
 UNIPATCH_DOCS="${WORKDIR}/patches/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}/0000_README"
 
 HOMEPAGE="http://hardened.gentoo.org/rsbac"
 DESCRIPTION="RSBAC hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
 SRC_URI="${KERNEL_URI} ${RSBAC_SRC} ${RGPV_SRC} ${CAN_SRC}"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 
 src_unpack() {
 	universal_unpack
 	cd ${WORKDIR}/linux-${KV}; unpack rsbac-v${RSBACV}.tar.bz2
 	unipatch "${UNIPATCH_LIST}"
-	[ -z "${K_NOSETEXTRAVERSION}" ] && unpack_set_extraversion
 	unpack_2_4
 }
 
 pkg_postinst() {
 	postinst_sources
+	ewarn "Please configure and compile your RSBAC kernel before installing rsbac-admin tools"
+
+	einfo "Guides are available from the Gentoo Documentation Project for this kernel"
+	einfo "Please see http://www.gentoo.org/proj/en/hardened/rsbac/quickstart.xml"
+	einfo "And the RSBAC hardened project http://www.gentoo.org/proj/en/hardened/rsbac/"
+	einfo "For help setting up and using RSBAC."
+
 }
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-2.6.10-r1.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.6.10-r1.ebuild
index 8c3893a67b42..eab2f45c1259 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-2.6.10-r1.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-2.6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.6.10-r1.ebuild,v 1.1 2005/01/18 22:15:48 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.6.10-r1.ebuild,v 1.2 2005/01/21 13:33:50 kang Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -25,7 +25,7 @@ HOMEPAGE="http://hardened.gentoo.org/rsbac/"
 DESCRIPTION="RSBAC hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
 SRC_URI="${KERNEL_URI} ${RSBAC_SRC} ${RGPV_SRC} ${CAN_SRC}"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 
 
 src_unpack() {