Received: by mail.netbsd.org (Postfix, from userid 605) id BA8CA84E77; Sun, 11 Sep 2022 19:33:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F347C84D15 for ; Sun, 11 Sep 2022 19:33:06 +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 wiF1ErftvfjC for ; Sun, 11 Sep 2022 19:33:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0E15684CD9 for ; Sun, 11 Sep 2022 19:33:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 078A2FA90; Sun, 11 Sep 2022 19:33:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1662924786267580" MIME-Version: 1.0 Date: Sun, 11 Sep 2022 19:33:06 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/security/tlswrapper To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20220911193306.078A2FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1662924786267580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sun Sep 11 19:33:05 UTC 2022 Modified Files: pkgsrc/security/tlswrapper: Makefile distinfo pkgsrc/security/tlswrapper/patches: patch-Makefile Removed Files: pkgsrc/security/tlswrapper/patches: patch-makefilegen.sh patch-randombytes.c patch-randombytes.c-01getentropy patch-randombytes.c-02devurandom patch-randombytes.h-01getentropy patch-randombytes.h-02devurandom Log Message: Update to 20220901. From the changelog: - fixed randombytes(), uses getentropy() and /dev/urandom where getentropy() does not exist To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/tlswrapper/Makefile \ pkgsrc/security/tlswrapper/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/tlswrapper/patches/patch-Makefile cvs rdiff -u -r1.1 -r0 \ pkgsrc/security/tlswrapper/patches/patch-makefilegen.sh \ pkgsrc/security/tlswrapper/patches/patch-randombytes.c \ pkgsrc/security/tlswrapper/patches/patch-randombytes.c-01getentropy \ pkgsrc/security/tlswrapper/patches/patch-randombytes.c-02devurandom \ pkgsrc/security/tlswrapper/patches/patch-randombytes.h-01getentropy \ pkgsrc/security/tlswrapper/patches/patch-randombytes.h-02devurandom Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1662924786267580 Content-Disposition: inline Content-Length: 4778 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/tlswrapper/Makefile diff -u pkgsrc/security/tlswrapper/Makefile:1.5 pkgsrc/security/tlswrapper/Makefile:1.6 --- pkgsrc/security/tlswrapper/Makefile:1.5 Tue Aug 30 17:55:31 2022 +++ pkgsrc/security/tlswrapper/Makefile Sun Sep 11 19:33:05 2022 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2022/08/30 17:55:31 schmonz Exp $ +# $NetBSD: Makefile,v 1.6 2022/09/11 19:33:05 schmonz Exp $ DISTNAME= ${GITHUB_PROJECT} PKGNAME= ${GITHUB_PROJECT}-${GITHUB_TAG} -PKGREVISION= 1 CATEGORIES= security net MASTER_SITES= ${MASTER_SITE_GITHUB:=janmojzis/} GITHUB_PROJECT= tlswrapper -GITHUB_TAG= 20220814 +GITHUB_TAG= 20220901 MAINTAINER= schmonz@NetBSD.org HOMEPAGE= https://github.com/janmojzis/tlswrapper/ @@ -23,10 +22,6 @@ LDFLAGS.SunOS+= -lsocket INSTALLATION_DIRS= bin man/man1 share/examples/${PKGBASE} -post-extract: - cd ${WRKSRC}; \ - ${MV} -f randombytes.h randombytes.h-01getentropy - do-install: cd ${WRKSRC}; \ ${INSTALL_DATA} examples.md \ Index: pkgsrc/security/tlswrapper/distinfo diff -u pkgsrc/security/tlswrapper/distinfo:1.5 pkgsrc/security/tlswrapper/distinfo:1.6 --- pkgsrc/security/tlswrapper/distinfo:1.5 Tue Aug 30 17:55:31 2022 +++ pkgsrc/security/tlswrapper/distinfo Sun Sep 11 19:33:05 2022 @@ -1,12 +1,6 @@ -$NetBSD: distinfo,v 1.5 2022/08/30 17:55:31 schmonz Exp $ +$NetBSD: distinfo,v 1.6 2022/09/11 19:33:05 schmonz Exp $ -BLAKE2s (tlswrapper-20220814.tar.gz) = 5ce956397f0639bd400643b74d809f2e074c60511f02dd376dbabafbb66f561f -SHA512 (tlswrapper-20220814.tar.gz) = f9c0e1b368a634390b6e2fe1092084ebecbe5c4f3892a4ef1dfaf40fce7058b60bfd513ac94693c1eb82cd859b52c84935520770cbf48b195d408bd0e8c4b58e -Size (tlswrapper-20220814.tar.gz) = 248914 bytes -SHA1 (patch-Makefile) = 8c531e8b0a42b43b3555e5b95caeec53d3326ef5 -SHA1 (patch-makefilegen.sh) = dfa45f414f0f22e58a39d7bf4a0c32b104876f23 -SHA1 (patch-randombytes.c) = b6d945c69bf67a2040028b3d654582dda4ac7965 -SHA1 (patch-randombytes.c-01getentropy) = b3518de0561393ef6b0f3c820a7142c233689d65 -SHA1 (patch-randombytes.c-02devurandom) = ec8fcff0d126ff794958e29716cf2b2312ac604d -SHA1 (patch-randombytes.h-01getentropy) = ad16c4556bf3b32f82314b6dd93eb6bf3e65a67a -SHA1 (patch-randombytes.h-02devurandom) = 96fd1ab08f0e999e718962466009784e1137cfc1 +BLAKE2s (tlswrapper-20220901.tar.gz) = bdd737eb0ec0cb31550eea387a72e4317b3ce345170022d6c51536cb7be06aee +SHA512 (tlswrapper-20220901.tar.gz) = d4ed61270c4ce5d5660bc7ac2892f9c1610b88ff7a8aff27834159e858ef10a6ea2f568c53d80a0dcbc43a0d98bd9212b66a0a003caf3ccc5e31d9504530b74d +Size (tlswrapper-20220901.tar.gz) = 249120 bytes +SHA1 (patch-Makefile) = 06d4b97ac026693def83bbab09249737a152ac97 Index: pkgsrc/security/tlswrapper/patches/patch-Makefile diff -u pkgsrc/security/tlswrapper/patches/patch-Makefile:1.2 pkgsrc/security/tlswrapper/patches/patch-Makefile:1.3 --- pkgsrc/security/tlswrapper/patches/patch-Makefile:1.2 Tue Aug 30 17:55:31 2022 +++ pkgsrc/security/tlswrapper/patches/patch-Makefile Sun Sep 11 19:33:05 2022 @@ -1,38 +1,16 @@ -$NetBSD: patch-Makefile,v 1.2 2022/08/30 17:55:31 schmonz Exp $ +$NetBSD: patch-Makefile,v 1.3 2022/09/11 19:33:05 schmonz Exp $ Do not consider building a local copy of BearSSL. -Apply upstream commit 0cb7bb4 to fall back to /dev/urandom on systems -where getentropy() is not present. ---- Makefile.orig 2022-08-14 12:18:16.000000000 +0000 +--- Makefile.orig 2022-08-30 13:33:51.000000000 +0000 +++ Makefile -@@ -10,6 +10,13 @@ BINARIES+=tlswrapper-test - - all: bearssl $(BINARIES) tlswrapper-tcp tlswrapper-smtp - -+randombytes.h: -+ (grep -v "randombytes.h" "randombytes.c-01getentropy"; echo "int main() {}";) > try.c -+ [ ! -f randombytes.h ] && $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o try try.c && cat randombytes.h-01getentropy > randombytes.h || : -+ (grep -v "randombytes.h" "randombytes.c-02devurandom"; echo "int main() {}";) > try.c -+ [ ! -f randombytes.h ] && $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o try try.c && cat randombytes.h-02devurandom > randombytes.h || : -+ rm try.c try -+ - alloc.o: alloc.c log.h alloc.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c alloc.c - -@@ -267,9 +274,6 @@ tlswrapper-test: tlswrapper-test.o $(OBJ +@@ -267,9 +267,6 @@ tlswrapper-test: tlswrapper-test.o $(OBJ bearssl: - echo 'int main(){}' > try.c -- $(CC) $(CFLAGS) $(CPPFLAGS) -o try.o $(LDFLAGS) try.c || (sh bearssl.sh; cd bearssl; make; rm build/*.so; ) -- rm -f try.o try.c +- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o try try.c || (sh bearssl.sh; cd bearssl; make; rm build/*.so; ) +- rm -f try.c try mkdir -p bearssl/inc tlswrapper-tcp: tlswrapper -@@ -296,4 +300,5 @@ test: bearssl $(BINARIES) tlswrapper-tcp - - clean: - rm -f *.o *.out $(BINARIES) tlswrapper-tcp tlswrapper-smtp -+ rm -f randombytes.h - --_----------=_1662924786267580--