add 'head' parameter fix

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-analyzer/nmbscan/ChangeLog b/net-analyzer/nmbscan/ChangeLog
index 50e7541a4a0c2fecc3121e6f6ab336dc510d477e..91afb12350e2a80ac3627696f88607670bee8e43 100644 (file)
--- a/net-analyzer/nmbscan/ChangeLog
+++ b/net-analyzer/nmbscan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmbscan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmbscan/ChangeLog,v 1.2 2005/09/21 20:10:52 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmbscan/ChangeLog,v 1.3 2005/09/21 20:29:35 wschlich Exp $
+
+  21 Sep 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +files/nmbscan-1.2.4-head.diff, nmbscan-1.2.4.ebuild:
+  add 'head' parameter fix
 
   21 Sep 2005; Wolfram Schlich <wschlich@gentoo.org> nmbscan-1.2.4.ebuild:
   mark stable on x86

diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest
index 0360fc0667f8b7932c06046422e734ce01e988ec..19b436e340177da004184c9e6484a85ec98d780a 100644 (file)
--- a/net-analyzer/nmbscan/Manifest
+++ b/net-analyzer/nmbscan/Manifest
@@ -1,4 +1,5 @@
-MD5 a547fd3f0eae668012a58758e9e9ae9b ChangeLog 453
+MD5 a34e2989bd947598fe52c3d2c0bc47a9 ChangeLog 590
 MD5 0052e903feec599fb14e64f75a45fe26 metadata.xml 817
-MD5 d8d76423170256234645eca2a459138d nmbscan-1.2.4.ebuild 766
+MD5 ef8eae5e619f48d75a9668ac261899ec nmbscan-1.2.4.ebuild 803
 MD5 578cfd7c8c46c97cbbf1d2dec1dd81ca files/digest-nmbscan-1.2.4 63
+MD5 f68b926ad4d4bd973e446645aa2662dd files/nmbscan-1.2.4-head.diff 862

diff --git a/net-analyzer/nmbscan/files/nmbscan-1.2.4-head.diff b/net-analyzer/nmbscan/files/nmbscan-1.2.4-head.diff
new file mode 100644 (file)
index 0000000..3aa0343
--- /dev/null
+++ b/net-analyzer/nmbscan/files/nmbscan-1.2.4-head.diff
@@ -0,0 +1,27 @@
+--- nmbscan.orig       2005-09-21 22:10:05.223491664 +0200
++++ nmbscan    2005-09-21 22:11:59.215162296 +0200
+@@ -376,7 +376,7 @@
+ 
+ function get_server_and_os_by_ip
+ {
+-    V=$(smbclient -L ${2:-$1} -I $1 -U % 2>&1 | grep '^Domain'| sed 's#.*OS=\[\(.*\)\].*Server=\[\(.*\)\].*#\2/\1#' | head -1)
++    V=$(smbclient -L ${2:-$1} -I $1 -U % 2>&1 | grep '^Domain'| sed 's#.*OS=\[\(.*\)\].*Server=\[\(.*\)\].*#\2/\1#' | head -n 1)
+     echo ${V:--/-}
+ }
+ 
+@@ -424,13 +424,13 @@
+ 
+ function get_nmbname
+ {
+-    V=$(nmblookup -A $1 2>&1 | grep "<20>" | head -1 | awk '{print $1}')
++    V=$(nmblookup -A $1 2>&1 | grep "<20>" | head -n 1 | awk '{print $1}')
+     echo ${V:--}
+ }
+ 
+ function get_domain
+ {
+-    V=$(nmblookup -A $1 2>&1 | grep "<1e>" | head -1 | awk '{print $1}')
++    V=$(nmblookup -A $1 2>&1 | grep "<1e>" | head -n 1 | awk '{print $1}')
+     echo ${V:--}
+ }
+ 

diff --git a/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild
index eb7839027abda768b6ba28f9db98a9f7b20848da..b7958068857c5e6380953e8d3bfb63a60a70bc9a 100644 (file)
--- a/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild
+++ b/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild,v 1.2 2005/09/21 20:10:52 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild,v 1.3 2005/09/21 20:29:35 wschlich Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ RDEPEND="app-shells/bash
 src_unpack() {
        unpack ${A}
        cd ${S}
+       epatch "${FILESDIR}/${P}-head.diff"
 }
 
 src_compile() {

diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 01551243f8830fb59617d6e84eab48e32c12e1d4..d4141bc38afa17357db0f94526dd02b4ca1a9783 100644 (file)
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,16 +1,16 @@
+MD5 f020dfc0688c51474b6f470a9c59dbda ChangeLog 15848
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
-MD5 0e251a6a5770aae0aea192831758d394 snort-2.3.3.ebuild 3975
-MD5 fadb4ceb24f3a36cbd470194d6f2794f ChangeLog 15762
 MD5 bca601c10581b168c51558fe0ae04ffb snort-2.3.0-r1.ebuild 4199
-MD5 71813a2f35fde73dae622dac926c50ab snort-2.3.3-r1.ebuild 4045
 MD5 8cca347231e9fe3363163759a3518c0b snort-2.3.2.ebuild 4205
+MD5 71813a2f35fde73dae622dac926c50ab snort-2.3.3-r1.ebuild 4045
+MD5 b360cb079bb12675a615301852e71a7f snort-2.3.3.ebuild 3975
 MD5 ba226a5dc5b2cea5d0df8f36fd265ab3 snort-2.4.1.ebuild 4075
+MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
 MD5 a9fc70d50c4512c835aa428f4b198fae files/digest-snort-2.3.0-r1 287
-MD5 24851ef65be2d80a70ba4bebe3e8c0ff files/digest-snort-2.3.3 287
 MD5 5d26c971694357c500d666e68622a120 files/digest-snort-2.3.2 287
+MD5 24851ef65be2d80a70ba4bebe3e8c0ff files/digest-snort-2.3.3 287
+MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
 MD5 3ff2d04cb5adac55b4f35c28326f0fb0 files/digest-snort-2.4.1 271
-MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
-MD5 d212aff92317ccfae4c2228de5f9e5cb files/snort-2.3.3-log.c.diff 4781
-MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
-MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
+MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
+MD5 d212aff92317ccfae4c2228de5f9e5cb files/snort-2.3.3-log.c.diff 4781