Run user.eclass functions conditionally, and in pkg_preinst too. Fix CFLAGS -O2 injection better. Copy the configure warning about SMB support.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 36 insertions, 16 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 84b79e537a2a..60f20f9e7fd9 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.168 2013/06/02 14:50:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.169 2013/06/02 16:16:07 jer Exp $
+
+  02 Jun 2013; Jeroen Roovers <jer@gentoo.org> tcpdump-4.4.0-r1.ebuild:
+  Run user.eclass functions conditionally, and in pkg_preinst too. Fix CFLAGS
+  -O2 injection better. Copy the configure warning about SMB support.
 
   02 Jun 2013; Jeroen Roovers <jer@gentoo.org> tcpdump-4.4.0-r1.ebuild:
   Do not keep /var/lib/tcpdump.
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 218c032449fa..9cd28d00ede4 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -5,14 +5,14 @@ AUX tcpdump-4.3.0-ssl-detect.patch 3568 SHA256 970b709a1599e9496e77dd4cbf7e87ed8
 DIST tcpdump-4.3.0.tar.gz 887619 SHA256 efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286 SHA512 56a33f8aeae551fdc499be31d834207b253de27dce7bdde02e2de5ed0edc4bbe86d8e120c9d2a2303b21d5c32773a4f2984e6af4f0d6f945edb3691a6446cb3c WHIRLPOOL b7d06938816aad8313d61bc30d15efa321ae2ab4663e9355ae2c50b7645bd3cb694de85e04314b5e320459312ee6150a2d3c8c93ee7ffc47ca2ece29bebd8270
 DIST tcpdump-4.4.0.tar.gz 915381 SHA256 12274bed2cb89098dadf00a022b4d40853c5108369f3b3117aedf21ec61530bd SHA512 cf31eb2f878e7e448533172241d57071e105b40265b943ebad8d25867384658016676a528f399fb38b0a2ec09d4986d99e4862fd8a09d9a491eeca75ae69d754 WHIRLPOOL f875510dd8c4f409341790281cc2f2f0be2a6e4642e7a00bd7d62ebd4a263f12e7e5f80a17a219c1fa85edf884ccd870dda259d7f90284d9b356edcb0c137d9b
 EBUILD tcpdump-4.3.0.ebuild 2345 SHA256 c210a21ad6a56c17add0eca2027cdf8cc4c2c58ffb8cb560d79a8e4fe030dacb SHA512 d1ee29b0ccfd7f9014d42499b87e74e7c81841674f64f70d7887a4955605623a8b4897fc0bb721192d718a72d794402bd2b8a080dfa37cd2439a458d8c47a35b WHIRLPOOL c8b276ab9612f74381cd1c5194727d53d691218e51fa998d76e531a9e89ae7f87d3d49b9c048440038c4734a3cdccd0c6d2b7a71de22c7825bd33ead761e5492
-EBUILD tcpdump-4.4.0-r1.ebuild 2255 SHA256 b7c00b777bd01574e7322159248314bf4f3138722e90711c691b02e37dcb2806 SHA512 e62a451e9b5219cc391a193dce88f9e5ecaa76976d340befbdc4b298bd25c562e83bf91421b2e97e56019c294dcf48f03c53dc9ae07e46652b56f35b124cdeeb WHIRLPOOL 85dd9cd7e1ad7c7b9b95f9de5832d3a4ddc17ef44156099d2568e41656bf4b6577b70889f3919be708c0ebf3a35155996be6200fb175ee6da9eb2d2b63d98413
+EBUILD tcpdump-4.4.0-r1.ebuild 2543 SHA256 182715206cc3d15c68ad75c1d82612f8060295db2c392414d8261773b7b34c6f SHA512 9cddc1b4e769339dc3480760dea96c89acbfd25a32a7a1e53c49d959cd9a54fcab8d7838370af3bd43edd06ebab718b5ad7814f32ee0069de29fd71831f72dec WHIRLPOOL cd961ef0334c03bde4892bfb71c86ad19c35ad134d376da969cb4bf1366b91cfb06c5b4f036c4153f464dce361f942712abb044e9f15053c62054d8a18d1895a
 EBUILD tcpdump-4.4.0.ebuild 2209 SHA256 a2d7e1fc4bcb4a7ed958816949943f975fcf4c8c63f39981331a8d03ea9df8d5 SHA512 fb0a66f91132d6ebbe4fe0f73f349b36d3dccc28aa5f0acae822bea4dba282d7b173fc3a7807cc0eff95ed6e50b3d14f926c9cea224a3939c474bcb76db1502d WHIRLPOOL 85616181baaa9758fce8adc12a20663f466bb14ee2bcd85e93f9d0ecad7a97842d85dcfcb5a9a4790c73667ccb3c38b7cf69ca96f62c7bd031368dd8f9157d55
