From owner-svn-ports-head@freebsd.org Sat Jan 6 14:18:40 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 288FAEBB793; Sat, 6 Jan 2018 14:18:40 +0000 (UTC) (envelope-from jbeich@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 045FE70A3B; Sat, 6 Jan 2018 14:18:40 +0000 (UTC) (envelope-from jbeich@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 452A0137BC; Sat, 6 Jan 2018 14:18:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w06EIdUF074330; Sat, 6 Jan 2018 14:18:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w06EIdgE074329; Sat, 6 Jan 2018 14:18:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801061418.w06EIdgE074329@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 6 Jan 2018 14:18:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458272 - head/net/libproxy/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/net/libproxy/files X-SVN-Commit-Revision: 458272 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.25 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: Sat, 06 Jan 2018 14:18:40 -0000 Author: jbeich Date: Sat Jan 6 14:18:38 2018 New Revision: 458272 URL: https://svnweb.freebsd.org/changeset/ports/458272 Log: net/libproxy: unbreak build with Clang 6 (C++14 by default) libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatible type '__bind' ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported by: antoine (via bug 224669) Added: head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp (contents, props changed) Added: head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp Sat Jan 6 14:18:38 2018 (r458272) @@ -0,0 +1,17 @@ +libc++ doesn't like "using namespace std" in C++11 + +libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatible type '__bind' + ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- libproxy/test/get-pac-test.cpp.orig 2016-01-12 16:41:07 UTC ++++ libproxy/test/get-pac-test.cpp +@@ -45,7 +45,7 @@ class TestServer { + + setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); + +- ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ++ ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); + assert(!ret); + + ret = listen(m_sock, 1);