Thu Oct 24 12:50:36 2019 UTC ()
bind914: Fix build on SmartOS

SmartOS requires _XOPEN_SOURCE for various macros and functions (CMSG_DATA() et
al.)


(otis)
diff -r1.11 -r1.12 pkgsrc/net/bind914/Makefile
diff -r1.9 -r1.10 pkgsrc/net/bind914/distinfo
diff -r0 -r1.1 pkgsrc/net/bind914/patches/patch-lib_isc_unix_net.c
diff -r1.2 -r1.3 pkgsrc/net/bind914/patches/patch-lib_isc_unix_socket.c
cvs diff -r1.11 -r1.12 pkgsrc/net/bind914/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/bind914/Attic/Makefile 2019/10/16 20:51:59 1.11
+++ pkgsrc/net/bind914/Attic/Makefile 2019/10/24 12:50:36 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2019/10/16 20:51:59 maya Exp $ 1# $NetBSD: Makefile,v 1.12 2019/10/24 12:50:36 otis Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ 6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.isc.org/software/bind/ 9HOMEPAGE= http://www.isc.org/software/bind/
10COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14 10COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14
11LICENSE= mpl-2.0 11LICENSE= mpl-2.0
12 12
13CONFLICTS+= host-[0-9]* 13CONFLICTS+= host-[0-9]*
14 14
@@ -28,26 +28,28 @@ GNU_CONFIGURE= yes @@ -28,26 +28,28 @@ GNU_CONFIGURE= yes
28 28
29CONFIGURE_ARGS+= --with-libtool 29CONFIGURE_ARGS+= --with-libtool
30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
31CONFIGURE_ARGS+= --localstatedir=${VARBASE} 31CONFIGURE_ARGS+= --localstatedir=${VARBASE}
32CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 32CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
33CONFIGURE_ARGS+= --with-python=no 33CONFIGURE_ARGS+= --with-python=no
34.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ 34.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
35 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ 35 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
36 !empty(MACHINE_PLATFORM:MNetBSD-*-vax) 36 !empty(MACHINE_PLATFORM:MNetBSD-*-vax)
37CONFIGURE_ARGS+= --disable-atomic 37CONFIGURE_ARGS+= --disable-atomic
38.endif 38.endif
39CONFIGURE_ARGS.DragonFly+= --disable-kqueue 39CONFIGURE_ARGS.DragonFly+= --disable-kqueue
40 40
 41BUILDLINK_TRANSFORM.SunOS+= rm:-zrelax=transtls
 42
41PKG_GROUPS_VARS+= BIND_GROUP 43PKG_GROUPS_VARS+= BIND_GROUP
42PKG_USERS_VARS= BIND_USER 44PKG_USERS_VARS= BIND_USER
43 45
44PKG_GROUPS= ${BIND_GROUP} 46PKG_GROUPS= ${BIND_GROUP}
45PKG_USERS= ${BIND_USER}:${BIND_GROUP} 47PKG_USERS= ${BIND_USER}:${BIND_GROUP}
46 48
47PKG_GECOS.${BIND_USER}= Named pseudo-user 49PKG_GECOS.${BIND_USER}= Named pseudo-user
48PKG_HOME.${BIND_USER}= ${BIND_DIR} 50PKG_HOME.${BIND_USER}= ${BIND_DIR}
49 51
50DOCS= CHANGES HISTORY OPTIONS README 52DOCS= CHANGES HISTORY OPTIONS README
51 53
52FILES_SUBST+= BIND_GROUP=${BIND_GROUP} \ 54FILES_SUBST+= BIND_GROUP=${BIND_GROUP} \
53 BIND_USER=${BIND_USER} PAX=${PAX:Q} \ 55 BIND_USER=${BIND_USER} PAX=${PAX:Q} \
@@ -62,14 +64,15 @@ SMF_METHODS= named @@ -62,14 +64,15 @@ SMF_METHODS= named
62INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/bind9 64INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/bind9
63CONF_FILES+= share/examples/bind9/bind.keys \ 65CONF_FILES+= share/examples/bind9/bind.keys \
64 ${PKG_SYSCONFDIR}/bind.keys 66 ${PKG_SYSCONFDIR}/bind.keys
65 67
66INSTALLATION_DIRS+= ${DOCDIR} ${DOCDIR}/arm 68INSTALLATION_DIRS+= ${DOCDIR} ${DOCDIR}/arm
67 69
68post-install: 70post-install:
69.for f in ${DOCS} 71.for f in ${DOCS}
70 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR} 72 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
71.endfor 73.endfor
72 ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm 74 ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm
73 75
74.include "../../security/openssl/buildlink3.mk" 76.include "../../security/openssl/buildlink3.mk"
 77.include "../../devel/zlib/buildlink3.mk"
