Revision: 26698
http://sourceforge.net/p/gar/code/26698
Author: dmichelsen
Date: 2020-09-07 11:57:33 +0000 (Mon, 07 Sep 2020)
Log Message:
-----------
rsyslog/trunk: Update to 8.2008.0
Modified Paths:
--------------
csw/mgar/pkg/rsyslog/trunk/Makefile
csw/mgar/pkg/rsyslog/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/rsyslog/trunk/files/0001-Use-correct-type.patch
Removed Paths:
-------------
csw/mgar/pkg/rsyslog/trunk/files/0001-Forward-port-patch-from-pkgsrc.patch
Modified: csw/mgar/pkg/rsyslog/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/Makefile 2020-09-07 09:52:41 UTC (rev 26697)
+++ csw/mgar/pkg/rsyslog/trunk/Makefile 2020-09-07 11:57:33 UTC (rev 26698)
@@ -1,5 +1,5 @@
NAME = rsyslog
-VERSION = 8.34.0
+VERSION = 8.2008.0
GARTYPE = v2
DESCRIPTION = Enhanced multi-threaded syslogd with a focus on security and
reliability
@@ -12,11 +12,9 @@
DISTFILES += cswrsyslogd.xml
DISTFILES += rsyslog.conf
-# Use patch from
-# 0001-Forward-port-patch-from-pkgsrc.patch
-# until this is fixed:
+# Use patch until this is fixed:
# https://github.com/rsyslog/rsyslog/issues/417
-# PATCHFILES += 0001-Forward-port-patch-from-pkgsrc.patch
+PATCHFILES += 0001-Use-correct-type.patch
BUILD_DEP_PKGS += CSWlibestr-dev
BUILD_DEP_PKGS += CSWlibjson-c-dev
@@ -24,7 +22,6 @@
BUILD_DEP_PKGS += CSWliblogging-dev
RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibz1
-RUNTIME_DEP_PKGS_CSWrsyslog += CSWliblogging-stdlog0
RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibuuid1
RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibestr0
RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibgcrypt20
Modified: csw/mgar/pkg/rsyslog/trunk/checksums
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/checksums 2020-09-07 09:52:41 UTC (rev
26697)
+++ csw/mgar/pkg/rsyslog/trunk/checksums 2020-09-07 11:57:33 UTC (rev
26698)
@@ -1 +1 @@
-19a21c83d77f7df4f4f3c4e486c00659 rsyslog-8.34.0.tar.gz
+9b6ae1a517231764ad4fbd68181cc23e rsyslog-8.2008.0.tar.gz
Deleted:
csw/mgar/pkg/rsyslog/trunk/files/0001-Forward-port-patch-from-pkgsrc.patch
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/files/0001-Forward-port-patch-from-pkgsrc.patch
2020-09-07 09:52:41 UTC (rev 26697)
+++ csw/mgar/pkg/rsyslog/trunk/files/0001-Forward-port-patch-from-pkgsrc.patch
2020-09-07 11:57:33 UTC (rev 26698)
@@ -1,46 +0,0 @@
-From 6658fe23e1e199cb1c0cead031c97fe2995c53e8 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Wed, 1 Jul 2015 22:47:56 +0200
-Subject: [PATCH] Forward-port patch from pkgsrc
-
----
- plugins/imfile/imfile.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
-index 3d6e8ef..bc3d73b 100644
---- a/plugins/imfile/imfile.c
-+++ b/plugins/imfile/imfile.c
-@@ -1763,10 +1763,14 @@ BEGINrunInput
- CODESTARTrunInput
- DBGPRINTF("imfile: working in %s mode\n",
- (runModConf->opMode == OPMODE_POLLING) ? "polling" :
"inotify");
-+#if HAVE_INOTIFY_INIT
- if(runModConf->opMode == OPMODE_POLLING)
- iRet = doPolling();
- else
- iRet = do_inotify();
-+#else
-+ iRet = doPolling();
-+#endif
-
- DBGPRINTF("imfile: terminating upon request of rsyslog core\n");
- ENDrunInput
-@@ -1869,12 +1873,14 @@ CODESTARTmodExit
- objRelease(errmsg, CORE_COMPONENT);
- objRelease(prop, CORE_COMPONENT);
- objRelease(ruleset, CORE_COMPONENT);
-+#if HAVE_INOTIFY_INIT
- if(dirs != NULL) {
- free(dirs->active.listeners);
- free(dirs->configured.listeners);
- free(dirs);
- }
- free(wdmap);
-+#endif /* #if HAVE_INOTIFY_INIT */
- ENDmodExit
-
-
---
-2.4.0
-
Added: csw/mgar/pkg/rsyslog/trunk/files/0001-Use-correct-type.patch
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/files/0001-Use-correct-type.patch
(rev 0)
+++ csw/mgar/pkg/rsyslog/trunk/files/0001-Use-correct-type.patch
2020-09-07 11:57:33 UTC (rev 26698)
@@ -0,0 +1,34 @@
+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.
