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-configdiff -r1.13 -r1.14 pkgsrc/devel/ucommon/Makefile
(adam)
@@ -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 | |||
4 | DISTNAME= ucommon-6.3.1 | 3 | DISTNAME= ucommon-7.0.0 | |
5 | PKGREVISION= 4 | |||
6 | CATEGORIES= devel | 4 | CATEGORIES= devel | |
7 | MASTER_SITES= ${MASTER_SITE_GNU:=commonc++/} | 5 | MASTER_SITES= ${MASTER_SITE_GNU:=commoncpp/} | |
8 | 6 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://www.gnu.org/software/commoncpp/ | 8 | HOMEPAGE= https://www.gnu.org/software/commoncpp/ | |
11 | COMMENT= Very light-weight C++ library for deeply embedded applications | 9 | COMMENT= Very light-weight C++ library for deeply embedded applications | |
12 | LICENSE= gnu-lgpl-v3 | 10 | LICENSE= gnu-lgpl-v3 | |
13 | 11 | |||
14 | USE_TOOLS+= intltool pkg-config | 12 | USE_CMAKE= yes | |
15 | USE_LANGUAGES= c c++ | 13 | USE_LANGUAGES= c c++ | |
16 | USE_LIBTOOL= yes | 14 | USE_TOOLS+= intltool pkg-config | |
17 | USE_CMAKE= yes | 15 | #USE_LIBTOOL= yes | |
18 | ||||
19 | PKGCONFIG_OVERRIDE+= commoncpp.pc.in | 16 | PKGCONFIG_OVERRIDE+= commoncpp.pc.in | |
20 | PKGCONFIG_OVERRIDE+= ucommon.pc.in | 17 | PKGCONFIG_OVERRIDE+= ucommon.pc.in | |
21 | 18 | |||
22 | .include "options.mk" | 19 | .include "options.mk" | |
23 | 20 | |||
24 | LDFLAGS.SunOS+= -lsocket -lnsl -lintl | 21 | LDFLAGS.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" |
@@ -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 $ | |
2 | bin/args | 2 | bin/args | |
3 | bin/car | 3 | bin/car | |
4 | bin/commoncpp-config | 4 | bin/commoncpp-config | |
5 | bin/keywait | 5 | bin/keywait | |
6 | bin/mdsum | 6 | bin/mdsum | |
7 | bin/pdetach | 7 | bin/pdetach | |
8 | bin/scrub-files | 8 | bin/scrub-files | |
9 | bin/sockaddr | 9 | bin/sockaddr | |
10 | bin/ucommon-config | 10 | bin/ucommon-config | |
11 | bin/urlout | |||
11 | bin/zerofill | 12 | bin/zerofill | |
12 | include/commoncpp/address.h | 13 | include/commoncpp/address.h | |
13 | include/commoncpp/applog.h | 14 | include/commoncpp/applog.h | |
14 | include/commoncpp/commoncpp.h | 15 | include/commoncpp/commoncpp.h | |
15 | include/commoncpp/config.h | 16 | include/commoncpp/config.h | |
16 | include/commoncpp/dccp.h | 17 | include/commoncpp/dccp.h | |
17 | include/commoncpp/exception.h | 18 | include/commoncpp/exception.h | |
18 | include/commoncpp/export.h | 19 | include/commoncpp/export.h | |
19 | include/commoncpp/file.h | 20 | include/commoncpp/file.h | |
20 | include/commoncpp/mime.h | 21 | include/commoncpp/mime.h | |
21 | include/commoncpp/misc.h | 22 | include/commoncpp/misc.h | |
22 | include/commoncpp/numbers.h | 23 | include/commoncpp/numbers.h | |
23 | include/commoncpp/object.h | 24 | include/commoncpp/object.h | |
25 | include/commoncpp/persist.h | |||
24 | include/commoncpp/pointer.h | 26 | include/commoncpp/pointer.h | |
25 | include/commoncpp/process.h | 27 | include/commoncpp/process.h | |
26 | include/commoncpp/serial.h | 28 | include/commoncpp/serial.h | |
27 | include/commoncpp/slog.h | 29 | include/commoncpp/slog.h | |
28 | include/commoncpp/socket.h | 30 | include/commoncpp/socket.h | |
29 | include/commoncpp/string.h | 31 | include/commoncpp/string.h | |
30 | include/commoncpp/tcp.h | 32 | include/commoncpp/tcp.h | |
31 | include/commoncpp/thread.h | 33 | include/commoncpp/thread.h | |
32 | include/commoncpp/tokenizer.h | 34 | include/commoncpp/tokenizer.h | |
33 | include/commoncpp/udp.h | 35 | include/commoncpp/udp.h | |
36 | include/commoncpp/xml.h | |||
34 | include/ucommon/access.h | 37 | include/ucommon/access.h | |
38 | include/ucommon/arrayref.h | |||
35 | include/ucommon/atomic.h | 39 | include/ucommon/atomic.h | |
36 | include/ucommon/bitmap.h | 40 | include/ucommon/condition.h | |
37 | include/ucommon/buffer.h | |||
38 | include/ucommon/containers.h | |||
39 | include/ucommon/counter.h | 41 | include/ucommon/counter.h | |
40 | include/ucommon/cpr.h | 42 | include/ucommon/cpr.h | |
41 | include/ucommon/datetime.h | 43 | include/ucommon/datetime.h | |
42 | include/ucommon/export.h | 44 | include/ucommon/export.h | |
43 | include/ucommon/file.h | |||
44 | include/ucommon/fsys.h | 45 | include/ucommon/fsys.h | |
45 | include/ucommon/generics.h | 46 | include/ucommon/generics.h | |
46 | include/ucommon/keydata.h | 47 | include/ucommon/keydata.h | |
47 | include/ucommon/linked.h | 48 | include/ucommon/linked.h | |
48 | include/ucommon/mapped.h | 49 | include/ucommon/mapped.h | |
50 | include/ucommon/mapref.h | |||
49 | include/ucommon/memory.h | 51 | include/ucommon/memory.h | |
50 | include/ucommon/numbers.h | 52 | include/ucommon/numbers.h | |
51 | include/ucommon/object.h | 53 | include/ucommon/object.h | |
52 | include/ucommon/persist.h | |||
53 | include/ucommon/platform.h | 54 | include/ucommon/platform.h | |
54 | include/ucommon/protocols.h | 55 | include/ucommon/protocols.h | |
56 | include/ucommon/reuse.h | |||
55 | include/ucommon/secure.h | 57 | include/ucommon/secure.h | |
58 | include/ucommon/shared.h | |||
56 | include/ucommon/shell.h | 59 | include/ucommon/shell.h | |
57 | include/ucommon/socket.h | 60 | include/ucommon/socket.h | |
58 | include/ucommon/stl.h | 61 | include/ucommon/stl.h | |
59 | include/ucommon/stream.h | 62 | include/ucommon/stream.h | |
60 | include/ucommon/string.h | 63 | include/ucommon/string.h | |
64 | include/ucommon/temporary.h | |||
61 | include/ucommon/thread.h | 65 | include/ucommon/thread.h | |
62 | include/ucommon/timers.h | 66 | include/ucommon/timers.h | |
67 | include/ucommon/typeref.h | |||
63 | include/ucommon/ucommon.h | 68 | include/ucommon/ucommon.h | |
64 | include/ucommon/unicode.h | 69 | include/ucommon/unicode.h | |
65 | include/ucommon/vector.h | 70 | lib/libcommoncpp.so | |
66 | include/ucommon/xml.h | 71 | lib/libcommoncpp.so.8 | |
67 | ${PLIST.static}lib/libcommoncpp.a | 72 | lib/libcommoncpp.so.8.0.0 | |
68 | ${PLIST.dynamic}lib/libcommoncpp.so | 73 | lib/libucommon.so | |
69 | ${PLIST.dynamic}lib/libcommoncpp.so.7 | 74 | lib/libucommon.so.8 | |
70 | ${PLIST.dynamic}lib/libcommoncpp.so.7.0.5 | 75 | lib/libucommon.so.8.0.0 | |
71 | ${PLIST.static}lib/libucommon.a | 76 | lib/libusecure.so | |
72 | ${PLIST.dynamic}lib/libucommon.so | 77 | lib/libusecure.so.8 | |
73 | ${PLIST.dynamic}lib/libucommon.so.7 | 78 | lib/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 | |||
79 | lib/pkgconfig/commoncpp.pc | 79 | lib/pkgconfig/commoncpp.pc | |
80 | lib/pkgconfig/ucommon.pc | 80 | lib/pkgconfig/ucommon.pc | |
81 | man/man1/args.1 | 81 | man/man1/args.1 | |
82 | man/man1/car.1 | 82 | man/man1/car.1 | |
83 | man/man1/commoncpp-config.1 | 83 | man/man1/commoncpp-config.1 | |
84 | man/man1/keywait.1 | 84 | man/man1/keywait.1 | |
85 | man/man1/mdsum.1 | 85 | man/man1/mdsum.1 | |
86 | man/man1/pdetach.1 | 86 | man/man1/pdetach.1 | |
87 | man/man1/scrub-files.1 | 87 | man/man1/scrub-files.1 | |
88 | man/man1/sockaddr.1 | 88 | man/man1/sockaddr.1 | |
89 | man/man1/ucommon-config.1 | 89 | man/man1/ucommon-config.1 | |
90 | man/man1/urlout.1 | |||
90 | man/man1/zerofill.1 | 91 | man/man1/zerofill.1 | |
91 | share/ucommon/cmake/CapeConfig.cmake | 92 | share/ucommon/cmake/CapeConfig.cmake | |
92 | share/ucommon/cmake/CapeMakeTargets.cmake | 93 | share/ucommon/cmake/CapeMakeTargets.cmake |
@@ -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 | |||
3 | BUILDLINK_TREE+= ucommon | 3 | BUILDLINK_TREE+= ucommon | |
4 | 4 | |||
5 | .if !defined(UCOMMON_BUILDLINK3_MK) | 5 | .if !defined(UCOMMON_BUILDLINK3_MK) | |
6 | UCOMMON_BUILDLINK3_MK:= | 6 | UCOMMON_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.ucommon+= ucommon>=6.0.0 | 8 | BUILDLINK_API_DEPENDS.ucommon+= ucommon>=6.0.0 | |
9 | BUILDLINK_ABI_DEPENDS.ucommon?= ucommon>=6.3.1nb4 | 9 | BUILDLINK_ABI_DEPENDS.ucommon+= ucommon>=6.3.1nb4 | |
10 | BUILDLINK_PKGSRCDIR.ucommon?= ../../devel/ucommon | 10 | BUILDLINK_PKGSRCDIR.ucommon?= ../../devel/ucommon | |
11 | 11 | |||
12 | pkgbase := ucommon | 12 | pkgbase := 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) | |
24 | BUILDLINK_DEPMETHOD.ucommon?= build | 24 | BUILDLINK_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 | |||
32 | BUILDLINK_TREE+= -ucommon | 31 | BUILDLINK_TREE+= -ucommon |
@@ -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 | |||
3 | SHA1 (ucommon-6.3.1.tar.gz) = 82db4fda4b11589b0b02a2afb07a4f675edacfb9 | 3 | SHA1 (ucommon-7.0.0.tar.gz) = 1317c89c4f53b38059a193c75291283606eb9c26 | |
4 | RMD160 (ucommon-6.3.1.tar.gz) = b58ac6dcd7b5e88fdc2e38703cddc9afd17175bf | 4 | RMD160 (ucommon-7.0.0.tar.gz) = 7af41f1dc3d965ac165cce56f19164aa18482f24 | |
5 | SHA512 (ucommon-6.3.1.tar.gz) = 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec | 5 | SHA512 (ucommon-7.0.0.tar.gz) = d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b | |
6 | Size (ucommon-6.3.1.tar.gz) = 830661 bytes | 6 | Size (ucommon-7.0.0.tar.gz) = 837905 bytes | |
7 | SHA1 (patch-commoncpp_tcp.cpp) = 312c1b4ee234852dcecb0ba2fbdf8813e7ca1704 | |||
8 | SHA1 (patch-commoncpp_udp.cpp) = 34607048d74a0c0142334179e43f481aa4affab7 | |||
9 | SHA1 (patch-configure) = 13335dcb186aa37a12e8dafcf64c077ccc543819 | 7 | SHA1 (patch-configure) = 13335dcb186aa37a12e8dafcf64c077ccc543819 | |
10 | SHA1 (patch-inc_ucommon_thread.h) = 7e90ba09c05e2d1e41525eb078add93746bf8a2d | 8 | SHA1 (patch-corelib_thread.cpp) = 7d298062c8610ee15abd6db7b506a4827f9ac552 | |
11 | SHA1 (patch-utils_keywait.cpp) = 003bc190393f0b1c3e052605136ef9cf50bddc40 |
@@ -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 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.ucommon | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.ucommon | |
4 | PKG_SUPPORTED_OPTIONS= gnutls openssl static tests | 4 | PKG_SUPPORTED_OPTIONS= gnutls openssl tests | |
5 | PKG_SUGGESTED_OPTIONS+= openssl | 5 | PKG_SUGGESTED_OPTIONS+= openssl | |
6 | PLIST_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) | |
11 | BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.0.0 | 10 | BUILDLINK_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) | |
16 | BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.0 | 15 | BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.0 | |
17 | .include "../../security/openssl/buildlink3.mk" | 16 | .include "../../security/openssl/buildlink3.mk" | |
18 | CMAKE_ARGS+= -DCRYPTO_OPENSSL=ON | 17 | CMAKE_ARGS+= -DCRYPTO_OPENSSL=ON | |
19 | .else | 18 | .else | |
20 | CMAKE_ARGS+= -DCRYPTO_OPENSSL=OFF | 19 | CMAKE_ARGS+= -DCRYPTO_OPENSSL=OFF | |
21 | .endif | 20 | .endif | |
22 | 21 | |||
23 | .if !empty(PKG_OPTIONS:Mstatic) | |||
24 | CMAKE_ARGS+= -DBUILD_STATIC=ON -DCRYPTO_STATIC=ON | |||
25 | PLIST.static= yes | |||
26 | .else | |||
27 | CMAKE_ARGS+= -DBUILD_STATIC=OFF -DCRYPTO_STATIC=OFF | |||
28 | PLIST.dynamic= yes | |||
29 | .endif | |||
30 | ||||
31 | .if !empty(PKG_OPTIONS:Mtests) | 22 | .if !empty(PKG_OPTIONS:Mtests) | |
32 | CMAKE_ARGS+= -DBUILD_TESTING=ON | 23 | CMAKE_ARGS+= -DBUILD_TESTING=ON | |
33 | .else | 24 | .else | |
34 | CMAKE_ARGS+= -DBUILD_TESTING=OFF | 25 | CMAKE_ARGS+= -DBUILD_TESTING=OFF | |
35 | .endif | 26 | .endif |
$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;