commit 8602fef50817d9f85e79f01bca1110b706380e92
Author: Jan Rękorajski <[email protected]>
Date: Mon Mar 28 21:49:29 2016 +0900
- fix build with gcc 5
- rel 2
gcc5.patch | 36 ++++++++++++++++++++++++++++++++++++
libnids.spec | 3 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
---
diff --git a/libnids.spec b/libnids.spec
index 7eaa04a..2c44cdc 100644
--- a/libnids.spec
+++ b/libnids.spec
@@ -2,7 +2,7 @@ Summary: Implementation of E-component of Network
Intrusion Detection System
Summary(pl.UTF-8): Implementacja E-komponentu NIDS (sieciowego systemu
wykrywania intruzów)
Name: libnids
Version: 1.24
-Release: 1
+Release: 2
Epoch: 1
License: BSD
Group: Libraries
@@ -10,6 +10,7 @@ Source0:
http://dl.sourceforge.net/libnids/%{name}-%{version}.tar.gz
# Source0-md5: 72d37c79c85615ffe158aa524d649610
Patch0: %{name}-libnet1.patch
Patch1: %{name}-nolibs.patch
+Patch2: gcc5.patch
URL: http://libnids.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
diff --git a/gcc5.patch b/gcc5.patch
new file mode 100644
index 0000000..03b752a
--- /dev/null
+++ b/gcc5.patch
@@ -0,0 +1,36 @@
+--- libnids-1.24/src/checksum.c~ 2010-02-26 19:58:41.000000000 +0900
++++ libnids-1.24/src/checksum.c 2016-03-28 21:48:45.105542792 +0900
+@@ -120,7 +120,7 @@
+ By Jorge Cwik <[email protected]>, 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))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libnids.git/commitdiff/8602fef50817d9f85e79f01bca1110b706380e92
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
