Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id E4B327A16B for ; Fri, 20 Jan 2017 18:35:40 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5B0528559F; Fri, 20 Jan 2017 18:35:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E00C88558A for ; Fri, 20 Jan 2017 18:35:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id UujWpW2clZSF for ; Fri, 20 Jan 2017 18:35:38 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DB78385581 for ; Fri, 20 Jan 2017 18:35:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D0EFAFBA6; Fri, 20 Jan 2017 18:35:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1484937338214280" MIME-Version: 1.0 Date: Fri, 20 Jan 2017 18:35:38 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2016Q4] pkgsrc/security/botan-devel To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20170120183538.D0EFAFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1484937338214280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Jan 20 18:35:38 UTC 2017 Modified Files: pkgsrc/security/botan-devel [pkgsrc-2016Q4]: distinfo pkgsrc/security/botan-devel/patches [pkgsrc-2016Q4]: patch-src_lib_utils_os__utils.cpp Added Files: pkgsrc/security/botan-devel/patches [pkgsrc-2016Q4]: patch-src_build-data_os_solaris.txt patch-src_lib_utils_locking__allocator_info.txt Log Message: Pullup ticket #5194 - requested by joerg security/botan-devel: build fix Revisions pulled up: - security/botan-devel/distinfo 1.12 - security/botan-devel/patches/patch-src_build-data_os_solaris.txt 1.1 - security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt 1.1 - security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp 1.4 --- Module Name: pkgsrc Committed By: joerg Date: Mon Jan 16 01:50:15 UTC 2017 Modified Files: pkgsrc/security/botan-devel: distinfo pkgsrc/security/botan-devel/patches: patch-src_lib_utils_os__utils.cpp Added Files: pkgsrc/security/botan-devel/patches: patch-src_build-data_os_solaris.txt patch-src_lib_utils_locking__allocator_info.txt Log Message: More fixes for build on SmartOS/Solaris. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.2.1 pkgsrc/security/botan-devel/distinfo cvs rdiff -u -r0 -r1.1.2.2 \ pkgsrc/security/botan-devel/patches/patch-src_build-data_os_solaris.txt \ pkgsrc/security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt cvs rdiff -u -r1.3 -r1.3.2.1 \ pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1484937338214280 Content-Disposition: inline Content-Length: 4440 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/botan-devel/distinfo diff -u pkgsrc/security/botan-devel/distinfo:1.11 pkgsrc/security/botan-devel/distinfo:1.11.2.1 --- pkgsrc/security/botan-devel/distinfo:1.11 Thu Nov 17 10:23:14 2016 +++ pkgsrc/security/botan-devel/distinfo Fri Jan 20 18:35:38 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2016/11/17 10:23:14 joerg Exp $ +$NetBSD: distinfo,v 1.11.2.1 2017/01/20 18:35:38 bsiegert Exp $ SHA1 (Botan-1.11.33.tgz) = 71f2f4c81af48197e7c6db86bab393396ecf6541 RMD160 (Botan-1.11.33.tgz) = f0de0fea65fd501747cf1949e47ec2faeb6acaa0 @@ -7,4 +7,6 @@ Size (Botan-1.11.33.tgz) = 4329671 bytes SHA1 (patch-src_build-data_os_dragonfly.txt) = 2aef3f0c514f6d1e84aae43052d82b3536a1b1c5 SHA1 (patch-src_build-data_os_netbsd.txt) = e3acd79c182f338542c4c65b20f2443e42a1a488 SHA1 (patch-src_build-data_os_openbsd.txt) = 2388e859c855409f6ec23e2b149b3eb56c5a0aea -SHA1 (patch-src_lib_utils_os__utils.cpp) = 9c5d3bc241ab87fa7c2b9cf8a817682207b026f5 +SHA1 (patch-src_build-data_os_solaris.txt) = d4632d817c401d3942aaabe23719c7496d416b84 +SHA1 (patch-src_lib_utils_locking__allocator_info.txt) = 30dd9043e1fa7befdf6933778e5c729fcb88263d +SHA1 (patch-src_lib_utils_os__utils.cpp) = 28298bc3b98703275dce23d1d7fcd65ff262d05f Index: pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp diff -u pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp:1.3 pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp:1.3.2.1 --- pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp:1.3 Fri Nov 11 19:44:51 2016 +++ pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp Fri Jan 20 18:35:38 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.3 2016/11/11 19:44:51 joerg Exp $ +$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.3.2.1 2017/01/20 18:35:38 bsiegert Exp $ --- src/lib/utils/os_utils.cpp.orig 2016-10-26 13:39:08.000000000 +0000 +++ src/lib/utils/os_utils.cpp @@ -13,7 +13,7 @@ $NetBSD: patch-src_lib_utils_os__utils.c #if defined(BOTAN_TARGET_OS_IS_WINDOWS) || defined(BOTAN_TARGET_OS_IS_MINGW) #include #endif -@@ -146,7 +150,20 @@ uint64_t get_system_timestamp_ns() +@@ -146,7 +150,21 @@ uint64_t get_system_timestamp_ns() size_t get_memory_locking_limit() { @@ -30,7 +30,8 @@ $NetBSD: patch-src_lib_utils_os__utils.c + priv_freeset(priv_set); + + /* XXX how to obtain the real limit? */ -+ return can_mlock ? std::min(512 * 1024, max_req) : 0; ++ size_t mlock_requested = BOTAN_MLOCK_ALLOCATOR_MAX_LOCKED_KB; ++ return can_mlock ? std::min(512 * 1024, mlock_requested) : 0; +#elif defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK) /* * Linux defaults to only 64 KiB of mlockable memory per process Added files: Index: pkgsrc/security/botan-devel/patches/patch-src_build-data_os_solaris.txt diff -u /dev/null pkgsrc/security/botan-devel/patches/patch-src_build-data_os_solaris.txt:1.1.2.2 --- /dev/null Fri Jan 20 18:35:38 2017 +++ pkgsrc/security/botan-devel/patches/patch-src_build-data_os_solaris.txt Fri Jan 20 18:35:38 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_build-data_os_solaris.txt,v 1.1.2.2 2017/01/20 18:35:38 bsiegert Exp $ + +--- src/build-data/os/solaris.txt.orig 2017-01-16 01:41:19.253492127 +0000 ++++ src/build-data/os/solaris.txt +@@ -3,6 +3,10 @@ os_type unix + install_cmd_data '/usr/ucb/install -m 644' + install_cmd_exec '/usr/ucb/install -m 755' + ++soname_pattern_base "libbotan-{version_major}.{version_minor}.so" ++soname_pattern_abi "libbotan-{version_major}.{version_minor}.so.{abi_rev}" ++soname_pattern_patch "libbotan-{version_major}.{version_minor}.so.{abi_rev}.{version_patch}" ++ + + posix_mlock + gettimeofday Index: pkgsrc/security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt diff -u /dev/null pkgsrc/security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt:1.1.2.2 --- /dev/null Fri Jan 20 18:35:38 2017 +++ pkgsrc/security/botan-devel/patches/patch-src_lib_utils_locking__allocator_info.txt Fri Jan 20 18:35:38 2017 @@ -0,0 +1,10 @@ +$NetBSD: patch-src_lib_utils_locking__allocator_info.txt,v 1.1.2.2 2017/01/20 18:35:38 bsiegert Exp $ + +--- src/lib/utils/locking_allocator/info.txt.orig 2017-01-16 01:42:23.676606157 +0000 ++++ src/lib/utils/locking_allocator/info.txt +@@ -6,4 +6,5 @@ freebsd + openbsd + netbsd + windows ++solaris + --_----------=_1484937338214280--