Vulnerable.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 9 insertions, 235 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 23d67cf82e14..690686f40e56 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.363 2012/07/25 21:05:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.364 2012/07/25 21:07:40 jer Exp $
+
+  25 Jul 2012; Jeroen Roovers <jer@gentoo.org> -wireshark-1.8.0.ebuild,
+  -files/wireshark-1.8.0-underlinking.patch:
+  Vulnerable.
 
 *wireshark-1.6.9 (25 Jul 2012)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7851faa2f183..b2e03a4c04bc 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,21 +2,18 @@
 Hash: SHA256
 
 AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
-AUX wireshark-1.8.0-underlinking.patch 239 SHA256 63a0ecdd4b45e048c6f8a3f25c0fe0b7a827df8e7dc2167cc3ad51ab94b8eae7 SHA512 df34235187efc9c423acd2b0f14d7ff569db090566abfa8f343a6826afb246f6dbacf84af9d4903f3f2656ed832f8329ae4037536d7be1f18db8e36b1fb4c1c6 WHIRLPOOL 3fda73b9fa6cd6e22201a20f0e4331a610ea13f53a8b352f89f27e89e1a2b4edc16bededa6677892ec65b53c78dbc53ce051082824ddd7e1d823f0001e33faed
 DIST wireshark-1.6.8.tar.bz2 21967111 SHA256 d4fbaffa4fd32543ed1d03b3097bf89a7d492e6d02e9bf8f8aa8a71281f3057f SHA512 1f2eae0b94632f0bc37dbab16afdba711e1b3c8b059390645c38523d114b2c2908ccd0c396fc0c3b89be8b6fb8a314fee7b1e16c57ce05e98bf88d923b55fc78 WHIRLPOOL b46571b9cf33d35158ef95c0df65fb4941ab2097d687ebc21501ca4f46bed176b91893adb910a884a16c1054d2be9cb52c68f4f552871a81c91c3618fec811f4
 DIST wireshark-1.6.9.tar.bz2 22012780 SHA256 38d4dd9848ec2de5a16bf6706291f93b073e7521afacd669803f497d8d23991a SHA512 9f856f3ab3c95dda9750be8b4fe8c5a714db7f72794321b755fb61f97c409af957aafc84c2b45bd6cd0ea5b31142ab14a37ab4591e2d4becf16d328ff3604cea WHIRLPOOL 664d83872736cad73fef788fa2dd0e480531e3c8a0772495db232a8e6ba7addf648d135fabde50612a97e9b188bdbee92f27fa1f8c0ae355d8c6876dce66a5e5
-DIST wireshark-1.8.0.tar.bz2 24425043 SHA256 4cb802f116bbdcfa71afbc842dbfacd8f96594f4b221cbb5616d5c17bc696a62 SHA512 bd2b476dda089d27aba73ae5d5974757ec0fd1f6047adecad9966366cacd6e0565a313be1f14f59e38011cd18331f7cf4aaca69228d9af1201866c5174bf41d4 WHIRLPOOL e1173052180ad8f5634395cbdf5fc57e0339870aedfe7173ea9af44cdf1ec4386cfb314f34c10a37c38aae0fa1808a2ae08d6ae5076d1c9b2d1cfdf319ab784f
 DIST wireshark-1.8.1.tar.bz2 24125571 SHA256 5966a3e23d34972eb35433ae8198fccf1945617f71b89c1af26dada9f342feb7 SHA512 fec2212ca6c0b50b84f0642160b4685c5aa9e06677b68fa1103dbbd7dd684bfdc00330b2444a8805169e9fc88866707cf2b0dee45207e7f91ac40f7bcefb6faa WHIRLPOOL 1343b68fd95cb55f6445e09f38cd1b8f9b93d5a05146ea8937609f9d97be4b1fb4a45ff68aaa1885fd753d889b81f31422b5a96517eb72fd72d29e24f90745b6
 EBUILD wireshark-1.6.8.ebuild 6453 SHA256 45983c22afd371ca12b7cfaaa7b8657bb2c661ecc78c7d639cd8f7067e73670d SHA512 ab98125603ada0828444414b8807760e4f5bf009547fe58110ba6cf3ff981df18bd34e7d17605ac11fdbd592a8ef9e0b5a1985775dbea11ea750b3aaedb9b6fe WHIRLPOOL 500f699b5f8d84c85cb2422745a95e2a47cdf7915cb030ea5d688a1cd2a772c9060b8058ee577eecfde2a9bfb4e2dcbe1c380fd113621cd9240e1db82d964110
 EBUILD wireshark-1.6.9.ebuild 6457 SHA256 a7d20a5ed25826d4eb4e3ccc5e34e28ca9b2e5ddd40b54f1303a6279db080b37 SHA512 ca406a37d91b20cf0ae54d39d6b3b97ec3a5ace0c50662f1f1c313d3009f1569f1d4205efbdbf1eff7e2267b2fdeabada051d34dccd71e5275a79ebf3bc5ae5c WHIRLPOOL 8d932efe21db98e5ab4b8d29da55aeb1c31b90d60e10c1e813c6f3076e701c608e3106fd05b3e0dab05b5d857c4444441bf99d4623ef72934fa6676816a6a859
