[pkgsrc/trunk]: pkgsrc/devel/ucommon ucommon: updated to 7.0.0

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/ucommon ucommon: updated to 7.0.0
From: adam <adam%pkgsrc.org@localhost>
Date: Sun, 13 Jan 2019 20:00:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4dfaaee515b3
branches:  trunk
changeset: 317690:4dfaaee515b3
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Jan 13 18:21:24 2019 +0000

description:
ucommon: updated to 7.0.0

Changes from 6.6.0 to 7.0.0
- clean new library abi 8.0
- atomic typeref system completed, matches tychomt spec
- c++11 support completed
- deprecated functions and templates removed
- deprecated modules (xml, persist) moved to commoncpp

Changes from 6.5.7 to 6.6.0
- introduced rsa key support
- expanded hmac support
- expanded digests for sha256 and 384
- reword of common digest code
- improved nullptr clang support
- remove clang forced c++11 from build
- check for openssl rsa support
- port types for 7.0 migration
- socket addresses for typeref
- further c++11 header fixes
- removed old ssl demo app

Changes from 6.5.6 to 6.5.7
- improved c++11 support
- mapped pointer introduced
- fixed is usage
- improved mapref remove

Changes from 6.5.5 to 6.5.6
- simplified arrayref
- added listref
- map iterators thru locked instances
- type standardization
- socket address type

Changes from 6.5.4 to 6.5.5
- more portable nullptr support
- thread-safe mapref class
- some typeref convenience types
- bit operations on byterefs

Changes from 6.5.3 to 6.5.4
- secure string and key management types
- better cleanup of secure objects
- file i/o for heap temporary

Changes from 6.5.2 to 6.5.3
- arrayref now uses ConditionalAccess, fix for Conditional

Changes from 6.5.1 to 6.5.2
- memory management cleanup and mingw32 support for native conditionals
- new methodology of having getaddrinfo allocate memory
- introduction of queueref and stackref; arrayref becomes useful
- typeref concatenation operators

Changes from 6.5.0 to 6.5.1
- thread shared references added

Changes from 6.4.4 to 6.5.0
- typeref expanded
- arrayref introduced
- nullptr and other c++ modernizations
- clang now defaulted to c++11
- minimum native windows now requires conditionals
- mingw has to use win32 pthread support
- somewhat more usable heap temporary templates

Changes from 6.4.3 to 6.4.4
- additional typeref operators

Changes from 6.4.2 to 6.4.3
- fix for broken windows setuid macro

Changes from 6.4.1 to 6.4.2
- solaris related cmake fixes
- cleanup of test build and osx fixes

Changes from 6.4.0 to 6.4.1
- keyfile fixed constructor issue

Changes from 6.3.6 to 6.4.0
- new typeref system for immutable atomic reference counted objects
- heap management objects support moving heap through assignment
- extended unit tests for typeref system
- improved openbsd support
- atomics enabled by default

Changes from 6.3.5 to 6.3.6
- code cleanup
- simulate option for scrub
- set newline style for cmake genorated files

Changes from 6.3.4 to 6.3.5
- general code cleanup
- some build fixes

Changes from 6.3.3 to 6.3.4
- improved atomics support
- configure atomics default matches cmake default
- general code cleanup
- more casting operations and cast fixups
- polymorphic casting support & rtti detection
- enclose random value templates in Random
- improved rng support

Changes from 6.3.2 to 6.3.3
- improved cipher key management
- b64 support improved and string hex conversions
- simplified digest functions
- some solaris fixes

Changes from 6.3.1 to 6.3.2
- fixed a broken streambuf for commoncpp
- deref cast function added
- fixed missing pkg-config

diffstat:

 devel/ucommon/Makefile                           |  17 ++++-----
 devel/ucommon/PLIST                              |  41 ++++++++++++-----------
 devel/ucommon/buildlink3.mk                      |   5 +-
 devel/ucommon/distinfo                           |  15 +++-----
 devel/ucommon/options.mk                         |  13 +------
 devel/ucommon/patches/patch-commoncpp_tcp.cpp    |  15 --------
 devel/ucommon/patches/patch-commoncpp_udp.cpp    |  15 --------
 devel/ucommon/patches/patch-corelib_thread.cpp   |  38 ++++++++++++++++++++++
 devel/ucommon/patches/patch-inc_ucommon_thread.h |  15 --------
 devel/ucommon/patches/patch-utils_keywait.cpp    |  22 ------------
 10 files changed, 76 insertions(+), 120 deletions(-)

