Sun Jan 13 18:21:25 2019 UTC ()
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


(adam)
diff -r1.13 -r1.14 pkgsrc/devel/ucommon/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/ucommon/PLIST
diff -r1.10 -r1.11 pkgsrc/devel/ucommon/buildlink3.mk
diff -r1.12 -r1.13 pkgsrc/devel/ucommon/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/ucommon/options.mk
diff -r1.1 -r0 pkgsrc/devel/ucommon/patches/patch-commoncpp_tcp.cpp
diff -r1.1 -r0 pkgsrc/devel/ucommon/patches/patch-inc_ucommon_thread.h
diff -r1.3 -r0 pkgsrc/devel/ucommon/patches/patch-commoncpp_udp.cpp
diff -r0 -r1.1 pkgsrc/devel/ucommon/patches/patch-corelib_thread.cpp
diff -r1.2 -r0 pkgsrc/devel/ucommon/patches/patch-utils_keywait.cpp

cvs diff -r1.13 -r1.14 pkgsrc/devel/ucommon/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ucommon/Makefile 2018/04/17 22:29:32 1.13
+++ pkgsrc/devel/ucommon/Makefile 2019/01/13 18:21:24 1.14
@@ -1,29 +1,26 @@ @@ -1,29 +1,26 @@
1# $NetBSD: Makefile,v 1.13 2018/04/17 22:29:32 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2019/01/13 18:21:24 adam Exp $
2# 
3 2
4DISTNAME= ucommon-6.3.1 3DISTNAME= ucommon-7.0.0
5PKGREVISION= 4 
6CATEGORIES= devel 4CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNU:=commonc++/} 5MASTER_SITES= ${MASTER_SITE_GNU:=commoncpp/}
8 6
9MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gnu.org/software/commoncpp/ 8HOMEPAGE= https://www.gnu.org/software/commoncpp/
11COMMENT= Very light-weight C++ library for deeply embedded applications 9COMMENT= Very light-weight C++ library for deeply embedded applications
12LICENSE= gnu-lgpl-v3 10LICENSE= gnu-lgpl-v3
13 11
14USE_TOOLS+= intltool pkg-config 12USE_CMAKE= yes
15USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 14USE_TOOLS+= intltool pkg-config
17USE_CMAKE= yes 15#USE_LIBTOOL= yes
18 
19PKGCONFIG_OVERRIDE+= commoncpp.pc.in 16PKGCONFIG_OVERRIDE+= commoncpp.pc.in
20PKGCONFIG_OVERRIDE+= ucommon.pc.in 17PKGCONFIG_OVERRIDE+= ucommon.pc.in
21 18
22.include "options.mk" 19.include "options.mk"
23 20
24LDFLAGS.SunOS+= -lsocket -lnsl -lintl 21LDFLAGS.SunOS+= -lsocket -lnsl -lintl
25 22
26.include "../../mk/dlopen.buildlink3.mk" 23.include "../../mk/dlopen.buildlink3.mk"
27.include "../../mk/pthread.buildlink3.mk" 24.include "../../mk/pthread.buildlink3.mk"
28.include "../../devel/gettext-lib/buildlink3.mk" 25.include "../../devel/gettext-lib/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"

cvs diff -r1.4 -r1.5 pkgsrc/devel/ucommon/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ucommon/PLIST 2015/04/18 02:43:24 1.4
+++ pkgsrc/devel/ucommon/PLIST 2019/01/13 18:21:24 1.5
@@ -1,92 +1,93 @@ @@ -1,92 +1,93 @@
1@comment $NetBSD: PLIST,v 1.4 2015/04/18 02:43:24 rodent Exp $ 1@comment $NetBSD: PLIST,v 1.5 2019/01/13 18:21:24 adam Exp $
2bin/args 2bin/args
3bin/car 3bin/car
4bin/commoncpp-config 4bin/commoncpp-config
5bin/keywait 5bin/keywait
6bin/mdsum 6bin/mdsum
7bin/pdetach 7bin/pdetach
8bin/scrub-files 8bin/scrub-files
9bin/sockaddr 9bin/sockaddr
10bin/ucommon-config 10bin/ucommon-config
 11bin/urlout
11bin/zerofill 12bin/zerofill
12include/commoncpp/address.h 13include/commoncpp/address.h
13include/commoncpp/applog.h 14include/commoncpp/applog.h
14include/commoncpp/commoncpp.h 15include/commoncpp/commoncpp.h
15include/commoncpp/config.h 16include/commoncpp/config.h
16include/commoncpp/dccp.h 17include/commoncpp/dccp.h
17include/commoncpp/exception.h 18include/commoncpp/exception.h
18include/commoncpp/export.h 19include/commoncpp/export.h
19include/commoncpp/file.h 20include/commoncpp/file.h
20include/commoncpp/mime.h 21include/commoncpp/mime.h
21include/commoncpp/misc.h 22include/commoncpp/misc.h
22include/commoncpp/numbers.h 23include/commoncpp/numbers.h
23include/commoncpp/object.h 24include/commoncpp/object.h
 25include/commoncpp/persist.h
