From owner-svn-ports-head@freebsd.org Wed Dec 26 13:29:32 2018 Return-Path: Delivered-To: svn-ports-head@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 60FD21351832; Wed, 26 Dec 2018 13:29:32 +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 0741983305; Wed, 26 Dec 2018 13:29:32 +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 D3F27242C8; Wed, 26 Dec 2018 13:29:31 +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 wBQDTVbh027840; Wed, 26 Dec 2018 13:29:31 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBQDTVcD027838; Wed, 26 Dec 2018 13:29:31 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201812261329.wBQDTVcD027838@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 26 Dec 2018 13:29:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488388 - in head/net/minisapserver: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/net/minisapserver: . files X-SVN-Commit-Revision: 488388 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0741983305 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.99)[-0.985,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Wed, 26 Dec 2018 13:29:32 -0000 Author: tobik Date: Wed Dec 26 13:29:31 2018 New Revision: 488388 URL: https://svnweb.freebsd.org/changeset/ports/488388 Log: net/minisaperver: Fix build on CURRENT broadcast.cpp:91:13: error: value of type '__bind' is not contextually convertible to 'bool' if (bind (fd6, (struct sockaddr *)&addr, sizeof (addr))) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ http://beefy11.nyi.freebsd.org/data/head-i386-default/p488289_s342400/logs/minisapserver-0.3.8_1.log Added: head/net/minisapserver/files/patch-broadcast.cpp (contents, props changed) Modified: head/net/minisapserver/Makefile Modified: head/net/minisapserver/Makefile ============================================================================== --- head/net/minisapserver/Makefile Wed Dec 26 13:28:49 2018 (r488387) +++ head/net/minisapserver/Makefile Wed Dec 26 13:29:31 2018 (r488388) @@ -36,7 +36,6 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc/sap.cfg|${PREFIX}/etc/sap.cfg|' \ ${WRKSRC}/sapserver.h - @${REINPLACE_CMD} -e 's|a6->sin_len|a6->sin6_len|g' ${WRKSRC}/broadcast.cpp @${CP} -f ${WRKSRC}/sap.cfg ${WRKSRC}/sap.cfg-dist .include Added: head/net/minisapserver/files/patch-broadcast.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/minisapserver/files/patch-broadcast.cpp Wed Dec 26 13:29:31 2018 (r488388) @@ -0,0 +1,33 @@ +broadcast.cpp:91:13: error: value of type '__bind' is not contextually convertible to 'bool' + if (bind (fd6, (struct sockaddr *)&addr, sizeof (addr))) + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- broadcast.cpp.orig 2010-10-09 16:04:27 UTC ++++ broadcast.cpp +@@ -88,7 +88,7 @@ Broadcast::Broadcast(int i_ttl, const char *psz_iface) + setsockopt (fd6, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + &i_ttl, sizeof(i_ttl)); + +- if (bind (fd6, (struct sockaddr *)&addr, sizeof (addr))) ++ if (::bind (fd6, (struct sockaddr *)&addr, sizeof (addr))) + { + close (fd6); + fd6 = -1; +@@ -143,7 +143,7 @@ Broadcast::Broadcast(int i_ttl, const char *psz_iface) + setsockopt (fd4, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, 1); + } + +- if (bind (fd4, (struct sockaddr *)&addr, sizeof (addr))) ++ if (::bind (fd4, (struct sockaddr *)&addr, sizeof (addr))) + { + close (fd4); + fd4 = -1; +@@ -281,7 +281,7 @@ int Broadcast::GuessDestination (const char *str, + memset (a6, 0, sizeof (*a6)); + a6->sin6_family = AF_INET6; + #ifdef HAVE_SA_LEN +- a6->sin_len = sizeof (*a6); ++ a6->sin6_len = sizeof (*a6); + #endif + a6->sin6_scope_id = scope_id; + a6->sin6_port = htons (HELLO_PORT);