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

Package-Manager: portage-2.1.1

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 6845db7b3c94af6dc922d7da07c8f968660c03de..201ce0a388e245477be4bbfc10555c1343ddb8ba 100644 (file)
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -17,10 +17,10 @@ EBUILD tcpdump-3.9.3.ebuild 1457 RMD160 62ada676444b761d22a3c18ce4a0bfa380cfd266
 MD5 afcd04d0437ce5d2d0a481e14c230e7e tcpdump-3.9.3.ebuild 1457
 RMD160 62ada676444b761d22a3c18ce4a0bfa380cfd266 tcpdump-3.9.3.ebuild 1457
 SHA256 8a2c591401cae82f5f205df58ce45b4118f7867e54de0a7b60f2492864cf36a9 tcpdump-3.9.3.ebuild 1457
-EBUILD tcpdump-3.9.4-r2.ebuild 1793 RMD160 659796f2b1332a283c90201c3310c366489844ff SHA1 409f38729f2b9b65ca14374bec46592b08779a24 SHA256 59e71850f652947fc9e0f0a7f43b61ffb9e1db0df43f5a2face35c5256a82fd8
-MD5 2de25903634f7fd7b643f1c121e8be61 tcpdump-3.9.4-r2.ebuild 1793
-RMD160 659796f2b1332a283c90201c3310c366489844ff tcpdump-3.9.4-r2.ebuild 1793
-SHA256 59e71850f652947fc9e0f0a7f43b61ffb9e1db0df43f5a2face35c5256a82fd8 tcpdump-3.9.4-r2.ebuild 1793
+EBUILD tcpdump-3.9.4-r3.ebuild 1792 RMD160 dda67d3255c3c3e5545c22352349c2affdf56280 SHA1 01c74066677e3913ca76c29f49696fe74a3feaca SHA256 84375391602a500fa8a0360bd081bc37353213c32a9d4d2f495313faed3a4c14
+MD5 18eb432e890d219e9860cae4981dc2e2 tcpdump-3.9.4-r3.ebuild 1792
+RMD160 dda67d3255c3c3e5545c22352349c2affdf56280 tcpdump-3.9.4-r3.ebuild 1792
+SHA256 84375391602a500fa8a0360bd081bc37353213c32a9d4d2f495313faed3a4c14 tcpdump-3.9.4-r3.ebuild 1792
 EBUILD tcpdump-3.9.4.ebuild 1458 RMD160 8b327734139427ed34a13bcc608cc12e1259b33f SHA1 74a7ef9c0e6b2ad61aa86b018ec68268b78f6d3e SHA256 069e9dc2ccdb73c30acc82cce009d281c5fbc762f37bb4c4eb5ae77b9f44b9cb
 MD5 2c0fad20640768f5c28323ebe70b3bbd tcpdump-3.9.4.ebuild 1458
 RMD160 8b327734139427ed34a13bcc608cc12e1259b33f tcpdump-3.9.4.ebuild 1458
@@ -29,10 +29,10 @@ EBUILD tcpdump-3.9.5-r1.ebuild 1805 RMD160 ca362dfb092daf34152e1bfe9302dea163529
 MD5 99628c825a1423216df5f7fe46895289 tcpdump-3.9.5-r1.ebuild 1805
 RMD160 ca362dfb092daf34152e1bfe9302dea163529788 tcpdump-3.9.5-r1.ebuild 1805
 SHA256 9c4e5dcaa96d0cd7467c61a43e47a0f9ffbce58299661213ebe9b5b8aba9dae4 tcpdump-3.9.5-r1.ebuild 1805
-MISC ChangeLog 11173 RMD160 6d9a6ddbf5cec2c21e8e2c61c294195a9f821adc SHA1 140d4b4eca377c8ff5225f5424be1288cd3b96d7 SHA256 59821fc674a1e1f8552a0d7b10badf909035393fb5cc43abc891dd7146c85564
-MD5 c89abf78f4e15c4ecf429f8b2bc13e69 ChangeLog 11173
-RMD160 6d9a6ddbf5cec2c21e8e2c61c294195a9f821adc ChangeLog 11173
-SHA256 59821fc674a1e1f8552a0d7b10badf909035393fb5cc43abc891dd7146c85564 ChangeLog 11173
+MISC ChangeLog 11385 RMD160 ce268047cca97b603ddfa09e222d105fec4219ba SHA1 72521d839ae23b13dfbf395a07e2890c613401dc SHA256 fdce234153b99dd22262ba7645e8717450ffbef569983a8dc130fb60f1779082
+MD5 26dd76ce038b924be1c871c5c9a5a7ea ChangeLog 11385
+RMD160 ce268047cca97b603ddfa09e222d105fec4219ba ChangeLog 11385
+SHA256 fdce234153b99dd22262ba7645e8717450ffbef569983a8dc130fb60f1779082 ChangeLog 11385
 MISC metadata.xml 268 RMD160 896e1ec3be866fe1d515b55473f0ac763b9f8a12 SHA1 9a77e6e1b7e0c4469583dc9d9a20065d6ac74ab6 SHA256 01030866e2f7de584ec505f71cfbfbbb48f8a790a0ea50a3da1974b74423f827
 MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
 RMD160 896e1ec3be866fe1d515b55473f0ac763b9f8a12 metadata.xml 268
@@ -43,9 +43,9 @@ SHA256 4d887dbcc64aa5c57db3ad380eea3ea6de7d7c8e93559047eb206a6f7e96cde8 files/di
 MD5 5b7e9e87db98adceedf64b926fb30901 files/digest-tcpdump-3.9.4 241
 RMD160 7ce1afbd50b447cfef1b5702157cfbfab6cfa78b files/digest-tcpdump-3.9.4 241
 SHA256 0f31cf28e2cf548760dec49e19d8e615588655abd6bc3a7a2c63372683fcb4ba files/digest-tcpdump-3.9.4 241
-MD5 5b7e9e87db98adceedf64b926fb30901 files/digest-tcpdump-3.9.4-r2 241
-RMD160 7ce1afbd50b447cfef1b5702157cfbfab6cfa78b files/digest-tcpdump-3.9.4-r2 241
-SHA256 0f31cf28e2cf548760dec49e19d8e615588655abd6bc3a7a2c63372683fcb4ba files/digest-tcpdump-3.9.4-r2 241
+MD5 5b7e9e87db98adceedf64b926fb30901 files/digest-tcpdump-3.9.4-r3 241
+RMD160 7ce1afbd50b447cfef1b5702157cfbfab6cfa78b files/digest-tcpdump-3.9.4-r3 241
+SHA256 0f31cf28e2cf548760dec49e19d8e615588655abd6bc3a7a2c63372683fcb4ba files/digest-tcpdump-3.9.4-r3 241
 MD5 529ef132e81950340671aa911a76e183 files/digest-tcpdump-3.9.5-r1 241
 RMD160 eb77d5212d7f489fa7ff696bfb37f6bb534a5ab9 files/digest-tcpdump-3.9.5-r1 241
 SHA256 e7b50f54579db8c825c28d89b19081abf1c5407bd89276f47b03ada1968e085e files/digest-tcpdump-3.9.5-r1 241

diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4-r2 b/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4-r2
deleted file mode 100644 (file)
index 90473b5..0000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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-r2.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.4-r2.ebuild
deleted file mode 100644 (file)
index 38bb7b6..0000000
--- a/net-analyzer/tcpdump/tcpdump-3.9.4-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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-r2.ebuild,v 1.11 2006/11/04 19:00:38 eroyf 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_with 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
-}