1 |
jer 13/02/22 18:18:04 |
2 |
|
3 |
Modified: ChangeLog wireshark-1.8.5-r1.ebuild |
4 |
wireshark-1.9.0.ebuild |
5 |
Log: |
6 |
Backport changes to 1.8.5. |
7 |
|
8 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
9 |
|
10 |
Revision Changes Path |
11 |
1.452 net-analyzer/wireshark/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.452&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.452&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.451&r2=1.452 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
20 |
retrieving revision 1.451 |
21 |
retrieving revision 1.452 |
22 |
diff -u -r1.451 -r1.452 |
23 |
--- ChangeLog 22 Feb 2013 17:19:09 -0000 1.451 |
24 |
+++ ChangeLog 22 Feb 2013 18:18:03 -0000 1.452 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for net-analyzer/wireshark |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.451 2013/02/22 17:19:09 jer Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.452 2013/02/22 18:18:03 jer Exp $ |
30 |
+ |
31 |
+ 22 Feb 2013; Jeroen Roovers <jer@g.o> wireshark-1.8.5-r1.ebuild, |
32 |
+ wireshark-1.9.0.ebuild: |
33 |
+ Backport changes to 1.8.5. |
34 |
|
35 |
22 Feb 2013; Jeroen Roovers <jer@g.o> wireshark-1.6.13-r1.ebuild, |
36 |
wireshark-1.9.0.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.2 net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: wireshark-1.8.5-r1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- wireshark-1.8.5-r1.ebuild 31 Jan 2013 15:59:24 -0000 1.1 |
53 |
+++ wireshark-1.8.5-r1.ebuild 22 Feb 2013 18:18:03 -0000 1.2 |
54 |
@@ -1,8 +1,8 @@ |
55 |
# Copyright 1999-2013 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild,v 1.1 2013/01/31 15:59:24 jer Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild,v 1.2 2013/02/22 18:18:03 jer Exp $ |
59 |
|
60 |
-EAPI="5" |
61 |
+EAPI=5 |
62 |
PYTHON_DEPEND="python? 2" |
63 |
inherit autotools eutils fcaps flag-o-matic python toolchain-funcs user |
64 |
|
65 |
@@ -15,47 +15,56 @@ |
66 |
SLOT="0/${PV}" |
67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
68 |
IUSE=" |
69 |
- adns doc doc-pdf geoip gtk crypt ipv6 kerberos libadns lua +pcap |
70 |
+ adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap |
71 |
portaudio profile python selinux smi ssl zlib |
72 |
" |
73 |
RDEPEND=" |
74 |
>=dev-libs/glib-2.14:2 |
75 |
- zlib? ( sys-libs/zlib |
76 |
- !=sys-libs/zlib-1.2.4 ) |
77 |
- smi? ( net-libs/libsmi ) |
78 |
- gtk? ( >=x11-libs/gtk+-2.4.0:2 |
79 |
- x11-libs/pango |
80 |
- dev-libs/atk |
81 |
- x11-misc/xdg-utils ) |
82 |
- ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
83 |
+ adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) |
84 |
crypt? ( dev-libs/libgcrypt ) |
85 |
- pcap? ( net-libs/libpcap ) |
86 |
- kerberos? ( virtual/krb5 ) |
87 |
- portaudio? ( media-libs/portaudio ) |
88 |
- adns? ( |
89 |
- !libadns? ( >=net-dns/c-ares-1.5 ) |
90 |
+ geoip? ( dev-libs/geoip ) |
91 |
+ gtk? ( |
92 |
+ >=x11-libs/gtk+-2.4.0:2 |
93 |
+ dev-libs/atk |
94 |
+ x11-libs/pango |
95 |
+ x11-misc/xdg-utils |
96 |
) |
97 |
+ kerberos? ( virtual/krb5 ) |
98 |
libadns? ( net-libs/adns ) |
99 |
- geoip? ( dev-libs/geoip ) |
100 |
lua? ( >=dev-lang/lua-5.1 ) |
101 |
+ pcap? ( net-libs/libpcap ) |
102 |
+ portaudio? ( media-libs/portaudio ) |
103 |
selinux? ( sec-policy/selinux-wireshark ) |
104 |
+ smi? ( net-libs/libsmi ) |
105 |
+ ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
106 |
+ zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
107 |
" |
108 |
|
109 |
DEPEND=" |
110 |
${RDEPEND} |
111 |
- doc? ( dev-libs/libxslt |
112 |
- dev-libs/libxml2 |
113 |
- app-doc/doxygen |
114 |
- doc-pdf? ( dev-java/fop ) ) |
115 |
- virtual/pkgconfig |
116 |
dev-lang/perl |
117 |
- sys-devel/bison |
118 |
+ doc? ( |
119 |
+ app-doc/doxygen |
120 |
+ dev-libs/libxml2 |
121 |
+ dev-libs/libxslt |
122 |
+ doc-pdf? ( dev-java/fop ) |
123 |
+ ) |
124 |
sys-apps/sed |
125 |
+ sys-devel/bison |
126 |
sys-devel/flex |
127 |
+ virtual/pkgconfig |
128 |
" |
129 |
|
130 |
S=${WORKDIR}/${MY_P} |
131 |
|
132 |
+pkg_pretend() { |
133 |
+ if [[ $(gcc-major-version) -lt 3 || |
134 |
+ ( $(gcc-major-version) -eq 3 && |
135 |
+ $(gcc-minor-version) -le 4 ) ]] ; then |
136 |
+ die "Unsupported compiler version, please upgrade." |
137 |
+ fi |
138 |
+} |
139 |
+ |
140 |
pkg_setup() { |
141 |
if ! use gtk; then |
142 |
ewarn "USE=-gtk disables gtk-based gui called wireshark." |
143 |
@@ -78,12 +87,6 @@ |
144 |
src_configure() { |
145 |
local myconf |
146 |
|
147 |
- if [[ $(gcc-major-version) -lt 3 || |
148 |
- ( $(gcc-major-version) -eq 3 && |
149 |
- $(gcc-minor-version) -le 4 ) ]] ; then |
150 |
- die "Unsupported compiler version, please upgrade." |
151 |
- fi |
152 |
- |
153 |
# profile and pie are incompatible #215806, #292991 |
154 |
if use profile; then |
155 |
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled." |
156 |
@@ -104,6 +107,7 @@ |
157 |
myconf+=( "--without-adns --without-c-ares" ) |
158 |
fi |
159 |
fi |
160 |
+ |
161 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
162 |
# --with-ssl to ./configure. (Mimics code from acinclude.m4). |
163 |
if use kerberos; then |
164 |
@@ -128,8 +132,8 @@ |
165 |
$(use_enable gtk wireshark) \ |
166 |
$(use_enable ipv6) \ |
167 |
$(use_enable profile profile-build) \ |
168 |
- $(use_with filecaps libcap) \ |
169 |
$(use_with crypt gcrypt) \ |
170 |
+ $(use_with filecaps libcap) \ |
171 |
$(use_with geoip) \ |
172 |
$(use_with kerberos krb5) \ |
173 |
$(use_with lua) \ |
174 |
@@ -192,8 +196,8 @@ |
175 |
# Add group for users allowed to sniff. |
176 |
enewgroup wireshark |
177 |
|
178 |
- if use filecaps && use pcap; then |
179 |
- fcaps -o 0 -g wireshark -m 550 \ |
180 |
+ if use pcap; then |
181 |
+ fcaps -o 0 -g wireshark -m 0750 -M 0750 \ |
182 |
cap_dac_read_search,cap_net_raw,cap_net_admin \ |
183 |
"${EROOT}"/usr/bin/dumpcap |
184 |
fi |
185 |
|
186 |
|
187 |
|
188 |
1.5 net-analyzer/wireshark/wireshark-1.9.0.ebuild |
189 |
|
190 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild?rev=1.5&view=markup |
191 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild?rev=1.5&content-type=text/plain |
192 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild?r1=1.4&r2=1.5 |
193 |
|
194 |
Index: wireshark-1.9.0.ebuild |
195 |
=================================================================== |
196 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v |
197 |
retrieving revision 1.4 |
198 |
retrieving revision 1.5 |
199 |
diff -u -r1.4 -r1.5 |
200 |
--- wireshark-1.9.0.ebuild 22 Feb 2013 17:19:09 -0000 1.4 |
201 |
+++ wireshark-1.9.0.ebuild 22 Feb 2013 18:18:03 -0000 1.5 |
202 |
@@ -1,6 +1,6 @@ |
203 |
# Copyright 1999-2013 Gentoo Foundation |
204 |
# Distributed under the terms of the GNU General Public License v2 |
205 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.4 2013/02/22 17:19:09 jer Exp $ |
206 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.5 2013/02/22 18:18:03 jer Exp $ |
207 |
|
208 |
EAPI=5 |
209 |
PYTHON_DEPEND="python? 2" |
210 |
@@ -196,7 +196,7 @@ |
211 |
enewgroup wireshark |
212 |
|
213 |
if use pcap; then |
214 |
- fcaps -o 0 -g wireshark -m 0750 -M 550 \ |
215 |
+ fcaps -o 0 -g wireshark -m 0750 -M 0750 \ |
216 |
cap_dac_read_search,cap_net_raw,cap_net_admin \ |
217 |
"${EROOT}"/usr/bin/dumpcap |
218 |
fi |