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 74BAB7A28C for ; Mon, 2 Jan 2017 02:18:33 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D9DFA85631; Mon, 2 Jan 2017 02:18:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 69F67855CB for ; Mon, 2 Jan 2017 02:18:32 +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 05WFn51riVEC for ; Mon, 2 Jan 2017 02:18:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E522D85589 for ; Mon, 2 Jan 2017 02:18:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E03C4FBA6; Mon, 2 Jan 2017 02:18:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1483323510239020" MIME-Version: 1.0 Date: Mon, 2 Jan 2017 02:18:30 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/devel/bglibs To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20170102021830.E03C4FBA6@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. --_----------=_1483323510239020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Mon Jan 2 02:18:30 UTC 2017 Modified Files: pkgsrc/devel/bglibs: Makefile PLIST buildlink3.mk distinfo pkgsrc/devel/bglibs/patches: patch-ab patch-crypto_hmac-md5.c patch-crypto_hmac-sha1.c patch-crypto_hmac-sha256.c patch-crypto_hmac-sha384.c patch-crypto_hmac-sha512.c patch-crypto_hmac.c Added Files: pkgsrc/devel/bglibs/patches: patch-include_hmac.h Removed Files: pkgsrc/devel/bglibs/patches: patch-ac patch-crypto_hmac.h Log Message: Update to 2.03. From the changelog: - Reverted libbg-cli back to static linkage (for now) to fix problem with cli-generate generated code. - Fixed header include path in cli-generate. - Rewrote iobuf and str number formatting using fmt. - Added missing selftest.c file to the dist tarball (oops). - Fixed uint##.h headers. - Flattened out the installed headers and libraries. NOTE: This means this package is not backwards compatible. - Added dns library (modified from public domain djbdns-1.05) - Added wildcard handling and substitution to bg-installer. - Added reversed IPv4 formatting functions (from Jorge Valdes). - Added str_end* and str_case_end* functions, parallel to str_start* and str_case_start* but for suffixes. - Added the ability to use arbitrary format functions in fmt_multi. - Added support for enumerate and itemize in cli-generate. - Added surfrand_uniform function, protected against bias. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/bglibs/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/bglibs/PLIST cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/bglibs/buildlink3.mk cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/bglibs/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/bglibs/patches/patch-ab cvs rdiff -u -r1.3 -r0 pkgsrc/devel/bglibs/patches/patch-ac cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/bglibs/patches/patch-crypto_hmac-md5.c \ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha1.c \ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha256.c \ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha384.c \ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha512.c \ pkgsrc/devel/bglibs/patches/patch-crypto_hmac.c cvs rdiff -u -r1.1 -r0 pkgsrc/devel/bglibs/patches/patch-crypto_hmac.h cvs rdiff -u -r0 -r1.1 pkgsrc/devel/bglibs/patches/patch-include_hmac.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1483323510239020 Content-Disposition: inline Content-Length: 21108 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/bglibs/Makefile diff -u pkgsrc/devel/bglibs/Makefile:1.30 pkgsrc/devel/bglibs/Makefile:1.31 --- pkgsrc/devel/bglibs/Makefile:1.30 Sun Dec 18 21:39:58 2016 +++ pkgsrc/devel/bglibs/Makefile Mon Jan 2 02:18:30 2017 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2016/12/18 21:39:58 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2017/01/02 02:18:30 schmonz Exp $ # -DISTNAME= bglibs-1.106 -PKGREVISION= 6 +DISTNAME= bglibs-2.03 CATEGORIES= devel MASTER_SITES= ${HOMEPAGE} @@ -10,7 +9,7 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://untroubled.org/bglibs/ COMMENT= Collection of libraries by Bruce Guenter -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run gmake MAKE_ENV+= PERL5=${TOOLS_PERL5:Q} INSTALL_ENV+= install_prefix=${DESTDIR:Q} USE_LIBTOOL= yes @@ -19,9 +18,9 @@ DJB_RESTRICTED= NO DJB_MAKE_TARGETS= NO TEST_TARGET= selftests -DJB_CONFIG_CMDS= \ - ${ECHO} ${DJB_CONFIG_PREFIX:Q}/include/bglibs > conf-include; \ - ${ECHO} ${DJB_CONFIG_PREFIX:Q}/lib/bglibs > conf-lib; +DJB_CONFIG_CMDS= \ + ${ECHO} ${DJB_CONFIG_PREFIX:Q}/include > conf-include; \ + ${ECHO} ${DJB_CONFIG_PREFIX:Q}/lib > conf-lib; CFLAGS.SunOS+= -DSOL_TCP=SOL_SOCKET Index: pkgsrc/devel/bglibs/PLIST diff -u pkgsrc/devel/bglibs/PLIST:1.9 pkgsrc/devel/bglibs/PLIST:1.10 --- pkgsrc/devel/bglibs/PLIST:1.9 Sun Jun 14 17:48:34 2009 +++ pkgsrc/devel/bglibs/PLIST Mon Jan 2 02:18:30 2017 @@ -1,134 +1,70 @@ -@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:48:34 joerg Exp $ +@comment $NetBSD: PLIST,v 1.10 2017/01/02 02:18:30 schmonz Exp $ bin/bg-installer bin/cli-generate bin/crc-gentab -include/bglibs/adt/common.h -include/bglibs/adt/ghash.h -include/bglibs/adt/gqueue.h -include/bglibs/adt/gstack.h -include/bglibs/base64/base64.h -include/bglibs/cdb/cdb.h -include/bglibs/cdb/make.h -include/bglibs/cdb/str.h -include/bglibs/cli/cli.h -include/bglibs/crc/crc16_arc.h -include/bglibs/crc/crc16_ccitt.h -include/bglibs/crc/crc16_xmodem.h -include/bglibs/crc/crc32.h -include/bglibs/crc/crc32c.h -include/bglibs/crc/crc64.h -include/bglibs/crc/gcrc.h -include/bglibs/crypto/hmac.h -include/bglibs/crypto/md5.h -include/bglibs/crypto/sha1.h -include/bglibs/crypto/sha256.h -include/bglibs/crypto/sha384.h -include/bglibs/crypto/sha512.h -include/bglibs/crypto/surf.h -include/bglibs/crypto/surfrand.h -include/bglibs/dict/dict.h -include/bglibs/dict/load.h -include/bglibs/fmt/misc.h -include/bglibs/fmt/multi.h -include/bglibs/fmt/number.h -include/bglibs/installer.h -include/bglibs/iobuf/common.h -include/bglibs/iobuf/ibuf.h -include/bglibs/iobuf/iobuf.h -include/bglibs/iobuf/obuf.h -include/bglibs/misc/misc.h -include/bglibs/misc/ucspi.h -include/bglibs/msg/debug.h -include/bglibs/msg/msg.h -include/bglibs/msg/wrap.h -include/bglibs/net/ipv4.h -include/bglibs/net/ipv6.h -include/bglibs/net/resolve.h -include/bglibs/net/socket.h -include/bglibs/path/path.h -include/bglibs/pwcmp/client.h -include/bglibs/pwcmp/hex.h -include/bglibs/pwcmp/module.h -include/bglibs/str/env.h -include/bglibs/str/iter.h -include/bglibs/str/str.h +include/bglibs/adt_common.h +include/bglibs/base64.h +include/bglibs/cdb.h +include/bglibs/cli.h +include/bglibs/crc16_arc.h +include/bglibs/crc16_ccitt.h +include/bglibs/crc16_xmodem.h +include/bglibs/crc32.h +include/bglibs/crc32c.h +include/bglibs/crc64.h +include/bglibs/debug.h +include/bglibs/dict.h +include/bglibs/dns.h +include/bglibs/envstr.h +include/bglibs/fmt.h +include/bglibs/gcrc.h +include/bglibs/ghash.h +include/bglibs/gqueue.h +include/bglibs/gstack.h +include/bglibs/hmac.h +include/bglibs/ibuf.h +include/bglibs/iobuf.h +include/bglibs/iobuf_common.h +include/bglibs/ipv4.h +include/bglibs/ipv6.h +include/bglibs/md4.h +include/bglibs/md5.h +include/bglibs/misc.h +include/bglibs/msg.h +include/bglibs/obuf.h +include/bglibs/path.h +include/bglibs/resolve.h +include/bglibs/selfpipe.h +include/bglibs/sha1.h +include/bglibs/sha256.h +include/bglibs/sha384.h +include/bglibs/sha512.h +include/bglibs/sig.h +include/bglibs/signalfd.h +include/bglibs/socket.h +include/bglibs/str.h +include/bglibs/striter.h +include/bglibs/surf.h +include/bglibs/surfrand.h include/bglibs/sysdeps.h include/bglibs/systime.h +include/bglibs/trigger.h +include/bglibs/ucspi.h include/bglibs/uint16.h include/bglibs/uint32.h include/bglibs/uint64.h include/bglibs/uintnn.h -include/bglibs/unix/cloexec.h -include/bglibs/unix/fcntl.h -include/bglibs/unix/nonblock.h -include/bglibs/unix/selfpipe.h -include/bglibs/unix/sig.h -include/bglibs/unix/signalfd.h -include/bglibs/unix/trigger.h -include/bglibs/vmailmgr/client.h -include/bglibs/vmailmgr/vpwentry.h -lib/bglibs/base64/base64.a -lib/bglibs/cdb/cdb.a -lib/bglibs/cdb/make.a -lib/bglibs/cdb/str.a -lib/bglibs/cli/cli.a -lib/bglibs/crypt.lib -lib/bglibs/crypto/md5.a -lib/bglibs/crypto/sha1.a -lib/bglibs/crypto/sha256.a -lib/bglibs/crypto/sha512a.a -lib/bglibs/dict/dict.a -lib/bglibs/dict/load.a -lib/bglibs/dl.lib -lib/bglibs/iobuf/iobuf.a -lib/bglibs/iobuf/str.a -lib/bglibs/libbg-adt.a -lib/bglibs/libbg-base64.a -lib/bglibs/libbg-cdb.a -lib/bglibs/libbg-cli.a -lib/bglibs/libbg-crc.a -lib/bglibs/libbg-crypto.a -lib/bglibs/libbg-dict.a -lib/bglibs/libbg-fmt.a -lib/bglibs/libbg-installer.a -lib/bglibs/libbg-instcheck.a -lib/bglibs/libbg-instshow.a -lib/bglibs/libbg-iobuf.a -lib/bglibs/libbg-misc.a -lib/bglibs/libbg-msg.a -lib/bglibs/libbg-net.a -lib/bglibs/libbg-path.a -lib/bglibs/libbg-str.a -lib/bglibs/libbg-sysdeps.la -lib/bglibs/libbg-unix.a -lib/bglibs/libbg.la -lib/bglibs/libinstaller.a -lib/bglibs/libinstcheck.a -lib/bglibs/libinstshow.a -lib/bglibs/libpwcmp-module.a -lib/bglibs/libpwcmp.a -lib/bglibs/libsysdeps.a -lib/bglibs/libvmailmgr.a -lib/bglibs/m.lib -lib/bglibs/misc/misc.a -lib/bglibs/msg/msg.a -lib/bglibs/msg/wrap.a -lib/bglibs/net.lib -lib/bglibs/net/ipv4.a -lib/bglibs/net/resolve.a -lib/bglibs/net/socket.a -lib/bglibs/path/path.a -lib/bglibs/pwcmp/client.a -lib/bglibs/pwcmp/hex.a -lib/bglibs/pwcmp/module.a -lib/bglibs/rt.lib -lib/bglibs/s.lib -lib/bglibs/shadow.lib -lib/bglibs/socket.lib -lib/bglibs/str/iter.a -lib/bglibs/str/str.a -lib/bglibs/unix/nonblock.a -lib/bglibs/unix/sig.a -lib/bglibs/vmailmgr/client.a -lib/bglibs/vmailmgr/vpwentry.a +include/bglibs/unix.h +include/bglibs/wrap.h +include/pwcmp/client.h +include/pwcmp/hex.h +include/pwcmp/module.h +include/vmailmgr/client.h +include/vmailmgr/vpwentry.h +lib/libbg-cli.a +lib/libbg.la +lib/libpwcmp-module.a +lib/libpwcmp.a +lib/libvmailmgr.a +man/man1/bg-installer.1 man/man1/cli-generate.1 Index: pkgsrc/devel/bglibs/buildlink3.mk diff -u pkgsrc/devel/bglibs/buildlink3.mk:1.13 pkgsrc/devel/bglibs/buildlink3.mk:1.14 --- pkgsrc/devel/bglibs/buildlink3.mk:1.13 Fri Mar 20 19:24:10 2009 +++ pkgsrc/devel/bglibs/buildlink3.mk Mon Jan 2 02:18:30 2017 @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2017/01/02 02:18:30 schmonz Exp $ BUILDLINK_TREE+= bglibs .if !defined(BGLIBS_BUILDLINK3_MK) BGLIBS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.bglibs+= bglibs>=1.104 +BUILDLINK_API_DEPENDS.bglibs+= bglibs>=2.03 BUILDLINK_PKGSRCDIR.bglibs?= ../../devel/bglibs .endif # BGLIBS_BUILDLINK3_MK Index: pkgsrc/devel/bglibs/distinfo diff -u pkgsrc/devel/bglibs/distinfo:1.26 pkgsrc/devel/bglibs/distinfo:1.27 --- pkgsrc/devel/bglibs/distinfo:1.26 Sat Dec 31 15:13:43 2016 +++ pkgsrc/devel/bglibs/distinfo Mon Jan 2 02:18:30 2017 @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.26 2016/12/31 15:13:43 schmonz Exp $ +$NetBSD: distinfo,v 1.27 2017/01/02 02:18:30 schmonz Exp $ -SHA1 (bglibs-1.106.tar.gz) = 5f1914299c0f91a3d5c83bf6c8c1d0b824ffe624 -RMD160 (bglibs-1.106.tar.gz) = d3ac009a0b9196701ff90b6cddbd58596ab480a9 -SHA512 (bglibs-1.106.tar.gz) = c1ae4bb9978b09ffe01231738d1f249c2040a51c2a0bbc4b04389a7085a3885cca6483f1bfe65deca213d991273bb3b7b925ebde8b6e2cd9182d8a57cb9a49d8 -Size (bglibs-1.106.tar.gz) = 481564 bytes -SHA1 (patch-ab) = a1d06fcc1aa73afd92be9acd1001187a28ff03e0 -SHA1 (patch-ac) = 1b75516a494dbc0c7943bc89b2eaf2f9668048fd -SHA1 (patch-crypto_hmac-md5.c) = 1982dfb84b42f0e2b3aa7a59664de7694dd65038 -SHA1 (patch-crypto_hmac-sha1.c) = aebb2be7721a38bd1c15fde32831ae6966b8b705 -SHA1 (patch-crypto_hmac-sha256.c) = 578e1c36527d463a8fcca86c32604b0fe94b6b81 -SHA1 (patch-crypto_hmac-sha384.c) = 1ed746c62fcf717d4b2978f55b78f6bec781e077 -SHA1 (patch-crypto_hmac-sha512.c) = 0fddbb7d34dd66197c72c61fe21da8eabb9bc267 -SHA1 (patch-crypto_hmac.c) = 65c1f526d3d73734fc431210088ce4f26a42b313 -SHA1 (patch-crypto_hmac.h) = 1ae05a3160859069160ff1a17a7ae460b622fa12 +SHA1 (bglibs-2.03.tar.gz) = 9c1506f60cd3d2572fd2019f676834cdf0a52860 +RMD160 (bglibs-2.03.tar.gz) = 474d460f062f3d573f38d4e4c7451b34a31a29a6 +SHA512 (bglibs-2.03.tar.gz) = 45d600e59394edd696c0e3f8477ce3b711a6729f199a5c263de1380427501d502aa5630c79fe3bc661615faabff754db51718f24fa354b2844ef4ed9f68e71df +Size (bglibs-2.03.tar.gz) = 676188 bytes +SHA1 (patch-ab) = c35699dba585340d6c9c7fcefbd80344c86c2102 +SHA1 (patch-crypto_hmac-md5.c) = 197c0d6de2b48dd611430d64d029381d95c8e5d8 +SHA1 (patch-crypto_hmac-sha1.c) = d540ac565ef79e68099186c64578f32c8925cfb1 +SHA1 (patch-crypto_hmac-sha256.c) = 29635908a1012e5a31ed46599a64ed33249c4015 +SHA1 (patch-crypto_hmac-sha384.c) = 1a6300ef2d8ab01e20853439ac578b862de19e7d +SHA1 (patch-crypto_hmac-sha512.c) = 664430b6c21a3044be713af3770ac672212953d7 +SHA1 (patch-crypto_hmac.c) = 7699db75cdc269fb2fded70ed501bcef635691f6 +SHA1 (patch-include_hmac.h) = e0b113a73dfaf78327be5bf8a7001efd8896a8da Index: pkgsrc/devel/bglibs/patches/patch-ab diff -u pkgsrc/devel/bglibs/patches/patch-ab:1.7 pkgsrc/devel/bglibs/patches/patch-ab:1.8 --- pkgsrc/devel/bglibs/patches/patch-ab:1.7 Sat Dec 31 15:13:43 2016 +++ pkgsrc/devel/bglibs/patches/patch-ab Mon Jan 2 02:18:30 2017 @@ -1,26 +1,39 @@ -$NetBSD: patch-ab,v 1.7 2016/12/31 15:13:43 schmonz Exp $ +$NetBSD: patch-ab,v 1.8 2017/01/02 02:18:30 schmonz Exp $ ---- Makefile.orig 2009-02-19 17:11:51.000000000 +0000 +Avoid "echo -n" in subshells and unsupported linker flags to fix OS X build. + +--- Makefile.orig 2015-02-06 23:57:34.000000000 +0000 +++ Makefile @@ -69,7 +69,7 @@ adt/hashb.lo adt/hashb.o: ltcompile adt/ - adt/hashs.lo adt/hashs.o: ltcompile adt/hashs.c adt/common.h + adt/hashs.lo adt/hashs.o: ltcompile adt/hashs.c include/bglibs/adt_common.h ./ltcompile adt/hashs.c --all: dotlibs sysdeps.h libraries bg-installer cli-generate selftests -+all: dotlibs sysdeps.h libraries bg-installer cli-generate +-all: sysdeps.h libraries programs man selftests ++all: sysdeps.h libraries programs man - base64/asc2bin.lo base64/asc2bin.o: ltcompile base64/asc2bin.c base64/base64.h str/str.h + base64/asc2bin.lo base64/asc2bin.o: ltcompile base64/asc2bin.c include/bglibs/base64.h include/bglibs/str.h sysdeps.h ./ltcompile base64/asc2bin.c -@@ -210,7 +210,7 @@ crypt.lib: compile load - @echo 'main() { ; }' >trylib-lcrypt.c - @{ ./compile trylib-lcrypt.c && ./load trylib-lcrypt -lcrypt; } >/dev/null 2>&1 \ - && { echo -lcrypt >crypt.lib; echo yes; } \ -- || { echo -n >crypt.lib; echo no; } -+ || { : >crypt.lib; echo no; } - @rm -f trylib-lcrypt.c trylib-lcrypt.o trylib-lcrypt - - crypto/hmac-md5.lo crypto/hmac-md5.o: ltcompile crypto/hmac-md5.c sysdeps.h crypto/hmac.h crypto/md5.h str/str.h -@@ -290,7 +290,7 @@ dl.lib: compile load +@@ -89,8 +89,8 @@ base64/encode_line.lo base64/encode_line + base64/encode_part.lo base64/encode_part.o: ltcompile base64/encode_part.c include/bglibs/base64.h include/bglibs/str.h sysdeps.h + ./ltcompile base64/encode_part.c + +-bg-installer: bg-installer.o ltload libbg-cli.la libbg.la bg-installer-cli.o +- ./ltload bg-installer libbg-cli.la libbg.la bg-installer-cli.o -lbg-cli -static ++bg-installer: bg-installer.o load libbg-cli.la libbg.la bg-installer-cli.o ++ ./load bg-installer .libs/libbg-cli.a .libs/libbg.a bg-installer-cli.o + + bg-installer-cli.c: bg-installer.cli cli-generate sysdeps.h + ./cli-generate -c $< >$@ +@@ -157,7 +157,7 @@ compile: conf-cc + chmod 755 compile + + crc-gentab: crc-gentab.o load fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o +- ./load crc-gentab fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o -static ++ ./load crc-gentab fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o + + crc-gentab.o: compile crc-gentab.c sysdeps.h include/bglibs/iobuf.h include/bglibs/iobuf_common.h include/bglibs/ibuf.h include/iobuf_common.h include/bglibs/obuf.h sysdeps.h include/bglibs/msg.h sysdeps.h include/bglibs/debug.h + ./compile crc-gentab.c +@@ -293,7 +293,7 @@ dl.lib: compile load @echo 'main() { ; }' >trylib-ldl.c @{ ./compile trylib-ldl.c && ./load trylib-ldl -ldl; } >/dev/null 2>&1 \ && { echo -ldl >dl.lib; echo yes; } \ @@ -28,35 +41,8 @@ $NetBSD: patch-ab,v 1.7 2016/12/31 15:13 + || { : >dl.lib; echo no; } @rm -f trylib-ldl.c trylib-ldl.o trylib-ldl - dotlibs: crypt.lib dl.lib m.lib net.lib rt.lib s.lib shadow.lib socket.lib -@@ -624,7 +624,7 @@ m.lib: compile load - @echo 'main() { ; }' >trylib-lm.c - @{ ./compile trylib-lm.c && ./load trylib-lm -lm; } >/dev/null 2>&1 \ - && { echo -lm >m.lib; echo yes; } \ -- || { echo -n >m.lib; echo no; } -+ || { : >m.lib; echo no; } - @rm -f trylib-lm.c trylib-lm.o trylib-lm - - makeshlib: conf-ld conf-lib LIBVERSION Makefile -@@ -632,7 +632,7 @@ makeshlib: conf-ld conf-lib LIBVERSION M - echo '#!/bin/sh'; \ - echo 'lib="$$1"; shift';\ - echo 'rm -f "$$lib"';\ -- echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"}';\ -+ echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"}' `cat socket.lib`;\ - ) >makeshlib - chmod 755 makeshlib - -@@ -710,7 +710,7 @@ net.lib: compile load - @echo 'main() { ; }' >trylib-lnet.c - @{ ./compile trylib-lnet.c && ./load trylib-lnet -lnet; } >/dev/null 2>&1 \ - && { echo -lnet >net.lib; echo yes; } \ -- || { echo -n >net.lib; echo no; } -+ || { : >net.lib; echo no; } - @rm -f trylib-lnet.c trylib-lnet.o trylib-lnet - - net/accept4.lo net/accept4.o: ltcompile net/accept4.c net/socket.h net/ipv4.h sysdeps.h net/ipv6.h sysdeps.h -@@ -876,9 +876,7 @@ path/mktemp.lo path/mktemp.o: ltcompile + fmt/char.lo fmt/char.o: ltcompile fmt/char.c include/bglibs/fmt.h +@@ -863,9 +863,7 @@ path/mktemp.lo path/mktemp.o: ltcompile ./ltcompile path/mktemp.c perl-head.pl: @@ -67,7 +53,7 @@ $NetBSD: patch-ab,v 1.7 2016/12/31 15:13 echo "# WARNING: This file was auto-generated. Do not edit!"; \ echo ) >perl-head.pl -@@ -896,7 +894,7 @@ rt.lib: compile load +@@ -885,7 +883,7 @@ rt.lib: compile load @echo 'main() { ; }' >trylib-lrt.c @{ ./compile trylib-lrt.c && ./load trylib-lrt -lrt; } >/dev/null 2>&1 \ && { echo -lrt >rt.lib; echo yes; } \ @@ -75,22 +61,4 @@ $NetBSD: patch-ab,v 1.7 2016/12/31 15:13 + || { : >rt.lib; echo no; } @rm -f trylib-lrt.c trylib-lrt.o trylib-lrt - s.lib: compile load -@@ -904,7 +902,7 @@ s.lib: compile load - @echo 'main() { ; }' >trylib-ls.c - @{ ./compile trylib-ls.c && ./load trylib-ls -ls; } >/dev/null 2>&1 \ - && { echo -ls >s.lib; echo yes; } \ -- || { echo -n >s.lib; echo no; } -+ || { : >s.lib; echo no; } - @rm -f trylib-ls.c trylib-ls.o trylib-ls - - selftests: selftests.sh sysdeps.h libbg-sysdeps.la libbg.la -@@ -915,7 +913,7 @@ shadow.lib: compile load - @echo 'main() { ; }' >trylib-lshadow.c - @{ ./compile trylib-lshadow.c && ./load trylib-lshadow -lshadow; } >/dev/null 2>&1 \ - && { echo -lshadow >shadow.lib; echo yes; } \ -- || { echo -n >shadow.lib; echo no; } -+ || { : >shadow.lib; echo no; } - @rm -f trylib-lshadow.c trylib-lshadow.o trylib-lshadow - - socket.lib: compile load + selftest-cmp: selftest-cmp.o ltload libbg.la Index: pkgsrc/devel/bglibs/patches/patch-crypto_hmac-md5.c diff -u pkgsrc/devel/bglibs/patches/patch-crypto_hmac-md5.c:1.1 pkgsrc/devel/bglibs/patches/patch-crypto_hmac-md5.c:1.2 --- pkgsrc/devel/bglibs/patches/patch-crypto_hmac-md5.c:1.1 Sun Dec 18 21:39:58 2016 +++ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-md5.c Mon Jan 2 02:18:30 2017 @@ -1,4 +1,6 @@ -$NetBSD: patch-crypto_hmac-md5.c,v 1.1 2016/12/18 21:39:58 joerg Exp $ +$NetBSD: patch-crypto_hmac-md5.c,v 1.2 2017/01/02 02:18:30 schmonz Exp $ + +Rename hmac to bghmac. --- crypto/hmac-md5.c.orig 2016-12-18 09:59:13.731995800 +0000 +++ crypto/hmac-md5.c Index: pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha1.c diff -u pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha1.c:1.1 pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha1.c:1.2 --- pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha1.c:1.1 Sun Dec 18 21:39:58 2016 +++ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha1.c Mon Jan 2 02:18:30 2017 @@ -1,4 +1,6 @@ -$NetBSD: patch-crypto_hmac-sha1.c,v 1.1 2016/12/18 21:39:58 joerg Exp $ +$NetBSD: patch-crypto_hmac-sha1.c,v 1.2 2017/01/02 02:18:30 schmonz Exp $ + +Rename hmac to bghmac. --- crypto/hmac-sha1.c.orig 2016-12-18 09:59:10.547412663 +0000 +++ crypto/hmac-sha1.c Index: pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha256.c diff -u pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha256.c:1.1 pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha256.c:1.2 --- pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha256.c:1.1 Sun Dec 18 21:39:58 2016 +++ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha256.c Mon Jan 2 02:18:30 2017 @@ -1,4 +1,6 @@ -$NetBSD: patch-crypto_hmac-sha256.c,v 1.1 2016/12/18 21:39:58 joerg Exp $ +$NetBSD: patch-crypto_hmac-sha256.c,v 1.2 2017/01/02 02:18:30 schmonz Exp $ + +Rename hmac to bghmac. --- crypto/hmac-sha256.c.orig 2016-12-18 09:59:08.038143186 +0000 +++ crypto/hmac-sha256.c Index: pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha384.c diff -u pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha384.c:1.1 pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha384.c:1.2 --- pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha384.c:1.1 Sun Dec 18 21:39:58 2016 +++ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha384.c Mon Jan 2 02:18:30 2017 @@ -1,4 +1,6 @@ -$NetBSD: patch-crypto_hmac-sha384.c,v 1.1 2016/12/18 21:39:58 joerg Exp $ +$NetBSD: patch-crypto_hmac-sha384.c,v 1.2 2017/01/02 02:18:30 schmonz Exp $ + +Rename hmac to bghmac. --- crypto/hmac-sha384.c.orig 2016-12-18 09:59:03.209209425 +0000 +++ crypto/hmac-sha384.c Index: pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha512.c diff -u pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha512.c:1.1 pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha512.c:1.2 --- pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha512.c:1.1 Sun Dec 18 21:39:58 2016 +++ pkgsrc/devel/bglibs/patches/patch-crypto_hmac-sha512.c Mon Jan 2 02:18:30 2017 @@ -1,4 +1,6 @@ -$NetBSD: patch-crypto_hmac-sha512.c,v 1.1 2016/12/18 21:39:58 joerg Exp $ +$NetBSD: patch-crypto_hmac-sha512.c,v 1.2 2017/01/02 02:18:30 schmonz Exp $ + +Rename hmac to bghmac. --- crypto/hmac-sha512.c.orig 2016-12-18 09:59:00.448666869 +0000 +++ crypto/hmac-sha512.c Index: pkgsrc/devel/bglibs/patches/patch-crypto_hmac.c diff -u pkgsrc/devel/bglibs/patches/patch-crypto_hmac.c:1.1 pkgsrc/devel/bglibs/patches/patch-crypto_hmac.c:1.2 --- pkgsrc/devel/bglibs/patches/patch-crypto_hmac.c:1.1 Sun Dec 18 21:39:58 2016 +++ pkgsrc/devel/bglibs/patches/patch-crypto_hmac.c Mon Jan 2 02:18:30 2017 @@ -1,4 +1,6 @@ -$NetBSD: patch-crypto_hmac.c,v 1.1 2016/12/18 21:39:58 joerg Exp $ +$NetBSD: patch-crypto_hmac.c,v 1.2 2017/01/02 02:18:30 schmonz Exp $ + +Rename hmac to bghmac. --- crypto/hmac.c.orig 2016-12-18 09:58:18.626636990 +0000 +++ crypto/hmac.c Added files: Index: pkgsrc/devel/bglibs/patches/patch-include_hmac.h diff -u /dev/null pkgsrc/devel/bglibs/patches/patch-include_hmac.h:1.1 --- /dev/null Mon Jan 2 02:18:30 2017 +++ pkgsrc/devel/bglibs/patches/patch-include_hmac.h Mon Jan 2 02:18:30 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-include_hmac.h,v 1.1 2017/01/02 02:18:30 schmonz Exp $ + +Rename hmac to bghmac. + +--- include/hmac.h.orig 2015-02-06 23:57:34.000000000 +0000 ++++ include/hmac.h +@@ -34,7 +34,7 @@ extern void hmac_finish(const struct hma + const void* midstate, + const struct str* nonce, + void* outout); +-extern void hmac(const struct hmac_control_block* hcb, ++extern void bghmac(const struct hmac_control_block* hcb, + const struct str* secret, + const struct str* nonce, + void* output); --_----------=_1483323510239020--