libraries/libnids: Fix references.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Willy Sudiarto Raharjo 2016-02-18 09:15:40 +07:00
parent b2bef49bc7
commit 2ae00a0e32
2 changed files with 55 additions and 6 deletions

View file

@ -25,7 +25,7 @@
PRGNAM=libnids
VERSION=${VERSION:-1.24}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -67,10 +67,14 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# needed to build dsniff
# https://github.com/aol/moloch/issues/440
patch -p1 < $CWD/libnids.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@ -83,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install install_prefix=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;

View file

@ -0,0 +1,45 @@
--- libnids-1.24/src/checksum.c.orig 2016-02-18 05:45:04.673171164 +0700
+++ libnids-1.24/src/checksum.c 2016-02-18 05:49:19.297787169 +0700
@@ -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))
@@ -172,7 +172,7 @@
computes the checksum of the TCP/UDP pseudo-header
returns a 16-bit checksum, already complemented
*/
-static inline u_short
+inline u_short
csum_tcpudp_magic(u_int saddr, u_int daddr, u_short len,
u_short proto, u_int sum)
{
@@ -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))