From owner-svn-ports-all@freebsd.org Thu Oct 25 11:47:07 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 E8E0F107153E; Thu, 25 Oct 2018 11:47:06 +0000 (UTC) (envelope-from decke@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 905BB7D8EB; Thu, 25 Oct 2018 11:47:06 +0000 (UTC) (envelope-from decke@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 6BD6F115D0; Thu, 25 Oct 2018 11:47:06 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9PBl6XF059911; Thu, 25 Oct 2018 11:47:06 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9PBl6us059910; Thu, 25 Oct 2018 11:47:06 GMT (envelope-from decke@FreeBSD.org) Message-Id: <201810251147.w9PBl6us059910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Thu, 25 Oct 2018 11:47:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482966 - in head/multimedia/tvheadend: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/multimedia/tvheadend: . files X-SVN-Commit-Revision: 482966 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.29 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: Thu, 25 Oct 2018 11:47:07 -0000 Author: decke Date: Thu Oct 25 11:47:05 2018 New Revision: 482966 URL: https://svnweb.freebsd.org/changeset/ports/482966 Log: multimedia/tvheadend: Follow upstream and revert "FreeBSD: Fix recv problem if no data received." Reported by: Jongsung Kim Added: head/multimedia/tvheadend/files/patch-src_tcp.c (contents, props changed) Modified: head/multimedia/tvheadend/Makefile Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Thu Oct 25 11:32:03 2018 (r482965) +++ head/multimedia/tvheadend/Makefile Thu Oct 25 11:47:05 2018 (r482966) @@ -4,6 +4,7 @@ PORTNAME= tvheadend PORTVERSION= 4.2.7 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org Added: head/multimedia/tvheadend/files/patch-src_tcp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/tvheadend/files/patch-src_tcp.c Thu Oct 25 11:47:05 2018 (r482966) @@ -0,0 +1,23 @@ +commit f08bbef11c77a6a81d4e2bf974e36e54b0cd14d6 +Author: Jaroslav Kysela +Date: Tue Oct 16 16:51:00 2018 +0200 + + Revert "FreeBSD: Fix recv problem if no data received." + + This reverts commit 3895c923a3a959da05080831b8146c09ed143b00. + +--- src/tcp.c ++++ src/tcp.c +@@ -454,11 +454,8 @@ tcp_socket_dead(int fd) + if (err) + return -err; + #ifdef PLATFORM_FREEBSD +- err = recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT); +- if (err < 0) ++ if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) < 0) + return -errno; +- else if (err == 0) +- return -EIO; + #else + if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) == 0) + return -EIO;