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

(-)multicat23/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/net/multicat/Makefile 507585 2019-07-29 18:41:44Z amdmi3 $
2
# $FreeBSD: head/net/multicat/Makefile 507585 2019-07-29 18:41:44Z amdmi3 $
3
3
4
PORTNAME=	multicat
4
PORTNAME=	multicat
5
PORTVERSION=	2.2
5
PORTVERSION=	2.3
6
CATEGORIES=	net multimedia
6
CATEGORIES=	net multimedia
7
MASTER_SITES=	https://get.videolan.org/multicat/${PORTVERSION}/
7
MASTER_SITES=	https://get.videolan.org/multicat/${PORTVERSION}/
8
8
(-)multicat23/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1486402678
1
TIMESTAMP = 1573810897
2
SHA256 (multicat-2.2.tar.bz2) = fa4e48b38665658df7719293f9358df08f59f3eb7f7b77df510b35951e316b40
2
SHA256 (multicat-2.3.tar.bz2) = 2be162e9e8b2e6f6aa7686431f102db6c72c8288bd82dbc67ffed631f4a3361e
3
SIZE (multicat-2.2.tar.bz2) = 35369
3
SIZE (multicat-2.3.tar.bz2) = 37307
(-)multicat23/files/patch-Makefile (-3 / +4 lines)
Lines 1-11 Link Here
1
--- Makefile.orig	2017-01-31 18:17:02 UTC
1
--- Makefile.orig	2018-06-12 15:18:47 UTC
2
+++ Makefile
2
+++ Makefile
3
@@ -1,8 +1,7 @@
3
@@ -1,8 +1,7 @@
4
 # multicat Makefile
4
 # multicat Makefile
5
 
5
 
6
 VERSION = 2.2
6
-VERSION = 2.2
7
-CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE
7
-CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE
8
-CFLAGS += -g
8
-CFLAGS += -g
9
+VERSION = 2.3
9
+CFLAGS += -Wall -Wformat-security -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE
10
+CFLAGS += -Wall -Wformat-security -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE
10
 # Comment out the following line for Mac OS X build
11
 # Comment out the following line for Mac OS X build
11
 LDLIBS += -lrt -pthread
12
 LDLIBS += -lrt -pthread
