From owner-svn-ports-all@freebsd.org Wed Aug 1 13:39:37 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92661105C988; Wed, 1 Aug 2018 13:39:37 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40C6F7462F; Wed, 1 Aug 2018 13:39:37 +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 1F1C923283; Wed, 1 Aug 2018 13:39:37 +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 w71DdaIE062814; Wed, 1 Aug 2018 13:39:36 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w71Ddasd062811; Wed, 1 Aug 2018 13:39:36 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201808011339.w71Ddasd062811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 1 Aug 2018 13:39:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476181 - in head/sysutils/burp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/sysutils/burp: . files X-SVN-Commit-Revision: 476181 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Aug 2018 13:39:37 -0000 Author: tobik Date: Wed Aug 1 13:39:36 2018 New Revision: 476181 URL: https://svnweb.freebsd.org/changeset/ports/476181 Log: sysutils/burp: Fix build with Clang 6 server.c:546:25: error: ordered comparison between pointer and zero ('struct strlist **' and 'int') if(!ret && cconf->keep>0) ~~~~~~~~~~~^~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/burp-1.4.40_1.log - Remove bad BROKEN tag (util/bdthreads.cc does not exist in burp) Added: head/sysutils/burp/files/patch-src_server.c (contents, props changed) Modified: head/sysutils/burp/Makefile Modified: head/sysutils/burp/Makefile ============================================================================== --- head/sysutils/burp/Makefile Wed Aug 1 13:37:29 2018 (r476180) +++ head/sysutils/burp/Makefile Wed Aug 1 13:39:36 2018 (r476181) @@ -46,10 +46,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vss_strip @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/burp -.include - -.if ${OSVERSION} >= 1200039 && ${CC:T} == "clang" -BROKEN= fails to compile due to clang 4.0 regression: util/bdthreads.cc:132:10: ordered comparison between pointer and zero -.endif - -.include +.include Added: head/sysutils/burp/files/patch-src_server.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/burp/files/patch-src_server.c Wed Aug 1 13:39:36 2018 (r476181) @@ -0,0 +1,15 @@ +server.c:546:25: error: ordered comparison between pointer and zero ('struct strlist **' and 'int') + if(!ret && cconf->keep>0) + ~~~~~~~~~~~^~ + +--- src/server.c.orig 2018-08-01 13:34:56 UTC ++++ src/server.c +@@ -543,7 +543,7 @@ static int do_backup_server(const char *basedir, const + working, current, currentdata, + finishing, cconf, client, + p1cntr, cntr); +- if(!ret && cconf->keep>0) ++ if(!ret && cconf->keep != NULL) + ret=remove_old_backups(basedir, cconf, client); + } +