Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (65d9e8013e428be6e5f4f58e96d96b4f49d42148)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (65d9e8013e428be6e5f4f58e96d96b4f49d42148)
  • Date: Sat, 29 Oct 2022 20:07:09 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

security/audit/DETAILS | 4
security/audit/HISTORY | 7 +
security/audit/PRE_BUILD | 4
security/audit/logging.patch | 54
----------
security/audit/patches/audit-3.0.9-flex-array-workaround.patch | 36 ++++++
5 files changed, 48 insertions(+), 57 deletions(-)

New commits:
commit 65d9e8013e428be6e5f4f58e96d96b4f49d42148
Author: Conner <connerclere AT gmail.com>
Commit: Pavel Vinogradov <public AT sourcemage.org>

audit: => 3.0.9, patch flex array swig bug

diff --git a/security/audit/DETAILS b/security/audit/DETAILS
index fac6440..27318e6 100755
--- a/security/audit/DETAILS
+++ b/security/audit/DETAILS
@@ -1,9 +1,9 @@
SPELL="audit"
- VERSION="2.8.3"
+ VERSION="3.0.9"
PATCHLEVEL=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]="http://people.redhat.com/sgrubb/${SPELL}/${SOURCE}";
-
SOURCE_HASH=sha512:aa939b81a66111f4e466208d7a38414bd186d00ccd374b420439764905b4707bbfcdc2331a6179a080fca981d19171696ecabd26674205b2f9339c44954db933
+
SOURCE_HASH=sha512:5219eb0b41746eca3406008a97731c0083e7be50ec88563a39537de22cb69fe88490f5fe5a11535930f360b11a62538e2ff6cbe39e059cd760038363954ef4d6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOC_DIRS=""
WEB_SITE="http://people.redhat.com/sgrubb/audit/";
diff --git a/security/audit/HISTORY b/security/audit/HISTORY
index 01302c0..6eec0a2 100644
--- a/security/audit/HISTORY
+++ b/security/audit/HISTORY
@@ -1,3 +1,10 @@
+2022-10-29 Conner Clere <connerclere AT gmail.com>
+ * DETAILS: version 3.0.9
+ * PRE_BUILD: copy audit.h from /usr/include/linux/; apply patch
+ * logging.patch: removed, no longer needed
+ * patches/audit-3.0.9-flex-array-workaround.patch: added, fixes
+ flex array issue in relation to swig
+
2018-03-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply patch
diff --git a/security/audit/PRE_BUILD b/security/audit/PRE_BUILD
index 7bf2a96..9f04a10 100755
--- a/security/audit/PRE_BUILD
+++ b/security/audit/PRE_BUILD
@@ -1,7 +1,9 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-patch -p1 < "${SPELL_DIRECTORY}/logging.patch" &&
+cp ${TRACK_ROOT}/usr/include/linux/audit.h ./lib/ &&
+
+apply_patch_dir patches &&

sedit "/auditd.init/d" init.d/Makefile.am &&

