unpack patch

3 files changed, 194 insertions, 2 deletions

diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index cdd2dc2220e6..1b88bde3ea1d 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,9 +1,9 @@
 MD5 e62f7085ef37a208a914cbe30524e74b files/digest-libnids-1.16 63
-MD5 071001548c5f912faf9da3fa07870ba1 files/libnids_gcc33_fix.gz 1181
 MD5 461dcf2a88008ece06f32599af5e7878 files/1.16-libnet-1.0.patch 2230
 MD5 e62f7085ef37a208a914cbe30524e74b files/digest-libnids-1.16-r1 63
 MD5 0166cdd9c4b00a3ca63138f8ba65fda9 files/digest-libnids-1.17_rc1 66
-MD5 41eb1a486e050aa8d969c70182cd91d3 libnids-1.16.ebuild 989
+MD5 2398bb37cb63ed70642a6e2fa23edbd5 files/libnids_gcc33_fix 4724
+MD5 03eebd35f2b2fc021e0dc1eabd042a14 libnids-1.16.ebuild 974
 MD5 de63fb82374710080f77a5e97d9a475f ChangeLog 1467
 MD5 cb3a0561d311a79b37793cad09584359 libnids-1.16-r1.ebuild 1068
 MD5 1f280b2f6d82675f469043889579e45c libnids-1.17_rc1.ebuild 867
diff --git a/net-libs/libnids/files/libnids_gcc33_fix b/net-libs/libnids/files/libnids_gcc33_fix
new file mode 100644
index 000000000000..3ebe92401202
--- /dev/null
+++ b/net-libs/libnids/files/libnids_gcc33_fix
@@ -0,0 +1,192 @@
+--- 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/files/libnids_gcc33_fix.gz b/net-libs/libnids/files/libnids_gcc33_fix.gz
deleted file mode 100644
index b0b368015eed..000000000000
--- a/net-libs/libnids/files/libnids_gcc33_fix.gz
+++ /dev/null