24include/commoncpp/pointer.h 26include/commoncpp/pointer.h
25include/commoncpp/process.h 27include/commoncpp/process.h
26include/commoncpp/serial.h 28include/commoncpp/serial.h
27include/commoncpp/slog.h 29include/commoncpp/slog.h
28include/commoncpp/socket.h 30include/commoncpp/socket.h
29include/commoncpp/string.h 31include/commoncpp/string.h
30include/commoncpp/tcp.h 32include/commoncpp/tcp.h
31include/commoncpp/thread.h 33include/commoncpp/thread.h
32include/commoncpp/tokenizer.h 34include/commoncpp/tokenizer.h
33include/commoncpp/udp.h 35include/commoncpp/udp.h
 36include/commoncpp/xml.h
34include/ucommon/access.h 37include/ucommon/access.h
 38include/ucommon/arrayref.h
35include/ucommon/atomic.h 39include/ucommon/atomic.h
36include/ucommon/bitmap.h 40include/ucommon/condition.h
37include/ucommon/buffer.h 
38include/ucommon/containers.h 
39include/ucommon/counter.h 41include/ucommon/counter.h
40include/ucommon/cpr.h 42include/ucommon/cpr.h
41include/ucommon/datetime.h 43include/ucommon/datetime.h
42include/ucommon/export.h 44include/ucommon/export.h
43include/ucommon/file.h 
44include/ucommon/fsys.h 45include/ucommon/fsys.h
45include/ucommon/generics.h 46include/ucommon/generics.h
46include/ucommon/keydata.h 47include/ucommon/keydata.h
47include/ucommon/linked.h 48include/ucommon/linked.h
48include/ucommon/mapped.h 49include/ucommon/mapped.h
 50include/ucommon/mapref.h
49include/ucommon/memory.h 51include/ucommon/memory.h
50include/ucommon/numbers.h 52include/ucommon/numbers.h
51include/ucommon/object.h 53include/ucommon/object.h
52include/ucommon/persist.h 
53include/ucommon/platform.h 54include/ucommon/platform.h
54include/ucommon/protocols.h 55include/ucommon/protocols.h
 56include/ucommon/reuse.h
55include/ucommon/secure.h 57include/ucommon/secure.h
 58include/ucommon/shared.h
56include/ucommon/shell.h 59include/ucommon/shell.h
57include/ucommon/socket.h 60include/ucommon/socket.h
58include/ucommon/stl.h 61include/ucommon/stl.h
59include/ucommon/stream.h 62include/ucommon/stream.h
60include/ucommon/string.h 63include/ucommon/string.h
 64include/ucommon/temporary.h
61include/ucommon/thread.h 65include/ucommon/thread.h
62include/ucommon/timers.h 66include/ucommon/timers.h
 67include/ucommon/typeref.h
63include/ucommon/ucommon.h 68include/ucommon/ucommon.h
64include/ucommon/unicode.h 69include/ucommon/unicode.h
65include/ucommon/vector.h 70lib/libcommoncpp.so
66include/ucommon/xml.h 71lib/libcommoncpp.so.8
67${PLIST.static}lib/libcommoncpp.a 72lib/libcommoncpp.so.8.0.0
68${PLIST.dynamic}lib/libcommoncpp.so 73lib/libucommon.so
69${PLIST.dynamic}lib/libcommoncpp.so.7 74lib/libucommon.so.8
70${PLIST.dynamic}lib/libcommoncpp.so.7.0.5 75lib/libucommon.so.8.0.0
71${PLIST.static}lib/libucommon.a 76lib/libusecure.so
72${PLIST.dynamic}lib/libucommon.so 77lib/libusecure.so.8
73${PLIST.dynamic}lib/libucommon.so.7 78lib/libusecure.so.8.0.0
74${PLIST.dynamic}lib/libucommon.so.7.0.5 
75${PLIST.static}lib/libusecure.a 
76${PLIST.dynamic}lib/libusecure.so 
77${PLIST.dynamic}lib/libusecure.so.7 
78${PLIST.dynamic}lib/libusecure.so.7.0.5 
79lib/pkgconfig/commoncpp.pc 79lib/pkgconfig/commoncpp.pc
80lib/pkgconfig/ucommon.pc 80lib/pkgconfig/ucommon.pc
81man/man1/args.1 81man/man1/args.1
82man/man1/car.1 82man/man1/car.1
83man/man1/commoncpp-config.1 83man/man1/commoncpp-config.1
84man/man1/keywait.1 84man/man1/keywait.1
85man/man1/mdsum.1 85man/man1/mdsum.1
86man/man1/pdetach.1 86man/man1/pdetach.1
87man/man1/scrub-files.1 87man/man1/scrub-files.1
88man/man1/sockaddr.1 88man/man1/sockaddr.1
89man/man1/ucommon-config.1 89man/man1/ucommon-config.1
 90man/man1/urlout.1
