Add print-802_11.c patch for bug 168916. Thanks to Executioner <executioner at phobik dot org>. Also, removing old ebuilds.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

5 files changed, 15 insertions, 135 deletions

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 36563d86e104..845c426fd9dd 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -10,42 +10,38 @@ AUX tcpdump-3.8.3-gentoo.patch 4002 RMD160 ac99f45e1c7c9ebe6c6892fb6f2f751b9f9fd
 MD5 4d0df7aa1535098ccef25ba7e86e5e95 files/tcpdump-3.8.3-gentoo.patch 4002
 RMD160 ac99f45e1c7c9ebe6c6892fb6f2f751b9f9fd084 files/tcpdump-3.8.3-gentoo.patch 4002
 SHA256 d37b772383dfc5c1d708af751857e19d6f77143b1cbf86b008e76d3243fce506 files/tcpdump-3.8.3-gentoo.patch 4002
-DIST tcpdump-3.9.3.tar.gz 664369 RMD160 b6000dd099be545c6a62fe3763634fdd41798fe8 SHA1 5a92cba21ff70d1306077e6ab9c8bf7b4c0371c2 SHA256 d701a3e4d7ab296fecdd6f8f84610a3c6d275839f9db4269b1ff7db3e0a9c0e5
+AUX tcpdump-3.9.5-print-802_11.c.diff 365 RMD160 2b1186b691a9e25416eea1c7b1c3599dfc4b703f SHA1 4dfb5fcc2c79d128b99bbc3b644e388c44bd840a SHA256 83c188a5bf08199a3c4abf481fa2a2813ff29954e12b5df81002bd40e1d5dab4
+MD5 361356159496cb5a083bc49a8f4241a4 files/tcpdump-3.9.5-print-802_11.c.diff 365
+RMD160 2b1186b691a9e25416eea1c7b1c3599dfc4b703f files/tcpdump-3.9.5-print-802_11.c.diff 365
+SHA256 83c188a5bf08199a3c4abf481fa2a2813ff29954e12b5df81002bd40e1d5dab4 files/tcpdump-3.9.5-print-802_11.c.diff 365
 DIST tcpdump-3.9.4.tar.gz 716862 RMD160 72f53565363bd49614b983bfa4f865cffd83a357 SHA1 fbfdb0e08713c6bf95d2658e294ac3f8bf2c7a16 SHA256 7ee770a16cab2ed69b9c84f8d4fec0d63e09a004994eb368adc31eed8db373b5
 DIST tcpdump-3.9.5.tar.gz 712411 RMD160 e0409ad55deda1b2a74950522720610c6c94d771 SHA1 a9850177809196008ed3e6212cb651ed1500353c SHA256 6a1617253f12bf2ac440eeb8709baeb907c6b801442bf2229a6bb84489cf38f4
-EBUILD tcpdump-3.9.3.ebuild 1457 RMD160 62ada676444b761d22a3c18ce4a0bfa380cfd266 SHA1 1b9072ece824f878cbdee2383c3332f3b1d25d41 SHA256 8a2c591401cae82f5f205df58ce45b4118f7867e54de0a7b60f2492864cf36a9
-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-r3.ebuild 1793 RMD160 65e25d38b10d658258b31b1222a6ba4acca8c9dc SHA1 92d78f5958f9cd35a1b749ffa3e2cf97152d7542 SHA256 7930a5b77810a6fe39955cfd21290a5eadc9a90bf876bb963f28b43f0d2cddbb
 MD5 7fe8a0f1b2c90af7ced908455236618e tcpdump-3.9.4-r3.ebuild 1793
 RMD160 65e25d38b10d658258b31b1222a6ba4acca8c9dc tcpdump-3.9.4-r3.ebuild 1793
 SHA256 7930a5b77810a6fe39955cfd21290a5eadc9a90bf876bb963f28b43f0d2cddbb tcpdump-3.9.4-r3.ebuild 1793
-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
-SHA256 069e9dc2ccdb73c30acc82cce009d281c5fbc762f37bb4c4eb5ae77b9f44b9cb tcpdump-3.9.4.ebuild 1458
 EBUILD tcpdump-3.9.5-r1.ebuild 1805 RMD160 ca362dfb092daf34152e1bfe9302dea163529788 SHA1 a8b27841a28b485ec5123bf8046c6444a4baf1b3 SHA256 9c4e5dcaa96d0cd7467c61a43e47a0f9ffbce58299661213ebe9b5b8aba9dae4
 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 11488 RMD160 7f2a9a381eff6305e1bab1dd37b9610c5bfddd62 SHA1 ba1934529e4bc0a7a4078c8b268702574dfdc20d SHA256 d6d8dc887ea49de287715deea1e1fc34ec753facc6aad36080d56e7c57ac8c8f
