Received: by mail.netbsd.org (Postfix, from userid 605) id 4886F84D54; Mon, 5 Apr 2021 07:51:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8316984D33 for ; Mon, 5 Apr 2021 07:51:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id yuOZFkUawdyI for ; Mon, 5 Apr 2021 07:51:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B38F984D0C for ; Mon, 5 Apr 2021 07:51:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AD0E0FA95; Mon, 5 Apr 2021 07:51:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1617609096190630" MIME-Version: 1.0 Date: Mon, 5 Apr 2021 07:51:36 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/filesystems/ori To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210405075136.AD0E0FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1617609096190630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Mon Apr 5 07:51:36 UTC 2021 Modified Files: pkgsrc/filesystems/ori: Makefile distinfo Added Files: pkgsrc/filesystems/ori/patches: patch-liboriutil_key.cc Removed Files: pkgsrc/filesystems/ori/patches: patch-oris3_SConscript Log Message: ori: Update to 0.8.2 - help it build again. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/filesystems/ori/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/filesystems/ori/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/filesystems/ori/patches/patch-liboriutil_key.cc cvs rdiff -u -r1.1 -r0 pkgsrc/filesystems/ori/patches/patch-oris3_SConscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1617609096190630 Content-Disposition: inline Content-Length: 4820 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/filesystems/ori/Makefile diff -u pkgsrc/filesystems/ori/Makefile:1.12 pkgsrc/filesystems/ori/Makefile:1.13 --- pkgsrc/filesystems/ori/Makefile:1.12 Thu Nov 5 09:08:05 2020 +++ pkgsrc/filesystems/ori/Makefile Mon Apr 5 07:51:36 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2020/11/05 09:08:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2021/04/05 07:51:36 nia Exp $ -DISTNAME= ori-0.8.1 -PKGREVISION= 5 +DISTNAME= ori-0.8.2 CATEGORIES= filesystems MASTER_SITES= https://bitbucket.org/orifs/ori/downloads/ EXTRACT_SUFX= .tar.xz @@ -14,6 +13,9 @@ LICENSE= isc USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config +# (insert swearing) +CWRAPPERS_APPEND.cxx+= -Wno-narrowing + PYTHON_VERSIONS_ACCEPTED= 27 # python2 SCons files SUBST_CLASSES+= man @@ -39,7 +41,6 @@ do-install: BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0 .include "../../archivers/xz/buildlink3.mk" -.include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/libevent/buildlink3.mk" PYTHON_FOR_BUILD_ONLY?= yes .include "../../devel/scons/buildlink3.mk" Index: pkgsrc/filesystems/ori/distinfo diff -u pkgsrc/filesystems/ori/distinfo:1.3 pkgsrc/filesystems/ori/distinfo:1.4 --- pkgsrc/filesystems/ori/distinfo:1.3 Tue Nov 3 00:15:02 2015 +++ pkgsrc/filesystems/ori/distinfo Mon Apr 5 07:51:36 2021 @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 00:15:02 agc Exp $ +$NetBSD: distinfo,v 1.4 2021/04/05 07:51:36 nia Exp $ -SHA1 (ori-0.8.1.tar.xz) = 4362159f6e24781724122d2927a2d45389b8b65d -RMD160 (ori-0.8.1.tar.xz) = 03378e5d63059562d5a82314981b410c073077fd -SHA512 (ori-0.8.1.tar.xz) = 9b02ff3bed73bff8e8ccaaf2fb3a65516e5c91791d637c913586ca9eb730bf7457b2140ddacbef7a6f2fe0364cd7390b2b40ad3284ac93289e7cf706fd872670 -Size (ori-0.8.1.tar.xz) = 296216 bytes +SHA1 (ori-0.8.2.tar.xz) = 88856d3ceef858cca157c1ea7d9d6e29188109ec +RMD160 (ori-0.8.2.tar.xz) = bf6ff123b6eae465477bc10a6ef72a24dde44df0 +SHA512 (ori-0.8.2.tar.xz) = 19e913506cb5edb4961def9f19a97a9e3ac54d32f20e379830349fd8d5a37923ce97b3419a04d6cbd665c74d4aa0cd9a3cf6d23c5b7c63440f2cf3f51a8ac8bd +Size (ori-0.8.2.tar.xz) = 238576 bytes +SHA1 (patch-liboriutil_key.cc) = cb1b773b43ee53df75863d02186c1390ab114e01 SHA1 (patch-ori_SConscript) = e2eba2c01f2b6d4b7f3edea5eafc39656e047894 SHA1 (patch-ori__httpd_SConscript) = 8b8ba3a1545a87e9a3c150fec8c1e7c271cc8603 SHA1 (patch-oridbg_SConscript) = 36e6c4a8c08315412bdac2fa7a50113f216949ad SHA1 (patch-orilocal_SConscript) = be9cfffc40c5591831129dfa392849d376bd95a1 -SHA1 (patch-oris3_SConscript) = c4f908ecac6ad86a5767e8a1f117a97ed01d96f6 SHA1 (patch-orisync_SConscript) = 4e12bce34f0f7d7827f47278a344645f42fa26fc Added files: Index: pkgsrc/filesystems/ori/patches/patch-liboriutil_key.cc diff -u /dev/null pkgsrc/filesystems/ori/patches/patch-liboriutil_key.cc:1.1 --- /dev/null Mon Apr 5 07:51:36 2021 +++ pkgsrc/filesystems/ori/patches/patch-liboriutil_key.cc Mon Apr 5 07:51:36 2021 @@ -0,0 +1,57 @@ +$NetBSD: patch-liboriutil_key.cc,v 1.1 2021/04/05 07:51:36 nia Exp $ + +OpenSSL 1.1 support. + +--- liboriutil/key.cc.orig 2019-01-28 01:12:19.000000000 +0000 ++++ liboriutil/key.cc +@@ -131,7 +131,7 @@ PublicKey::verify(const string &blob, + const string &digest) const + { + int err; +- EVP_MD_CTX * ctx = new EVP_MD_CTX(); // XXX: openssl 1.1+ EVP_MD_CTX_new(); ++ EVP_MD_CTX * ctx = EVP_MD_CTX_new(); + if (!ctx) { + throw system_error(ENOMEM, std::generic_category(), "Could not allocate EVP_MD_CTX"); + return false; +@@ -146,14 +146,14 @@ PublicKey::verify(const string &blob, + if (err != 1) + { + ERR_print_errors_fp(stderr); +- delete ctx; // XXX: openssl 1.1+ EVP_MD_CTX_free(ctx); ++ EVP_MD_CTX_free(ctx); + throw exception(); + return false; + } + + // Prepend 8-byte public key digest + +- delete ctx; // XXX: openssl 1.1+ EVP_MD_CTX_free(ctx); ++ EVP_MD_CTX_free(ctx); + return true; + } + +@@ -191,7 +191,7 @@ PrivateKey::sign(const string &blob) con + int err; + unsigned int sigLen = SIGBUF_LEN; + char sigBuf[SIGBUF_LEN]; +- EVP_MD_CTX * ctx = new EVP_MD_CTX(); // XXX: openssl 1.1+ EVP_MD_CTX_new(); ++ EVP_MD_CTX * ctx = EVP_MD_CTX_new(); + if (!ctx) { + throw system_error(ENOMEM, std::generic_category(), "Could not allocate EVP_MD_CTX"); + } +@@ -202,13 +202,13 @@ PrivateKey::sign(const string &blob) con + if (err != 1) + { + ERR_print_errors_fp(stderr); +- delete ctx; // XXX: openssl 1.1+ EVP_MD_CTX_free(ctx); ++ EVP_MD_CTX_free(ctx); + throw exception(); + } + + // XXX: Prepend 8-byte public key digest + +- delete ctx; // XXX: openssl 1.1+ EVP_MD_CTX_free(ctx); ++ EVP_MD_CTX_free(ctx); + return string().assign(sigBuf, sigLen); + } + --_----------=_1617609096190630--