From owner-svn-ports-head@freebsd.org Fri Feb 7 10:30:02 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65E93248930; Fri, 7 Feb 2020 10:30:02 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48DWlG1xkVz4NTx; Fri, 7 Feb 2020 10:30:02 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DEF230BE; Fri, 7 Feb 2020 10:30:02 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 017AU27a093027; Fri, 7 Feb 2020 10:30:02 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 017AU2kL093026; Fri, 7 Feb 2020 10:30:02 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202002071030.017AU2kL093026@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 7 Feb 2020 10:30:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525473 - head/devel/libexplain/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/devel/libexplain/files X-SVN-Commit-Revision: 525473 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Feb 2020 10:30:02 -0000 Author: tobik Date: Fri Feb 7 10:30:01 2020 New Revision: 525473 URL: https://svnweb.freebsd.org/changeset/ports/525473 Log: devel/libexplain: Unbreak after base r357412 libexplain/buffer/open_flags.c:187:10: error: duplicate case value '262144' case O_EXEC: ^ /usr/include/fcntl.h:121:17: note: expanded from macro 'O_EXEC' #define O_EXEC 0x00040000 /* Open for execute only */ ^ libexplain/buffer/open_flags.c:180:11: note: previous case defined here case O_SEARCH: ^ /usr/include/fcntl.h:122:18: note: expanded from macro 'O_SEARCH' #define O_SEARCH O_EXEC ^ /usr/include/fcntl.h:121:17: note: expanded from macro 'O_EXEC' #define O_EXEC 0x00040000 /* Open for execute only */ ^ 1 error generated. http://beefy17.nyi.freebsd.org/data/head-i386-default/p525358_s357606/logs/libexplain-1.3.D012_6.log Added: head/devel/libexplain/files/patch-libexplain_buffer_open__flags.c (contents, props changed) Added: head/devel/libexplain/files/patch-libexplain_buffer_open__flags.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libexplain/files/patch-libexplain_buffer_open__flags.c Fri Feb 7 10:30:01 2020 (r525473) @@ -0,0 +1,30 @@ +Unbreak after base r357412 + +libexplain/buffer/open_flags.c:187:10: error: duplicate case value '262144' + case O_EXEC: + ^ +/usr/include/fcntl.h:121:17: note: expanded from macro 'O_EXEC' +#define O_EXEC 0x00040000 /* Open for execute only */ + ^ +libexplain/buffer/open_flags.c:180:11: note: previous case defined here + case O_SEARCH: + ^ +/usr/include/fcntl.h:122:18: note: expanded from macro 'O_SEARCH' +#define O_SEARCH O_EXEC + ^ +/usr/include/fcntl.h:121:17: note: expanded from macro 'O_EXEC' +#define O_EXEC 0x00040000 /* Open for execute only */ + ^ +1 error generated. + +--- libexplain/buffer/open_flags.c.orig 2020-02-07 09:55:29 UTC ++++ libexplain/buffer/open_flags.c +@@ -176,7 +176,7 @@ explain_buffer_open_flags(explain_string_buffer_t *sb, + explain_string_buffer_puts(sb, "O_WRONLY"); + break; + +-#if defined(O_SEARCH) && O_SEARCH != 0 ++#if defined(O_SEARCH) && O_SEARCH != 0 && O_SEARCH != O_EXEC + case O_SEARCH: + /* open a directory for searchin only */ + explain_string_buffer_puts(sb, "O_SEARCH");