Revision: 26410
http://sourceforge.net/p/gar/code/26410
Author: dmichelsen
Date: 2018-04-26 09:54:18 +0000 (Thu, 26 Apr 2018)
Log Message:
-----------
liblognorm/trunk: Update to 2.0.5
Modified Paths:
--------------
csw/mgar/pkg/liblognorm/trunk/Makefile
csw/mgar/pkg/liblognorm/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/liblognorm/trunk/files/0001-Use-substitute-for-strndup.patch
Modified: csw/mgar/pkg/liblognorm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblognorm/trunk/Makefile 2018-04-23 13:30:48 UTC (rev
26409)
+++ csw/mgar/pkg/liblognorm/trunk/Makefile 2018-04-26 09:54:18 UTC (rev
26410)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = liblognorm
-VERSION = 1.1.1
+VERSION = 2.0.5
GARTYPE = v2
DESCRIPTION = Liblognorm shall help to make sense out of syslog data
@@ -10,10 +10,6 @@
MASTER_SITES = http://www.liblognorm.com/files/download/
DISTFILES += $(DISTNAME).tar.gz
-# Use patch until this is fixed:
-# http://bugzilla.adiscon.com/show_bug.cgi?id=539
-PATCHFILES += 0001-Use-substitute-for-strndup.patch
-
VENDOR_URL = http://www.liblognorm.com/
BUILD_DEP_PKGS += CSWpy-sphinx
@@ -20,17 +16,17 @@
BUILD_DEP_PKGS += CSWlibjson-c-dev
BUILD_DEP_PKGS += CSWlibestr-dev
-PACKAGES += CSWliblognorm2
-SPKG_DESC_CSWliblognorm2 = Liblognorm shall help to make sense out of syslog
data, liblognorm.so.2
-PKGFILES_CSWliblognorm2 += $(call pkgfiles_lib,liblognorm.so.2)
-RUNTIME_DEP_PKGS_CSWliblognorm2 += CSWlibjson-c3
-RUNTIME_DEP_PKGS_CSWliblognorm2 += CSWlibpcre1
-RUNTIME_DEP_PKGS_CSWliblognorm2 += CSWlibestr0
+PACKAGES += CSWliblognorm5
+SPKG_DESC_CSWliblognorm5 = Liblognorm shall help to make sense out of syslog
data, liblognorm.so.5
+PKGFILES_CSWliblognorm5 += $(call pkgfiles_lib,liblognorm.so.5)
+RUNTIME_DEP_PKGS_CSWliblognorm5 += CSWlibfastjson4
+RUNTIME_DEP_PKGS_CSWliblognorm5 += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWliblognorm5 += CSWlibestr0
PACKAGES += CSWliblognorm-dev
SPKG_DESC_CSWliblognorm-dev = Deevelopment files for liblognorm
-RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWliblognorm2
-RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWlibjson-c3
+RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWliblognorm5
+RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWlibfastjson4
RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWlibestr0
BUILD64 = 1
@@ -39,7 +35,17 @@
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --enable-regexp
CONFIGURE_ARGS += --enable-docs
+CONFIGURE_ARGS += --disable-Werror
+# We need asprintf from libc SUNW_1.22.7
+LINKER_MAPS =
+CHECKPKG_OVERRIDES_CSWliblognorm5 +=
forbidden-version-interface-dependencies|/opt/csw/lib/amd64/liblognorm.so.5.1.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1
+CHECKPKG_OVERRIDES_CSWliblognorm5 +=
forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/liblognorm.so.5.1.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1
+CHECKPKG_OVERRIDES_CSWliblognorm5 +=
forbidden-version-interface-dependencies|/opt/csw/lib/liblognorm.so.5.1.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1
+
+# We need 'grep -F'
+TEST_ENV_PATH = /opt/csw/gnu:$(PATH)
+
# We GNU find as 'find'
INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/liblognorm/trunk/checksums
===================================================================
--- csw/mgar/pkg/liblognorm/trunk/checksums 2018-04-23 13:30:48 UTC (rev
26409)
+++ csw/mgar/pkg/liblognorm/trunk/checksums 2018-04-26 09:54:18 UTC (rev
26410)
@@ -1 +1 @@
-a5a452be3d0f187cdd589236d5e7e936 liblognorm-1.1.1.tar.gz
+74dc898c65a9918139b898a44a2735e8 liblognorm-2.0.5.tar.gz
Deleted:
csw/mgar/pkg/liblognorm/trunk/files/0001-Use-substitute-for-strndup.patch
===================================================================
--- csw/mgar/pkg/liblognorm/trunk/files/0001-Use-substitute-for-strndup.patch
2018-04-23 13:30:48 UTC (rev 26409)
+++ csw/mgar/pkg/liblognorm/trunk/files/0001-Use-substitute-for-strndup.patch
2018-04-26 09:54:18 UTC (rev 26410)
@@ -1,41 +0,0 @@
-From 9c393161ed8256970b56aac6487bc73d13433565 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Wed, 1 Jul 2015 14:10:08 +0200
-Subject: [PATCH] Use substitute for strndup
-
----
- src/liblognorm.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/src/liblognorm.c b/src/liblognorm.c
-index a530b99..ea73f63 100644
---- a/src/liblognorm.c
-+++ b/src/liblognorm.c
-@@ -42,6 +42,24 @@
- }
-
- char *
-+strndup (const char *s, size_t n)
-+{
-+ char *result;
-+ size_t len = strlen (s);
-+
-+ if (n < len)
-+ len = n;
-+
-+ result = (char *) malloc (len + 1);
-+ if (!result)
-+ return 0;
-+
-+ result[len] = '\0';
-+ return (char *) memcpy (result, s, len);
-+}
-+
-+
-+char *
- ln_version(void)
- {
- return VERSION;
---
-2.4.0
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