-EBUILD wireshark-1.8.0.ebuild 6347 SHA256 faa7bd3a28c578960f14c3346be417a00e213f828990408e39ebbf246c9767ac SHA512 e5079835d7836de849506f6db836acfc55498344c312d8ee72ed5c55c139cbae01610e4ae1da0c734bfa3df19f2d048e76f5e99e5258667d80337e7f8bf3606f WHIRLPOOL 39f5cd4c512ecfc640cc7786b56b866adaa37005df0301a32fb50a3843c8db948b591f94f91373e8ebf5fe2f3575fa93ac23a28094e6a805b8c0894ef805c529
 EBUILD wireshark-1.8.1.ebuild 6307 SHA256 9569d98ef9e34b6d08c05010b6dfa1a3313a194def1bd94e4cea637ae3ce5b49 SHA512 07bc3a3f506a42f8b6383ba9bd00499a064c07a4f6914b1677fa6bf7d1dd16158b3273b487f079c65d0385eb1eeb1fe1e8b22ab14101a6571fb499f04a7c6464 WHIRLPOOL 2c72e2aa208f02c460bf25fed22b73294e16e8f25c7b5d66565834c53acf61043991e6eb76d07117a3658fa6388f45314825321e3b8f2291de137de8491f9518
-MISC ChangeLog 52531 SHA256 d1ff3b8160c67c1f66d2b76b4aebd118f4c49f3d2b9683799c0163b7d66767da SHA512 d710ca8819afb6ee754a54f2ef295c4f67e81e7448e924279f71ba79733f8bf93e1a275c178c6a34e816b03606d881110459da68de738fbd029fd2c0325991c3 WHIRLPOOL a3a7fe8266c57eea7d3e86eb8a9201f17725b8dcdbd792da37deb51dde5375429aa34427f7e2c818d1d5f186a79ae60bbbcbc02bc9d38a247dc3512cbd6f3834
+MISC ChangeLog 52663 SHA256 651a6080c1ac3d516afe4cc4499ab510f0e6802c7f6507f1042afee20779e542 SHA512 8e4cf920df0c50ba73d118f4461890942ae651ce15eecf2685b1c001ba5a87f7d8961e1e3c1e250a83fae44c841ce74827fb4f85b311aeafa34de8bd5b0c1235 WHIRLPOOL 5587f2afacd02025c50fb8bcb21d100559c097db0d7408a35a22fdd2a81009d91fafadf51792ea9faff553716d482ddbe70493b3d9cd504896be3dc6031521b5
 MISC metadata.xml 2400 SHA256 76f9bbd8fe91ac408781d92cd721b859e0c28fb9b645d48b7455d98320df8f30 SHA512 53cead1f63742ea915183e0d9d44776651f365a973884cf52525b181613a0ca4c2905e73597c228b637b633fa5e05a0331f6f91ca3e9c86991178dec3045412f WHIRLPOOL 98c5773fe59eb96e4f34ef7fc3e0ced2af1f28fd69be635c8afc6a95becc80c8f1a099d49486f9931dd7b7aa5d46672b97dfdb4dd3d0352ed23f8a94bd02b0ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAQX7oACgkQVWmRsqeSphO9fwCfbfRVlVJEvqt40rre44ZM3rTE
