rpms/kernel/devel kernel-2.6.spec, 1.1826.2.10.2.2, 1.1826.2.10.2.3 linux-2.6-audit-rule-log.patch, 1.1.2.1, 1.1.2.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 30 15:57:25 UTC 2006
Author: sgrubb
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15931
Modified Files:
Tag: private-fc5-test2-lspp-branch
kernel-2.6.spec linux-2.6-audit-rule-log.patch
Log Message:
Remove string patch since it causes oopses and fixup audit-rule-log patch
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1826.2.10.2.2
retrieving revision 1.1826.2.10.2.3
diff -u -r1.1826.2.10.2.2 -r1.1826.2.10.2.3
--- kernel-2.6.spec 13 Jan 2006 17:18:55 -0000 1.1826.2.10.2.2
+++ kernel-2.6.spec 30 Jan 2006 15:57:23 -0000 1.1826.2.10.2.3
@@ -20,7 +20,7 @@
%define sublevel 15
%define kversion 2.6.%{sublevel}
%define rpmversion 2.6.%{sublevel}
-%define rhbsys .lspp.6
+%define rhbsys .lspp.7
%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
%define signmodules 0
%define make_target bzImage
@@ -969,8 +969,8 @@
%patch20009 -p1
%patch20010 -p1
-%patch20020 -p1
-%patch20021 -p1
+#%patch20020 -p1
+#%patch20021 -p1
%patch20022 -p1
%patch20023 -p1
%patch20024 -p1
linux-2.6-audit-rule-log.patch:
include/linux/audit.h | 2 +-
kernel/auditfilter.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
Index: linux-2.6-audit-rule-log.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-audit-rule-log.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-audit-rule-log.patch 13 Jan 2006 17:17:15 -0000 1.1.2.1
+++ linux-2.6-audit-rule-log.patch 30 Jan 2006 15:57:23 -0000 1.1.2.2
@@ -1,65 +1,3 @@
-From linux-audit-bounces at redhat.com Mon Jan 9 14:48:00 2006
-Return-path: <linux-audit-bounces at redhat.com>
-Envelope-to: dwmw2 at baythorne.infradead.org
-Delivery-date: Mon, 09 Jan 2006 14:48:00 +0000
-Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
- baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
- 1EvyJU-0008Ah-Ie for dwmw2 at baythorne.infradead.org; Mon, 09 Jan 2006
- 14:48:00 +0000
-Received: from hormel.redhat.com ([209.132.177.30]) by
- pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id
- 1EvyJS-00083r-Ac for dwmw2 at infradead.org; Mon, 09 Jan 2006 14:47:59 +0000
-Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
- [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 0081172F6B; Mon,
- 9 Jan 2006 09:47:57 -0500 (EST)
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
- [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP
- id k09Els3H012878 for <linux-audit at listman.util.phx.redhat.com>; Mon, 9 Jan
- 2006 09:47:55 -0500
-Received: from mail.boston.redhat.com (mail.boston.redhat.com
- [172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id
- k09Els116875 for <linux-audit at int-mx1.corp.redhat.com>; Mon, 9 Jan 2006
- 09:47:54 -0500
-Received: from discovery.boston.redhat.com (discovery.boston.redhat.com
- [172.16.80.171]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id
- k09ElsEg002852 for <linux-audit at redhat.com>; Mon, 9 Jan 2006 09:47:54 -0500
-From: Steve Grubb <sgrubb at redhat.com>
-Organization: Red Hat
-To: Linux Audit Discussion <linux-audit at redhat.com>
-Date: Mon, 9 Jan 2006 09:48:17 -0500
-User-Agent: KMail/1.9.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Disposition: inline
-Message-Id: <200601090948.17487.sgrubb at redhat.com>
-X-loop: linux-audit at redhat.com
-Subject: [PATCH] add/remove rule update
-X-BeenThere: linux-audit at redhat.com
-X-Mailman-Version: 2.1.5
-Precedence: junk
-List-Id: Linux Audit Discussion <linux-audit.redhat.com>
-List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/linux-audit>,
- <mailto:linux-audit-request at redhat.com?subject=unsubscribe>
-List-Archive: <https://www.redhat.com/archives/linux-audit>
-List-Post: <mailto:linux-audit at redhat.com>
-List-Help: <mailto:linux-audit-request at redhat.com?subject=help>
-List-Subscribe: <https://www.redhat.com/mailman/listinfo/linux-audit>,
- <mailto:linux-audit-request at redhat.com?subject=subscribe>
-Sender: linux-audit-bounces at redhat.com
-Errors-To: linux-audit-bounces at redhat.com
-X-Spam-Score: 0.0 (/)
-X-Evolution-Source: imap://dwmw2@pentafluge.infradead.org/
-Content-Transfer-Encoding: 8bit
-
-Hi,
-
-The following patch adds a little more information to the add/remove rule message emitted
-by the kernel.
-
-Signed-off-by: Steve Grubb <sgrubb at redhat.com>
-
-
-
diff -urp linux-2.6.14.orig/include/linux/audit.h linux-2.6.14/include/linux/audit.h
--- linux-2.6.14.orig/include/linux/audit.h 2006-01-05 10:13:30.000000000 -0500
+++ linux-2.6.14/include/linux/audit.h 2006-01-05 10:12:09.000000000 -0500
@@ -75,36 +13,29 @@
diff -urp linux-2.6.14.orig/kernel/auditfilter.c linux-2.6.14/kernel/auditfilter.c
--- linux-2.6.14.orig/kernel/auditfilter.c 2006-01-05 10:13:40.000000000 -0500
+++ linux-2.6.14/kernel/auditfilter.c 2006-01-05 10:11:29.000000000 -0500
-@@ -571,10 +571,10 @@ int audit_receive_filter(int type, int p
-
- err = audit_add_rule(entry,
- &audit_filter_list[entry->rule.listnr]);
+@@ -243,9 +243,9 @@ int audit_receive_filter(int type, int p
+ ;
+ }
+ err = audit_add_rule(data, &audit_filter_list[listnr]);
- if (!err)
- audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
- "auid=%u added an audit rule\n", loginuid);
-- else {
+ audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+ "auid=%u added rule to list=%d res=%d\n",
-+ loginuid, entry->rule.listnr, !err);
-+ if (err) {
- audit_free_watch(entry->rule.watch);
- kfree(entry);
- }
-@@ -590,9 +590,9 @@ int audit_receive_filter(int type, int p
++ loginuid, listnr, !err);
+ break;
+ case AUDIT_DEL:
+ listnr =((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND;
+@@ -253,9 +253,9 @@ int audit_receive_filter(int type, int p
+ return -EINVAL;
- err = audit_del_rule(entry,
- &audit_filter_list[entry->rule.listnr]);
+ err = audit_del_rule(data, &audit_filter_list[listnr]);
- if (!err)
- audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
- "auid=%u removed an audit rule\n", loginuid);
+ audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+ "auid=%u removed rule from list=%d res=%d\n",
-+ loginuid, entry->rule.listnr, !err);
- audit_free_watch(entry->rule.watch);
- kfree(entry);
++ loginuid, listnr, !err);
break;
-
---
-Linux-audit mailing list
-Linux-audit at redhat.com
-https://www.redhat.com/mailman/listinfo/linux-audit
+ default:
+ return -EINVAL;
More information about the fedora-cvs-commits
mailing list