diff options
| author | Bernhard Froehlich <decke@FreeBSD.org> | 2018-10-25 11:47:05 +0000 |
|---|---|---|
| committer | Bernhard Froehlich <decke@FreeBSD.org> | 2018-10-25 11:47:05 +0000 |
| commit | 5047bdcb521912489c237e102f703cb9e4b656fe (patch) | |
| tree | f37b0e1e2c3ad8447a7aa66f98be1369aa741447 /multimedia/tvheadend | |
| parent | 1d871c98ed5dd60a94234d6812e6c539e965c3dc (diff) | |
| download | ports-5047bdcb521912489c237e102f703cb9e4b656fe.tar.gz ports-5047bdcb521912489c237e102f703cb9e4b656fe.zip | |
multimedia/tvheadend: Follow upstream and revert "FreeBSD: Fix recv problem if no data received."
Reported by: Jongsung Kim <jongsung.kim@gmail.com>
Notes
Notes:
svn path=/head/; revision=482966
Diffstat (limited to 'multimedia/tvheadend')
| -rw-r--r-- | multimedia/tvheadend/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/tvheadend/files/patch-src_tcp.c | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile index f3a517b79fa0..00d4a27f6b8a 100644 --- a/multimedia/tvheadend/Makefile +++ b/multimedia/tvheadend/Makefile @@ -4,6 +4,7 @@ PORTNAME= tvheadend PORTVERSION= 4.2.7 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org diff --git a/multimedia/tvheadend/files/patch-src_tcp.c b/multimedia/tvheadend/files/patch-src_tcp.c new file mode 100644 index 000000000000..886bf4ed7eca --- /dev/null +++ b/multimedia/tvheadend/files/patch-src_tcp.c @@ -0,0 +1,23 @@ +commit f08bbef11c77a6a81d4e2bf974e36e54b0cd14d6 +Author: Jaroslav Kysela <perex@perex.cz> +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; |