-MISC ChangeLog 23031 SHA256 ffbc3128ea91cf8c1e5c1ac9aa8f6b63faa2f663664bb0b411cc56f0ccc19e9c SHA512 5ef2d46901a86fa98d22990c55c4b376e26b531869d844ce223b37b0192ac90a9465fd91f82ca56cbebf12f7fadc2c5961d5a42d2838421b84d4d11a37334fd2 WHIRLPOOL ddc5d030490f93ac9b1f5b2bc9fd8c0f69e02df1c06e0c0b3edcdc9c71103eea364e8c9f3d770127c13be382bf8f8319a282ad5b7d9fff955d0fea32809fd767
+MISC ChangeLog 23252 SHA256 feb23fe435070754f29e70bd80d62b11694b1e937b675c5d3d90850f1c31b4e7 SHA512 6abdd569af08a6756a9a0e8b1dbf0d4c33edcda6ab606b28ec3bf439a22caaebae9aa4930e524d5e0a4c5881ba663508b0ec640442556fb33366e953f6828cae WHIRLPOOL 6fc6f0c301d5a526108e6e3fabc98095d110554e0437da0f591d419650b0fcb10d5663d9acf701e5964acb55d376139ad6fd8071d1c84fd3cf531ed6f2591a00
 MISC metadata.xml 477 SHA256 734dc211640a616efb2a10945f4ea984f9f9ea55863c1b869d95039314336285 SHA512 8b5353591b0f9a4145c5703759cea6ace05bf5d1f70c403bd483fe534f71196c5efaa4c3c160fd314bda9261bc45b2152cea5ae00b8f6635254907121eefc5e8 WHIRLPOOL dece9e0f60ef545dfc27b53f5627ecf6a31578885c87a9e3712e9adc36ae3c886b226c2f7772aa685b3cfe689dd241c49086b4673c034e6f780e15f392b814c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGrW68ACgkQVWmRsqeSphP35wCfewUcEV3GGHttcYF5kvE0KXGV
-fGYAnR5ScqMdz04nTkUozzbUtiEnCDZ7
-=Kbz/
+iEYEAREIAAYFAlGrb88ACgkQVWmRsqeSphNWYgCeOX+E5xP/+T3s9afoUGhEUkm9
+mkYAn2WH9OhXbGHagWoDtO1fZ/ZmL5js
+=dSXE
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild
index e455c3f4808e..41f780172335 100644
--- a/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild,v 1.2 2013/06/02 14:50:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild,v 1.3 2013/06/02 16:16:07 jer Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTO_DEPEND="no" # Only cross-compiling
-inherit eutils flag-o-matic user toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="http://www.tcpdump.org/"
@@ -38,27 +38,36 @@ pkg_setup() {
 		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 "Upstream tags it with:"
+		ewarn "WARNING: The SMB printer may have exploitable buffer overflows!!!"
 		ewarn "So think twice whether this is fine with you"
 		ewarn
 		ewarn "CAUTION !!! CAUTION !!! CAUTION"
 		ewarn
 	fi
-	enewgroup tcpdump
-	enewuser tcpdump -1 -1 -1 tcpdump
+	if use chroot || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
 }
 
+src_prepare() {
+	sed -i aclocal.m4 -e 's|\"-O2\"|\"\"|g' || die
+	eautoconf
+}
 src_configure() {
-	# tcpdump needs some optymalization. see bug #108391
-	( ! is-flag -O? || is-flag -O0 ) && append-flags -O2
+	# tcpdump needs some optimization. see bug #108391
+	# but do not replace -Os
+	filter-flags -O[0-9]
+	is-flagq -O? || append-flags -O2
+
+	filter-flags -finline-functions
+
 	if use chroot; then
 		append-cppflags -DHAVE_CAP_NG_H
 		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
 	fi
 
-	replace-flags -O[3-9] -O2
-	filter-flags -finline-functions
-
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable samba smb) \
@@ -85,6 +94,13 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	if use chroot || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
 pkg_postinst() {
 	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
 }