SF.net SVN: gar:[25146] csw/mgar/pkg/liblogging/trunk

[dmichelsen at users.sourceforge.net]

Revision: 25146
          http://sourceforge.net/p/gar/code/25146
Author:   dmichelsen
Date:     2015-07-01 14:18:22 +0000 (Wed, 01 Jul 2015)
Log Message:
-----------
liblogging/trunk: Enable RFC3195 support

Modified Paths:
--------------
    csw/mgar/pkg/liblogging/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/liblogging/trunk/files/0001-endif-must-be-on-next-line.patch

Modified: csw/mgar/pkg/liblogging/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblogging/trunk/Makefile	2015-07-01 13:27:11 UTC (rev 25145)
+++ csw/mgar/pkg/liblogging/trunk/Makefile	2015-07-01 14:18:22 UTC (rev 25146)
@@ -10,22 +10,37 @@
 MASTER_SITES = http://download.rsyslog.com/liblogging/
 DISTFILES += $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-endif-must-be-on-next-line.patch
+
 VENDOR_URL = http://www.liblogging.org
 
 PACKAGES += CSWliblogging-stdlog0
-SPKG_DESC_CSWliblogging-stdlog0 =  An easy to use logging library
+SPKG_DESC_CSWliblogging-stdlog0 =  An easy to use logging library, liblogginstdlog.so.0
 PKGFILES_CSWliblogging-stdlog0 += $(call pkgfiles_lib,liblogging-stdlog.so.0)
 
-PACKAGES += CSWliblogging-stdlog-dev
-SPKG_DESC_CSWliblogging-stdlog-dev = Development files for liblogging-stdlog.so.0
+PACKAGES += CSWliblogging-rfc3195-0
+SPKG_DESC_CSWliblogging-rfc3195-0 = An easy to use logging library for the RFC3150 standard, liblogging-rfc3195.so.0
+PKGFILES_CSWliblogging-rfc3195-0 += $(call pkgfiles_lib,liblogging-rfc3195.so.0)
+
+PACKAGES += CSWliblogging-dev
+SPKG_DESC_CSWliblogging-dev = Development files for liblogging-stdlog.so.0, liblogging-rfc3195.so.0
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWliblogging-stdlog-dev += CSWliblogging-stdlog0
+RUNTIME_DEP_PKGS_CSWliblogging-dev += CSWliblogging-stdlog0
+RUNTIME_DEP_PKGS_CSWliblogging-dev += CSWliblogging-rfc3195-0
 
+OBSOLETED_BY_CSWliblogging-dev += CSWliblogging-stdlog-dev
+
+# This is needed for rfc3195 support
+EXTRA_CPPFLAGS += -DSROS_Solaris
+
+# For recv, ...
+EXTRA_LINKER_FLAGS += -lsocket -lnsl
+
 CONFIGURE_ARGS += $(DIRPATHS)
 # This is SystemD, why does it not detect that there is no SystemD?
 CONFIGURE_ARGS += --disable-journal
 # This is disabled by default and does not compile out-of-the-box, leave it off for now
-# CONFIGURE_ARGS += --enable-rfc3195
+CONFIGURE_ARGS += --enable-rfc3195
 
 BUILD64 = 1
 

Added: csw/mgar/pkg/liblogging/trunk/files/0001-endif-must-be-on-next-line.patch
===================================================================
--- csw/mgar/pkg/liblogging/trunk/files/0001-endif-must-be-on-next-line.patch	                        (rev 0)
+++ csw/mgar/pkg/liblogging/trunk/files/0001-endif-must-be-on-next-line.patch	2015-07-01 14:18:22 UTC (rev 25146)
@@ -0,0 +1,38 @@
+From 7b1bbae3411325a8b59434ee2e858b096975602e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 1 Jul 2015 15:52:43 +0200
+Subject: [PATCH] endif must be on next line
+
+---
+ rfc3195/src/oscallsUnix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rfc3195/src/oscallsUnix.c b/rfc3195/src/oscallsUnix.c
+index 4d3864d..d22dd57 100644
+--- a/rfc3195/src/oscallsUnix.c
++++ b/rfc3195/src/oscallsUnix.c
+@@ -77,6 +77,7 @@ srRetVal getCurrTime(int* year, int* month, int* day, int *hour, int* minute, in
+      */
+     lBias = -(daylight ? altzone : timezone);
+ #else
+-	lBias = tm->tm_gmtoff;
+#endif
++	lBias = tm->tm_gmtoff;
++#endif
+ 	if(lBias < 0)
+	{
+		*pcOffsetMode = '-';
+		lBias *= -1;
+	}
+	else
+		*pcOffsetMode = '+';
+
+	*pOffsetHour = lBias / 3600;
+	*pOffsetMinute = lBias % 3600;
+
+ 	return SR_RET_OK;
+}
+
+-- 
+2.4.0
+

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