(-)multicat23/files/patch-multicat.c (-11 / +2 lines)
Lines 1-15 Link Here
1
--- multicat.c.orig	2016-10-07 14:32:44 UTC
1
--- multicat.c.orig	2019-11-15 11:52:01 UTC
2
+++ multicat.c
2
+++ multicat.c
3
@@ -44,7 +44,7 @@
3
@@ -280,14 +280,14 @@ static ssize_t raw_Write( const void *p_buf, size_t i_
4
 #include <sys/ioctl.h>
5
 #include <syslog.h>
6
 
7
-#ifdef __FreeBSD__
8
+#if defined(__FreeBSD__) || defined(__DragonFly__)
9
 #   include <sys/uio.h>
10
 #endif
11
 
12
@@ -280,14 +280,14 @@ static ssize_t raw_Write( const void *p_
13
     ssize_t i_ret;
4
     ssize_t i_ret;
14
     struct iovec iov[2];
5
     struct iovec iov[2];
15
 
6
 
(-)multicat23/files/patch-util.c (-7 / +16 lines)
Lines 1-6 Link Here
1
--- util.c.orig	2016-10-07 14:32:44 UTC
1
--- util.c.orig	2019-11-15 11:52:26 UTC
2
+++ util.c
2
+++ util.c
3
@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char
3
@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char *psz_name )
4
 
4
 
5
     close( i_fd );
5
     close( i_fd );
6
 
6
 
Lines 9-15 Link Here
9
     return ifr.ifr_index;
9
     return ifr.ifr_index;
10
 #else
10
 #else
11
     return ifr.ifr_ifindex;
11
     return ifr.ifr_ifindex;
12
@@ -451,7 +451,7 @@ static void RawFillHeaders(struct udpraw
12
@@ -454,7 +454,7 @@ static void RawFillHeaders(struct udprawpkt *dgram,
13
                         uint8_t ttl, uint8_t tos, uint16_t len)
13
                         uint8_t ttl, uint8_t tos, uint16_t len)
14
 {
14
 {
15
 #ifndef __APPLE__
15
 #ifndef __APPLE__
Lines 18-24 Link Here
18
     struct ip *iph = &(dgram->iph);
18
     struct ip *iph = &(dgram->iph);
19
 #else
19
 #else
20
     struct iphdr *iph = &(dgram->iph);
20
     struct iphdr *iph = &(dgram->iph);
21
@@ -468,7 +468,7 @@ static void RawFillHeaders(struct udpraw
21
@@ -471,7 +471,7 @@ static void RawFillHeaders(struct udprawpkt *dgram,
22
     printf("Filling raw header (%p) (%s:%u -> %s:%u)\n", dgram, ipsrc_str, portsrc, ipdst_str, portdst);
22
     printf("Filling raw header (%p) (%s:%u -> %s:%u)\n", dgram, ipsrc_str, portsrc, ipdst_str, portdst);
23
 #endif
23
 #endif
24
 
24
 
Lines 27-33 Link Here
27
     // Fill ip header
27
     // Fill ip header
28
     iph->ip_hl    = 5;              // ip header with no specific option
28
     iph->ip_hl    = 5;              // ip header with no specific option
29
     iph->ip_v     = 4;
29
     iph->ip_v     = 4;
30
@@ -710,7 +710,7 @@ int OpenSocket( const char *_psz_arg, in
30
@@ -558,7 +558,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1
31
     in_addr_t i_raw_srcaddr = INADDR_ANY;
32
     int i_raw_srcport = 0;
33
     char *psz_ifname = NULL;
34
-#ifdef __FreeBSD__
35
+#if defined(__FreeBSD__) || defined(__DragonFly__)
36
     int hincl = 1;
37
 #endif
38
 
39
@@ -718,7 +718,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1
31
                 i_raw_srcaddr, connect_addr.sin.sin_addr.s_addr, i_raw_srcport,
40
                 i_raw_srcaddr, connect_addr.sin.sin_addr.s_addr, i_raw_srcport,
32
                 ntohs(connect_addr.sin.sin_port), i_ttl, i_tos, 0);
41
                 ntohs(connect_addr.sin.sin_port), i_ttl, i_tos, 0);
33
             i_fd = socket( AF_INET, SOCK_RAW, IPPROTO_RAW );
42
             i_fd = socket( AF_INET, SOCK_RAW, IPPROTO_RAW );
Lines 36-42 Link Here
36
             if ( setsockopt( i_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1 )
45
             if ( setsockopt( i_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1 )
37
             {
46
             {
38
                 msg_Err( NULL, "unable to set socket (%s)", strerror(errno) );
47
                 msg_Err( NULL, "unable to set socket (%s)", strerror(errno) );
39
@@ -747,7 +747,7 @@ int OpenSocket( const char *_psz_arg, in
48
@@ -755,7 +755,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1
40
 
49
 
41
             if ( bind_addr.ss.ss_family != AF_UNSPEC )
50
             if ( bind_addr.ss.ss_family != AF_UNSPEC )
42
             {
51
             {
Lines 45-51 Link Here
45
                 if ( IN6_IS_ADDR_MULTICAST( &bind_addr.sin6.sin6_addr ) )
54
                 if ( IN6_IS_ADDR_MULTICAST( &bind_addr.sin6.sin6_addr ) )
46
                 {
55
                 {
47
                     struct ipv6_mreq imr;
56
                     struct ipv6_mreq imr;
48
@@ -827,7 +827,7 @@ normal_bind:
57
@@ -838,7 +838,7 @@ normal_bind:
49
             }
58
             }
50
             else
59
             else
51
 #endif
60
 #endif
(-)multicat23/files/patch-util.h (-7 / +7 lines)
Lines 1-20 Link Here
1
--- util.h.orig	2016-10-07 14:32:44 UTC
1
--- util.h.orig	2019-11-15 11:52:14 UTC
2
+++ util.h
2
+++ util.h
3
@@ -24,7 +24,7 @@
3
@@ -25,7 +25,7 @@
4
 #include <netinet/udp.h>
5
 #include <netinet/ip.h>
4
 #include <netinet/ip.h>
5
 #include <sys/types.h>
6
 
6
 
7
-#if defined(__APPLE__) || defined(__FreeBSD__)
7
-#if defined(__APPLE__) || defined(__FreeBSD__)
8
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
8
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
9
 #define POLLRDHUP 0
9
 #define POLLRDHUP 0
10
 /* uClibc may does not have clock_nanosleep() */
10
 /* uClibc may does not have clock_nanosleep() */
11
 #elif !defined (__UCLIBC__) || \
11
 #elif !defined (__UCLIBC__) || \
12
@@ -59,7 +59,7 @@ typedef union
12
@@ -60,7 +60,7 @@ typedef union
13
  * Raw udp packet structure with flexible-array payload
13
  *****************************************************************************/
14
  *****************************************************************************/
14
 struct udprawpkt {
15
 struct udprawpkt {
15
 #if !defined(__APPLE__)
16
-#if defined(__APPLE__) || defined(__FreeBSD__)
16
-#if defined(__FreeBSD__)
17
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
17
+#if defined(__FreeBSD__) || defined(__DragonFly__)
18
     struct  ip iph;
18
     struct  ip iph;
19
 #else
19
 #else
20
     struct  iphdr iph;
20
     struct  iphdr iph;

Return to bug 241982