| 1 |
jer 13/02/22 17:19:09 |
| 2 |
|
| 3 |
Modified: ChangeLog wireshark-1.6.13-r1.ebuild |
| 4 |
wireshark-1.9.0.ebuild |
| 5 |
Log: |
| 6 |
Backport recent changes to 1.6.13. Clean up. |
| 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.451 net-analyzer/wireshark/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.451&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.451&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.450&r2=1.451 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
| 20 |
retrieving revision 1.450 |
| 21 |
retrieving revision 1.451 |
| 22 |
diff -u -r1.450 -r1.451 |
| 23 |
--- ChangeLog 22 Feb 2013 16:43:54 -0000 1.450 |
| 24 |
+++ ChangeLog 22 Feb 2013 17:19:09 -0000 1.451 |
| 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.450 2013/02/22 16:43:54 jer Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.451 2013/02/22 17:19:09 jer Exp $ |
| 30 |
+ |
| 31 |
+ 22 Feb 2013; Jeroen Roovers <jer@g.o> wireshark-1.6.13-r1.ebuild, |
| 32 |
+ wireshark-1.9.0.ebuild: |
| 33 |
+ Backport recent changes to 1.6.13. Clean up. |
| 34 |
|
| 35 |
22 Feb 2013; Jeroen Roovers <jer@g.o> wireshark-1.9.0.ebuild: |
| 36 |
Restore old use pcap && use_enable filecaps logic. |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: wireshark-1.6.13-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- wireshark-1.6.13-r1.ebuild 31 Jan 2013 15:59:24 -0000 1.1 |
| 53 |
+++ wireshark-1.6.13-r1.ebuild 22 Feb 2013 17:19:09 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 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.6.13-r1.ebuild,v 1.1 2013/01/31 15:59:24 jer Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild,v 1.2 2013/02/22 17:19:09 jer Exp $ |
| 59 |
|
| 60 |
EAPI=5 |
| 61 |
PYTHON_DEPEND="python? 2" |
| 62 |
@@ -15,44 +15,56 @@ |
| 63 |
SLOT="0/${PV}" |
| 64 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 65 |
IUSE=" |
| 66 |
- adns doc doc-pdf gtk ipv6 libadns lua crypt geoip kerberos profile |
| 67 |
- +pcap portaudio python selinux smi ssl threads zlib |
| 68 |
+ adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap |
| 69 |
+ portaudio profile python selinux smi ssl threads zlib |
| 70 |
" |
| 71 |
-RDEPEND=">=dev-libs/glib-2.14:2 |
| 72 |
- zlib? ( sys-libs/zlib |
| 73 |
- !=sys-libs/zlib-1.2.4 ) |
| 74 |
- smi? ( net-libs/libsmi ) |
| 75 |
- gtk? ( >=x11-libs/gtk+-2.4.0:2 |
| 76 |
- x11-libs/pango |
| 77 |
- dev-libs/atk |
| 78 |
- x11-misc/xdg-utils ) |
| 79 |
- ssl? ( <net-libs/gnutls-3 ) |
| 80 |
+RDEPEND=" |
| 81 |
+ >=dev-libs/glib-2.14:2 |
| 82 |
+ adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) |
| 83 |
crypt? ( dev-libs/libgcrypt ) |
| 84 |
- pcap? ( net-libs/libpcap ) |
| 85 |
- kerberos? ( virtual/krb5 ) |
| 86 |
- portaudio? ( media-libs/portaudio ) |
| 87 |
- adns? ( |
| 88 |
- !libadns? ( >=net-dns/c-ares-1.5 ) |
| 89 |
+ geoip? ( dev-libs/geoip ) |
| 90 |
+ gtk? ( |
| 91 |
+ >=x11-libs/gtk+-2.4.0:2 |
| 92 |
+ dev-libs/atk |
| 93 |
+ x11-libs/pango |
| 94 |
+ x11-misc/xdg-utils |
| 95 |
) |
| 96 |
+ kerberos? ( virtual/krb5 ) |
| 97 |
libadns? ( net-libs/adns ) |
| 98 |
- geoip? ( dev-libs/geoip ) |
| 99 |
lua? ( >=dev-lang/lua-5.1 ) |
| 100 |
- selinux? ( sec-policy/selinux-wireshark )" |
| 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-3 ) |
| 106 |
+ zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
| 107 |
+" |
| 108 |
|
| 109 |
-DEPEND="${RDEPEND} |
| 110 |
- doc? ( dev-libs/libxslt |
| 111 |
- dev-libs/libxml2 |
| 112 |
- app-doc/doxygen |
| 113 |
- doc-pdf? ( dev-java/fop ) ) |
| 114 |
- virtual/pkgconfig |
| 115 |
+DEPEND=" |
| 116 |
+ ${RDEPEND} |
| 117 |
dev-lang/perl |
| 118 |
- sys-devel/bison |
| 119 |
+ doc? ( |
| 120 |
+ app-doc/doxygen |
| 121 |
+ dev-libs/libxml2 |
| 122 |
+ dev-libs/libxslt |
| 123 |
+ doc-pdf? ( dev-java/fop ) |
| 124 |
+ ) |
| 125 |
sys-apps/sed |
| 126 |
+ sys-devel/bison |
| 127 |
sys-devel/flex |
| 128 |
+ virtual/pkgconfig |
| 129 |
" |
| 130 |
|
| 131 |
S=${WORKDIR}/${MY_P} |
| 132 |
|
| 133 |
+pkg_pretend() { |
| 134 |
+ if [[ $(gcc-major-version) -lt 3 || |
| 135 |
+ ( $(gcc-major-version) -eq 3 && |
| 136 |
+ $(gcc-minor-version) -le 4 ) ]] ; then |
| 137 |
+ die "Unsupported compiler version, please upgrade." |
| 138 |
+ fi |
| 139 |
+} |
| 140 |
+ |
| 141 |
pkg_setup() { |
| 142 |
if ! use gtk; then |
| 143 |
ewarn "USE=-gtk disables gtk-based gui called wireshark." |
| 144 |
@@ -75,12 +87,6 @@ |
| 145 |
src_configure() { |
| 146 |
local myconf |
| 147 |
|
| 148 |
- if [[ $(gcc-major-version) -lt 3 || |
| 149 |
- ( $(gcc-major-version) -eq 3 && |
| 150 |
- $(gcc-minor-version) -le 4 ) ]] ; then |
| 151 |
- die "Unsupported compiler version, please upgrade." |
| 152 |
- fi |
| 153 |
- |
| 154 |
# profile and pie are incompatible #215806, #292991 |
| 155 |
if use profile; then |
| 156 |
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled." |
| 157 |
@@ -90,13 +96,15 @@ |
| 158 |
|
| 159 |
if use adns; then |
| 160 |
if use libadns; then |
| 161 |
- myconf+=" --with-adns --without-c-ares" |
| 162 |
+ myconf+=( "--with-adns --without-c-ares" ) |
| 163 |
else |
| 164 |
- myconf+=" --without-adns --with-c-ares" |
| 165 |
+ myconf+=( "--without-adns --with-c-ares" ) |
| 166 |
fi |
| 167 |
else |
| 168 |
if use libadns; then |
| 169 |
- myconf+=" --with-adns --without-c-ares" |
| 170 |
+ myconf+=( "--with-adns --without-c-ares" ) |
| 171 |
+ else |
| 172 |
+ myconf+=( "--without-adns --without-c-ares" ) |
| 173 |
fi |
| 174 |
fi |
| 175 |
|
| 176 |
@@ -108,7 +116,7 @@ |
| 177 |
ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." |
| 178 |
ewarn "Note there are annoying license incompatibilities between the OpenSSL" |
| 179 |
ewarn "license and the GPL, so do your check before distributing such package." |
| 180 |
- myconf+=" --with-ssl" |
| 181 |
+ myconf+=( "--with-ssl" ) |
| 182 |
;; |
| 183 |
esac |
| 184 |
fi |
| 185 |
@@ -125,8 +133,8 @@ |
| 186 |
$(use_enable ipv6) \ |
| 187 |
$(use_enable profile profile-build) \ |
| 188 |
$(use_enable threads) \ |
| 189 |
- $(use_with filecaps libcap) \ |
| 190 |
$(use_with crypt gcrypt) \ |
| 191 |
+ $(use_with filecaps libcap) \ |
| 192 |
$(use_with geoip) \ |
| 193 |
$(use_with kerberos krb5) \ |
| 194 |
$(use_with lua) \ |
| 195 |
@@ -139,12 +147,12 @@ |
| 196 |
$(use_with zlib) \ |
| 197 |
--sysconfdir="${EPREFIX}"/etc/wireshark \ |
| 198 |
--disable-extra-gcc-checks \ |
| 199 |
- ${myconf} |
| 200 |
+ ${myconf[@]} |
| 201 |
} |
| 202 |
|
| 203 |
src_compile() { |
| 204 |
default |
| 205 |
- use doc && cd docbook && { emake; } |
| 206 |
+ use doc && emake -C docbook |
| 207 |
} |
| 208 |
|
| 209 |
src_install() { |
| 210 |
@@ -180,8 +188,8 @@ |
| 211 |
# Add group for users allowed to sniff. |
| 212 |
enewgroup wireshark |
| 213 |
|
| 214 |
- if use filecaps && use pcap; then |
| 215 |
- fcaps -o 0 -g wireshark -m 550 \ |
| 216 |
+ if use pcap; then |
| 217 |
+ fcaps -o 0 -g wireshark -m 0750 -M 550 \ |
| 218 |
cap_dac_read_search,cap_net_raw,cap_net_admin \ |
| 219 |
"${EROOT}"/usr/bin/dumpcap |
| 220 |
fi |
| 221 |
|
| 222 |
|
| 223 |
|
| 224 |
1.4 net-analyzer/wireshark/wireshark-1.9.0.ebuild |
| 225 |
|
| 226 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild?rev=1.4&view=markup |
| 227 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild?rev=1.4&content-type=text/plain |
| 228 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild?r1=1.3&r2=1.4 |
| 229 |
|
| 230 |
Index: wireshark-1.9.0.ebuild |
| 231 |
=================================================================== |
| 232 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v |
| 233 |
retrieving revision 1.3 |
| 234 |
retrieving revision 1.4 |
| 235 |
diff -u -r1.3 -r1.4 |
| 236 |
--- wireshark-1.9.0.ebuild 22 Feb 2013 16:43:54 -0000 1.3 |
| 237 |
+++ wireshark-1.9.0.ebuild 22 Feb 2013 17:19:09 -0000 1.4 |
| 238 |
@@ -1,8 +1,8 @@ |
| 239 |
# Copyright 1999-2013 Gentoo Foundation |
| 240 |
# Distributed under the terms of the GNU General Public License v2 |
| 241 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.3 2013/02/22 16:43:54 jer Exp $ |
| 242 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.4 2013/02/22 17:19:09 jer Exp $ |
| 243 |
|
| 244 |
-EAPI="5" |
| 245 |
+EAPI=5 |
| 246 |
PYTHON_DEPEND="python? 2" |
| 247 |
inherit autotools eutils fcaps flag-o-matic python toolchain-funcs user |
| 248 |
|
| 249 |
@@ -15,51 +15,51 @@ |
| 250 |
SLOT="0/${PV}" |
| 251 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 252 |
IUSE=" |
| 253 |
- adns doc doc-pdf +filecaps geoip gtk crypt ipv6 kerberos libadns lua +pcap |
| 254 |
+ adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap |
| 255 |
portaudio profile python selinux smi ssl zlib |
| 256 |
" |
| 257 |
RDEPEND=" |
| 258 |
>=dev-libs/glib-2.14:2 |
| 259 |
- zlib? ( sys-libs/zlib |
| 260 |
- !=sys-libs/zlib-1.2.4 ) |
| 261 |
- smi? ( net-libs/libsmi ) |
| 262 |
- gtk? ( >=x11-libs/gtk+-2.4.0:2 |
| 263 |
- x11-libs/pango |
| 264 |
- dev-libs/atk |
| 265 |
- x11-misc/xdg-utils ) |
| 266 |
- ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
| 267 |
+ adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) |
| 268 |
crypt? ( dev-libs/libgcrypt ) |
| 269 |
- kerberos? ( virtual/krb5 ) |
| 270 |
- pcap? ( net-libs/libpcap ) |
| 271 |
- portaudio? ( media-libs/portaudio ) |
| 272 |
- adns? ( |
| 273 |
- !libadns? ( >=net-dns/c-ares-1.5 ) |
| 274 |
+ geoip? ( dev-libs/geoip ) |
| 275 |
+ gtk? ( |
| 276 |
+ >=x11-libs/gtk+-2.4.0:2 |
| 277 |
+ dev-libs/atk |
| 278 |
+ x11-libs/pango |
| 279 |
+ x11-misc/xdg-utils |
| 280 |
) |
| 281 |
+ kerberos? ( virtual/krb5 ) |
| 282 |
libadns? ( net-libs/adns ) |
| 283 |
- geoip? ( dev-libs/geoip ) |
| 284 |
lua? ( >=dev-lang/lua-5.1 ) |
| 285 |
+ pcap? ( net-libs/libpcap ) |
| 286 |
+ portaudio? ( media-libs/portaudio ) |
| 287 |
selinux? ( sec-policy/selinux-wireshark ) |
| 288 |
+ smi? ( net-libs/libsmi ) |
| 289 |
+ ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
| 290 |
+ zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
| 291 |
" |
| 292 |
|
| 293 |
DEPEND=" |
| 294 |
${RDEPEND} |
| 295 |
+ dev-lang/perl |
| 296 |
doc? ( |
| 297 |
- dev-libs/libxslt |
| 298 |
- dev-libs/libxml2 |
| 299 |
app-doc/doxygen |
| 300 |
+ dev-libs/libxml2 |
| 301 |
+ dev-libs/libxslt |
| 302 |
doc-pdf? ( dev-java/fop ) |
| 303 |
) |
| 304 |
- virtual/pkgconfig |
| 305 |
- dev-lang/perl |
| 306 |
- sys-devel/bison |
| 307 |
sys-apps/sed |
| 308 |
+ sys-devel/bison |
| 309 |
sys-devel/flex |
| 310 |
+ virtual/pkgconfig |
| 311 |
" |
| 312 |
|
| 313 |
S=${WORKDIR}/${MY_P} |
| 314 |
|
| 315 |
pkg_pretend() { |
| 316 |
- if [[ $(gcc-major-version) -lt 3 || ( $(gcc-major-version) -eq 3 && |
| 317 |
+ if [[ $(gcc-major-version) -lt 3 || |
| 318 |
+ ( $(gcc-major-version) -eq 3 && |
| 319 |
$(gcc-minor-version) -le 4 ) ]] ; then |
| 320 |
die "Unsupported compiler version, please upgrade." |
| 321 |
fi |
| 322 |
@@ -106,6 +106,7 @@ |
| 323 |
myconf+=( "--without-adns --without-c-ares" ) |
| 324 |
fi |
| 325 |
fi |
| 326 |
+ |
| 327 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
| 328 |
# --with-ssl to ./configure. (Mimics code from acinclude.m4). |
| 329 |
if use kerberos; then |
Archives