diffs (truncated from 336 to 300 lines):

diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/Makefile
--- a/devel/ucommon/Makefile    Sun Jan 13 18:03:38 2019 +0000
+++ b/devel/ucommon/Makefile    Sun Jan 13 18:21:24 2019 +0000
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.13 2018/04/17 22:29:32 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2019/01/13 18:21:24 adam Exp $
 
-DISTNAME=      ucommon-6.3.1
-PKGREVISION=   4
+DISTNAME=      ucommon-7.0.0
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_GNU:=commonc++/}
+MASTER_SITES=  ${MASTER_SITE_GNU:=commoncpp/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.gnu.org/software/commoncpp/
 COMMENT=       Very light-weight C++ library for deeply embedded applications
 LICENSE=       gnu-lgpl-v3
 
-USE_TOOLS+=    intltool pkg-config
-USE_LANGUAGES= c c++
-USE_LIBTOOL=   yes
-USE_CMAKE=     yes
-
+USE_CMAKE=             yes
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            intltool pkg-config
+#USE_LIBTOOL=          yes
 PKGCONFIG_OVERRIDE+=   commoncpp.pc.in
 PKGCONFIG_OVERRIDE+=   ucommon.pc.in
 
diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/PLIST
--- a/devel/ucommon/PLIST       Sun Jan 13 18:03:38 2019 +0000
+++ b/devel/ucommon/PLIST       Sun Jan 13 18:21:24 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/04/18 02:43:24 rodent Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/01/13 18:21:24 adam Exp $
 bin/args
 bin/car
 bin/commoncpp-config
@@ -8,6 +8,7 @@
 bin/scrub-files
 bin/sockaddr
 bin/ucommon-config
+bin/urlout
 bin/zerofill
 include/commoncpp/address.h
 include/commoncpp/applog.h
@@ -21,6 +22,7 @@
 include/commoncpp/misc.h
 include/commoncpp/numbers.h
 include/commoncpp/object.h
+include/commoncpp/persist.h
 include/commoncpp/pointer.h
 include/commoncpp/process.h
 include/commoncpp/serial.h
@@ -31,51 +33,49 @@
 include/commoncpp/thread.h
 include/commoncpp/tokenizer.h
 include/commoncpp/udp.h
+include/commoncpp/xml.h
 include/ucommon/access.h
+include/ucommon/arrayref.h
 include/ucommon/atomic.h
-include/ucommon/bitmap.h
-include/ucommon/buffer.h
-include/ucommon/containers.h
+include/ucommon/condition.h
 include/ucommon/counter.h
 include/ucommon/cpr.h
 include/ucommon/datetime.h
 include/ucommon/export.h
-include/ucommon/file.h
 include/ucommon/fsys.h
 include/ucommon/generics.h
 include/ucommon/keydata.h
 include/ucommon/linked.h
 include/ucommon/mapped.h
+include/ucommon/mapref.h
 include/ucommon/memory.h
 include/ucommon/numbers.h
 include/ucommon/object.h
-include/ucommon/persist.h
 include/ucommon/platform.h
 include/ucommon/protocols.h
+include/ucommon/reuse.h
 include/ucommon/secure.h
+include/ucommon/shared.h
 include/ucommon/shell.h
 include/ucommon/socket.h
 include/ucommon/stl.h
 include/ucommon/stream.h
 include/ucommon/string.h
+include/ucommon/temporary.h
 include/ucommon/thread.h
 include/ucommon/timers.h
+include/ucommon/typeref.h
 include/ucommon/ucommon.h
 include/ucommon/unicode.h
-include/ucommon/vector.h
-include/ucommon/xml.h
-${PLIST.static}lib/libcommoncpp.a
-${PLIST.dynamic}lib/libcommoncpp.so
-${PLIST.dynamic}lib/libcommoncpp.so.7
-${PLIST.dynamic}lib/libcommoncpp.so.7.0.5
-${PLIST.static}lib/libucommon.a
-${PLIST.dynamic}lib/libucommon.so
-${PLIST.dynamic}lib/libucommon.so.7
-${PLIST.dynamic}lib/libucommon.so.7.0.5
-${PLIST.static}lib/libusecure.a
-${PLIST.dynamic}lib/libusecure.so
-${PLIST.dynamic}lib/libusecure.so.7
-${PLIST.dynamic}lib/libusecure.so.7.0.5
+lib/libcommoncpp.so
+lib/libcommoncpp.so.8
+lib/libcommoncpp.so.8.0.0
+lib/libucommon.so
+lib/libucommon.so.8
+lib/libucommon.so.8.0.0
+lib/libusecure.so
+lib/libusecure.so.8
+lib/libusecure.so.8.0.0
 lib/pkgconfig/commoncpp.pc
 lib/pkgconfig/ucommon.pc
 man/man1/args.1
@@ -87,6 +87,7 @@
 man/man1/scrub-files.1
 man/man1/sockaddr.1
 man/man1/ucommon-config.1
+man/man1/urlout.1
 man/man1/zerofill.1
 share/ucommon/cmake/CapeConfig.cmake
 share/ucommon/cmake/CapeMakeTargets.cmake
diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/buildlink3.mk
--- a/devel/ucommon/buildlink3.mk       Sun Jan 13 18:03:38 2019 +0000
+++ b/devel/ucommon/buildlink3.mk       Sun Jan 13 18:21:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/04/17 22:29:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2019/01/13 18:21:24 adam Exp $
 
 BUILDLINK_TREE+=       ucommon
 
@@ -6,7 +6,7 @@
 UCOMMON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ucommon+=        ucommon>=6.0.0
-BUILDLINK_ABI_DEPENDS.ucommon?=        ucommon>=6.3.1nb4
+BUILDLINK_ABI_DEPENDS.ucommon+=        ucommon>=6.3.1nb4
 BUILDLINK_PKGSRCDIR.ucommon?=  ../../devel/ucommon
 
 pkgbase := ucommon
@@ -25,7 +25,6 @@
 .endif
 
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # UCOMMON_BUILDLINK3_MK
 
diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/distinfo
--- a/devel/ucommon/distinfo    Sun Jan 13 18:03:38 2019 +0000
+++ b/devel/ucommon/distinfo    Sun Jan 13 18:21:24 2019 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.12 2016/12/19 13:33:43 joerg Exp $
+$NetBSD: distinfo,v 1.13 2019/01/13 18:21:24 adam Exp $
 
-SHA1 (ucommon-6.3.1.tar.gz) = 82db4fda4b11589b0b02a2afb07a4f675edacfb9
-RMD160 (ucommon-6.3.1.tar.gz) = b58ac6dcd7b5e88fdc2e38703cddc9afd17175bf
-SHA512 (ucommon-6.3.1.tar.gz) = 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec
-Size (ucommon-6.3.1.tar.gz) = 830661 bytes
-SHA1 (patch-commoncpp_tcp.cpp) = 312c1b4ee234852dcecb0ba2fbdf8813e7ca1704
-SHA1 (patch-commoncpp_udp.cpp) = 34607048d74a0c0142334179e43f481aa4affab7
+SHA1 (ucommon-7.0.0.tar.gz) = 1317c89c4f53b38059a193c75291283606eb9c26
+RMD160 (ucommon-7.0.0.tar.gz) = 7af41f1dc3d965ac165cce56f19164aa18482f24
+SHA512 (ucommon-7.0.0.tar.gz) = d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
+Size (ucommon-7.0.0.tar.gz) = 837905 bytes
 SHA1 (patch-configure) = 13335dcb186aa37a12e8dafcf64c077ccc543819
-SHA1 (patch-inc_ucommon_thread.h) = 7e90ba09c05e2d1e41525eb078add93746bf8a2d
-SHA1 (patch-utils_keywait.cpp) = 003bc190393f0b1c3e052605136ef9cf50bddc40
+SHA1 (patch-corelib_thread.cpp) = 7d298062c8610ee15abd6db7b506a4827f9ac552
diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/options.mk
--- a/devel/ucommon/options.mk  Sun Jan 13 18:03:38 2019 +0000
+++ b/devel/ucommon/options.mk  Sun Jan 13 18:21:24 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2015/04/18 02:43:24 rodent Exp $
+# $NetBSD: options.mk,v 1.3 2019/01/13 18:21:24 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucommon
-PKG_SUPPORTED_OPTIONS= gnutls openssl static tests
+PKG_SUPPORTED_OPTIONS= gnutls openssl tests
 PKG_SUGGESTED_OPTIONS+=        openssl
-PLIST_VARS+=           dynamic static
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,14 +19,6 @@
 CMAKE_ARGS+=   -DCRYPTO_OPENSSL=OFF
 .endif
 
-.if !empty(PKG_OPTIONS:Mstatic)
-CMAKE_ARGS+=   -DBUILD_STATIC=ON -DCRYPTO_STATIC=ON
-PLIST.static=  yes
-.else
-CMAKE_ARGS+=   -DBUILD_STATIC=OFF -DCRYPTO_STATIC=OFF
-PLIST.dynamic= yes
-.endif
-
 .if !empty(PKG_OPTIONS:Mtests)
 CMAKE_ARGS+=   -DBUILD_TESTING=ON
 .else
diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/patches/patch-commoncpp_tcp.cpp
--- a/devel/ucommon/patches/patch-commoncpp_tcp.cpp     Sun Jan 13 18:03:38 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-commoncpp_tcp.cpp,v 1.1 2015/04/23 18:25:15 joerg Exp $
-
---- commoncpp/tcp.cpp.orig     2015-04-23 14:03:06.000000000 +0000
-+++ commoncpp/tcp.cpp
-@@ -457,8 +457,8 @@ TCPStream::TCPStream(TCPV6Socket &server
- #endif
- 
- TCPStream::TCPStream(const IPV4Host &host, tpport_t port, unsigned size, bool throwflag, timeout_t to) :
--    streambuf(), Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)
--    ,iostream(),
-+    streambuf(), Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP),
-+    iostream((streambuf *)this),
-     bufsize(0),gbuf(NULL),pbuf(NULL) {
-     family = IPV4;
-     timeout = to;
diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/patches/patch-commoncpp_udp.cpp
--- a/devel/ucommon/patches/patch-commoncpp_udp.cpp     Sun Jan 13 18:03:38 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-commoncpp_udp.cpp,v 1.3 2015/04/18 02:43:24 rodent Exp $
-
-Fix build for NetBSD.
-
---- commoncpp/udp.cpp.orig     2015-03-24 23:28:03.000000000 +0000
-+++ commoncpp/udp.cpp
-@@ -317,7 +317,7 @@ Socket::Error UDPSocket::join(const ucom
- Socket::Error UDPSocket::getInterfaceIndex(const char *DeviceName,int& InterfaceIndex)
- {
- #ifndef _MSWINDOWS_
--#if defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__)
-+#if defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__) && 
!defined(__NetBSD__)
- 
-     struct ip_mreqn  mreqn;
-     struct ifreq       m_ifreq;
diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/patches/patch-corelib_thread.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ucommon/patches/patch-corelib_thread.cpp    Sun Jan 13 18:21:24 2019 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-corelib_thread.cpp,v 1.1 2019/01/13 18:21:24 adam Exp $
+
+Fix building on Darwin.
+
+--- corelib/thread.cpp.orig    2019-01-13 16:03:59.000000000 +0000
++++ corelib/thread.cpp
+@@ -27,6 +27,11 @@
+ #include <stdarg.h>
+ #include <limits.h>
+ 
++#if defined(__APPLE__)
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif
++
+ #if _POSIX_PRIORITY_SCHEDULING > 0
+ #include <sched.h>
+ static int realtime_policy = SCHED_FIFO;
+@@ -1287,7 +1292,11 @@ void Thread::init(void)
+ 
+ size_t Thread::cache(void)
+ {
++#if defined(__APPLE__)
++    static size_t line_size = 0;
++#else
+     static volatile size_t line_size = 0;
++#endif
+ 
+     if(line_size)
+         return line_size;
+@@ -1311,7 +1320,6 @@ size_t Thread::cache(void)
+     free(buffer);
+     return line_size;
+ #elif defined(__APPLE__)
+-    size_t line_size = 0;
+     size_t sizeof_line_size = sizeof(line_size);
+     sysctlbyname("hw.cachelinesize", &line_size, &sizeof_line_size, 0, 0);
+     return line_size;
diff -r 1bcc765689d6 -r 4dfaaee515b3 devel/ucommon/patches/patch-inc_ucommon_thread.h
--- a/devel/ucommon/patches/patch-inc_ucommon_thread.h  Sun Jan 13 18:03:38 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-inc_ucommon_thread.h,v 1.1 2016/12/19 13:33:43 joerg Exp $
-
-Friendship is not inherited.
-
---- inc/ucommon/thread.h.orig  2016-12-18 09:48:45.932481633 +0000
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/ccrtp cctp: fix shared library name
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated pkgtools/pkglint to 5.6.11
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/ccrtp cctp: fix shared library name
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated pkgtools/pkglint to 5.6.11
Indexes:
Home | Main Index | Thread Index | Old Index