svn commit: r342448 - in head/net/libnids: . files
Mathieu Arnold
mat at FreeBSD.org
Mon Feb 3 14:23:08 UTC 2014
Author: mat
Date: Mon Feb 3 14:23:07 2014
New Revision: 342448
URL: http://svnweb.freebsd.org/changeset/ports/342448
QAT: https://qat.redports.org/buildarchive/r342448/
Log:
Fix on 10, whilst gcc is exporting inline functions, clang isn't.
Sponsored by: Absolight
Added:
head/net/libnids/files/patch-src__checksum.c (contents, props changed)
head/net/libnids/files/patch-src__libnids.c
- copied, changed from r342405, head/net/libnids/files/patch-src::libnids.c
Deleted:
head/net/libnids/files/patch-src::libnids.c
Modified:
head/net/libnids/Makefile
Modified: head/net/libnids/Makefile
==============================================================================
--- head/net/libnids/Makefile Mon Feb 3 14:13:26 2014 (r342447)
+++ head/net/libnids/Makefile Mon Feb 3 14:23:07 2014 (r342448)
@@ -3,6 +3,7 @@
PORTNAME= libnids
PORTVERSION= 1.24
+PORTREVISION= 1
CATEGORIES= net security
MASTER_SITES= SF
Added: head/net/libnids/files/patch-src__checksum.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/libnids/files/patch-src__checksum.c Mon Feb 3 14:23:07 2014 (r342448)
@@ -0,0 +1,36 @@
+--- ./src/checksum.c.orig 2014-02-03 14:04:23.999531000 +0000
++++ ./src/checksum.c 2014-02-03 14:15:33.000000000 +0000
+@@ -120,7 +120,7 @@
+ By Jorge Cwik <jorge at laser.satlink.net>, adapted for linux by Arnt
+ Gulbrandsen.
+ */
+-inline u_short ip_fast_csum(u_char * iph, u_int ihl)
++u_short ip_fast_csum(u_char * iph, u_int ihl)
+ {
+ u_int sum;
+ if (dontchksum(((struct ip*)iph)->ip_src.s_addr))
+@@ -191,13 +191,13 @@
+ this routine is used for miscellaneous IP-like checksums, mainly in
+ icmp.c
+ */
+-inline u_short
++u_short
+ ip_compute_csum(u_char * buff, int len)
+ {
+ return (csum_fold(csum_partial(buff, len, 0)));
+ }
+
+-inline u_short
++u_short
+ my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)
+ {
+ if (dontchksum(saddr))
+@@ -205,7 +205,7 @@
+ return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,
+ csum_partial((u_char *)th, len, 0));
+ }
+-inline u_short
++u_short
+ my_udp_check(void *u, int len, u_int saddr, u_int daddr)
+ {
+ if (dontchksum(saddr))
Copied and modified: head/net/libnids/files/patch-src__libnids.c (from r342405, head/net/libnids/files/patch-src::libnids.c)
==============================================================================
--- head/net/libnids/files/patch-src::libnids.c Mon Feb 3 09:48:39 2014 (r342405, copy source)
+++ head/net/libnids/files/patch-src__libnids.c Mon Feb 3 14:23:07 2014 (r342448)
@@ -1,11 +1,5 @@
-Description: Do not include the non-existent alloca.h header.
- I'll forward this patch next week after I write a configure test for it.
-Forwarded: no
-Author: Peter Pentchev <roam at FreeBSD.org>
-Last-Update: 2010-06-011
-
---- src/libnids.c.orig
-+++ src/libnids.c
+--- ./src/libnids.c.orig 2010-03-01 21:13:25.000000000 +0000
++++ ./src/libnids.c 2014-02-03 14:04:04.000000000 +0000
@@ -14,7 +14,6 @@
#include <stdlib.h>
#include <string.h>
More information about the svn-ports-all
mailing list