Received: by mail.netbsd.org (Postfix, from userid 605) id BB30784D60; Thu, 24 Oct 2019 12:50:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4471784D5D for ; Thu, 24 Oct 2019 12:50: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 TcpUwVvVOJZi for ; Thu, 24 Oct 2019 12:50:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 83A6684CDC for ; Thu, 24 Oct 2019 12:50:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7F58CFA84; Thu, 24 Oct 2019 12:50:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1571921436209450" MIME-Version: 1.0 Date: Thu, 24 Oct 2019 12:50:36 +0000 From: "Juraj Lutter" Subject: CVS commit: pkgsrc/net/bind914 To: pkgsrc-changes@NetBSD.org Reply-To: otis@netbsd.org X-Mailer: log_accum Message-Id: <20191024125036.7F58CFA84@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1571921436209450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: otis Date: Thu Oct 24 12:50:36 UTC 2019 Modified Files: pkgsrc/net/bind914: Makefile distinfo pkgsrc/net/bind914/patches: patch-lib_isc_unix_socket.c Added Files: pkgsrc/net/bind914/patches: patch-lib_isc_unix_net.c Log Message: bind914: Fix build on SmartOS SmartOS requires _XOPEN_SOURCE for various macros and functions (CMSG_DATA() et al.) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/bind914/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/bind914/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/bind914/patches/patch-lib_isc_unix_net.c cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/net/bind914/patches/patch-lib_isc_unix_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1571921436209450 Content-Disposition: inline Content-Length: 4116 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/bind914/Makefile diff -u pkgsrc/net/bind914/Makefile:1.11 pkgsrc/net/bind914/Makefile:1.12 --- pkgsrc/net/bind914/Makefile:1.11 Wed Oct 16 20:51:59 2019 +++ pkgsrc/net/bind914/Makefile Thu Oct 24 12:50:36 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/10/16 20:51:59 maya Exp $ +# $NetBSD: Makefile,v 1.12 2019/10/24 12:50:36 otis Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P/pl/} @@ -38,6 +38,8 @@ CONFIGURE_ARGS+= --disable-atomic .endif CONFIGURE_ARGS.DragonFly+= --disable-kqueue +BUILDLINK_TRANSFORM.SunOS+= rm:-zrelax=transtls + PKG_GROUPS_VARS+= BIND_GROUP PKG_USERS_VARS= BIND_USER @@ -72,4 +74,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm .include "../../security/openssl/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/bind914/distinfo diff -u pkgsrc/net/bind914/distinfo:1.9 pkgsrc/net/bind914/distinfo:1.10 --- pkgsrc/net/bind914/distinfo:1.9 Wed Oct 16 20:51:59 2019 +++ pkgsrc/net/bind914/distinfo Thu Oct 24 12:50:36 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2019/10/16 20:51:59 maya Exp $ +$NetBSD: distinfo,v 1.10 2019/10/24 12:50:36 otis Exp $ SHA1 (bind-9.14.7.tar.gz) = ab0b14f4fe6a818fb15673ea9cef3eead8f6a94b RMD160 (bind-9.14.7.tar.gz) = 6caf6e1a7ea03e311c6bcdd1cca63547e230f86b @@ -35,5 +35,6 @@ SHA1 (patch-lib_dns_validator.c) = 7d747 SHA1 (patch-lib_dns_view.c) = 25095827adbc75dc629b0f435dbd711b599c86c9 SHA1 (patch-lib_isc_backtrace.c) = 5fa1dd0f18ae757233d9cc21e36a5f6a84990db1 SHA1 (patch-lib_isc_stats.c) = 9857f640fb0becfab1a7f347f835610230bd3279 -SHA1 (patch-lib_isc_unix_socket.c) = 4f7be1616bac7263069292f909896373f0e6fab8 +SHA1 (patch-lib_isc_unix_net.c) = a8779d7e51c3a54f5dada1396abe10eb77ff0df9 +SHA1 (patch-lib_isc_unix_socket.c) = 3325d04decda1d6ecd9e5be34ac5fe4c122466f4 SHA1 (patch-lib_isc_unix_time.c) = 04312e043601688aa2b0a09dad1bcb51d9273e9d Index: pkgsrc/net/bind914/patches/patch-lib_isc_unix_socket.c diff -u pkgsrc/net/bind914/patches/patch-lib_isc_unix_socket.c:1.2 pkgsrc/net/bind914/patches/patch-lib_isc_unix_socket.c:1.3 --- pkgsrc/net/bind914/patches/patch-lib_isc_unix_socket.c:1.2 Fri Jun 14 16:14:05 2019 +++ pkgsrc/net/bind914/patches/patch-lib_isc_unix_socket.c Thu Oct 24 12:50:36 2019 @@ -1,10 +1,28 @@ -$NetBSD: patch-lib_isc_unix_socket.c,v 1.2 2019/06/14 16:14:05 taca Exp $ +$NetBSD: patch-lib_isc_unix_socket.c,v 1.3 2019/10/24 12:50:36 otis Exp $ * Apply fixes from NetBSD base system. +* Fix build on SmartOS. In this special case, _XOPEN_SOURCE has to be only + defined on SmartOS. ---- lib/isc/unix/socket.c.orig 2019-04-06 20:09:59.000000000 +0000 +--- lib/isc/unix/socket.c.orig 2019-10-02 06:24:10.000000000 +0000 +++ lib/isc/unix/socket.c -@@ -225,6 +225,7 @@ typedef enum { poll_idle, poll_active, p +@@ -11,6 +11,15 @@ + + /*! \file */ + ++/* needed for CMSG_DATA */ ++#if defined(__sun) ++#if (__STDC_VERSION__ - 0 < 199901L) ++#define _XOPEN_SOURCE 500 ++#else ++#define _XOPEN_SOURCE 600 ++#endif ++#endif ++ + #include + + #include +@@ -225,6 +234,7 @@ typedef enum { poll_idle, poll_active, p (e) == EWOULDBLOCK || \ (e) == ENOBUFS || \ (e) == EINTR || \ Added files: Index: pkgsrc/net/bind914/patches/patch-lib_isc_unix_net.c diff -u /dev/null pkgsrc/net/bind914/patches/patch-lib_isc_unix_net.c:1.1 --- /dev/null Thu Oct 24 12:50:36 2019 +++ pkgsrc/net/bind914/patches/patch-lib_isc_unix_net.c Thu Oct 24 12:50:36 2019 @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_isc_unix_net.c,v 1.1 2019/10/24 12:50:36 otis Exp $ + +* Fix build on SmartOS. In this special case, _XOPEN_SOURCE has to be only + defined on SmartOS. + +--- lib/isc/unix/net.c.orig 2019-10-02 06:24:10.000000000 +0000 ++++ lib/isc/unix/net.c +@@ -9,6 +9,14 @@ + * information regarding copyright ownership. + */ + ++/* needed for CMSG_DATA */ ++#if defined(__sun) ++#if (__STDC_VERSION__ - 0 < 199901L) ++#define _XOPEN_SOURCE 500 ++#else ++#define _XOPEN_SOURCE 600 ++#endif ++#endif + + #include + --_----------=_1571921436209450--