Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wireshark: 2.4.6 -> 2.4.7 #41175

Merged
merged 1 commit into from May 28, 2018
Merged

wireshark: 2.4.6 -> 2.4.7 #41175

merged 1 commit into from May 28, 2018

Conversation

lsix
Copy link
Member

@lsix lsix commented May 28, 2018

Motivation for this change

This is a bugfix release. See https://www.wireshark.org/docs/relnotes/wireshark-2.4.7.html for
release information.

Once merged, I’ll port it to 18.03.

I’ll work shortly into updating master to the 2.6 branch.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: wireshark

Partial log (click to expand)

shrinking /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7/lib/libwscodecs.so.1.1.0
shrinking /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7/lib/libwireshark.so.10.1.7
shrinking /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7/lib/libwiretap.so.7.0.7
shrinking /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7/lib/libwsutil.so.8.0.0
gzipping man pages under /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7/share/man/
strip is /nix/store/92d2ifxcni4n3zx9s8wnkcjlvnx5ajlc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7/lib  /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7/bin
patching script interpreter paths in /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7
checking for references to /build in /nix/store/fn9izn6cw83h676v41sbjrjcxddrzfnc-wireshark-qt-2.4.7...
postPatchMkspecs

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: wireshark

Partial log (click to expand)

shrinking /nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7/bin/tfshark
shrinking /nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7/bin/tshark
shrinking /nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7/bin/wireshark
gzipping man pages under /nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7/share/man/
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7/lib  /nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7/bin
patching script interpreter paths in /nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7
checking for references to /build in /nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7...
postPatchMkspecs
/nix/store/i5llxqr08p1rfq419k9wi51hb01qx6rb-wireshark-qt-2.4.7

@jtojnar
Copy link
Contributor

jtojnar commented May 28, 2018

@GrahamcOfBorg build wireshark-gtk wireshark-cli

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: wireshark-cli

The following builds were skipped because they don't evaluate on aarch64-linux: wireshark-gtk

Partial log (click to expand)

shrinking /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7/bin/sharkd
shrinking /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7/bin/rawshark
shrinking /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7/bin/tfshark
shrinking /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7/bin/tshark
gzipping man pages under /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7/share/man/
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7/lib  /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7/bin
patching script interpreter paths in /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7
checking for references to /build in /nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7...
/nix/store/aqgymwi9z2q72vmn1nzk7kjvxilb9bx5-wireshark-cli-2.4.7

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: wireshark-cli

The following builds were skipped because they don't evaluate on x86_64-darwin: wireshark-gtk

Partial log (click to expand)

/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwsutil.8.0.0.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwireshark.10.1.7.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwiretap.7.0.7.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwscodecs.1.1.0.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwsutil.8.0.0.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwireshark.10.1.7.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwiretap.7.0.7.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwscodecs.1.1.0.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7/lib/libwsutil.8.0.0.dylib: fixing dylib
/nix/store/j4j7bshr3a0s72231rbzypahivd924ym-wireshark-cli-2.4.7

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: wireshark-cli

The following builds were skipped because they don't evaluate on x86_64-linux: wireshark-gtk

Partial log (click to expand)

shrinking /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7/lib/wireshark/plugins/2.4.7/wimaxmacphy.so
shrinking /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7/lib/libwscodecs.so.1.1.0
shrinking /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7/lib/libwireshark.so.10.1.7
shrinking /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7/lib/libwiretap.so.7.0.7
shrinking /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7/lib/libwsutil.so.8.0.0
gzipping man pages under /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7/share/man/
strip is /nix/store/92d2ifxcni4n3zx9s8wnkcjlvnx5ajlc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7/lib  /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7/bin
patching script interpreter paths in /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7
checking for references to /build in /nix/store/4ja3067j8rgp0yc6iw3h4p4iqly9m7nc-wireshark-cli-2.4.7...

@xeji
Copy link
Contributor

xeji commented May 28, 2018

wireshark-gtk didn't build anymore (assertion failure) because 48a1345 added withQt = true; to wireshark in top-level/all-packages.nix. Fixed this in 382c209

@xeji
Copy link
Contributor

xeji commented May 28, 2018

@GrahamcOfBorg build wireshark-qt wireshark-gtk

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: wireshark-qt, wireshark-gtk

Partial log (click to expand)

