aboutsummaryrefslogtreecommitdiffstats
path: root/main/wireshark/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'main/wireshark/APKBUILD')
-rw-r--r--main/wireshark/APKBUILD24
1 files changed, 13 insertions, 11 deletions
diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index 59b6684744..a3a6399f06 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -1,9 +1,10 @@
+# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Contributor: Ɓukasz Jendrysik <scadu@yandex.com>
# Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=wireshark
pkgver=2.2.4
-pkgrel=0
+pkgrel=1
pkgdesc="A network protocol analyzer - GTK version"
url="http://www.wireshark.org"
arch="all"
@@ -15,11 +16,15 @@ makedepends="bison flex perl-dev glib glib-dev libpcap-dev libcap-dev
install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk $pkgname-common tshark"
source="http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2
- fix-androiddump.patch"
+ fix-androiddump.patch
+ CVE-2017-6014.patch
+ "
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
# security fixes:
+# 2.2.4-r1:
+# - CVE-2017-6014
# 2.0.5-r0:
# - CVE-2016-6505
# - CVE-2016-6506
@@ -31,7 +36,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
# - CVE-2016-6513
prepare() {
- cd "$_builddir"
+ cd "$builddir"
for i in $source; do
case "$i" in
*.patch)
@@ -43,7 +48,7 @@ prepare() {
}
build() {
- cd "$_builddir"
+ cd "$builddir"
# configure script searches for uic and uic-qt4 but not uic-qt5
# we set path so it finds 'uic'
export PATH="$PATH:/usr/lib/qt5/bin"
@@ -61,7 +66,7 @@ build() {
}
package() {
- cd "$_builddir"
+ cd "$builddir"
make -j1 DESTDIR="$pkgdir" install || return 1
}
@@ -93,9 +98,6 @@ gtk() {
mv "$pkgdir"/usr/bin/wireshark-gtk "$subpkgdir"/usr/bin/
}
-md5sums="6d0878ba931ea379f6e675d4cba6536b wireshark-2.2.4.tar.bz2
-38a681230ccab441e64d1fc6f52858c4 fix-androiddump.patch"
-sha256sums="42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 wireshark-2.2.4.tar.bz2
-21aaa55e6b4bb9144146e8e3284512d2c5ee5deee8921b66a513b819b57d8b01 fix-androiddump.patch"
sha512sums="f3ff6979fdd1c7cf6abe386ec476fee12045ae6df3c8162568d521532045d5eb6ad689262c38b1766c75c9fc1068f480fcd64f0aa077b3a0ceea7c16dbdabc65 wireshark-2.2.4.tar.bz2
-d462e3289c1350a9f712a21d2d1973977e5dd7989f7beff4b71498551174458f572a23f267c83552f088466cb9d2721df2b2eb807514db6ad1e0877dbc87fc6d fix-androiddump.patch"
+d462e3289c1350a9f712a21d2d1973977e5dd7989f7beff4b71498551174458f572a23f267c83552f088466cb9d2721df2b2eb807514db6ad1e0877dbc87fc6d fix-androiddump.patch
+eb7c47e208d7278c1f80acc9d4b12fe9efb08a19b024cc13e90efac1fb37c700e739e154ba3b361ff1e5fdf28eeeabb2000d875010af70ae80a6c2baaaba8737 CVE-2017-6014.patch"