-MD5 9fd444182323a111de9a4acaf6d32722 ChangeLog 11488
-RMD160 7f2a9a381eff6305e1bab1dd37b9610c5bfddd62 ChangeLog 11488
-SHA256 d6d8dc887ea49de287715deea1e1fc34ec753facc6aad36080d56e7c57ac8c8f ChangeLog 11488
+EBUILD tcpdump-3.9.5-r2.ebuild 1958 RMD160 5fae5f28ef51a960eaba33cfe63730e0bc1baef5 SHA1 ea0f70cb0141b5f033fdc433d2548497a9fdd4d9 SHA256 7ad276e4c4340156b1bc24408b98b8265c93481215614983da3db110c7912fe1
+MD5 3646ac3b680bbb7cf6b17680e93d03c2 tcpdump-3.9.5-r2.ebuild 1958
+RMD160 5fae5f28ef51a960eaba33cfe63730e0bc1baef5 tcpdump-3.9.5-r2.ebuild 1958
+SHA256 7ad276e4c4340156b1bc24408b98b8265c93481215614983da3db110c7912fe1 tcpdump-3.9.5-r2.ebuild 1958
+MISC ChangeLog 11825 RMD160 8c0cadc75a2c3aa543c2b40c2d6915eafedfcc72 SHA1 6004a28a3e5a4a232d1808611503dc8ad50ce703 SHA256 a80716c91f624546b01807fc79abb0c49e2935abed9ba5b51083f6c5df3cc889
+MD5 c928f6976cd12f55009fe8f81ed73be6 ChangeLog 11825
+RMD160 8c0cadc75a2c3aa543c2b40c2d6915eafedfcc72 ChangeLog 11825
+SHA256 a80716c91f624546b01807fc79abb0c49e2935abed9ba5b51083f6c5df3cc889 ChangeLog 11825
 MISC metadata.xml 268 RMD160 896e1ec3be866fe1d515b55473f0ac763b9f8a12 SHA1 9a77e6e1b7e0c4469583dc9d9a20065d6ac74ab6 SHA256 01030866e2f7de584ec505f71cfbfbbb48f8a790a0ea50a3da1974b74423f827
 MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
 RMD160 896e1ec3be866fe1d515b55473f0ac763b9f8a12 metadata.xml 268
 SHA256 01030866e2f7de584ec505f71cfbfbbb48f8a790a0ea50a3da1974b74423f827 metadata.xml 268
-MD5 ac6d9536470ae98ed6e1fea1225dd5a5 files/digest-tcpdump-3.9.3 241
-RMD160 8aa18b280ed429552246fab2d0e85c71936afd65 files/digest-tcpdump-3.9.3 241
-SHA256 4d887dbcc64aa5c57db3ad380eea3ea6de7d7c8e93559047eb206a6f7e96cde8 files/digest-tcpdump-3.9.3 241
-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-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
+MD5 529ef132e81950340671aa911a76e183 files/digest-tcpdump-3.9.5-r2 241
+RMD160 eb77d5212d7f489fa7ff696bfb37f6bb534a5ab9 files/digest-tcpdump-3.9.5-r2 241
+SHA256 e7b50f54579db8c825c28d89b19081abf1c5407bd89276f47b03ada1968e085e files/digest-tcpdump-3.9.5-r2 241
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.3 b/net-analyzer/tcpdump/files/digest-tcpdump-3.9.3
deleted file mode 100644
index 823efa8e402f..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26c2f6405d6a94f1160a83109b2f71dd tcpdump-3.9.3.tar.gz 664369
-RMD160 b6000dd099be545c6a62fe3763634fdd41798fe8 tcpdump-3.9.3.tar.gz 664369
-SHA256 d701a3e4d7ab296fecdd6f8f84610a3c6d275839f9db4269b1ff7db3e0a9c0e5 tcpdump-3.9.3.tar.gz 664369
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4 b/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4
deleted file mode 100644
index 90473b591e10..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4
+++ /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.3.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild
deleted file mode 100644
index 63b40ce030e8..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild
+++ /dev/null
@@ -1,55 +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.3.ebuild,v 1.11 2006/02/20 01:53:51 kumba 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"
-	#mirror://sourceforge/tcpdump/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6"
-
-DEPEND="net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-
-src_unpack() {
-	unpack ${A}
-
-	if use ssl ; then
-		sed -i -e 's|des\(_cbc_encrypt\)|DES\1|' "${S}"/configure || \
-			die "sed configure failed"
-	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
-
-	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 #48747
-	fi
-
-	local myconf
-	use ssl || myconf="${myconf} --without-crypto"
-	econf $(use_enable ipv6) ${myconf} || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	dosbin tcpdump || die
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
-}
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.4.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.4.ebuild
deleted file mode 100644
index 1402d4f9f37a..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.9.4.ebuild
+++ /dev/null
@@ -1,55 +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.ebuild,v 1.10 2006/06/28 11:02:37 blubb 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"
-	#mirror://sourceforge/tcpdump/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6"
-
-DEPEND="net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-
-src_unpack() {
-	unpack ${A}
-
-	if use ssl ; then
-		sed -i -e 's|des\(_cbc_encrypt\)|DES\1|' "${S}"/configure || \
-			die "sed configure failed"
-	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
-
-	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 #48747
-	fi
-
-	local myconf
-	use ssl || myconf="${myconf} --without-crypto"
-	econf $(use_enable ipv6) ${myconf} || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	dosbin tcpdump || die
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
-}