[packages/syslog-ng] - upstream fix for compilation errors in pacct module

hawk hawk at pld-linux.org
Thu Jul 4 15:02:38 CEST 2013


commit d1e07e81540ba51cc3bbae9c8f92d0b232dbaa5d
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Thu Jul 4 13:05:46 2013 +0000

    - upstream fix for compilation errors in pacct module

 syslog-ng-pacct.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
---
diff --git a/syslog-ng-pacct.patch b/syslog-ng-pacct.patch
new file mode 100644
index 0000000..3b8ab1e
--- /dev/null
+++ b/syslog-ng-pacct.patch
@@ -0,0 +1,56 @@
+From 095667af0a837cb4df965764bc89730796e0a94d Mon Sep 17 00:00:00 2001
+From: Balazs Scheidler <bazsi at balabit.hu>
+Date: Mon, 25 Mar 2013 21:56:19 +0100
+Subject: [PATCH] pacct: fixed compilation errors
+
+This plugin has rotten somewhat and become uncompilable, fixed all compilation
+issues.
+
+Signed-off-by: Balazs Scheidler <bazsi at balabit.hu>
+---
+ modules/pacctformat/pacct-format.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/modules/pacctformat/pacct-format.c b/modules/pacctformat/pacct-format.c
+index 646e3a0..597635c 100644
+--- a/modules/pacctformat/pacct-format.c
++++ b/modules/pacctformat/pacct-format.c
+@@ -23,6 +23,7 @@
+ 
+ #include "pacct-format.h"
+ #include "logmsg.h"
++#include "logproto-record-server.h"
+ 
+ /* we're using the Linux header as the glibc one is incomplete */
+ #include <linux/acct.h>
+@@ -96,7 +97,7 @@
+ }
+ 
+ void
+-pacct_format_handler(MsgFormatOptions *options, const guchar *data, gsize length, LogMessage *msg)
++pacct_format_handler(const MsgFormatOptions *options, const guchar *data, gsize length, LogMessage *msg)
+ {
+   acct_t *rec;
+   gsize len;
+@@ -151,14 +152,14 @@
+   log_msg_set_value(msg, handle_ac_comm, rec->ac_comm, len);
+ }
+ 
+-void
+-pacct_construct_proto(MsgFormatOptions *options, LogTransport *transport, const LogProtoOptions *options)
++static LogProtoServer *
++pacct_construct_proto(const MsgFormatOptions *options, LogTransport *transport, const LogProtoServerOptions *proto_options)
+ {
+-  return log_proto_binary_record_server_new(transport, options, sizeof(acct_t));
++  return log_proto_binary_record_server_new(transport, proto_options, sizeof(acct_t));
+ }
+ 
+ MsgFormatHandler pacct_handler =
+ {
+-  .alter_proto_options = pacct_alter_proto_options,
++  .construct_proto = pacct_construct_proto,
+   .parse = &pacct_format_handler
+ };
+-- 
+1.8.1.6
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/887b46cae647bd1c9b36105686302e36260b424f



More information about the pld-cvs-commit mailing list