diff --git a/security/audit/logging.patch b/security/audit/logging.patch
deleted file mode 100644
index 102467f..0000000
--- a/security/audit/logging.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 623c4868441848ff81763dc9a73fe490d805bd14 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb AT redhat.com>
-Date: Mon, 26 Mar 2018 16:44:20 -0400
-Subject: [PATCH] Fix log file check/creation when file logging is disabled
- entirely. This is specifically useful when you have syslog logging module
- enabled, and dont want to leave unnecessary cruft such as empty log files.
- Reported by Vlad Glagolev
-
----
- src/auditd-config.c | 9 ++++-----
- src/auditd-event.c | 3 +++
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/auditd-config.c b/src/auditd-config.c
-index 921fdda..ccadcdd 100644
---- a/src/auditd-config.c
-+++ b/src/auditd-config.c
-@@ -619,11 +619,9 @@ static int log_file_parser(struct nv_pair *nv, int line,
-
- fd = open(nv->value, mode);
- if (fd < 0) {
-- if (errno == ENOENT) {
-- fd = create_log_file(nv->value);
-- if (fd < 0)
-- return 1;
-- } else {
-+ if (errno == ENOENT)
-+ goto finish_up; // Will create the log later
-+ else {
- audit_msg(LOG_ERR, "Unable to open %s (%s)",
nv->value,
- strerror(errno));
- return 1;
-@@ -652,6 +650,7 @@ static int log_file_parser(struct nv_pair *nv, int line,
- audit_msg(LOG_WARNING, "audit log is not writable by owner");
- }
-
-+finish_up:
- free((void *)config->log_file);
- config->log_file = strdup(nv->value);
- if (config->log_file == NULL)
-diff --git a/src/auditd-event.c b/src/auditd-event.c
-index dab9bd8..5944123 100644
---- a/src/auditd-event.c
-+++ b/src/auditd-event.c
-@@ -1120,6 +1120,9 @@ static int open_audit_log(void)
- {
- int flags, lfd;
-
-+ if (config->write_logs == 0)
-+ return 0;
-+
- flags = O_WRONLY|O_APPEND|O_NOFOLLOW;
- if (config->flush == FT_DATA)
- flags |= O_DSYNC;
diff --git a/security/audit/patches/audit-3.0.9-flex-array-workaround.patch
b/security/audit/patches/audit-3.0.9-flex-array-workaround.patch
new file mode 100644
index 0000000..c6b977a
--- /dev/null
+++ b/security/audit/patches/audit-3.0.9-flex-array-workaround.patch
@@ -0,0 +1,36 @@
+diff --color -urp audit-3.0.9.orig/bindings/swig/src/auditswig.i
audit-3.0.9/bindings/swig/src/auditswig.i
+--- audit-3.0.9.orig/bindings/swig/src/auditswig.i 2022-08-29
16:22:06.000000000 -0500
++++ audit-3.0.9/bindings/swig/src/auditswig.i 2022-10-29 13:26:54.888006805
-0500
+@@ -39,7 +39,7 @@ signed
+ #define __attribute(X) /*nothing*/
+ typedef unsigned __u32;
+ typedef unsigned uid_t;
+-%include "/usr/include/linux/audit.h"
++%include "../lib/libaudit.h"
+ #define __extension__ /*nothing*/
+ %include <stdint.i>
+ %include "../lib/libaudit.h"
+diff --color -urp audit-3.0.9.orig/lib/audit.h audit-3.0.9/lib/audit.h
+--- audit-3.0.9.orig/lib/audit.h 2022-10-29 13:24:59.853245373 -0500
++++ audit-3.0.9/lib/audit.h 2022-10-29 13:27:27.720241256 -0500
+@@ -514,7 +514,7 @@ struct audit_rule_data {
+ __u32 values[AUDIT_MAX_FIELDS];
+ __u32 fieldflags[AUDIT_MAX_FIELDS];
+ __u32 buflen; /* total length of string fields */
+- char buf[]; /* string fields buffer */
++ char buf[0]; /* string fields buffer */
+ };
+
+ #endif /* _LINUX_AUDIT_H_ */
+diff --color -urp audit-3.0.9.orig/lib/libaudit.h audit-3.0.9/lib/libaudit.h
+--- audit-3.0.9.orig/lib/libaudit.h 2022-08-29 16:22:06.000000000 -0500
++++ audit-3.0.9/lib/libaudit.h 2022-10-29 13:28:06.161512389 -0500
+@@ -27,7 +27,7 @@
+ #include <stdint.h>
+ #include <sys/socket.h>
+ #include <linux/netlink.h>
+-#include <linux/audit.h>
++#include "audit.h"
+ #include <stdarg.h>
+ #include <syslog.h>
+ #ifndef __attr_access



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (65d9e8013e428be6e5f4f58e96d96b4f49d42148), Pavel Vinogradov, 10/29/2022

Archive powered by MHonArc 2.6.24.

Top of Page