-z6kAniTcYpYGIkh9tQHXAUaIotYiOisr
-=0E5I
+iEYEAREIAAYFAlAQYCIACgkQVWmRsqeSphNNBACfTAttRSfWwWx/GUaWj3QHB/eq
+478AnRAwobZwoIAhGOxSmjTeX8Vn977k
+=toH3
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch b/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch
deleted file mode 100644
index 02b91092f03f..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -333,6 +333,7 @@ wireshark_LDADD = \
- 	@LIBGNUTLS_LIBS@		\
- 	@LIBSMI_LDFLAGS@		\
- 	@PORTAUDIO_LIBS@		\
-+	@GLIB_LIBS@			\
- 	@GTK_LIBS@ -lm
- 
- wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
diff --git a/net-analyzer/wireshark/wireshark-1.8.0.ebuild b/net-analyzer/wireshark/wireshark-1.8.0.ebuild
deleted file mode 100644
index 8cc74d1f7bb6..000000000000
--- a/net-analyzer/wireshark/wireshark-1.8.0.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.0.ebuild,v 1.7 2012/07/10 15:07:22 jer Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-inherit autotools eutils flag-o-matic python toolchain-funcs user
-
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
-profile +pcap portaudio python +caps selinux smi ssl zlib"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( <net-libs/gnutls-3 )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	ares? ( >=net-dns/c-ares-1.5 )
-	!ares? ( adns? ( net-libs/adns ) )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	virtual/pkgconfig
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex
-	!!<net-analyzer/wireshark-1.8.0"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have <FS>_FS_SECURITY enabled where <FS> is the filesystem"
-		ewarn "to store ${path} (e.g. EXT3_FS_SECURITY). For kernels version before"
-		ewarn "2.6.33_rc1 SECURITY_FILE_CAPABILITIES must be enabled as well."
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-pkg_setup() {
-	if ! use gtk; then
-		ewarn "USE=-gtk disables gtk-based gui called wireshark."
-		ewarn "Only command line utils will be built available"
-	fi
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	if use ares && use adns; then
-		elog "You asked for both, ares and adns, but we can use only one of them."
-		elog "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
-		myconf="$(use_with ares c-ares) --without-adns"
-	else
-		myconf="$(use_with adns) $(use_with ares c-ares)"
-	fi
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case `krb5-config --libs` in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=" --with-ssl"
-				;;
-		esac
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	# dumpcap requires libcap, setuid-install requires dumpcap
-	econf $(use_enable gtk wireshark) \
-		$(use_enable profile profile-build) \
-		$(use_with ssl gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable ipv6) \
-		$(use_with lua) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with zlib) \
-		$(use_with geoip) \
-		$(use_with portaudio) \
-		$(use_with python) \
-		$(use_with caps libcap) \
-		$(use_with pcap) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use pcap && use_enable !caps setuid-install) \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--disable-extra-gcc-checks \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C docbook
-}
-
-src_install() {
-	default
-	if use doc; then
-		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			insinto /usr/share/doc/${PF}/pdf/
-			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
-		fi
-	fi
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk; then
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-		domenu wireshark.desktop
-	fi
-	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	ewarn "NOTE: To run wireshark as normal user you have to add yourself to"
-	ewarn "the wireshark group. This security measure ensures that only trusted"
-	ewarn "users are allowed to sniff your traffic."
-	echo
-}