Received: by mail.netbsd.org (Postfix, from userid 605) id A2D3E84D4A; Thu, 1 Mar 2018 00:48:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D318584DA0 for ; Thu, 1 Mar 2018 00:48:05 +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 c2quMAobIKs0 for ; Thu, 1 Mar 2018 00:48:05 +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 0A3E084D4A for ; Thu, 1 Mar 2018 00:48:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F268CFB40; Thu, 1 Mar 2018 00:48:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1519865284282990" MIME-Version: 1.0 Date: Thu, 1 Mar 2018 00:48:04 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/net/quagga To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20180301004804.F268CFB40@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. --_----------=_1519865284282990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Thu Mar 1 00:48:04 UTC 2018 Modified Files: pkgsrc/net/quagga: Makefile distinfo pkgsrc/net/quagga/patches: patch-configure Log Message: quagga: correct mistake in configure check. this made the configure test always fail and broke the build on netbsd. Fixes PR pkg/53050. PKGREVISION++ To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/quagga/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/quagga/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/quagga/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1519865284282990 Content-Disposition: inline Content-Length: 3217 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/quagga/Makefile diff -u pkgsrc/net/quagga/Makefile:1.57 pkgsrc/net/quagga/Makefile:1.58 --- pkgsrc/net/quagga/Makefile:1.57 Mon Jan 22 13:42:06 2018 +++ pkgsrc/net/quagga/Makefile Thu Mar 1 00:48:04 2018 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.57 2018/01/22 13:42:06 wiedi Exp $ +# $NetBSD: Makefile,v 1.58 2018/03/01 00:48:04 maya Exp $ # DISTNAME= quagga-1.2.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.savannah.gnu.org/releases/quagga/ Index: pkgsrc/net/quagga/distinfo diff -u pkgsrc/net/quagga/distinfo:1.29 pkgsrc/net/quagga/distinfo:1.30 --- pkgsrc/net/quagga/distinfo:1.29 Mon Jan 22 13:42:06 2018 +++ pkgsrc/net/quagga/distinfo Thu Mar 1 00:48:04 2018 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.29 2018/01/22 13:42:06 wiedi Exp $ +$NetBSD: distinfo,v 1.30 2018/03/01 00:48:04 maya Exp $ SHA1 (quagga-1.2.2.tar.gz) = d2601270a39e707db88d0c39b81acb13b53e0568 RMD160 (quagga-1.2.2.tar.gz) = daa24bc37661eb5436edf42a15ed4ae1bc1b56ef SHA512 (quagga-1.2.2.tar.gz) = 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14 Size (quagga-1.2.2.tar.gz) = 2986142 bytes -SHA1 (patch-configure) = 310295eeed487ccadbd7f56ae71dbb7cf0c71919 +SHA1 (patch-configure) = d3289b94f9aa871678398ccd78f655944277f03f SHA1 (patch-solaris_quagga.init.in) = 47569aaffe2713809e21ebbb76164cf50b7f983f SHA1 (patch-zebra_kernel__socket.c) = 82c1be406ec587d7bc4d6eec39f9daebbc34e999 Index: pkgsrc/net/quagga/patches/patch-configure diff -u pkgsrc/net/quagga/patches/patch-configure:1.6 pkgsrc/net/quagga/patches/patch-configure:1.7 --- pkgsrc/net/quagga/patches/patch-configure:1.6 Mon Jan 22 13:42:07 2018 +++ pkgsrc/net/quagga/patches/patch-configure Thu Mar 1 00:48:04 2018 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.6 2018/01/22 13:42:07 wiedi Exp $ +$NetBSD: patch-configure,v 1.7 2018/03/01 00:48:04 maya Exp $ HAVE_BSD_STRUCT_IP_MREQ_HACK does not work on SunOS Results in: can't setsockopt IP_MULTICAST_IF(...): No route to host @@ -9,7 +9,7 @@ Results in: can't setsockopt IP_MULTICAS main () { -#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__sun) -+#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)) ++#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) return (0); #else #error No support for BSD struct ip_mreq hack detected --_----------=_1519865284282990--