building of '/nix/store/598rskk4qz2m0vf0hb6wrg76k4qbzb82-qtbase-5.10.1.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/bifwspn44j53k8xhd2v2pvlzld61bwmr-hook.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/6dp5gzza79lqmyq0386l9rcl5dvl6qcc-qtmacextras-5.10.1.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/3gwa27rlblgcgi3hnr3pnyfhli298pv3-qtsvg-5.10.1.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/bj41m6v68jyx292arkzhppfmchabpsyi-qttools-5.10.1.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/5cxccnvv7ap3sg1cj1vai53csssr21wr-qtxmlpatterns-5.10.1.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/xsc6fwiil8f46lcmija3l17a6181giay-qtdeclarative-5.10.1.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/pbhy95fs3mnhw75pxmnq32ppw2557xki-qtmultimedia-5.10.1.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/1b22m22xfdwravknl4zsv41ayg9d00p4-wireshark-qt-2.4.7.drv': 5 dependencies couldn't be built
error: build of '/nix/store/1b22m22xfdwravknl4zsv41ayg9d00p4-wireshark-qt-2.4.7.drv', '/nix/store/5qrw76aqngp31lxma7rr6201zc8c8lbq-wireshark-gtk-2.4.7.drv' failed

@jtojnar
Copy link
Contributor

jtojnar commented May 28, 2018

Hmm, we should probably fix the other issues listed in the commit too.

@xeji
Copy link
Contributor

xeji commented May 28, 2018

Agree. Sorry I didn't see your comments in 48a1345, I looked at it locally...

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: wireshark-qt, wireshark-gtk

Partial log (click to expand)

   Compiling rustc_const_eval v0.0.0 (file:///build/rustc-1.25.0-src/src/librustc_const_eval)
   Compiling rustc_lint v0.0.0 (file:///build/rustc-1.25.0-src/src/librustc_lint)
   Compiling rustc_passes v0.0.0 (file:///build/rustc-1.25.0-src/src/librustc_passes)
   Compiling rustc_mir v0.0.0 (file:///build/rustc-1.25.0-src/src/librustc_mir)
building of '/nix/store/04rc3rxknhf3gpxs0f4l37b6l7hh9kxi-rustc-1.25.0.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/jpc25qranb2dz8vxwf1n6dg594ssi8yc-cargo-0.26.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/73906rjsar0659qnmyapfxxzw47fq5bg-librsvg-2.42.4.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/kbg5w8hk1mfjkjlih7is2wqyifx1bnfs-hook.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/f78pykcc4b75sbxbycv1445q1h7rp55y-wireshark-gtk-2.4.7.drv': 2 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/f78pykcc4b75sbxbycv1445q1h7rp55y-wireshark-gtk-2.4.7.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: wireshark

Partial log (click to expand)

/nix/store/6ikfay7j2gd99wqgvz3rclj2qv85kqw3-wireshark-qt-2.4.7

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: wireshark

Partial log (click to expand)

shrinking /nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7/lib/libwiretap.so.7.0.7
shrinking /nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7/lib/libwireshark.so.10.1.7
shrinking /nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7/lib/libwscodecs.so.1.1.0
gzipping man pages under /nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7/share/man/
strip is /nix/store/92d2ifxcni4n3zx9s8wnkcjlvnx5ajlc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7/lib  /nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7/bin
patching script interpreter paths in /nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7
checking for references to /build in /nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7...
postPatchMkspecs
/nix/store/6fa014gskgpqps9cngjknkw8zzx4x0dq-wireshark-qt-2.4.7

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: wireshark-qt, wireshark-gtk

Partial log (click to expand)

   Compiling html5ever v0.20.0
   Compiling cssparser-macros v0.3.0
   Compiling kuchiki v0.6.0
   Compiling html-diff v0.0.6
building of '/nix/store/iwv52k8g0r4brn2dpc10zhz7y40q245s-rustc-1.25.0.drv' timed out after 4000 seconds
cannot build derivation '/nix/store/m1w2n07q9js00hbxw8r9g96v9r6pfrfs-cargo-0.26.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/qml59i5m9rcy4na5fsavvjn6j28dby07-librsvg-2.42.4.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/5756v6wrjaiz304v44xyxfqv1rarqgsd-hook.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/5ymmqi5na1zd0lnpi0yvl5xns6j66p6c-wireshark-gtk-2.4.7.drv': 2 dependencies couldn't be built
error: build of '/nix/store/5ymmqi5na1zd0lnpi0yvl5xns6j66p6c-wireshark-gtk-2.4.7.drv' failed

@xeji
Copy link
Contributor

xeji commented May 28, 2018

wireshark-gtk builds fine locally, so I think this can be merged.

@xeji xeji merged commit a7e0fb6 into NixOS:master May 28, 2018
@lsix
Copy link
Member Author

lsix commented May 29, 2018

It took me quite some time to rebuild wireshark-gtk to check it. I also got it working properly. Thanks @xeji

lsix added a commit that referenced this pull request May 29, 2018
@lsix lsix deleted the wireshark-2.4.7 branch August 22, 2019 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants