SF.net SVN: gar:[26331] csw/mgar/pkg/rsyslog/trunk

[dmichelsen at users.sourceforge.net]

Revision: 26331
          http://sourceforge.net/p/gar/code/26331
Author:   dmichelsen
Date:     2018-01-19 10:49:51 +0000 (Fri, 19 Jan 2018)
Log Message:
-----------
rsyslog/trunk: Update to 8.32.0, disable liblognorm for now until it is ready

Modified Paths:
--------------
    csw/mgar/pkg/rsyslog/trunk/Makefile
    csw/mgar/pkg/rsyslog/trunk/checksums

Modified: csw/mgar/pkg/rsyslog/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/Makefile	2018-01-17 13:47:44 UTC (rev 26330)
+++ csw/mgar/pkg/rsyslog/trunk/Makefile	2018-01-19 10:49:51 UTC (rev 26331)
@@ -1,5 +1,5 @@
 NAME = rsyslog
-VERSION = 8.11.0
+VERSION = 8.32.0
 GARTYPE = v2
 
 DESCRIPTION = Enhanced multi-threaded syslogd with a focus on security and reliability
@@ -16,7 +16,7 @@
 #   0001-Forward-port-patch-from-pkgsrc.patch
 # until this is fixed:
 #   https://github.com/rsyslog/rsyslog/issues/417
-PATCHFILES += 0001-Forward-port-patch-from-pkgsrc.patch
+# PATCHFILES += 0001-Forward-port-patch-from-pkgsrc.patch
 
 BUILD_DEP_PKGS += CSWlibestr-dev
 BUILD_DEP_PKGS += CSWlibjson-c-dev
@@ -23,14 +23,14 @@
 BUILD_DEP_PKGS += CSWlibrelp-dev
 BUILD_DEP_PKGS += CSWliblogging-dev
 
-RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibgcc-s1
 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
-RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibjson-c3
-RUNTIME_DEP_PKGS_CSWrsyslog += CSWliblognorm2
+RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibfastjson4
+# RUNTIME_DEP_PKGS_CSWrsyslog += CSWliblognorm2
 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibdbi1
 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibssl1-0-0
@@ -39,15 +39,25 @@
 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibrelp0
 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibgnutls28
 
+# We need asprintf
+CHECKPKG_OVERRIDES_CSWrsyslog += forbidden-version-interface-dependencies|/opt/csw/lib/rsyslog/lmcry_gcry.so|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1
+CHECKPKG_OVERRIDES_CSWrsyslog += forbidden-version-interface-dependencies|/opt/csw/sbin/rsyslogd|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1
+
 # This is the SMF DTD
 CHECKPKG_OVERRIDES_CSWrsyslog += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswrsyslogd.xml
 
-GARCOMPILER = GNU
+# GARCOMPILER = GNU
+GARCOMPILER = SOS12U4
 
+EXTRA_CFLAGS += -std=c99
+
 # We need libnet. See for details
 #   http://wiki.opencsw.org/project-libnet
 EXTRA_LDFLAGS = -L$(libdir)/libnet-new
 
+# We need asprintf
+LINKER_MAPS =
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-imsolaris
 
@@ -61,7 +71,8 @@
 CONFIGURE_ARGS += --enable-elasticsearch
 CONFIGURE_ARGS += --enable-gnutls
 CONFIGURE_ARGS += --enable-mail
-CONFIGURE_ARGS += --enable-mmnormalize
+# Disable for now until liblognorm can get updated
+# CONFIGURE_ARGS += --enable-mmnormalize
 CONFIGURE_ARGS += --enable-mmjsonparse
 CONFIGURE_ARGS += --enable-mmaudit
 CONFIGURE_ARGS += --enable-mmanon

Modified: csw/mgar/pkg/rsyslog/trunk/checksums
===================================================================
--- csw/mgar/pkg/rsyslog/trunk/checksums	2018-01-17 13:47:44 UTC (rev 26330)
+++ csw/mgar/pkg/rsyslog/trunk/checksums	2018-01-19 10:49:51 UTC (rev 26331)
@@ -1 +1 @@
-35f0b7024ae7b5677e49f14f36304d77  rsyslog-8.11.0.tar.gz
+0811aad3186bcae3b2dcd92063d9eb1d  rsyslog-8.32.0.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.