| 1 |
jer 13/06/03 19:20:55 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog tcpdump-4.4.0-r1.ebuild |
| 4 |
Log: |
| 5 |
Avoid test suite failure when USE=drop-root / FEATURES=-userpriv (bug #435982). Rename USE=chroot to USE=drop-root since USE=suid is already taken and has a different meaning in these ebuilds. |
| 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.6 net-analyzer/tcpdump/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/metadata.xml?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/metadata.xml?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/metadata.xml?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/metadata.xml,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- metadata.xml 7 Dec 2012 16:23:51 -0000 1.5 |
| 23 |
+++ metadata.xml 3 Jun 2013 19:20:55 -0000 1.6 |
| 24 |
@@ -6,5 +6,6 @@ |
| 25 |
<use> |
| 26 |
<flag name='smi'>Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag> |
| 27 |
<flag name='chroot'>Chroot into /var/lib/tcpdump when dropping privileges</flag> |
| 28 |
+ <flag name='drop-root'>Drop privileges to tcpdump:tcpdump when run as root</flag> |
| 29 |
</use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.171 net-analyzer/tcpdump/ChangeLog |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/ChangeLog?rev=1.171&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/ChangeLog?rev=1.171&content-type=text/plain |
| 38 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/ChangeLog?r1=1.170&r2=1.171 |
| 39 |
|
| 40 |
Index: ChangeLog |
| 41 |
=================================================================== |
| 42 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v |
| 43 |
retrieving revision 1.170 |
| 44 |
retrieving revision 1.171 |
| 45 |
diff -u -r1.170 -r1.171 |
| 46 |
--- ChangeLog 3 Jun 2013 01:46:58 -0000 1.170 |
| 47 |
+++ ChangeLog 3 Jun 2013 19:20:55 -0000 1.171 |
| 48 |
@@ -1,6 +1,12 @@ |
| 49 |
# ChangeLog for net-analyzer/tcpdump |
| 50 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 51 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.170 2013/06/03 01:46:58 jer Exp $ |
| 52 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.171 2013/06/03 19:20:55 jer Exp $ |
| 53 |
+ |
| 54 |
+ 03 Jun 2013; Jeroen Roovers <jer@g.o> tcpdump-4.4.0-r1.ebuild, |
| 55 |
+ metadata.xml: |
| 56 |
+ Avoid test suite failure when USE=drop-root / FEATURES=-userpriv (bug |
| 57 |
+ #435982). Rename USE=chroot to USE=drop-root since USE=suid is already taken |
| 58 |
+ and has a different meaning in these ebuilds. |
| 59 |
|
| 60 |
03 Jun 2013; Jeroen Roovers <jer@g.o> tcpdump-4.4.0-r1.ebuild: |
| 61 |
Use append-cflags instead of append-flags. |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.5 net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild?rev=1.5&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild?rev=1.5&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild?r1=1.4&r2=1.5 |
| 70 |
|
| 71 |
Index: tcpdump-4.4.0-r1.ebuild |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild,v |
| 74 |
retrieving revision 1.4 |
| 75 |
retrieving revision 1.5 |
| 76 |
diff -u -r1.4 -r1.5 |
| 77 |
--- tcpdump-4.4.0-r1.ebuild 3 Jun 2013 01:46:58 -0000 1.4 |
| 78 |
+++ tcpdump-4.4.0-r1.ebuild 3 Jun 2013 19:20:55 -0000 1.5 |
| 79 |
@@ -1,6 +1,6 @@ |
| 80 |
# Copyright 1999-2013 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild,v 1.4 2013/06/03 01:46:58 jer Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild,v 1.5 2013/06/03 19:20:55 jer Exp $ |
| 84 |
|
| 85 |
EAPI=5 |
| 86 |
|
| 87 |
@@ -15,17 +15,17 @@ |
| 88 |
LICENSE="BSD" |
| 89 |
SLOT="0" |
| 90 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux" |
| 91 |
-IUSE="+chroot smi ssl ipv6 -samba suid test" |
| 92 |
+IUSE="+drop-root smi ssl ipv6 -samba suid test" |
| 93 |
|
| 94 |
RDEPEND=" |
| 95 |
- chroot? ( sys-libs/libcap-ng ) |
| 96 |
+ drop-root? ( sys-libs/libcap-ng ) |
| 97 |
net-libs/libpcap |
| 98 |
smi? ( net-libs/libsmi ) |
| 99 |
ssl? ( >=dev-libs/openssl-0.9.6m ) |
| 100 |
" |
| 101 |
DEPEND=" |
| 102 |
${RDEPEND} |
| 103 |
- chroot? ( virtual/pkgconfig ) |
| 104 |
+ drop-root? ( virtual/pkgconfig ) |
| 105 |
test? ( |
| 106 |
|| ( app-arch/sharutils sys-freebsd/freebsd-ubin ) |
| 107 |
dev-lang/perl |
| 108 |
@@ -45,7 +45,7 @@ |
| 109 |
ewarn "CAUTION !!! CAUTION !!! CAUTION" |
| 110 |
ewarn |
| 111 |
fi |
| 112 |
- if use chroot || use suid; then |
| 113 |
+ if use drop-root || use suid; then |
| 114 |
enewgroup tcpdump |
| 115 |
enewuser tcpdump -1 -1 -1 tcpdump |
| 116 |
fi |
| 117 |
@@ -63,7 +63,7 @@ |
| 118 |
|
| 119 |
filter-flags -finline-functions |
| 120 |
|
| 121 |
- if use chroot; then |
| 122 |
+ if use drop-root; then |
| 123 |
append-cppflags -DHAVE_CAP_NG_H |
| 124 |
export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) |
| 125 |
fi |
| 126 |
@@ -71,15 +71,20 @@ |
| 127 |
econf \ |
| 128 |
$(use_enable ipv6) \ |
| 129 |
$(use_enable samba smb) \ |
| 130 |
- $(use_with chroot chroot '') \ |
| 131 |
+ $(use_with drop-root chroot '') \ |
| 132 |
$(use_with smi) \ |
| 133 |
$(use_with ssl crypto "${EPREFIX}/usr") \ |
| 134 |
--with-user=tcpdump |
| 135 |
} |
| 136 |
|
| 137 |
src_test() { |
| 138 |
- sed '/^\(espudp1\|eapon1\)/d;' -i tests/TESTLIST |
| 139 |
- emake check |
| 140 |
+ if has !userpriv ${FEATURES} && use drop-root; then |
| 141 |
+ sed -i '/^\(espudp1\|eapon1\)/d;' -i tests/TESTLIST |
| 142 |
+ emake check |
| 143 |
+ else |
| 144 |
+ ewarn "If you want to run the test suite, make sure you either" |
| 145 |
+ ewarn "set FEATURES=userpriv or set USE=-drop-root" |
| 146 |
+ fi |
| 147 |
} |
| 148 |
|
| 149 |
src_install() { |
Archives