Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=xqlTwgtW; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=dcGoL9zM Received: by mail.netbsd.org (Postfix, from userid 605) id BBDC584E6B; Mon, 11 Mar 2024 09:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1710148863; bh=ja5E3zvHNr6vTCB8HpejoDY+fuy6ZeIhy0QsdA/NjXA=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=xqlTwgtWe19qt+ZI0p8lJ/4TXIPvt4tU0oWrbwyM1U1comFCvtDyivoC3JPoiXTuf wl5D7oxV4fnCyEoNily9EmnxzNdr3vd9Gsk8iLTzfEvJEK/KmTkwe3LdIJbo+YAR/l 47+nIajeztIZTNVZrhVuFNPmeef0ydvemGIfDkb4= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ACC8984E5A for ; Mon, 11 Mar 2024 09:21:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 1oPRFIDTXt8r for ; Mon, 11 Mar 2024 09:21:02 +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 15D1084D67 for ; Mon, 11 Mar 2024 09:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1710148862; bh=ja5E3zvHNr6vTCB8HpejoDY+fuy6ZeIhy0QsdA/NjXA=; h=Date:From:Subject:To:Reply-To; b=dcGoL9zM0vghMfiQokTZWKMDeep2GCr8iHG9jb48a9GmZXLftEpyyFuESXEXZRY3O bWWPCykXje7T7Wd9rypdLukEl9psOvxoZ9yyImLNTFu+NqT3oliObbWePqWXz1km4w 318eecZofkUzKgGF446yjQs3rRbnQY0BcePCbyhM= Received: by cvs.NetBSD.org (Postfix, from userid 500) id 07820FA2C; Mon, 11 Mar 2024 09:21:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1710148862194030" MIME-Version: 1.0 Date: Mon, 11 Mar 2024 09:21:02 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/devel/capstone To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20240311092102.07820FA2C@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1710148862194030 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Mar 11 09:21:01 UTC 2024 Modified Files: pkgsrc/devel/capstone: distinfo Added Files: pkgsrc/devel/capstone/patches: patch-cstool_getopt.c patch-cstool_getopt.h Log Message: capstone: Handle illumos getopt. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/capstone/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/devel/capstone/patches/patch-cstool_getopt.c cvs rdiff -u -r0 -r1.3 pkgsrc/devel/capstone/patches/patch-cstool_getopt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1710148862194030 Content-Disposition: inline Content-Length: 2811 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/capstone/distinfo diff -u pkgsrc/devel/capstone/distinfo:1.18 pkgsrc/devel/capstone/distinfo:1.19 --- pkgsrc/devel/capstone/distinfo:1.18 Wed Feb 7 09:46:36 2024 +++ pkgsrc/devel/capstone/distinfo Mon Mar 11 09:21:01 2024 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2024/02/07 09:46:36 adam Exp $ +$NetBSD: distinfo,v 1.19 2024/03/11 09:21:01 jperkin Exp $ BLAKE2s (capstone-5.0.1.tar.gz) = a66f1354f655e31dd8cd4bbb4db933aea7f9c5914700568da6d76952c89bfe52 SHA512 (capstone-5.0.1.tar.gz) = 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5 @@ -7,4 +7,6 @@ SHA1 (patch-Makefile) = a96441309efa54cb SHA1 (patch-bindings_python_capstone_____init____.py) = ea410a99d4cd4ee0a109a7225b739971472c387d SHA1 (patch-bindings_python_setup.py) = f65d5a7a3d7e34867dd9981bc8db1ba1f5dc1ad6 SHA1 (patch-cstool_Makefile) = 68dd0a175d0e2270e2813f784cae5ca9f89a3a05 +SHA1 (patch-cstool_getopt.c) = da34cce2b62e072b59697e6a64ef665dc520e75b +SHA1 (patch-cstool_getopt.h) = f97b132d63b8e34f5e6064757167052a3955727b SHA1 (patch-suite_fuzz_driverbin.c) = 17a0876c475ad7782d0ccb362aadbd7633dfe778 Added files: Index: pkgsrc/devel/capstone/patches/patch-cstool_getopt.c diff -u /dev/null pkgsrc/devel/capstone/patches/patch-cstool_getopt.c:1.1 --- /dev/null Mon Mar 11 09:21:01 2024 +++ pkgsrc/devel/capstone/patches/patch-cstool_getopt.c Mon Mar 11 09:21:01 2024 @@ -0,0 +1,18 @@ +$NetBSD: patch-cstool_getopt.c,v 1.1 2024/03/11 09:21:01 jperkin Exp $ + +Handle illumos getopt. + +--- cstool/getopt.c.orig 2024-03-11 09:16:44.155866444 +0000 ++++ cstool/getopt.c +@@ -7,7 +7,11 @@ int opterr = 1, /* if error message shou + optind = 1, /* index into parent argv vector */ + optopt, /* character checked for validity */ + optreset; /* reset getopt */ ++#ifdef __illumos__ ++char *optarg; ++#else + const char *optarg; /* argument associated with option */ ++#endif + + #define BADCH (int)'?' + #define BADARG (int)':' Index: pkgsrc/devel/capstone/patches/patch-cstool_getopt.h diff -u /dev/null pkgsrc/devel/capstone/patches/patch-cstool_getopt.h:1.3 --- /dev/null Mon Mar 11 09:21:01 2024 +++ pkgsrc/devel/capstone/patches/patch-cstool_getopt.h Mon Mar 11 09:21:01 2024 @@ -0,0 +1,18 @@ +$NetBSD: patch-cstool_getopt.h,v 1.3 2024/03/11 09:21:01 jperkin Exp $ + +Handle illumos getopt. + +--- cstool/getopt.h.orig 2024-03-11 09:17:17.512916711 +0000 ++++ cstool/getopt.h +@@ -7,7 +7,11 @@ optind, /* index into parent argv vector + optopt, /* character checked for validity */ + optreset; /* reset getopt */ + ++#ifdef __illumos__ ++extern char *optarg; ++#else + extern const char *optarg; /* argument associated with option */ ++#endif + + int getopt (int nargc, char *const nargv[], const char *ostr); + --_----------=_1710148862194030--