From d08f3e4b1938899fef8bbd1f18ac001c087710b2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 9 Jun 2016 21:05:23 +0200 Subject: [PATCH] Revert "wireshark: update to 2.1.0." This reverts commit eee9d5d4a3d3ff139caf8a4476cc596b6781a1e8. This reverts commit b6b7e964fa5f1bb2aff5fec301350095f3d577e0. This reverts commit 3c719e96753da60c29885f122425eb73979ae3d4. --- common/shlibs | 7 +++---- srcpkgs/wireshark/template | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/common/shlibs b/common/shlibs index f7739c34d4..9025c23b87 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1548,10 +1548,9 @@ libdovecot-lda.so.0 dovecot-2.2.11_2 libnetapi.so.0 samba-3.6.23_1 libsmbsharemodes.so.0 samba-3.6.23_1 libmysqld.so.18 libmariadbclient-5.5.36_1 -libwscodecs.so.0 libwireshark-2.1.0_1 -libwsutil.so.0 libwireshark-2.1.0_1 -libwiretap.so.0 libwireshark-2.1.0_1 -libwireshark.so.0 libwireshark-2.1.0_1 +libwsutil.so.6 libwireshark-2.0.0_1 +libwiretap.so.5 libwireshark-2.0.0_1 +libwireshark.so.6 libwireshark-2.0.0_1 libfreerdp-core.so.1.0 libfreerdp-1.0.2_2 libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2 libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2 diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index dc64b3790c..b904bafb27 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,11 +1,11 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.1.0 +version=2.0.3 revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua --with-krb5 --with-gtk3=yes --without-portaudio CC_FOR_BUILD=cc" -hostmakedepends="pkg-config flex perl python-devel mit-krb5-devel automake libtool glib-devel" +hostmakedepends="pkg-config flex perl python-devel mit-krb5-devel automake libtool" makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel geoip-devel libgcrypt-devel gtk+3-devel libcap-devel sbc-devel" depends="libcap-progs" @@ -14,9 +14,9 @@ maintainer="Enno Boland " homepage="http://www.wireshark.org" license="GPL-2" # XXX ovh is blocked (repo4.voidlinux.eu can't download this). -distfiles="http://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2" -#distfiles="https://sources.voidlinux.eu/${pkgname}-${version}/${pkgname}-${version}.tar.bz2" -checksum=f73bd7660056c0910c8a89f480f61ab9fe62866eadf1af49e3374da3fe16b4cc +#distfiles="http://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2" +distfiles="https://sources.voidlinux.eu/${pkgname}-${version}/${pkgname}-${version}.tar.bz2" +checksum=e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc system_groups="wireshark" subpackages="libwireshark libwireshark-devel wireshark-gtk" @@ -39,7 +39,7 @@ post_install() { # Headers vmkdir $_includeDir - vcopy "config.h register.h ws_symbol_export.h" $_includeDir + vcopy "color.h config.h register.h ws_symbol_export.h" $_includeDir for i in wiretap wsutil; do vmkdir $_includeDir/$i