75.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/net/bind914/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/bind914/Attic/distinfo 2019/10/16 20:51:59 1.9
+++ pkgsrc/net/bind914/Attic/distinfo 2019/10/24 12:50:36 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.9 2019/10/16 20:51:59 maya Exp $ 1$NetBSD: distinfo,v 1.10 2019/10/24 12:50:36 otis Exp $
2 2
3SHA1 (bind-9.14.7.tar.gz) = ab0b14f4fe6a818fb15673ea9cef3eead8f6a94b 3SHA1 (bind-9.14.7.tar.gz) = ab0b14f4fe6a818fb15673ea9cef3eead8f6a94b
4RMD160 (bind-9.14.7.tar.gz) = 6caf6e1a7ea03e311c6bcdd1cca63547e230f86b 4RMD160 (bind-9.14.7.tar.gz) = 6caf6e1a7ea03e311c6bcdd1cca63547e230f86b
5SHA512 (bind-9.14.7.tar.gz) = e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740 5SHA512 (bind-9.14.7.tar.gz) = e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740
6Size (bind-9.14.7.tar.gz) = 6320994 bytes 6Size (bind-9.14.7.tar.gz) = 6320994 bytes
7SHA1 (patch-bin_named_Makefile.in) = 741e3708c670baaec45446f6bb364ada448ae330 7SHA1 (patch-bin_named_Makefile.in) = 741e3708c670baaec45446f6bb364ada448ae330
8SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0 8SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0
9SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b 9SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b
10SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833 10SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833
11SHA1 (patch-bin_named_server.c) = 558088a1e1128e7a69394d66bfff03a5b3b62ee8 11SHA1 (patch-bin_named_server.c) = 558088a1e1128e7a69394d66bfff03a5b3b62ee8
12SHA1 (patch-bin_nsupdate_nsupdate.c) = f71213385ec7c78243c1f93a6940caa111cb5072 12SHA1 (patch-bin_nsupdate_nsupdate.c) = f71213385ec7c78243c1f93a6940caa111cb5072
13SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e 13SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
14SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28 14SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
@@ -25,15 +25,16 @@ SHA1 (patch-lib_dns_gssapi__link.c) = d3 @@ -25,15 +25,16 @@ SHA1 (patch-lib_dns_gssapi__link.c) = d3
25SHA1 (patch-lib_dns_keytable.c) = 4369b07b75201d2f7384f05d8a3140a809d303ae 25SHA1 (patch-lib_dns_keytable.c) = 4369b07b75201d2f7384f05d8a3140a809d303ae
26SHA1 (patch-lib_dns_lookup.c) = 8e8e78e20a8e78692772d488e842df230e121203 26SHA1 (patch-lib_dns_lookup.c) = 8e8e78e20a8e78692772d488e842df230e121203
27SHA1 (patch-lib_dns_message.c) = 0be413cf8b56ce21bcceb451191cacf9d044fa06 27SHA1 (patch-lib_dns_message.c) = 0be413cf8b56ce21bcceb451191cacf9d044fa06
28SHA1 (patch-lib_dns_rbt.c) = 5b20fe8adf2fdf5b28822d0b5229845494c9639f 28SHA1 (patch-lib_dns_rbt.c) = 5b20fe8adf2fdf5b28822d0b5229845494c9639f
29SHA1 (patch-lib_dns_rbtdb.c) = 389a83f425050733cb90652ffcb515d7a53d76f2 29SHA1 (patch-lib_dns_rbtdb.c) = 389a83f425050733cb90652ffcb515d7a53d76f2
30SHA1 (patch-lib_dns_request.c) = 211e349ddda1e5a2bbafab7ddab48cca4b553822 30SHA1 (patch-lib_dns_request.c) = 211e349ddda1e5a2bbafab7ddab48cca4b553822
31SHA1 (patch-lib_dns_sdb.c) = 0e5ab9fadcdd20adeb6d5d3234b69087ab7439c8 31SHA1 (patch-lib_dns_sdb.c) = 0e5ab9fadcdd20adeb6d5d3234b69087ab7439c8
32SHA1 (patch-lib_dns_sdlz.c) = 84cc9539cb8fab3581feec2184be2dbebfc6fd67 32SHA1 (patch-lib_dns_sdlz.c) = 84cc9539cb8fab3581feec2184be2dbebfc6fd67
33SHA1 (patch-lib_dns_spnego.c) = 2867212608ebdb949c65d1d6a3db21742c1128f6 33SHA1 (patch-lib_dns_spnego.c) = 2867212608ebdb949c65d1d6a3db21742c1128f6
34SHA1 (patch-lib_dns_validator.c) = 7d7471efe5109f5b2d6f9e99fe15fa314fdd217d 34SHA1 (patch-lib_dns_validator.c) = 7d7471efe5109f5b2d6f9e99fe15fa314fdd217d
35SHA1 (patch-lib_dns_view.c) = 25095827adbc75dc629b0f435dbd711b599c86c9 35SHA1 (patch-lib_dns_view.c) = 25095827adbc75dc629b0f435dbd711b599c86c9
36SHA1 (patch-lib_isc_backtrace.c) = 5fa1dd0f18ae757233d9cc21e36a5f6a84990db1 36SHA1 (patch-lib_isc_backtrace.c) = 5fa1dd0f18ae757233d9cc21e36a5f6a84990db1
37SHA1 (patch-lib_isc_stats.c) = 9857f640fb0becfab1a7f347f835610230bd3279 37SHA1 (patch-lib_isc_stats.c) = 9857f640fb0becfab1a7f347f835610230bd3279
38SHA1 (patch-lib_isc_unix_socket.c) = 4f7be1616bac7263069292f909896373f0e6fab8 38SHA1 (patch-lib_isc_unix_net.c) = a8779d7e51c3a54f5dada1396abe10eb77ff0df9
 39SHA1 (patch-lib_isc_unix_socket.c) = 3325d04decda1d6ecd9e5be34ac5fe4c122466f4
