Fixed broken smb ./configure option. Thank Tommy Yu for report in bug #155193.

(Portage version: 2.1.1)

3 files changed, 81 insertions, 1 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 83a2a6e354b4..d7c8e65eb559 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.85 2006/11/04 19:00:38 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.86 2006/11/15 13:57:10 pva Exp $
+
+*tcpdump-3.9.4-r3 (15 Nov 2006)
+
+  15 Nov 2006; Peter Volkov <pva@gentoo.org> -tcpdump-3.9.4-r2.ebuild,
+  +tcpdump-3.9.4-r3.ebuild:
+  Fixed broken smb ./configure option. Thank Tommy Yu for report in bug #155193.
 
   04 Nov 2006; Alexander H. Færøy <eroyf@gentoo.org>
   tcpdump-3.9.4-r2.ebuild:
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4-r3 b/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4-r3
new file mode 100644
index 000000000000..90473b591e10
--- /dev/null
+++ b/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4-r3
@@ -0,0 +1,3 @@
+MD5 4b64755bbc8ba1af49c747271a6df5b8 tcpdump-3.9.4.tar.gz 716862
+RMD160 72f53565363bd49614b983bfa4f865cffd83a357 tcpdump-3.9.4.tar.gz 716862
+SHA256 7ee770a16cab2ed69b9c84f8d4fec0d63e09a004994eb368adc31eed8db373b5 tcpdump-3.9.4.tar.gz 716862
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.4-r3.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.4-r3.ebuild
new file mode 100644
index 000000000000..e771f9936fb0
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-3.9.4-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.4-r3.ebuild,v 1.1 2006/11/15 13:57:10 pva Exp $
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+	http://www.jp.tcpdump.org/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="ssl ipv6 samba"
+
+DEPEND="net-libs/libpcap
+	ssl? ( >=dev-libs/openssl-0.9.6m )"
+
+pkg_setup() {
+	if use samba ; then
+		ewarn
+		ewarn "CAUTION !!! CAUTION !!! CAUTION"
+		ewarn
+		ewarn "You're about to compile tcpdump with samba printing support"
+		ewarn "Upstream tags it as 'possibly-buggy SMB printer'"
+		ewarn "So think twice whether this is fine with you"
+		ewarn
+		ewarn "CAUTION !!! CAUTION !!! CAUTION"
+		ewarn
+		ewarn "(Giving you 10 secs to think about it)"
+		ewarn
+		ebeep 5
+		epause 5
+	fi
+}
+
+src_compile() {
+	# tcpdump needs some optymalization. see bug #108391
+	( ! is-flag -O? || is-flag -O0 ) && append-flags -O
+
+	replace-flags -O[3-9] -O2
+	filter-flags -finline-functions
+
+	# Fix wrt bug #48747
+	if [[ $(gcc-major-version) -gt 3 ]] || \
+		[[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 4 ]]
+	then
+		filter-flags -funit-at-a-time
+		append-flags -fno-unit-at-a-time
+	fi
+
+	local myconf
+	if ! use ssl ; then
+		myconf="--without-crypto"
+	fi
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable samba smb) \
+		${myconf} || die "configure failed"
+
+	make CCOPT="$CFLAGS" || die "make failed"
+}
+
+src_install() {
+	dosbin tcpdump || die
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc README FILES VERSION CHANGES
+}