rebase audit patch to CentOS7.5

Story: 2003389
Task: 24507

Change-Id: Id8d4d1674f20c264489264836a1cceb62c9efeaa
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-08-15 04:04:59 +08:00 committed by chenyan
parent 2f1aaac5ad
commit 3fd3486f27
3 changed files with 19 additions and 19 deletions

View File

@ -1,25 +1,25 @@
From c680a0f4c0cd01a575a3d0a79ba1356cb8c03012 Mon Sep 17 00:00:00 2001 From 5f712d1cb936ace204ccbbcb8cc0002f7ee2cd76 Mon Sep 17 00:00:00 2001
From: Kam Nasim <kam.nasim@windriver.com> From: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 6 Oct 2017 14:26:03 -0400 Date: Fri, 6 Oct 2017 14:26:03 -0400
Subject: [PATCH] Update package versioning for TIS format Subject: [PATCH 1/2] Update package versioning for TIS format
--- ---
SPECS/audit.spec | 2 +- SPECS/audit.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/audit.spec b/SPECS/audit.spec diff --git a/SPECS/audit.spec b/SPECS/audit.spec
index 74b6e7a..f1b28fb 100644 index ad10844..2bbd782 100644
--- a/SPECS/audit.spec --- a/SPECS/audit.spec
+++ b/SPECS/audit.spec +++ b/SPECS/audit.spec
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
Summary: User space tools for 2.6 kernel auditing Summary: User space tools for 2.6 kernel auditing
Name: audit Name: audit
Version: 2.7.6 Version: 2.8.1
-Release: 3%{?dist} -Release: 3%{?dist}
+Release: 3.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 3.el7%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+ License: GPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://people.redhat.com/sgrubb/audit/ URL: http://people.redhat.com/sgrubb/audit/
-- --
1.8.3.1 2.7.4

View File

@ -1,20 +1,20 @@
From f0d91192bc8778899d01e7723ababcf7a3808c91 Mon Sep 17 00:00:00 2001 From dc0677a11cede908f266ce4695320759b4694d18 Mon Sep 17 00:00:00 2001
From: Kam Nasim <kam.nasim@windriver.com> From: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 6 Oct 2017 14:10:25 -0400 Date: Fri, 6 Oct 2017 14:10:25 -0400
Subject: [PATCH] meta patch for enabling audispd and LOG_AUTH facility Subject: [PATCH 2/2] meta patch for enabling audispd and LOG_AUTH facility
--- ---
SPECS/audit.spec | 7 +++++++ SPECS/audit.spec | 7 +++++++
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
diff --git a/SPECS/audit.spec b/SPECS/audit.spec diff --git a/SPECS/audit.spec b/SPECS/audit.spec
index e144332..a188b89 100644 index 2bbd782..9e70f5d 100644
--- a/SPECS/audit.spec --- a/SPECS/audit.spec
+++ b/SPECS/audit.spec +++ b/SPECS/audit.spec
@@ -16,6 +16,10 @@ Patch2: audit-2.7.5-no-backlog-wait-time.patch @@ -20,6 +20,10 @@ Patch4: audit-2.8.2-ipv6-bind.patch
Patch3: audit-2.7.7-queue_error_action.patch Patch5: audit-2.8.2-fix-reset-lost-return.patch
# BZ 1460110 - aureport does not report all anomalies # This patch makes date a numeric field so auparse_search works
Patch4: audit-2.7.7-aureport.patch Patch6: audit-2.8.2-auparse-numeric_field.patch
+ +
+# WRS Patches +# WRS Patches
+Patch1000: 0001-enable-audispd-and-auth-facility.patch +Patch1000: 0001-enable-audispd-and-auth-facility.patch
@ -22,16 +22,16 @@ index e144332..a188b89 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: swig BuildRequires: swig
@@ -95,6 +99,9 @@ behavior. @@ -100,6 +104,9 @@ like relay events to remote machines.
%patch3 -p1 %patch5 -p1
%patch4 -p1 %patch6 -p1
+# WRS patches +# WRS patches
+%patch1000 -p1 +%patch1000 -p1
+ +
%build %build
%configure --sbindir=/sbin --libdir=/%{_lib} --with-python=yes --with-libwrap --enable-gssapi-krb5=yes --with-libcap-ng=yes --with-arm --with-aarch64 \ %configure --sbindir=/sbin --libdir=/%{_lib} --with-python=yes \
--without-golang --enable-zos-remote --enable-systemd --with-libwrap --enable-gssapi-krb5=yes \
-- --
1.9.1 2.7.4

View File

@ -1 +1 @@
mirror:Source/audit-2.7.6-3.el7.src.rpm mirror:Source/audit-2.8.1-3.el7.src.rpm