39SHA1 (patch-lib_isc_unix_time.c) = 04312e043601688aa2b0a09dad1bcb51d9273e9d 40SHA1 (patch-lib_isc_unix_time.c) = 04312e043601688aa2b0a09dad1bcb51d9273e9d
File Added: pkgsrc/net/bind914/patches/Attic/patch-lib_isc_unix_net.c
$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 <config.h>
cvs diff -r1.2 -r1.3 pkgsrc/net/bind914/patches/Attic/patch-lib_isc_unix_socket.c (expand / switch to unified diff)

--- pkgsrc/net/bind914/patches/Attic/patch-lib_isc_unix_socket.c 2019/06/14 16:14:05 1.2
+++ pkgsrc/net/bind914/patches/Attic/patch-lib_isc_unix_socket.c 2019/10/24 12:50:36 1.3
@@ -1,14 +1,32 @@ @@ -1,14 +1,32 @@
1$NetBSD: patch-lib_isc_unix_socket.c,v 1.2 2019/06/14 16:14:05 taca Exp $ 1$NetBSD: patch-lib_isc_unix_socket.c,v 1.3 2019/10/24 12:50:36 otis Exp $
2 2
3* Apply fixes from NetBSD base system. 3* Apply fixes from NetBSD base system.
 4* Fix build on SmartOS. In this special case, _XOPEN_SOURCE has to be only
 5 defined on SmartOS.
4 6
5--- lib/isc/unix/socket.c.orig 2019-04-06 20:09:59.000000000 +0000 7--- lib/isc/unix/socket.c.orig 2019-10-02 06:24:10.000000000 +0000
6+++ lib/isc/unix/socket.c 8+++ lib/isc/unix/socket.c
7@@ -225,6 +225,7 @@ typedef enum { poll_idle, poll_active, p 9@@ -11,6 +11,15 @@
 10
 11 /*! \file */
 12
 13+/* needed for CMSG_DATA */
 14+#if defined(__sun)
 15+#if (__STDC_VERSION__ - 0 < 199901L)
 16+#define _XOPEN_SOURCE 500
 17+#else
 18+#define _XOPEN_SOURCE 600
 19+#endif
 20+#endif
 21+
 22 #include <config.h>
 23
 24 #include <inttypes.h>
 25@@ -225,6 +234,7 @@ typedef enum { poll_idle, poll_active, p
8 (e) == EWOULDBLOCK || \ 26 (e) == EWOULDBLOCK || \
9 (e) == ENOBUFS || \ 27 (e) == ENOBUFS || \
10 (e) == EINTR || \ 28 (e) == EINTR || \
11+ (e) == ENOBUFS || \ 29+ (e) == ENOBUFS || \
12 (e) == 0) 30 (e) == 0)
13  31
14 #define DLVL(x) ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(x) 32 #define DLVL(x) ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(x)