Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dcebf6e155d7fd26e0f94ddca7b2ae53a3ff7f75
commit dcebf6e155d7fd26e0f94ddca7b2ae53a3ff7f75 Author: crazy <[email protected]> Date: Thu Jul 28 15:19:36 2016 +0200 wireshark-2.0.5-1-x86_64 * Version bump * added patch to workaround c++11 issues with qt5.7 * reworked lua patch diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index 704d543..54f1894 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy <[email protected]> pkgname=wireshark -pkgver=2.0.4 +pkgver=2.0.5 pkgrel=1 pkgdesc="The world's most popular network protocol analyzer." url="http://www.wireshark.org/"; @@ -13,11 +13,14 @@ archs=('i686' 'x86_64') options+=('scriptlet') up2date="lynx -dump http://www.wireshark.org/download.html | grep stable -m1 | sed 's/.*is \(.*\)\. .*/\1/'" source=(https://2.na.dl.wireshark.org/src/all-versions/$pkgname-$pkgver.tar.bz2 \ - wireshark-2.0.2-lua_5_3_1-1.patch stop-using-junk-in-version-string.patch) + wireshark-2.0.5-lua_5_3.patch \ + stop-using-junk-in-version-string.patch \ + qt5.7-c++11.patch) ## without the patch we have (SVN Rev Unknown from unknown) in version string -sha1sums=('9d76a28ba4f7566bef1aefbb2868e1ddcb93e999' \ - 'f9022f2119ec381e22a927ce9bd78a5a840205fa' \ - '4d9de6843cdb6ccb0c50d18b404752c6b022968f') +sha1sums=('ab77c632d8babf731bf0ecac0876fe3ff2923d04' \ + 'd3a6c790eeeb89db288134577b0ce0b733bfa404' \ + '4d9de6843cdb6ccb0c50d18b404752c6b022968f' \ + '2ec8a4382096b4c76427b90dd3eb280417186da5') subpkgs+=("$pkgname-gtk") subdescs+=("$pkgdesc (Gtk3 frontend)") @@ -36,12 +39,15 @@ subarchs+=('i686 x86_64') build() { - Fbuild \ + Fcd + Fpatchall + Fautoreconf + Fmake \ --with-ssl \ --with-qt=5 \ --with-gtk3=yes \ --with-dumpcap-group=netdev - + Fmakeinstall Fsplit $pkgname-gtk usr/bin/$pkgname-gtk Fsplit $pkgname-gtk usr/share/applications/$pkgname-gtk.desktop diff --git a/source/xapps-extra/wireshark/qt5.7-c++11.patch b/source/xapps-extra/wireshark/qt5.7-c++11.patch new file mode 100644 index 0000000..adf1e65 --- /dev/null +++ b/source/xapps-extra/wireshark/qt5.7-c++11.patch @@ -0,0 +1,12 @@ +diff -Naur wireshark-2.0.5/acinclude.m4 wireshark-2.0.5-p/acinclude.m4 +--- wireshark-2.0.5/acinclude.m4 2016-07-27 20:26:36.000000000 +0200 ++++ wireshark-2.0.5-p/acinclude.m4 2016-07-28 14:45:06.114870920 +0200 +@@ -2025,7 +2025,7 @@ + if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; then + mod_version=`$PKG_CONFIG --modversion $pkg_config_module` + AC_MSG_RESULT(yes (version $mod_version)) +- Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags $pkg_config_module`" ++ Qt_CFLAGS="$Qt_CFLAGS -std=c++11 `$PKG_CONFIG --cflags $pkg_config_module`" + Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs $pkg_config_module`" + # Run Action-If-Found + ifelse([$4], , :, [$4]) diff --git a/source/xapps-extra/wireshark/wireshark-2.0.2-lua_5_3_1-1.patch b/source/xapps-extra/wireshark/wireshark-2.0.5-lua_5_3.patch similarity index 73% rename from source/xapps-extra/wireshark/wireshark-2.0.2-lua_5_3_1-1.patch rename to source/xapps-extra/wireshark/wireshark-2.0.5-lua_5_3.patch index 5569194..ef191ae 100644 --- a/source/xapps-extra/wireshark/wireshark-2.0.2-lua_5_3_1-1.patch +++ b/source/xapps-extra/wireshark/wireshark-2.0.5-lua_5_3.patch @@ -1,23 +1,16 @@ -Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br> -Date: 2015-11-19 -Initial Package Version: 2.0.0 -Upstream Status: not submitted -Origin: Self -Description: Fix build against lua-5.3.1 - -diff -Naur wireshark-2.0.0.orig/configure wireshark-2.0.0/configure ---- wireshark-2.0.0.orig/configure 2015-11-18 19:21:26.000000000 -0300 -+++ wireshark-2.0.0/configure 2015-11-19 13:21:33.119407232 -0300 -@@ -37595,7 +37595,7 @@ +diff -Naur wireshark-2.0.5/acinclude.m4 wireshark-2.0.5-p/acinclude.m4 +--- wireshark-2.0.5/acinclude.m4 2016-07-27 20:26:36.000000000 +0200 ++++ wireshark-2.0.5-p/acinclude.m4 2016-07-28 15:04:46.981888424 +0200 +@@ -838,7 +838,7 @@ # We use a for loop instead of giving all the package names to # PKG_CHECK_MODULES because doing the latter doesn't appear to # work reliably (some package names are not searched for). - for pkg in "lua < 5.3" lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua5.0 lua-5.0 lua50 -+ for pkg in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua5.0 lua-5.0 lua50 ++ for pkg in lua lua5.3 lua-5.3 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua5.0 lua-5.0 lua50 do + PKG_CHECK_MODULES(LUA, $pkg, [have_lua=yes], [true]) - pkg_failed=no -@@ -37699,7 +37699,7 @@ +@@ -871,7 +871,7 @@ break fi @@ -26,31 +19,42 @@ diff -Naur wireshark-2.0.0.orig/configure wireshark-2.0.0/configure do if test -r "$dir/include/lua$ver/lua.h" then -@@ -37723,13 +37723,6 @@ - $as_echo_n "checking the Lua version... " >&6; } - lua_ver=`$AWK '/LUA_VERSION_NUM/ { print \$NF; }' \$header_dir/lua.h | sed 's/0/./'` +@@ -892,23 +892,16 @@ + AC_MSG_CHECKING(the Lua version) + lua_ver=`$AWK AS_ESCAPE('/LUA_VERSION_NUM/ { print $NF; }' $header_dir/lua.h | sed 's/0/./')` - if test "x$lua_ver" = "x5.3" - then - # Wireshark doesn't compile with Lua 5.3 today -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lua_ver - disabling Lua support" >&5 --$as_echo "$lua_ver - disabling Lua support" >&6; } +- AC_MSG_RESULT($lua_ver - disabling Lua support) - have_lua=no - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lua_ver" >&5 - $as_echo "$lua_ver" >&6; } - -@@ -37754,7 +37747,6 @@ - - done - +- AC_MSG_RESULT($lua_ver) ++ AC_MSG_RESULT($lua_ver) + +- wireshark_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -I$header_dir" +- AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h, , +- [ +- have_lua=no +- # Restore our CPPFLAGS +- CPPFLAGS="$wireshark_save_CPPFLAGS" +- ]) - fi ++ wireshark_save_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -I$header_dir" ++ AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h, , ++ [ ++ have_lua=no ++ # Restore our CPPFLAGS ++ CPPFLAGS="$wireshark_save_CPPFLAGS" ++ ]) if test "x$have_lua" = "x" then -diff -Naur wireshark-2.0.0.orig/epan/wslua/lua_bitop.c wireshark-2.0.0/epan/wslua/lua_bitop.c ---- wireshark-2.0.0.orig/epan/wslua/lua_bitop.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/lua_bitop.c 2015-11-19 13:21:33.120407210 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/lua_bitop.c wireshark-2.0.5-p/epan/wslua/lua_bitop.c +--- wireshark-2.0.5/epan/wslua/lua_bitop.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/lua_bitop.c 2016-07-28 15:05:25.248888991 +0200 @@ -48,7 +48,7 @@ typedef union { @@ -95,9 +99,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/lua_bitop.c wireshark-2.0.0/epan/wslu #ifdef _WIN32 if (b == (UBits)1610612736L) msg = "use D3DCREATE_FPU_PRESERVE with DirectX"; -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_byte_array.c wireshark-2.0.0/epan/wslua/wslua_byte_array.c ---- wireshark-2.0.0.orig/epan/wslua/wslua_byte_array.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua_byte_array.c 2015-11-19 13:22:27.961200046 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua_byte_array.c wireshark-2.0.5-p/epan/wslua/wslua_byte_array.c +--- wireshark-2.0.5/epan/wslua/wslua_byte_array.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua_byte_array.c 2016-07-28 15:05:25.248888991 +0200 @@ -285,7 +285,7 @@ #define WSLUA_OPTARG_ByteArray_raw_OFFSET 2 /* The position of the first byte (default=0/first). */ #define WSLUA_OPTARG_ByteArray_raw_LENGTH 3 /* The length of the segment to get (default=all). */ @@ -116,9 +120,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_byte_array.c wireshark-2.0.0/ep if ((len < 0) || ((guint)len > (ba->len - offset))) len = ba->len - offset; -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_file.c wireshark-2.0.0/epan/wslua/wslua_file.c ---- wireshark-2.0.0.orig/epan/wslua/wslua_file.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua_file.c 2015-11-19 13:21:33.121407188 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua_file.c wireshark-2.0.5-p/epan/wslua/wslua_file.c +--- wireshark-2.0.5/epan/wslua/wslua_file.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua_file.c 2016-07-28 15:05:25.249888991 +0200 @@ -337,7 +337,7 @@ static const char *const modenames[] = {"set", "cur", "end", NULL}; File f = checkFile(L,1); @@ -128,9 +132,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_file.c wireshark-2.0.0/epan/wsl int err = WTAP_ERR_INTERNAL; -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua.h wireshark-2.0.0/epan/wslua/wslua.h ---- wireshark-2.0.0.orig/epan/wslua/wslua.h 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua.h 2015-11-19 13:22:27.967199914 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua.h wireshark-2.0.5-p/epan/wslua/wslua.h +--- wireshark-2.0.5/epan/wslua/wslua.h 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua.h 2016-07-28 15:05:25.249888991 +0200 @@ -84,10 +84,10 @@ #define wslua_checkguint32(L,i) (guint32) ( luaL_checknumber(L,i) ) #define wslua_checkguint64(L,i) (guint64) ( luaL_checknumber(L,i) ) @@ -144,9 +148,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua.h wireshark-2.0.0/epan/wslua/ws #define wslua_optguint32(L,i,d) (guint32) ( luaL_optnumber(L,i,d) ) #define wslua_optguint64(L,i,d) (guint64) ( luaL_optnumber(L,i,d) ) -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_int64.c wireshark-2.0.0/epan/wslua/wslua_int64.c ---- wireshark-2.0.0.orig/epan/wslua/wslua_int64.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua_int64.c 2015-11-19 13:21:33.123407144 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua_int64.c wireshark-2.0.5-p/epan/wslua/wslua_int64.c +--- wireshark-2.0.5/epan/wslua/wslua_int64.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua_int64.c 2016-07-28 15:05:25.250888991 +0200 @@ -276,7 +276,7 @@ #define WSLUA_OPTARG_Int64_new_NUMBYTES 2 /* The number of hex-chars/nibbles to generate, negative means uppercase (default=16). */ @@ -165,9 +169,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_int64.c wireshark-2.0.0/epan/ws const gchar *hexdigits = "0123456789abcdef"; gchar buf[16]; lua_Integer i; -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_internals.c wireshark-2.0.0/epan/wslua/wslua_internals.c ---- wireshark-2.0.0.orig/epan/wslua/wslua_internals.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua_internals.c 2015-11-19 13:22:27.964199980 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua_internals.c wireshark-2.0.5-p/epan/wslua/wslua_internals.c +--- wireshark-2.0.5/epan/wslua/wslua_internals.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua_internals.c 2016-07-28 15:05:25.251888991 +0200 @@ -103,7 +103,7 @@ return val; } @@ -177,9 +181,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_internals.c wireshark-2.0.0/epa WSLUA_API int wslua_optboolint(lua_State* L, int n, int def) { int val = 0; -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_listener.c wireshark-2.0.0/epan/wslua/wslua_listener.c ---- wireshark-2.0.0.orig/epan/wslua/wslua_listener.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua_listener.c 2015-11-19 13:21:33.124407122 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua_listener.c wireshark-2.0.5-p/epan/wslua/wslua_listener.c +--- wireshark-2.0.5/epan/wslua/wslua_listener.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua_listener.c 2016-07-28 15:05:25.251888991 +0200 @@ -107,7 +107,7 @@ switch ( lua_pcall(tap->L,3,1,1) ) { @@ -189,9 +193,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_listener.c wireshark-2.0.0/epan break; case LUA_ERRRUN: break; -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_nstime.c wireshark-2.0.0/epan/wslua/wslua_nstime.c ---- wireshark-2.0.0.orig/epan/wslua/wslua_nstime.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua_nstime.c 2015-11-19 13:21:33.124407122 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua_nstime.c wireshark-2.0.5-p/epan/wslua/wslua_nstime.c +--- wireshark-2.0.5/epan/wslua/wslua_nstime.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua_nstime.c 2016-07-28 15:05:25.252888991 +0200 @@ -46,8 +46,8 @@ if (!nstime) return 0; @@ -203,9 +207,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_nstime.c wireshark-2.0.0/epan/w pushNSTime(L,nstime); -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_struct.c wireshark-2.0.0/epan/wslua/wslua_struct.c ---- wireshark-2.0.0.orig/epan/wslua/wslua_struct.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua_struct.c 2015-11-19 13:21:33.126407078 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua_struct.c wireshark-2.0.5-p/epan/wslua/wslua_struct.c +--- wireshark-2.0.5/epan/wslua/wslua_struct.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua_struct.c 2016-07-28 15:05:25.252888991 +0200 @@ -462,7 +462,7 @@ const char *fmt = wslua_checkstring_only(L, WSLUA_ARG_Struct_unpack_FORMAT); size_t ld; @@ -215,9 +219,9 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_struct.c wireshark-2.0.0/epan/w defaultoptions(&h); lua_settop(L, 2); while (*fmt) { -diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c wireshark-2.0.0/epan/wslua/wslua_tvb.c ---- wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c 2015-11-18 19:20:58.000000000 -0300 -+++ wireshark-2.0.0/epan/wslua/wslua_tvb.c 2015-11-19 13:21:33.127407056 -0300 +diff -Naur wireshark-2.0.5/epan/wslua/wslua_tvb.c wireshark-2.0.5-p/epan/wslua/wslua_tvb.c +--- wireshark-2.0.5/epan/wslua/wslua_tvb.c 2016-07-27 20:26:42.000000000 +0200 ++++ wireshark-2.0.5-p/epan/wslua/wslua_tvb.c 2016-07-28 15:05:25.253888991 +0200 @@ -159,7 +159,7 @@ offset is beyond the end of the `Tvb`. */ #define Tvb_reported_length_remaining_OFFSET 2 /* offset */ @@ -238,7 +242,7 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c wireshark-2.0.0/epan/wslu if (tvb->expired) { luaL_error(L,"expired tvb"); -@@ -224,8 +224,8 @@ +@@ -223,8 +223,8 @@ #define WSLUA_OPTARG_Tvb_range_LENGTH 3 /* The length (in octets) of the range. Defaults to until the end of the `Tvb`. */ Tvb tvb = checkTvb(L,1); @@ -249,7 +253,7 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c wireshark-2.0.0/epan/wslu if (push_TvbRange(L,tvb->ws_tvb,offset,len)) { WSLUA_RETURN(1); /* The TvbRange */ -@@ -242,8 +242,8 @@ +@@ -241,8 +241,8 @@ #define WSLUA_OPTARG_Tvb_raw_OFFSET 2 /* The position of the first byte (default=0/first). */ #define WSLUA_OPTARG_Tvb_raw_LENGTH 3 /* The length of the segment to get (default=all). */ Tvb tvb = checkTvb(L,1); @@ -260,7 +264,7 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c wireshark-2.0.0/epan/wslu if (!tvb) return 0; if (tvb->expired) { -@@ -837,7 +837,7 @@ +@@ -836,7 +836,7 @@ #define WSLUA_OPTARG_TvbRange_nstime_ENCODING 2 /* An optional ENC_* encoding value to use */ TvbRange tvbr = checkTvbRange(L,1); NSTime nstime; @@ -269,7 +273,7 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c wireshark-2.0.0/epan/wslu if ( !(tvbr && tvbr->tvb)) return 0; if (tvbr->tvb->expired) { -@@ -918,7 +918,7 @@ +@@ -917,7 +917,7 @@ /* Obtain a string from a `TvbRange`. */ #define WSLUA_OPTARG_TvbRange_string_ENCODING 2 /* The encoding to use. Defaults to ENC_ASCII. */ TvbRange tvbr = checkTvbRange(L,1); @@ -278,7 +282,7 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c wireshark-2.0.0/epan/wslu if ( !(tvbr && tvbr->tvb)) return 0; if (tvbr->tvb->expired) { -@@ -962,7 +962,7 @@ +@@ -961,7 +961,7 @@ /* Obtain a zero terminated string from a `TvbRange`. */ #define WSLUA_OPTARG_TvbRange_stringz_ENCODING 2 /* The encoding to use. Defaults to ENC_ASCII. */ TvbRange tvbr = checkTvbRange(L,1); @@ -287,7 +291,7 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c wireshark-2.0.0/epan/wslu gint offset; gunichar2 uchar; -@@ -1009,7 +1009,7 @@ +@@ -1008,7 +1008,7 @@ */ #define WSLUA_OPTARG_TvbRange_strsize_ENCODING 2 /* The encoding to use. Defaults to ENC_ASCII. */ TvbRange tvbr = checkTvbRange(L,1); @@ -296,7 +300,7 @@ diff -Naur wireshark-2.0.0.orig/epan/wslua/wslua_tvb.c wireshark-2.0.0/epan/wslu gint offset; gunichar2 uchar; -@@ -1109,7 +1109,7 @@ +@@ -1108,7 +1108,7 @@ #define WSLUA_OPTARG_TvbRange_bytes_ENCODING 2 /* An optional ENC_* encoding value to use */ TvbRange tvbr = checkTvbRange(L,1); GByteArray* ba; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
