| 1 |
jer 13/06/02 16:16:07 |
| 2 |
|
| 3 |
Modified: tcpdump-4.4.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Run user.eclass functions conditionally, and in pkg_preinst too. Fix CFLAGS -O2 injection better. Copy the configure warning about SMB support. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: tcpdump-4.4.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- tcpdump-4.4.0-r1.ebuild 2 Jun 2013 14:50:22 -0000 1.2 |
| 23 |
+++ tcpdump-4.4.0-r1.ebuild 2 Jun 2013 16:16:07 -0000 1.3 |
| 24 |
@@ -1,11 +1,11 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
AUTOTOOLS_AUTO_DEPEND="no" # Only cross-compiling |
| 33 |
-inherit eutils flag-o-matic user toolchain-funcs |
| 34 |
+inherit autotools eutils flag-o-matic toolchain-funcs user |
| 35 |
|
| 36 |
DESCRIPTION="A Tool for network monitoring and data acquisition" |
| 37 |
HOMEPAGE="http://www.tcpdump.org/" |
| 38 |
@@ -38,27 +38,36 @@ |
| 39 |
ewarn "CAUTION !!! CAUTION !!! CAUTION" |
| 40 |
ewarn |
| 41 |
ewarn "You're about to compile tcpdump with samba printing support" |
| 42 |
- ewarn "Upstream tags it as 'possibly-buggy SMB printer'" |
| 43 |
+ ewarn "Upstream tags it with:" |
| 44 |
+ ewarn "WARNING: The SMB printer may have exploitable buffer overflows!!!" |
| 45 |
ewarn "So think twice whether this is fine with you" |
| 46 |
ewarn |
| 47 |
ewarn "CAUTION !!! CAUTION !!! CAUTION" |
| 48 |
ewarn |
| 49 |
fi |
| 50 |
- enewgroup tcpdump |
| 51 |
- enewuser tcpdump -1 -1 -1 tcpdump |
| 52 |
+ if use chroot || use suid; then |
| 53 |
+ enewgroup tcpdump |
| 54 |
+ enewuser tcpdump -1 -1 -1 tcpdump |
| 55 |
+ fi |
| 56 |
} |
| 57 |
|
| 58 |
+src_prepare() { |
| 59 |
+ sed -i aclocal.m4 -e 's|\"-O2\"|\"\"|g' || die |
| 60 |
+ eautoconf |
| 61 |
+} |
| 62 |
src_configure() { |
| 63 |
- # tcpdump needs some optymalization. see bug #108391 |
| 64 |
- ( ! is-flag -O? || is-flag -O0 ) && append-flags -O2 |
| 65 |
+ # tcpdump needs some optimization. see bug #108391 |
| 66 |
+ # but do not replace -Os |
| 67 |
+ filter-flags -O[0-9] |
| 68 |
+ is-flagq -O? || append-flags -O2 |
| 69 |
+ |
| 70 |
+ filter-flags -finline-functions |
| 71 |
+ |
| 72 |
if use chroot; then |
| 73 |
append-cppflags -DHAVE_CAP_NG_H |
| 74 |
export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) |
| 75 |
fi |
| 76 |
|
| 77 |
- replace-flags -O[3-9] -O2 |
| 78 |
- filter-flags -finline-functions |
| 79 |
- |
| 80 |
econf \ |
| 81 |
$(use_enable ipv6) \ |
| 82 |
$(use_enable samba smb) \ |
| 83 |
@@ -85,6 +94,13 @@ |
| 84 |
fi |
| 85 |
} |
| 86 |
|
| 87 |
+pkg_preinst() { |
| 88 |
+ if use chroot || use suid; then |
| 89 |
+ enewgroup tcpdump |
| 90 |
+ enewuser tcpdump -1 -1 -1 tcpdump |
| 91 |
+ fi |
| 92 |
+} |
| 93 |
+ |
| 94 |
pkg_postinst() { |
| 95 |
use suid && elog "To let normal users run tcpdump add them into tcpdump group." |
| 96 |
} |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.169 net-analyzer/tcpdump/ChangeLog |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/ChangeLog?rev=1.169&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/ChangeLog?rev=1.169&content-type=text/plain |
| 104 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/ChangeLog?r1=1.168&r2=1.169 |
| 105 |
|
| 106 |
Index: ChangeLog |
| 107 |
=================================================================== |
| 108 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v |
| 109 |
retrieving revision 1.168 |
| 110 |
retrieving revision 1.169 |
| 111 |
diff -u -r1.168 -r1.169 |
| 112 |
--- ChangeLog 2 Jun 2013 14:50:22 -0000 1.168 |
| 113 |
+++ ChangeLog 2 Jun 2013 16:16:07 -0000 1.169 |
| 114 |
@@ -1,6 +1,10 @@ |
| 115 |
# ChangeLog for net-analyzer/tcpdump |
| 116 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 117 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.168 2013/06/02 14:50:22 jer Exp $ |
| 118 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.169 2013/06/02 16:16:07 jer Exp $ |
| 119 |
+ |
| 120 |
+ 02 Jun 2013; Jeroen Roovers <jer@g.o> tcpdump-4.4.0-r1.ebuild: |
| 121 |
+ Run user.eclass functions conditionally, and in pkg_preinst too. Fix CFLAGS |
| 122 |
+ -O2 injection better. Copy the configure warning about SMB support. |
| 123 |
|
| 124 |
02 Jun 2013; Jeroen Roovers <jer@g.o> tcpdump-4.4.0-r1.ebuild: |
| 125 |
Do not keep /var/lib/tcpdump. |
Archives