diff options
author | Florian Franzmann | 2018-12-15 20:01:58 +0100 |
---|---|---|
committer | Florian Franzmann | 2018-12-15 20:33:59 +0100 |
commit | 5c957ebb3e10d1f09d6371f2cdc79089516743b6 (patch) | |
tree | 765296ad9596519ce1b16808bc61c240a30bdd75 /security | |
parent | d9fafa9bd75148245e5eb79c48b94d7a10c46dfa (diff) |
security/wireshark: version 2.9.0
Diffstat (limited to 'security')
-rwxr-xr-x | security/wireshark/BUILD | 4 | ||||
-rwxr-xr-x | security/wireshark/CONFIGURE | 5 | ||||
-rwxr-xr-x | security/wireshark/DEPENDS | 76 | ||||
-rwxr-xr-x | security/wireshark/DETAILS | 4 | ||||
-rw-r--r-- | security/wireshark/HISTORY | 5 | ||||
-rwxr-xr-x | security/wireshark/INSTALL | 3 |
6 files changed, 36 insertions, 61 deletions
diff --git a/security/wireshark/BUILD b/security/wireshark/BUILD index fcab8fecc5..ee467da51f 100755 --- a/security/wireshark/BUILD +++ b/security/wireshark/BUILD @@ -1,5 +1,5 @@ -OPTS="--with-qt=no $WIRESHARK_OPTS $OPTS" && +OPTS="$WIRESHARK_OPTS $OPTS" && CFLAGS="$CFLAGS -Wno-error=maybe-uninitialized" && CXXFLAGS="$CXXFLAGS -Wno-error=maybe-uninitialized" && -default_build +qt5_cmake_build diff --git a/security/wireshark/CONFIGURE b/security/wireshark/CONFIGURE index 71fbb1c421..e55f8ba554 100755 --- a/security/wireshark/CONFIGURE +++ b/security/wireshark/CONFIGURE @@ -3,7 +3,4 @@ list_remove WIRESHARK_OPTS '--enable-threads' && list_remove WIRESHARK_OPTS '--disable-threads' && list_remove WIRESHARK_OPTS '--enable-ipv6' && list_remove WIRESHARK_OPTS '--disable-ipv6' && - -config_query_option WIRESHARK_OPTS \ - "Install dumpcap as setuid?" n \ - "--enable-setuid-install" "" +list_remove WIRESHARK_OPTS '--enable-setuid-install' diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS index 63c9cd403e..bc62d6b495 100755 --- a/security/wireshark/DEPENDS +++ b/security/wireshark/DEPENDS @@ -1,98 +1,74 @@ -depends glibc && -depends glib2 && -depends libpcap && +depends cmake && +depends glib2 && +depends glibc && +depends libgcrypt && +depends libpcap && +depends libssh2 && +depends qtbase && +depends qtmultimedia && +depends SSL && +depends zlib && -#optional_depends qtbase \ -# "--with-qt=5" "" \ -# "for QT GUI support" && -optional_depends gtk+3 \ - "--with-gtk=3" "" \ - "for GTK+3 GUI support" -if ! is_depends_enabled $SPELL gtk+3; then - optional_depends gtk+2 \ - "--with-gtk=2" "" \ - "for GTK+2 GUI support" -fi && #optional_depends extcap \ # "--with-extcap" "--without-extcap" \ # "use extcap for external capture sources" && optional_depends libxml2 \ - "--with-libxml2" "--without-libxml2" \ + "-DENABLE_LIBXML2=ON" "-DENABLE_LIBXML2=OFF" \ "for XML support in dissectors" && #optional_depends spandsp \ -# "--with-spandsp" "--without-spandsp" \ +# "-DENABLE_SPANDSP=ON" "-DENABLE_SPANDSP=OFF" \ # "for G.722/G.726 support" && optional_depends sbc \ - "--with-sbc" "--without-sbc" \ + "-DENABLE_SBC=ON" "-DENABLE_SBC=OFF" \ "for Bluetooth A2DP support" && optional_depends nghttp2 \ - "--with-nghttp" "--without-nghttp" \ + "-DENABLE_NGHTTP2=ON" "-DENABLE_NGHTTP2=OFF" \ "for HTTP support" && -optional_depends libssh2 \ - "--with-libssh" "--without-libssh" \ - "for ssh support" && - -optional_depends snappy \ - "--with-snappy" "--without-snappy" \ - "to read snappy-compressed data" && - optional_depends lz4 \ - "--with-lz4" "--without-lz4" \ + "-DENABLE_LZ4=ON" "-DENABLE_LZ4=OFF" \ "to read lz4-compressed data" && -optional_depends zlib \ - "--with-zlib" "--without-zlib" \ - "to read zlib-compressed data" && +optional_depends snappy \ + "-DENABLE_SNAPPY=ON" "-DENABLE_SNAPPY=OFF" \ + "to read snappy-compressed data" && optional_depends libcap \ - "--with-libcap" "--without-libcap" \ + "-DENABLE_CAP=ON" "-DENABLE_CAP=OFF" \ "for POSIX.1e capabilities management" && -optional_depends SSL \ - "--with-ssl" "--without-ssl" \ - "use SSL crypto library" && - optional_depends gnutls \ - "--with-gnutls" "--without-gnutls" \ + "-DENABLE_GNUTLS=ON" "-DENABLE_GNUTLS=OFF" \ "for GNUTLS library support" && optional_depends krb5 \ - "--with-krb5" "--without-krb5" \ + "-DENABLE_KERBEROS=ON" "-DENABLE_KERBEROS=OFF" \ "for Kerberos usage" && -optional_depends libgcrypt \ - "--with-gcrypt" "--without-gcrypt" \ - "for gcrypt library support" && - # support is broken except in development branch #optional_depends python \ # "--with-python" "--without-python" \ # "for Python scripting support" && optional_depends lua51 \ - "--with-lua" "--without-lua" \ + "-DENABLE_LUA=ON" "-DENABLE_LUA=OFF" \ "for Lua scripting support" && -optional_depends geoip \ - "--with-geoip" "--without-geoip" \ +suggest_depends geoip \ + "" "" \ "for GeoIP location support" && optional_depends c-ares \ - "--with-c-ares" "--without-c-ares" \ + "-DENABLE_CARES=ON" "-DENABLE_CARES=OFF" \ "for asynchronous (non-blocking) name resolution via c-ares" && -optional_depends adns \ - "--with-adns" "--without-adns" \ - "for asynchronous (non-blocking) name resolution via adns" && - optional_depends libsmi \ - "--with-libsmi" "--without-libsmi" \ + "-DENABLE_SMI=ON" "-DENABLE_SMI=OFF" \ "to do more sophisticated decoding of SNMP packets" diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS index ac72d302cd..abee45bda2 100755 --- a/security/wireshark/DETAILS +++ b/security/wireshark/DETAILS @@ -1,5 +1,5 @@ SPELL=wireshark - VERSION=2.6.5 + VERSION=2.9.0 SECURITY_PATCH=60 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_URL[0]=https://www.wireshark.org/download/src/$SOURCE @@ -8,7 +8,7 @@ SOURCE_URL[3]=https://2.na.dl.wireshark.org/src/all-versions/$SOURCE SOURCE_URL[4]=https://1.eu.dl.wireshark.org/src/all-versions/$SOURCE SOURCE_URL[5]=https://1.as.dl.wireshark.org/src/all-versions/$SOURCE - SOURCE_HASH=sha512:fed2d08bb0ba06496c22a5d45946faf2ff4ca19c59faf758c668c583193faeec3c4379b64750478469fede91562891e9b6991591a09a3da8d2193cb64718d02f + SOURCE_HASH=sha512:f24d873d75510488e0e60f75abce5820457786ff540ede3fb19fd45fea269527323ef5b5157ff83d2aaeabd60d03bac0a3dfc14495468d9478a8e5d7a30ad47b SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://www.wireshark.org/ ENTERED=20020116 diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY index fba10beabf..ed7517c176 100644 --- a/security/wireshark/HISTORY +++ b/security/wireshark/HISTORY @@ -1,3 +1,8 @@ +2018-12-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 2.9.0 + * BUILD, CONFIGURE, DEPENDS: use cmake + * INSTALL: removed + 2018-11-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 2.6.5, security update diff --git a/security/wireshark/INSTALL b/security/wireshark/INSTALL deleted file mode 100755 index 57b625e18b..0000000000 --- a/security/wireshark/INSTALL +++ /dev/null @@ -1,3 +0,0 @@ -default_install && - -install -m 644 image/wsicon48.png "$INSTALL_ROOT/usr/share/pixmaps" |