From owner-svn-ports-branches@freebsd.org Wed Feb 1 13:00:04 2017 Return-Path: Delivered-To: svn-ports-branches@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 B679FCCBA3B; Wed, 1 Feb 2017 13:00:04 +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 mx1.freebsd.org (Postfix) with ESMTPS id 6D5681E36; Wed, 1 Feb 2017 13:00:04 +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 v11D03fV077622; Wed, 1 Feb 2017 13:00:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v11D03Ef077620; Wed, 1 Feb 2017 13:00:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201702011300.v11D03Ef077620@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 1 Feb 2017 13:00:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r433029 - in branches/2017Q1/multimedia/vdr-plugin-vdrmanager: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2017 13:00:04 -0000 Author: jbeich Date: Wed Feb 1 13:00:03 2017 New Revision: 433029 URL: https://svnweb.freebsd.org/changeset/ports/433029 Log: MFH: r432969 multimedia/vdr-plugin-vdrmanager: unbreak with clang 4.0 sock.cpp:23:13: error: ordered comparison between pointer and zero ('int (*)(int, int, int)' and 'int') if (socket >= 0) { ~~~~~~ ^ ~ PR: 216217 Reported by: antoine (via exp-run) Obtained from: upstream Approved by: ports-secteam blanket Added: branches/2017Q1/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp - copied unchanged from r432969, head/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp Modified: branches/2017Q1/multimedia/vdr-plugin-vdrmanager/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/multimedia/vdr-plugin-vdrmanager/Makefile ============================================================================== --- branches/2017Q1/multimedia/vdr-plugin-vdrmanager/Makefile Wed Feb 1 12:58:40 2017 (r433028) +++ branches/2017Q1/multimedia/vdr-plugin-vdrmanager/Makefile Wed Feb 1 13:00:03 2017 (r433029) @@ -3,7 +3,7 @@ PORTNAME= vdr-plugin-vdrmanager PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/828/ DISTNAME= ${PORTNAME:S/-plugin//}-${PORTVERSION} Copied: branches/2017Q1/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp (from r432969, head/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp Wed Feb 1 13:00:03 2017 (r433029, copy of r432969, head/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp) @@ -0,0 +1,17 @@ +From 333d83324710bbdef6f6feea38a9dadc3c01b959 Mon Sep 17 00:00:00 2001 +From: bju +Date: Tue, 24 Jan 2012 23:06:34 +0100 +Subject: Close() has used socket (method pointer) and not sock (variable) to + check if close() should be called. + +--- a/sock.cpp.orig 2011-12-28 15:11:48 UTC ++++ b/sock.cpp +@@ -20,7 +20,7 @@ cVdrmanagerSocket::~cVdrmanagerSocket() + } + + void cVdrmanagerSocket::Close() { +- if (socket >= 0) { ++ if (sock >= 0) { + close(sock); + sock = -1; + }