Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-libs/libnids/ChangeLog9
-rw-r--r--net-libs/libnids/Manifest18
-rw-r--r--net-libs/libnids/files/1.16-libnet-1.0.patch56
-rw-r--r--net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch23
-rw-r--r--net-libs/libnids/files/libnids_gcc33_fix192
-rw-r--r--net-libs/libnids/libnids-1.18.ebuild7
-rw-r--r--net-libs/libnids/metadata.xml6
7 files changed, 53 insertions, 258 deletions
diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index 7bc92d6e4009..7fd39bcb97bc 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-libs/libnids
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.12 2004/09/03 19:59:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.13 2004/12/17 12:22:01 eldad Exp $
+
+ 17 Dec 2004; Eldad Zack <eldad@gentoo.org> -files/1.16-libnet-1.0.patch,
+ +files/libnids-1.18-chksum.c-ebx.patch, -files/libnids_gcc33_fix,
+ libnids-1.18.ebuild:
+ Cleanup. Added patch to prevent clobbering of ebx, in order to compile cleanly
+ with gcc 3.5. Thanks to Thomas <Thomas.Eschenbacher@gmx.de>. Closes bug
+ #55906.
03 Sep 2004; Caleb Tennis <caleb@gentoo.org> -libnids-1.16-r1.ebuild,
-libnids-1.16.ebuild, -libnids-1.17_rc1.ebuild:
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index 63c1b7314894..e57dbbfce677 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,5 +1,15 @@
-MD5 c1d11bbe2b2a6f8b5aa7b52137f6bc3e libnids-1.18.ebuild 1049
-MD5 3a16ac9a6e777fde32a6bccc6314e8d5 ChangeLog 1809
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bb937b2beae7efc259d0bfb6616d98d6 libnids-1.18.ebuild 986
+MD5 336449356c187d7f842f58e01ad3ff7b ChangeLog 2141
+MD5 c9a3c259574bc6c3d7583402ad67e763 metadata.xml 311
MD5 b8821b8ac4cbf9a8d5c0ce7eadc5f710 files/digest-libnids-1.18 64
-MD5 461dcf2a88008ece06f32599af5e7878 files/1.16-libnet-1.0.patch 2230
-MD5 2398bb37cb63ed70642a6e2fa23edbd5 files/libnids_gcc33_fix 4724
+MD5 4f1acaf2ec159ddfba1e456f21c99112 files/libnids-1.18-chksum.c-ebx.patch 615
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBws81T+MN7JbqCpMRAr3SAJ9M+RjiPMXrTU2TpcILNtW9jufddQCghmYV
+XFaxreSOckm5iUkHAgy8Yc4=
+=uKHo
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libnids/files/1.16-libnet-1.0.patch b/net-libs/libnids/files/1.16-libnet-1.0.patch
deleted file mode 100644
index 82a9a7f1b4b2..000000000000
--- a/net-libs/libnids/files/1.16-libnet-1.0.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.orig 2003-08-19 13:57:32.933711496 -0400
-+++ configure 2003-08-19 13:57:33.029696904 -0400
-@@ -1498 +1498 @@
-- if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a; then
-+ if test -f $withval/include/libnet-1.0.h -a -f $withval/lib/libnet-1.0.a; then
-@@ -1501 +1501 @@
-- CFLAGS="$CFLAGS `$withval/libnet-config --defines`"
-+ CFLAGS="$CFLAGS `$withval/libnet-1.0-config --defines`"
-@@ -1503 +1503 @@
-- LNETLIB="-L$withval/lib -lnet"
-+ LNETLIB="-L$withval/lib -lnet-1.0"
-@@ -1506 +1506 @@
-- { echo "configure: error: libnet.h or libnet.a not found in $withval" 1>&2; exit 1; }
-+ { echo "configure: error: libnet-1.0.h or libnet-1.0.a not found in $withval" 1>&2; exit 1; }
-@@ -1511,2 +1511,2 @@
-- if test -f ${prefix}/include/libnet.h; then
-- CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
-+ if test -f ${prefix}/include/libnet-1.0.h; then
-+ CFLAGS="$CFLAGS `${prefix}/bin/libnet-1.0-config --defines`"
-@@ -1514 +1514 @@
-- LNETLIB="-L${prefix}/lib -lnet"
-+ LNETLIB="-L${prefix}/lib -lnet-1.0"
-@@ -1516,3 +1516,3 @@
-- elif test -f /usr/include/libnet.h; then
-- CFLAGS="$CFLAGS `libnet-config --defines`"
-- LNETLIB="-lnet"
-+ elif test -f /usr/include/libnet-1.0.h; then
-+ CFLAGS="$CFLAGS `libnet-1.0-config --defines`"
-+ LNETLIB="-lnet-1.0"
---- samples/Makefile.in.orig 2003-08-19 13:57:32.937710888 -0400
-+++ samples/Makefile.in 2003-08-19 13:57:32.995702072 -0400
-@@ -20 +20 @@
--LIBS = -L../src -lnids -lpcap -lnet @LIBS@
-+LIBS = -L../src -lnids-1.0 -lpcap -lnet-1.0 @LIBS@
---- src/Makefile.in.orig 2003-08-19 13:57:32.941710280 -0400
-+++ src/Makefile.in 2003-08-19 13:57:33.000701312 -0400
-@@ -38 +38 @@
--all: libnids.a
-+all: libnids-1.0.a
-@@ -40 +40 @@
--libnids.a: $(OBJS)
-+libnids-1.0.a: $(OBJS)
-@@ -44 +44 @@
--install: libnids.a
-+install: libnids-1.0.a
-@@ -48 +48 @@
-- $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir)
-+ $(INSTALL) -c -m 644 libnids-1.0.a $(install_prefix)$(libdir)
-@@ -53 +53 @@
-- rm -f *.o *~ libnids.a
-+ rm -f *.o *~ libnids-1.0.a
---- src/killtcp.c.orig 2003-08-19 13:57:32.945709672 -0400
-+++ src/killtcp.c 2003-08-19 13:57:33.031696600 -0400
-@@ -6 +6 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch b/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
new file mode 100644
index 000000000000..5c7dc3fb1079
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
@@ -0,0 +1,23 @@
+--- src/checksum.c.orig 2003-09-20 22:40:44.000000000 +0200
++++ src/checksum.c 2004-11-02 20:36:59.290981656 +0100
+@@ -29,6 +29,7 @@
+ movl 16(%esp),%ecx # Function arg: int len
+ movl 12(%esp),%esi # Function arg: u_char *buff*/
+
++" push %%ebx \n"
+ " testl $2, %%esi \n"
+ " jz 2f \n"
+ " subl $2, %%ecx \n"
+@@ -84,10 +85,10 @@
+ "5: movb (%%esi),%%cl \n"
+ "6: addl %%ecx,%%eax \n"
+ " adcl $0, %%eax \n"
+-"7: \n"
++"7: pop %%ebx \n"
+ : "=a"(sum)
+ : "0"(sum), "c"(len), "S"(buff)
+- : "bx", "dx");
++ : "dx");
+
+ return (sum);
+ }
diff --git a/net-libs/libnids/files/libnids_gcc33_fix b/net-libs/libnids/files/libnids_gcc33_fix
deleted file mode 100644
index 3ebe92401202..000000000000
--- a/net-libs/libnids/files/libnids_gcc33_fix
+++ /dev/null
@@ -1,192 +0,0 @@
---- libnids-1.17-orig/src/checksum.c 2002-08-21 17:11:09.000000000 +0200
-+++ libnids-1.17/src/checksum.c 2003-07-26 13:12:44.000000000 +0200
-@@ -29,61 +29,61 @@
- movl 16(%esp),%ecx # Function arg: int len
- movl 12(%esp),%esi # Function arg: u_char *buff*/
-
-- "testl $2, %%esi
-- jz 2f
-- subl $2, %%ecx
-- jae 1f
-- addl $2, %%ecx
-- jmp 4f
--1: movw (%%esi), %%bx
-- addl $2, %%esi
-- addw %%bx, %%ax
-- adcl $0, %%eax
--2:
-- movl %%ecx, %%edx
-- shrl $5, %%ecx
-- jz 2f
-- testl %%esi, %%esi
--1: movl (%%esi), %%ebx
-- adcl %%ebx, %%eax
-- movl 4(%%esi), %%ebx
-- adcl %%ebx, %%eax
-- movl 8(%%esi), %%ebx
-- adcl %%ebx, %%eax
-- movl 12(%%esi), %%ebx
-- adcl %%ebx, %%eax
-- movl 16(%%esi), %%ebx
-- adcl %%ebx, %%eax
-- movl 20(%%esi), %%ebx
-- adcl %%ebx, %%eax
-- movl 24(%%esi), %%ebx
-- adcl %%ebx, %%eax
-- movl 28(%%esi), %%ebx
-- adcl %%ebx, %%eax
-- lea 32(%%esi), %%esi
-- dec %%ecx
-- jne 1b
-- adcl $0, %%eax
--2: movl %%edx, %%ecx
-- andl $0x1c, %%edx
-- je 4f
-- shrl $2, %%edx
--3: adcl (%%esi), %%eax
-- lea 4(%%esi), %%esi
-- dec %%edx
-- jne 3b
-- adcl $0, %%eax
--4: andl $3, %%ecx
-- jz 7f
-- cmpl $2, %%ecx
-- jb 5f
-- movw (%%esi),%%cx
-- leal 2(%%esi),%%esi
-- je 6f
-- shll $16,%%ecx
--5: movb (%%esi),%%cl
--6: addl %%ecx,%%eax
-- adcl $0, %%eax
-+ "testl $2, %%esi \n \
-+ jz 2f \n \
-+ subl $2, %%ecx \n \
-+ jae 1f \n \
-+ addl $2, %%ecx \n \
-+ jmp 4f \n \
-+1: movw (%%esi), %%bx \n \
-+ addl $2, %%esi \n \
-+ addw %%bx, %%ax \n \
-+ adcl $0, %%eax \n \
-+2: \n \
-+ movl %%ecx, %%edx \n \
-+ shrl $5, %%ecx \n \
-+ jz 2f \n \
-+ testl %%esi, %%esi \n \
-+1: movl (%%esi), %%ebx \n \
-+ adcl %%ebx, %%eax \n \
-+ movl 4(%%esi), %%ebx \n \
-+ adcl %%ebx, %%eax \n \
-+ movl 8(%%esi), %%ebx \n \
-+ adcl %%ebx, %%eax \n \
-+ movl 12(%%esi), %%ebx \n \
-+ adcl %%ebx, %%eax \n \
-+ movl 16(%%esi), %%ebx \n \
-+ adcl %%ebx, %%eax \n \
-+ movl 20(%%esi), %%ebx \n \
-+ adcl %%ebx, %%eax \n \
-+ movl 24(%%esi), %%ebx \n \
-+ adcl %%ebx, %%eax \n \
-+ movl 28(%%esi), %%ebx \n \
-+ adcl %%ebx, %%eax \n \
-+ lea 32(%%esi), %%esi \n \
-+ dec %%ecx \n \
-+ jne 1b \n \
-+ adcl $0, %%eax \n \
-+2: movl %%edx, %%ecx \n \
-+ andl $0x1c, %%edx \n \
-+ je 4f \n \
-+ shrl $2, %%edx \n \
-+3: adcl (%%esi), %%eax \n \
-+ lea 4(%%esi), %%esi \n \
-+ dec %%edx \n \
-+ jne 3b \n \
-+ adcl $0, %%eax \n \
-+4: andl $3, %%ecx \n \
-+ jz 7f \n \
-+ cmpl $2, %%ecx \n \
-+ jb 5f \n \
-+ movw (%%esi),%%cx \n \
-+ leal 2(%%esi),%%esi \n \
-+ je 6f \n \
-+ shll $16,%%ecx \n \
-+5: movb (%%esi),%%cl \n \
-+6: addl %%ecx,%%eax \n \
-+ adcl $0, %%eax \n \
- 7: "
- : "=a"(sum)
- : "0"(sum), "c"(len), "S"(buff)
-@@ -103,24 +103,24 @@
- {
- u_int sum;
-
-- __asm__ __volatile__("
-- movl (%1), %0
-- subl $4, %2
-- jbe 2f
-- addl 4(%1), %0
-- adcl 8(%1), %0
-- adcl 12(%1), %0
--1: adcl 16(%1), %0
-- lea 4(%1), %1
-- decl %2
-- jne 1b
-- adcl $0, %0
-- movl %0, %2
-- shrl $16, %0
-- addw %w2, %w0
-- adcl $0, %0
-- notl %0
--2:
-+ __asm__ __volatile__(" \n \
-+ movl (%1), %0 \n \
-+ subl $4, %2 \n \
-+ jbe 2f \n \
-+ addl 4(%1), %0 \n \
-+ adcl 8(%1), %0 \n \
-+ adcl 12(%1), %0 \n \
-+1: adcl 16(%1), %0 \n \
-+ lea 4(%1), %1 \n \
-+ decl %2 \n \
-+ jne 1b \n \
-+ adcl $0, %0 \n \
-+ movl %0, %2 \n \
-+ shrl $16, %0 \n \
-+ addw %w2, %w0 \n \
-+ adcl $0, %0 \n \
-+ notl %0 \n \
-+2: \n \
- "
- /*
- Since the input registers which are loaded with iph and ipl
-@@ -137,9 +137,9 @@
- static inline u_int
- csum_fold(u_int sum)
- {
-- __asm__("
-- addl %1, %0
-- adcl $0xffff, %0
-+ __asm__(" \n \
-+ addl %1, %0 \n \
-+ adcl $0xffff, %0 \n \
- "
- : "=r" (sum)
- : "r" (sum << 16), "0" (sum & 0xffff0000)
-@@ -155,11 +155,11 @@
- csum_tcpudp_magic(u_int saddr, u_int daddr, u_short len,
- u_short proto, u_int sum)
- {
-- __asm__("
-- addl %1, %0
-- adcl %2, %0
-- adcl %3, %0
-- adcl $0, %0
-+ __asm__(" \n \
-+ addl %1, %0 \n \
-+ adcl %2, %0 \n \
-+ adcl %3, %0 \n \
-+ adcl $0, %0 \n \
- "
- : "=r" (sum)
- : "g" (daddr), "g"(saddr), "g"((ntohs(len) << 16) + proto * 256), "0"(sum));
diff --git a/net-libs/libnids/libnids-1.18.ebuild b/net-libs/libnids/libnids-1.18.ebuild
index d1a50df0fc7d..3a3739f9ec37 100644
--- a/net-libs/libnids/libnids-1.18.ebuild
+++ b/net-libs/libnids/libnids-1.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.4 2004/07/15 00:56:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.5 2004/12/17 12:22:01 eldad Exp $
inherit eutils
@@ -16,13 +16,10 @@ IUSE=""
DEPEND="net-libs/libpcap
>=net-libs/libnet-1.1.0-r3"
-S=${WORKDIR}/${P/_rc1}
-
src_unpack() {
unpack ${A}
cd ${S}
- # patch no longer patches clean >=libnids-1.18
- # epatch ${FILESDIR}/libnids_gcc33_fix
+ epatch ${FILESDIR}/libnids-1.18-chksum.c-ebx.patch
}
src_compile() {
diff --git a/net-libs/libnids/metadata.xml b/net-libs/libnids/metadata.xml
new file mode 100644
index 000000000000..ce33fa86db57
--- /dev/null
+++ b/net-libs/libnids/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection.</longdescription>
+</pkgmetadata>