90man/man1/zerofill.1 91man/man1/zerofill.1
91share/ucommon/cmake/CapeConfig.cmake 92share/ucommon/cmake/CapeConfig.cmake
92share/ucommon/cmake/CapeMakeTargets.cmake 93share/ucommon/cmake/CapeMakeTargets.cmake

cvs diff -r1.10 -r1.11 pkgsrc/devel/ucommon/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/ucommon/buildlink3.mk 2018/04/17 22:29:32 1.10
+++ pkgsrc/devel/ucommon/buildlink3.mk 2019/01/13 18:21:24 1.11
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: buildlink3.mk,v 1.10 2018/04/17 22:29:32 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2019/01/13 18:21:24 adam Exp $
2 2
3BUILDLINK_TREE+= ucommon 3BUILDLINK_TREE+= ucommon
4 4
5.if !defined(UCOMMON_BUILDLINK3_MK) 5.if !defined(UCOMMON_BUILDLINK3_MK)
6UCOMMON_BUILDLINK3_MK:= 6UCOMMON_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ucommon+= ucommon>=6.0.0 8BUILDLINK_API_DEPENDS.ucommon+= ucommon>=6.0.0
9BUILDLINK_ABI_DEPENDS.ucommon?= ucommon>=6.3.1nb4 9BUILDLINK_ABI_DEPENDS.ucommon+= ucommon>=6.3.1nb4
10BUILDLINK_PKGSRCDIR.ucommon?= ../../devel/ucommon 10BUILDLINK_PKGSRCDIR.ucommon?= ../../devel/ucommon
11 11
12pkgbase := ucommon 12pkgbase := ucommon
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.ucommon:Mgnutls) 15.if !empty(PKG_BUILD_OPTIONS.ucommon:Mgnutls)
16.include "../../security/gnutls/buildlink3.mk" 16.include "../../security/gnutls/buildlink3.mk"
17.endif 17.endif
18 18
19.if !empty(PKG_BUILD_OPTIONS.ucommon:Mopenssl) 19.if !empty(PKG_BUILD_OPTIONS.ucommon:Mopenssl)
20.include "../../security/openssl/buildlink3.mk" 20.include "../../security/openssl/buildlink3.mk"
21.endif 21.endif
22 22
23.if !empty(PKG_BUILD_OPTIONS.ucommon:Mstatic) 23.if !empty(PKG_BUILD_OPTIONS.ucommon:Mstatic)
24BUILDLINK_DEPMETHOD.ucommon?= build 24BUILDLINK_DEPMETHOD.ucommon?= build
25.endif 25.endif
26 26
27.include "../../mk/dlopen.buildlink3.mk" 27.include "../../mk/dlopen.buildlink3.mk"
28.include "../../security/openssl/buildlink3.mk" 
29.include "../../mk/pthread.buildlink3.mk" 28.include "../../mk/pthread.buildlink3.mk"
30.endif # UCOMMON_BUILDLINK3_MK 29.endif # UCOMMON_BUILDLINK3_MK
31 30
32BUILDLINK_TREE+= -ucommon 31BUILDLINK_TREE+= -ucommon

cvs diff -r1.12 -r1.13 pkgsrc/devel/ucommon/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ucommon/distinfo 2016/12/19 13:33:43 1.12
+++ pkgsrc/devel/ucommon/distinfo 2019/01/13 18:21:24 1.13
@@ -1,11 +1,8 @@ @@ -1,11 +1,8 @@
1$NetBSD: distinfo,v 1.12 2016/12/19 13:33:43 joerg Exp $ 1$NetBSD: distinfo,v 1.13 2019/01/13 18:21:24 adam Exp $
2 2
3SHA1 (ucommon-6.3.1.tar.gz) = 82db4fda4b11589b0b02a2afb07a4f675edacfb9 3SHA1 (ucommon-7.0.0.tar.gz) = 1317c89c4f53b38059a193c75291283606eb9c26
4RMD160 (ucommon-6.3.1.tar.gz) = b58ac6dcd7b5e88fdc2e38703cddc9afd17175bf 4RMD160 (ucommon-7.0.0.tar.gz) = 7af41f1dc3d965ac165cce56f19164aa18482f24
5SHA512 (ucommon-6.3.1.tar.gz) = 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec 5SHA512 (ucommon-7.0.0.tar.gz) = d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
6Size (ucommon-6.3.1.tar.gz) = 830661 bytes 6Size (ucommon-7.0.0.tar.gz) = 837905 bytes
7SHA1 (patch-commoncpp_tcp.cpp) = 312c1b4ee234852dcecb0ba2fbdf8813e7ca1704 
8SHA1 (patch-commoncpp_udp.cpp) = 34607048d74a0c0142334179e43f481aa4affab7 
9SHA1 (patch-configure) = 13335dcb186aa37a12e8dafcf64c077ccc543819 7SHA1 (patch-configure) = 13335dcb186aa37a12e8dafcf64c077ccc543819
10SHA1 (patch-inc_ucommon_thread.h) = 7e90ba09c05e2d1e41525eb078add93746bf8a2d 8SHA1 (patch-corelib_thread.cpp) = 7d298062c8610ee15abd6db7b506a4827f9ac552
11SHA1 (patch-utils_keywait.cpp) = 003bc190393f0b1c3e052605136ef9cf50bddc40 

cvs diff -r1.2 -r1.3 pkgsrc/devel/ucommon/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/ucommon/options.mk 2015/04/18 02:43:24 1.2
+++ pkgsrc/devel/ucommon/options.mk 2019/01/13 18:21:24 1.3
@@ -1,35 +1,26 @@ @@ -1,35 +1,26 @@
1# $NetBSD: options.mk,v 1.2 2015/04/18 02:43:24 rodent Exp $ 1# $NetBSD: options.mk,v 1.3 2019/01/13 18:21:24 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ucommon 3PKG_OPTIONS_VAR= PKG_OPTIONS.ucommon
4PKG_SUPPORTED_OPTIONS= gnutls openssl static tests 4PKG_SUPPORTED_OPTIONS= gnutls openssl tests
5PKG_SUGGESTED_OPTIONS+= openssl 5PKG_SUGGESTED_OPTIONS+= openssl
6PLIST_VARS+= dynamic static 
7 6
8.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
9 8
10.if !empty(PKG_OPTIONS:Mgnutls) 9.if !empty(PKG_OPTIONS:Mgnutls)
11BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.0.0 10BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.0.0
12.include "../../security/gnutls/buildlink3.mk" 11.include "../../security/gnutls/buildlink3.mk"
13.endif 12.endif
14 13
15.if !empty(PKG_OPTIONS:Mopenssl) 14.if !empty(PKG_OPTIONS:Mopenssl)
16BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.0 15BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.0
17.include "../../security/openssl/buildlink3.mk" 16.include "../../security/openssl/buildlink3.mk"
18CMAKE_ARGS+= -DCRYPTO_OPENSSL=ON 17CMAKE_ARGS+= -DCRYPTO_OPENSSL=ON
19.else 18.else
20CMAKE_ARGS+= -DCRYPTO_OPENSSL=OFF 19CMAKE_ARGS+= -DCRYPTO_OPENSSL=OFF
21.endif 20.endif
22 21
23.if !empty(PKG_OPTIONS:Mstatic) 
24CMAKE_ARGS+= -DBUILD_STATIC=ON -DCRYPTO_STATIC=ON 
25PLIST.static= yes 
26.else 
27CMAKE_ARGS+= -DBUILD_STATIC=OFF -DCRYPTO_STATIC=OFF 
28PLIST.dynamic= yes 
29.endif 
30 
31.if !empty(PKG_OPTIONS:Mtests) 22.if !empty(PKG_OPTIONS:Mtests)
32CMAKE_ARGS+= -DBUILD_TESTING=ON 23CMAKE_ARGS+= -DBUILD_TESTING=ON
33.else 24.else
34CMAKE_ARGS+= -DBUILD_TESTING=OFF 25CMAKE_ARGS+= -DBUILD_TESTING=OFF
35.endif 26.endif

File Deleted: pkgsrc/devel/ucommon/patches/Attic/patch-commoncpp_tcp.cpp

File Deleted: pkgsrc/devel/ucommon/patches/Attic/patch-inc_ucommon_thread.h

File Deleted: pkgsrc/devel/ucommon/patches/Attic/patch-commoncpp_udp.cpp

File Added: pkgsrc/devel/ucommon/patches/patch-corelib_thread.cpp
$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;

File Deleted: pkgsrc/devel/ucommon/patches/Attic/patch-utils_keywait.cpp