Trivial patches

Trivial patches

[Laurent Bigonville]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

Hi,

Could you please merge the following patches that have been proposed to 
debian by Nicolas Braud-Santoni?

The patches add the Documentation key in the .service file and also fix 
some typos.

Cheers,

Laurent Bigonville


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 02-Fix-typos-in-manpages-and-messages.patch --]
[-- Type: text/x-patch; name="02-Fix-typos-in-manpages-and-messages.patch", Size: 4672 bytes --]

From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Tue, 28 Jun 2016 22:59:59 +0200
Subject: Fix typos in manpages and messages

---
 bindings/python/auparse_python.c | 6 +++---
 docs/auditd.conf.5               | 2 +-
 docs/auparse_find_field.3        | 2 +-
 docs/auparse_find_field_next.3   | 4 ++--
 tools/auvirt/auvirt.8            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bindings/python/auparse_python.c b/bindings/python/auparse_python.c
index 6ec22c9..37d99be 100644
--- a/bindings/python/auparse_python.c
+++ b/bindings/python/auparse_python.c
@@ -1383,7 +1383,7 @@ PyDoc_STRVAR(find_field_doc,
 "find_field(name) Search for field name.\n\
 \n\
 find_field() will scan all records in an event to find the first\n\
-occurance of the field name passed to it. Searching begins from the\n\
+occurence of the field name passed to it. Searching begins from the\n\
 cursor’s current position. The field name is stored for subsequent\n\
 searching.\n\
 \n\
@@ -1413,9 +1413,9 @@ const char *auparse_find_field_next(auparse_state_t *au);
  * auparse_find_field_next
  ********************************/
 PyDoc_STRVAR(find_field_next_doc,
-"find_field_next() Get next occurrance of field name\n\
+"find_field_next() Get next occurrence of field name\n\
 \n\
-find_field_next() returns the value associated next occurrance of field name.\n\
+find_field_next() returns the value associated next occurrence of field name.\n\
 Returns value associated with field or None if there is no next field.\n\
 Raises exception (EnvironmentError) on error.\n\
 ");
diff --git a/docs/auditd.conf.5 b/docs/auditd.conf.5
index 6715341..6a16c21 100644
--- a/docs/auditd.conf.5
+++ b/docs/auditd.conf.5
@@ -204,7 +204,7 @@ means that it will issue a warning to syslog.
 .I rotate
 will rotate logs, losing the oldest to free up space.
 .I exec
-/path-to-script will execute the script. You cannot pass parameters to the script. The script is also responsible for telling the auditd daemon to resume loggin
+/path-to-script will execute the script. You cannot pass parameters to the script. The script is also responsible for telling the auditd daemon to resume login
 g once its completed its action. This can be done by adding service auditd resume to the script.
 .I Suspend
 will cause the audit daemon to stop writing records to the disk. The daemon will still be alive. The
diff --git a/docs/auparse_find_field.3 b/docs/auparse_find_field.3
index 4062588..a9db80e 100644
--- a/docs/auparse_find_field.3
+++ b/docs/auparse_find_field.3
@@ -8,7 +8,7 @@ const char *auparse_find_field(auparse_state_t *au, const char *name);
 
 .SH "DESCRIPTION"
 
-auparse_find_field will scan all records in an event to find the first occurance of the field name passed to it. Searching begins from the cursor's current position. The field name is stored for subsequent searching.
+auparse_find_field will scan all records in an event to find the first occurrence of the field name passed to it. Searching begins from the cursor's current position. The field name is stored for subsequent searching.
 
 .SH "RETURN VALUE"
 
diff --git a/docs/auparse_find_field_next.3 b/docs/auparse_find_field_next.3
index f072fe7..e921080 100644
--- a/docs/auparse_find_field_next.3
+++ b/docs/auparse_find_field_next.3
@@ -1,6 +1,6 @@
 .TH "AUPARSE_FIND_FIELD_NEXT" "3" "Feb 2007" "Red Hat" "Linux Audit API"
 .SH NAME
-auparse_find_field_next \- find next occurrance of field name
+auparse_find_field_next \- find next occurrence of field name
 .SH "SYNOPSIS"
 .B #include <auparse.h>
 .sp
@@ -8,7 +8,7 @@ const char *auparse_find_field_next(auparse_state_t *au);
 
 .SH "DESCRIPTION"
 
-auparse_find_field_next finds the next occurrance of the previously stored field name. It will scan until it reaches the last record of the current event.
+auparse_find_field_next finds the next occurrence of the previously stored field name. It will scan until it reaches the last record of the current event.
 
 .SH "RETURN VALUE"
 
diff --git a/tools/auvirt/auvirt.8 b/tools/auvirt/auvirt.8
index 96123f4..1fbc1f5 100644
--- a/tools/auvirt/auvirt.8
+++ b/tools/auvirt/auvirt.8
@@ -13,7 +13,7 @@ guest, both UUID or VM name can be given.
 
 For each guest session the tool prints a record with the domain name, the user
 that started the guest, the time when the guest was started and the time when
-the guest was stoped.
+the guest was stopped.
 
 If the option "\-\-all\-events" is given a more detailed output is shown. In this
 mode other records are shown for guest's stops, resource

[-- Attachment #3: 0003-Add-documentation-links-in-systemd-unit-file.patch --]
[-- Type: text/x-patch, Size: 640 bytes --]

From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Tue, 28 Jun 2016 23:25:01 +0200
Subject: Add documentation links in systemd unit file

---
 init.d/auditd.service | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/auditd.service b/init.d/auditd.service
index cb0ebfb..0793a92 100644
--- a/init.d/auditd.service
+++ b/init.d/auditd.service
@@ -5,6 +5,7 @@ After=local-fs.target systemd-tmpfiles-setup.service
 Conflicts=shutdown.target
 Before=sysinit.target shutdown.target
 ConditionKernelCommandLine=!audit=0
+Documentation=man:auditd(8) https://people.redhat.com/sgrubb/audit/
 
 [Service]
 ExecStart=/sbin/auditd -n

[-- Attachment #4: Type: text/plain, Size: 0 bytes --]

Re: Trivial patches

[Steve Grubb]

Hello,

On Tuesday, July 12, 2016 5:15:01 PM EDT Laurent Bigonville wrote:
> Could you please merge the following patches that have been proposed to
> debian by Nicolas Braud-Santoni?

Yes, thanks.

> The patches add the Documentation key in the .service file and also fix
> some typos.

They are now applied. If anyone has any other bug fixes, please send them. 
There will be a 2.6.5 release later this week that fixes events in the old 
format that get passed to plugins such as selinux troubleshooter. This is 
commit 1342 in case anyone needs it today.

-Steve