Revision: 26721
http://sourceforge.net/p/gar/code/26721
Author: dmichelsen
Date: 2020-12-29 14:01:17 +0000 (Tue, 29 Dec 2020)
Log Message:
-----------
rsyslog/trunk: Update to 8.2012.0 and enable omkafka
Modified Paths:
--------------
csw/mgar/pkg/rsyslog/trunk/Makefile
csw/mgar/pkg/rsyslog/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/rsyslog/trunk/files/0001-Use-correct-type.patch
Modified: csw/mgar/pkg/rsyslog/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/Makefile 2020-12-29 13:17:31 UTC (rev 26720)
+++ csw/mgar/pkg/rsyslog/trunk/Makefile 2020-12-29 14:01:17 UTC (rev 26721)
@@ -1,5 +1,5 @@
NAME = rsyslog
-VERSION = 8.2008.0
+VERSION = 8.2012.0
GARTYPE = v2
DESCRIPTION = Enhanced multi-threaded syslogd with a focus on security and
reliability
@@ -7,15 +7,11 @@
Enhanced multi-threaded syslogd with a focus on security and reliability
endef
-MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/
+MASTER_SITES = https://www.rsyslog.com/files/download/rsyslog/
DISTFILES += $(DISTNAME).tar.gz
DISTFILES += cswrsyslogd.xml
DISTFILES += rsyslog.conf
-# Use patch until this is fixed:
-# https://github.com/rsyslog/rsyslog/issues/417
-PATCHFILES += 0001-Use-correct-type.patch
-
BUILD_DEP_PKGS += CSWlibestr-dev
BUILD_DEP_PKGS += CSWlibjson-c-dev
BUILD_DEP_PKGS += CSWlibrelp-dev
@@ -34,6 +30,7 @@
RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibnet1
RUNTIME_DEP_PKGS_CSWrsyslog += CSWliblogging-rfc3195-0
RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibrelp0
+RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibrdkafka1
RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibgnutls28
RUNTIME_DEP_PKGS_CSWrsyslog += $(RUNTIME_DEP_PKGS_CSWrsyslog-$(GARCH))
@@ -98,7 +95,7 @@
CONFIGURE_ARGS += --enable-mmsnmptrapd
# CONFIGURE_ARGS += --enable-omhdfs
-# CONFIGURE_ARGS += --enable-omkafka
+CONFIGURE_ARGS += --enable-omkafka
# CONFIGURE_ARGS += --enable-ommongodb
# CONFIGURE_ARGS += --enable-imzmq3
# CONFIGURE_ARGS += --enable-imczmq
Modified: csw/mgar/pkg/rsyslog/trunk/checksums
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/checksums 2020-12-29 13:17:31 UTC (rev
26720)
+++ csw/mgar/pkg/rsyslog/trunk/checksums 2020-12-29 14:01:17 UTC (rev
26721)
@@ -1 +1 @@
-9b6ae1a517231764ad4fbd68181cc23e rsyslog-8.2008.0.tar.gz
+2a64947e3d157c0198609aabd37be42f rsyslog-8.2012.0.tar.gz
Deleted: csw/mgar/pkg/rsyslog/trunk/files/0001-Use-correct-type.patch
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/files/0001-Use-correct-type.patch
2020-12-29 13:17:31 UTC (rev 26720)
+++ csw/mgar/pkg/rsyslog/trunk/files/0001-Use-correct-type.patch
2020-12-29 14:01:17 UTC (rev 26721)
@@ -1,34 +0,0 @@
-From 364d4a92d76243ccf7b3e8c8039e3ab2acebdd76 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Mon, 7 Sep 2020 13:29:32 +0200
-Subject: [PATCH] Use correct type
-
----
- plugins/omudpspoof/omudpspoof.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c
-index f0906bf..2848cba 100644
---- a/plugins/omudpspoof/omudpspoof.c
-+++ b/plugins/omudpspoof/omudpspoof.c
-@@ -371,7 +371,7 @@ UDPSend(wrkrInstanceData_t *pWrkrData, uchar
*pszSourcename, char *msg, size_t l
- * divided by 8 */
- unsigned msgOffs, hdrOffs;
- unsigned maxPktLen, pktLen, udpPktLen;
-- u_int16_t ip_id;
-+ uint16_t ip_id;
- DEFiRet;
-
- if(pWrkrData->pSockArray == NULL) {
-@@ -393,7 +393,7 @@ UDPSend(wrkrInstanceData_t *pWrkrData, uchar
*pszSourcename, char *msg, size_t l
- /* We need a non-zero id number for the IP headers,
- * otherwise libnet will increase it after each
- * build_ipv4, breaking the fragments */
-- ip_id = (u_int16_t)libnet_get_prand(LIBNET_PR16);
-+ ip_id = (uint16_t)libnet_get_prand(LIBNET_PR16);
-
- inet_pton(AF_INET, (char*)pszSourcename, &(source_ip.sin_addr));
- bSendSuccess = RSFALSE;
---
-2.4.0
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
