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 2D0357A265 for ; Mon, 20 Mar 2017 06:02:29 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 974AF855FC; Mon, 20 Mar 2017 06:02:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 290C4855EE for ; Mon, 20 Mar 2017 06:02:28 +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 DB8jgrH_LHuC for ; Mon, 20 Mar 2017 06:02:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5429F84CE7 for ; Mon, 20 Mar 2017 06:02:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4A9C2FBE4; Mon, 20 Mar 2017 06:02:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1489989747289210" MIME-Version: 1.0 Date: Mon, 20 Mar 2017 06:02:27 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/databases To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20170320060227.4A9C2FBE4@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. --_----------=_1489989747289210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Mar 20 06:02:27 UTC 2017 Modified Files: pkgsrc/databases/gdbm: Makefile Makefile.common PLIST buildlink3.mk builtin.mk distinfo pkgsrc/databases/gdbm_compat: Makefile builtin.mk Added Files: pkgsrc/databases/gdbm/patches: patch-src_Makefile.in Log Message: Version 1.13 - 2017-03-11 * gdbm_fetch, gdbm_firstkey, and gdbm_nextkey behavior If the requested key was not found, these functions return datum with dptr pointing to NULL and set gdbm_errno to GDBM_ITEM_NOT_FOUND (in prior releases, gdbm_errno was set to GDBM_NO_ERROR), If an error occurred, dptr is set to NULL, and gdbm_errno to the error code. In any case gdbm_errno is guaranteed to have meaningful value upon return. * Error handling In previous versions of GDBM, fatal errors (such as write error while storing the key/data pair or bucket) caused immediate termination of the program via call to exit(3). This is no longer the case. Starting from this version, if a fatal error occurrs while modifying the database file, that database is marked as needing recovery and gdbm_errno is set to GDBM_NEED_RECOVERY. Calls to any GDBM functions, except gdbm_recover, will then return immediately with the same error code. The function gdbm_recover examines the database file and fixes eventual inconsistencies. Upon successful return it clears the error state and makes the database operational again. For backward compatibility, the fatal_func argument to gdbm_open is retained and its functionality is not changed. If it is not NULL, the new error handling procedures are disabled, the function it points to will be called upon fatal errors. When it returns, exit(1) will be called. * Per-database error codes In addition to gdbm_error global variable, the most recent error state is saved in the GDBM_FILE structure. This facilitates error handling when operating multiple GDBM databases simultaneously. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 pkgsrc/databases/gdbm/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/gdbm/Makefile.common cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/gdbm/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/gdbm/buildlink3.mk \ pkgsrc/databases/gdbm/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/gdbm/builtin.mk cvs rdiff -u -r0 -r1.1 pkgsrc/databases/gdbm/patches/patch-src_Makefile.in cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/gdbm_compat/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/gdbm_compat/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1489989747289210 Content-Disposition: inline Content-Length: 7135 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/gdbm/Makefile diff -u pkgsrc/databases/gdbm/Makefile:1.51 pkgsrc/databases/gdbm/Makefile:1.52 --- pkgsrc/databases/gdbm/Makefile:1.51 Thu Oct 9 14:06:05 2014 +++ pkgsrc/databases/gdbm/Makefile Mon Mar 20 06:02:26 2017 @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.51 2014/10/09 14:06:05 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2017/03/20 06:02:26 adam Exp $ .include "Makefile.common" COMMENT= The GNU database manager INFO_FILES= yes -MAKE_JOBS_SAFE= no - -.include "../../mk/bsd.prefs.mk" +.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/databases/gdbm/Makefile.common diff -u pkgsrc/databases/gdbm/Makefile.common:1.4 pkgsrc/databases/gdbm/Makefile.common:1.5 --- pkgsrc/databases/gdbm/Makefile.common:1.4 Sun May 22 17:24:32 2016 +++ pkgsrc/databases/gdbm/Makefile.common Mon Mar 20 06:02:26 2017 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.4 2016/05/22 17:24:32 wiz Exp $ +# $NetBSD: Makefile.common,v 1.5 2017/03/20 06:02:26 adam Exp $ # # used by databases/gdbm/Makefile # used by databases/gdbm_compat/Makefile -DISTNAME= gdbm-1.12 +DISTNAME= gdbm-1.13 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GNU:=gdbm/} Index: pkgsrc/databases/gdbm/PLIST diff -u pkgsrc/databases/gdbm/PLIST:1.12 pkgsrc/databases/gdbm/PLIST:1.13 --- pkgsrc/databases/gdbm/PLIST:1.12 Fri May 23 20:49:15 2014 +++ pkgsrc/databases/gdbm/PLIST Mon Mar 20 06:02:26 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2014/05/23 20:49:15 wiz Exp $ +@comment $NetBSD: PLIST,v 1.13 2017/03/20 06:02:26 adam Exp $ bin/gdbm_dump bin/gdbm_load bin/gdbmtool @@ -9,6 +9,7 @@ man/man1/gdbm_dump.1 man/man1/gdbm_load.1 man/man1/gdbmtool.1 man/man3/gdbm.3 +share/locale/da/LC_MESSAGES/gdbm.mo share/locale/de/LC_MESSAGES/gdbm.mo share/locale/eo/LC_MESSAGES/gdbm.mo share/locale/fi/LC_MESSAGES/gdbm.mo Index: pkgsrc/databases/gdbm/buildlink3.mk diff -u pkgsrc/databases/gdbm/buildlink3.mk:1.11 pkgsrc/databases/gdbm/buildlink3.mk:1.12 --- pkgsrc/databases/gdbm/buildlink3.mk:1.11 Tue Jan 24 09:10:06 2012 +++ pkgsrc/databases/gdbm/buildlink3.mk Mon Mar 20 06:02:26 2017 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/01/24 09:10:06 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2017/03/20 06:02:26 adam Exp $ BUILDLINK_TREE+= gdbm @@ -9,6 +9,7 @@ BUILDLINK_API_DEPENDS.gdbm+= gdbm>=1.8.3 BUILDLINK_ABI_DEPENDS.gdbm+= gdbm>=1.10nb3 BUILDLINK_PKGSRCDIR.gdbm?= ../../databases/gdbm +.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .endif # GDBM_BUILDLINK3_MK Index: pkgsrc/databases/gdbm/distinfo diff -u pkgsrc/databases/gdbm/distinfo:1.11 pkgsrc/databases/gdbm/distinfo:1.12 --- pkgsrc/databases/gdbm/distinfo:1.11 Sun May 22 17:24:32 2016 +++ pkgsrc/databases/gdbm/distinfo Mon Mar 20 06:02:26 2017 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.11 2016/05/22 17:24:32 wiz Exp $ +$NetBSD: distinfo,v 1.12 2017/03/20 06:02:26 adam Exp $ -SHA1 (gdbm-1.12.tar.gz) = 86513e8871bb376bc014e9e5a2d18a8e0a8ea2f5 -RMD160 (gdbm-1.12.tar.gz) = 5f47e6adfec14b31c3e26c1027684ba4845eef8a -SHA512 (gdbm-1.12.tar.gz) = 25e03dceed6986f1977d304a5ad059ac6c603a88ad4aa18c831ec42df82d68006f2e04b8a3cc400d0a4970750c78ba24a3f84cdff70de9f278cfd854c059699e -Size (gdbm-1.12.tar.gz) = 841213 bytes +SHA1 (gdbm-1.13.tar.gz) = 7f2a8301497bbcac91808b011ca533380914fd21 +RMD160 (gdbm-1.13.tar.gz) = ad3d3258d3ae82eb16237051ea0e981178d6e93e +SHA512 (gdbm-1.13.tar.gz) = fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad +Size (gdbm-1.13.tar.gz) = 891987 bytes +SHA1 (patch-src_Makefile.in) = 52b47f3dcd381143d1cdae40f1972bd989dcce1f Index: pkgsrc/databases/gdbm/builtin.mk diff -u pkgsrc/databases/gdbm/builtin.mk:1.2 pkgsrc/databases/gdbm/builtin.mk:1.3 --- pkgsrc/databases/gdbm/builtin.mk:1.2 Sat Nov 23 11:29:35 2013 +++ pkgsrc/databases/gdbm/builtin.mk Mon Mar 20 06:02:26 2017 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:29:35 obache Exp $ +# $NetBSD: builtin.mk,v 1.3 2017/03/20 06:02:26 adam Exp $ BUILTIN_PKG:= gdbm BUILTIN_FIND_HEADERS_VAR= GDBM_H @@ -56,7 +56,7 @@ USE_BUILTIN.gdbm= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.gdbm} . if !empty(USE_BUILTIN.gdbm:M[yY][eE][sS]) USE_BUILTIN.gdbm!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gdbm:Q}; then \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gdbm}; then \ ${ECHO} "yes"; \ else \ ${ECHO} "no"; \ Index: pkgsrc/databases/gdbm_compat/Makefile diff -u pkgsrc/databases/gdbm_compat/Makefile:1.7 pkgsrc/databases/gdbm_compat/Makefile:1.8 --- pkgsrc/databases/gdbm_compat/Makefile:1.7 Thu Oct 9 14:06:05 2014 +++ pkgsrc/databases/gdbm_compat/Makefile Mon Mar 20 06:02:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/10/09 14:06:05 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2017/03/20 06:02:27 adam Exp $ .include "../../databases/gdbm/Makefile.common" @@ -12,7 +12,8 @@ CONFIGURE_ARGS+= --enable-libgdbm-compat BUILD_DIRS= compat -.include "../../databases/gdbm/buildlink3.mk" post-extract: ${LN} -s ${BUILDLINK_PREFIX.gdbm}/lib/libgdbm.la ${WRKSRC}/src + +.include "../../databases/gdbm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/databases/gdbm_compat/builtin.mk diff -u pkgsrc/databases/gdbm_compat/builtin.mk:1.4 pkgsrc/databases/gdbm_compat/builtin.mk:1.5 --- pkgsrc/databases/gdbm_compat/builtin.mk:1.4 Sat Nov 23 11:29:35 2013 +++ pkgsrc/databases/gdbm_compat/builtin.mk Mon Mar 20 06:02:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2013/11/23 11:29:35 obache Exp $ +# $NetBSD: builtin.mk,v 1.5 2017/03/20 06:02:27 adam Exp $ BUILTIN_PKG:= gdbm_compat BUILTIN_FIND_HEADERS_VAR= NDBM_H @@ -52,7 +52,7 @@ USE_BUILTIN.gdbm_compat= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.gdbm_compat} . if !empty(USE_BUILTIN.gdbm_compat:M[yY][eE][sS]) USE_BUILTIN.gdbm_compat!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gdbm_compat:Q}; then \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gdbm_compat}; then \ ${ECHO} "yes"; \ else \ ${ECHO} "no"; \ Added files: Index: pkgsrc/databases/gdbm/patches/patch-src_Makefile.in diff -u /dev/null pkgsrc/databases/gdbm/patches/patch-src_Makefile.in:1.1 --- /dev/null Mon Mar 20 06:02:27 2017 +++ pkgsrc/databases/gdbm/patches/patch-src_Makefile.in Mon Mar 20 06:02:26 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2017/03/20 06:02:26 adam Exp $ + +Fix parallel build. + +--- src/Makefile.in.orig 2017-03-20 05:31:29.000000000 +0000 ++++ src/Makefile.in +@@ -829,7 +829,7 @@ distdir: $(DISTFILES) + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) ++all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) .WAIT $(PROGRAMS) $(HEADERS) + install-binPROGRAMS: install-libLTLIBRARIES + + installdirs: --_----------=_1489989747289210--