Attachment #189377 for bug #224855

View | Details | Raw Unified | Return to bug 224855
Collapse All | Expand All

Lines 2-10 Link Here

(-)./tvheadend/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/multimedia/tvheadend/Makefile 452570 2017-10-21 06:50:49Z jbeich $	2	# $FreeBSD: head/multimedia/tvheadend/Makefile 452570 2017-10-21 06:50:49Z jbeich $
3		3
4	PORTNAME= tvheadend	4	PORTNAME= tvheadend
5	PORTVERSION= 4.2.3	5	PORTVERSION= 4.2.5
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 1	7	PORTREVISION= 0
8	CATEGORIES= multimedia	8	CATEGORIES= multimedia
9		9
10	MAINTAINER= decke@FreeBSD.org	10	MAINTAINER= decke@FreeBSD.org

Lines 1-3 Link Here

(-)./tvheadend/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1501062908	1	TIMESTAMP = 1514952296
2	SHA256 (tvheadend-tvheadend-v4.2.3_GH0.tar.gz) = 2d289a1a8a0a960feba1da2da97c977a2b714d87adfdfaf00a53142e39d808e6	2	SHA256 (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 36816c8b506af6b0f5df442bd96aa301223dc7c44d8b88eec53262e92956d740
3	SIZE (tvheadend-tvheadend-v4.2.3_GH0.tar.gz) = 21518785	3	SIZE (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 21528718

Lines 1-10 Link Here

(-)./tvheadend/files/patch-src_spawn.c (-10 lines)
1	--- src/spawn.c.orig 2018-01-02 23:39:37.160267000 -0500
2	+++ src/spawn.c 2018-01-02 23:42:04.412973000 -0500
3	@@ -23,6 +23,7 @@
4	#include <unistd.h>
5	#include <stdlib.h>
6	#include <string.h>
7	+#include <signal.h>
8	#include <errno.h>
9	#include <assert.h>
10	#include <syslog.h>




- DSCP cannot be modified on FreeBSD yet
src/tcp.c:61:14: error: use of undeclared identifier 'IPTOS_DSCP_MASK'
  v = dscp & IPTOS_DSCP_MASK;

- Change include order for FreeBSD
In file included from src/tcp.c:33:
/usr/include/netinet/ip.h:69:17: error: field has incomplete type 'struct in_addr'
        struct  in_addr ip_src,ip_dst;  /* source and dest address */
                        ^
/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
        struct  in_addr ip_src,ip_dst;  /* source and dest address */
                ^
/usr/include/netinet/ip.h:69:24: error: field has incomplete type 'struct in_addr'
        struct  in_addr ip_src,ip_dst;  /* source and dest address */
                               ^
/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
        struct  in_addr ip_src,ip_dst;  /* source and dest address */
                ^
/usr/include/netinet/ip.h:181:19: error: field has incomplete type 'struct in_addr'
                        struct in_addr ipt_addr;
                                       ^
/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
        struct  in_addr ip_src,ip_dst;  /* source and dest address */
                ^
/usr/include/netinet/ip.h:216:17: error: field has incomplete type 'struct in_addr'
        struct  in_addr ippseudo_src;   /* source internet address */
                        ^
/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
        struct  in_addr ip_src,ip_dst;  /* source and dest address */
                ^
/usr/include/netinet/ip.h:217:17: error: field has incomplete type 'struct in_addr'
        struct  in_addr ippseudo_dst;   /* destination internet address */
                        ^
/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
        struct  in_addr ip_src,ip_dst;  /* source and dest address */
                ^
--- src/tcp.c.orig	2017-01-20 19:41:51.000000000 +0100
+++ src/tcp.c	2017-02-08 11:15:26.836727000 +0100
@@ -30,8 +30,8 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
-#include <netinet/ip.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
@@ -56,6 +56,7 @@
 int
 socket_set_dscp(int sockfd, uint32_t dscp, char *errbuf, size_t errbufsize)
 {
+#ifdef IPTOS_DSCP_MASK
   int r, v;
 
   v = dscp & IPTOS_DSCP_MASK;
@@ -65,6 +66,7 @@
       snprintf(errbuf, errbufsize, "IP_TOS failed: %s", strerror(errno));
     return -1;
   }
+#endif
   return 0;
 }


Return to bug 224855

Lines 1-64 Link Here

(-)./tvheadend/files/patch-src_tcp.c (-64 lines)
1	- DSCP cannot be modified on FreeBSD yet
2	src/tcp.c:61:14: error: use of undeclared identifier 'IPTOS_DSCP_MASK'
3	v = dscp & IPTOS_DSCP_MASK;
4
5	- Change include order for FreeBSD
6	In file included from src/tcp.c:33:
7	/usr/include/netinet/ip.h:69:17: error: field has incomplete type 'struct in_addr'
8	struct in_addr ip_src,ip_dst; /* source and dest address */
9	^
10	/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
11	struct in_addr ip_src,ip_dst; /* source and dest address */
12	^
13	/usr/include/netinet/ip.h:69:24: error: field has incomplete type 'struct in_addr'
14	struct in_addr ip_src,ip_dst; /* source and dest address */
15	^
16	/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
17	struct in_addr ip_src,ip_dst; /* source and dest address */
18	^
19	/usr/include/netinet/ip.h:181:19: error: field has incomplete type 'struct in_addr'
20	struct in_addr ipt_addr;
21	^
22	/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
23	struct in_addr ip_src,ip_dst; /* source and dest address */
24	^
25	/usr/include/netinet/ip.h:216:17: error: field has incomplete type 'struct in_addr'
26	struct in_addr ippseudo_src; /* source internet address */
27	^
28	/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
29	struct in_addr ip_src,ip_dst; /* source and dest address */
30	^
31	/usr/include/netinet/ip.h:217:17: error: field has incomplete type 'struct in_addr'
32	struct in_addr ippseudo_dst; /* destination internet address */
33	^
34	/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
35	struct in_addr ip_src,ip_dst; /* source and dest address */
36	^
37	--- src/tcp.c.orig 2017-01-20 19:41:51.000000000 +0100
38	+++ src/tcp.c 2017-02-08 11:15:26.836727000 +0100
39	@@ -30,8 +30,8 @@
40	#include <fcntl.h>
41	#include <errno.h>
42	#include <signal.h>
43	-#include <netinet/ip.h>
44	#include <netinet/in.h>
45	+#include <netinet/ip.h>
46	#include <netinet/tcp.h>
47	#include <arpa/inet.h>
48
49	@@ -56,6 +56,7 @@
50	int
51	socket_set_dscp(int sockfd, uint32_t dscp, char *errbuf, size_t errbufsize)
52	{
53	+#ifdef IPTOS_DSCP_MASK
54	int r, v;
55
56	v = dscp & IPTOS_DSCP_MASK;
57	@@ -65,6 +66,7 @@
58	snprintf(errbuf, errbufsize, "IP_TOS failed: %s", strerror(errno));
59	return -1;
60	}
61	+#endif
62	return 0;
63	}
64