1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00

Fix on 10, whilst gcc is exporting inline functions, clang isn't.

Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2014-02-03 14:23:07 +00:00
parent d8e8201c23
commit e0553647f7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=342448
4 changed files with 47 additions and 16 deletions

View File

@ -3,6 +3,7 @@
PORTNAME= libnids
PORTVERSION= 1.24
PORTREVISION= 1
CATEGORIES= net security
MASTER_SITES= SF

View File

@ -1,16 +0,0 @@
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@FreeBSD.org>
Last-Update: 2010-06-011
--- src/libnids.c.orig
+++ src/libnids.c
@@ -14,7 +14,6 @@
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#include <alloca.h>
#include <pcap.h>
#include <errno.h>
#include <config.h>

View File

@ -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@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))

View File

@ -0,0 +1,10 @@
--- ./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>
#include <syslog.h>
-#include <alloca.h>
#include <pcap.h>
#include <errno.h>
#include <config.h>