Skip to content
Jump to bottom

Update Wireshark from 2.0.2 to 2.0.16 #557

Merged
merged 6 commits into from
Dec 20, 2017
Merged

Update Wireshark from 2.0.2 to 2.0.16 #557

merged 6 commits into from
Dec 20, 2017

Commits on Dec 19, 2017

  1. wireshark: Remove trailing space

    @pmenzel
    pmenzel committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    e488a61 View commit details
    Browse the repository at this point in the history

  2. wireshark: Convert to versionless bee file

    @pmenzel
    pmenzel committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    3938d0e View commit details
    Browse the repository at this point in the history

  3. wireshark: Use current bee file template 

    Recreate bee file with the command below, and convert it to a
versionless bee file.

```
$ bee init https://2.na.dl.wireshark.org/src/wireshark-2.0.2.tar.bz2
creating wireshark-2.0.2-0.bee from template '/etc/default/bee/templates/fallback'
$ mv wireshark-2.0.2-0.bee wireshark.be0
$ vim wireshark.be0
```
    @pmenzel
    pmenzel committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    f7ab0f5 View commit details
    Browse the repository at this point in the history

  4. wireshark: Update download URL 

    The old sources are in the directory `all-versions`.
    @pmenzel
    pmenzel committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    675efdf View commit details
    Browse the repository at this point in the history

  5. wireshark: Update version from 2.0.2 to 2.0.16 

    Version 2.0.16 was released on October 10th, 2017.

The release notes are available online [1].

[1] https://www.wireshark.org/docs/relnotes/
    @pmenzel
    pmenzel committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    a6875d2 View commit details
    Browse the repository at this point in the history

  6. wireshark: Patch source to enable Lua bindings with Lua 5.3.3 

    From [1]:

> Optional patch:
> http://www.linuxfromscratch.org/patches/blfs/7.10/wireshark-2.0.5-lua_5_3_1-1.patch
> (allows building the LUA bindings if Lua-5.3.3 is installed and LUA is
> not disabled by passing --without-lua to configure)

Applies with a little offset.

```
[BEE] patch -N -p1 -i
/dev/shm/bee-root/wireshark/files/wireshark-2.0.5-lua_5_3_1-1.patch
patching file configure
Hunk #1 succeeded at 38870 (offset 1275 lines).
Hunk #2 succeeded at 38974 (offset 1275 lines).
Hunk #3 succeeded at 38998 (offset 1275 lines).
Hunk #4 succeeded at 39022 (offset 1275 lines).
patching file epan/wslua/lua_bitop.c
patching file epan/wslua/wslua_byte_array.c
patching file epan/wslua/wslua_file.c
Hunk #1 succeeded at 347 (offset 10 lines).
patching file epan/wslua/wslua.h
patching file epan/wslua/wslua_int64.c
patching file epan/wslua/wslua_internals.c
patching file epan/wslua/wslua_listener.c
patching file epan/wslua/wslua_nstime.c
patching file epan/wslua/wslua_struct.c
patching file epan/wslua/wslua_tvb.c
Hunk #3 succeeded at 223 (offset -1 lines).
Hunk #4 succeeded at 241 (offset -1 lines).
Hunk #5 succeeded at 836 (offset -1 lines).
Hunk #6 succeeded at 917 (offset -1 lines).
Hunk #7 succeeded at 961 (offset -1 lines).
Hunk #8 succeeded at 1008 (offset -1 lines).
Hunk #9 succeeded at 1108 (offset -1 lines).
```

With this patch, `Use Lua library : yes` is seen in the configure option
summary.

[1] http://www.linuxfromscratch.org/blfs/view/7.10/basicnet/wireshark.html
    @pmenzel
    pmenzel committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    c57ede6 View commit details
    Browse the repository at this point in the history