Received: by mail.netbsd.org (Postfix, from userid 605) id 29AF784DA0; Sun, 10 Sep 2017 01:44:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B175384D57 for ; Sun, 10 Sep 2017 01:44: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 leEMGa7rhGpo for ; Sun, 10 Sep 2017 01:44:32 +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 4549D84CE0 for ; Sun, 10 Sep 2017 01:44:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3B19CFA98; Sun, 10 Sep 2017 01:44:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1505007872162670" MIME-Version: 1.0 Date: Sun, 10 Sep 2017 01:44:32 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/security/honeyd To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20170910014432.3B19CFA98@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. --_----------=_1505007872162670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dholland Date: Sun Sep 10 01:44:32 UTC 2017 Modified Files: pkgsrc/security/honeyd: distinfo Added Files: pkgsrc/security/honeyd/patches: patch-tagging.h Log Message: Work around macro name conflict with netbsd's builtin libevent. The build goes further than before, but fails later trying to do no-longer-permitted things with libevent's internals. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/honeyd/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/security/honeyd/patches/patch-tagging.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1505007872162670 Content-Disposition: inline Content-Length: 1472 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/honeyd/distinfo diff -u pkgsrc/security/honeyd/distinfo:1.7 pkgsrc/security/honeyd/distinfo:1.8 --- pkgsrc/security/honeyd/distinfo:1.7 Wed Nov 4 01:17:46 2015 +++ pkgsrc/security/honeyd/distinfo Sun Sep 10 01:44:31 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 01:17:46 agc Exp $ +$NetBSD: distinfo,v 1.8 2017/09/10 01:44:31 dholland Exp $ SHA1 (honeyd-1.5b.tar.gz) = a6cef01ddb0b649442ac60e2a08b226b1634e3f9 RMD160 (honeyd-1.5b.tar.gz) = 40ebe7d3a2915b5145c5a2eef04b9d1de18fbb09 @@ -6,3 +6,4 @@ SHA512 (honeyd-1.5b.tar.gz) = 13f32d1243 Size (honeyd-1.5b.tar.gz) = 881787 bytes SHA1 (patch-aa) = b69d986bd1a5c1847f4f5467216730da020c8686 SHA1 (patch-ab) = 6f789cae31cc9b38ae68c2d9250dcab67e1a0146 +SHA1 (patch-tagging.h) = 69c19ce9948594010a2db3701453c5ff5d085577 Added files: Index: pkgsrc/security/honeyd/patches/patch-tagging.h diff -u /dev/null pkgsrc/security/honeyd/patches/patch-tagging.h:1.1 --- /dev/null Sun Sep 10 01:44:32 2017 +++ pkgsrc/security/honeyd/patches/patch-tagging.h Sun Sep 10 01:44:32 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-tagging.h,v 1.1 2017/09/10 01:44:32 dholland Exp $ + +Work around namespace conflict from libevent. + +--- tagging.h~ 2006-08-19 07:10:41.000000000 +0000 ++++ tagging.h +@@ -33,6 +33,9 @@ + #ifndef _TAGGING_ + #define _TAGGING_ + ++/* work around namespace conflict from libevent */ ++#undef encode_int ++ + void tagging_init(void); + + #define SHINGLE_MIN 32 --_----------=_1505007872162670--