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

exiv2: bugfix updates #44466

Merged
merged 2 commits into from Aug 5, 2018
Merged

exiv2: bugfix updates #44466

merged 2 commits into from Aug 5, 2018

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Aug 4, 2018

  • use upstream branch with backports
  • backport two fixes missing from it yet
Motivation for this change

I wasn't aware of work #44464 and took a different approach. I'm not too sure which is better, so let me open another PR at least for reference :-)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • negligible impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

- use upstream branch with backports
- backport two fixes missing from it yet
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: exiv2

Partial log (click to expand)

strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dx9hgbkha2zmmz2mn1wjj2isshsa4qc0-exiv2-0.26.2018.06.09/lib  /nix/store/dx9hgbkha2zmmz2mn1wjj2isshsa4qc0-exiv2-0.26.2018.06.09/bin
patching script interpreter paths in /nix/store/dx9hgbkha2zmmz2mn1wjj2isshsa4qc0-exiv2-0.26.2018.06.09
checking for references to /build in /nix/store/dx9hgbkha2zmmz2mn1wjj2isshsa4qc0-exiv2-0.26.2018.06.09...
shrinking RPATHs of ELF executables and libraries in /nix/store/q15qy4lr7q844g0kgwxnrwbgg91zgc2x-exiv2-0.26.2018.06.09-dev
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/q15qy4lr7q844g0kgwxnrwbgg91zgc2x-exiv2-0.26.2018.06.09-dev/lib
patching script interpreter paths in /nix/store/q15qy4lr7q844g0kgwxnrwbgg91zgc2x-exiv2-0.26.2018.06.09-dev
checking for references to /build in /nix/store/q15qy4lr7q844g0kgwxnrwbgg91zgc2x-exiv2-0.26.2018.06.09-dev...
/nix/store/dx9hgbkha2zmmz2mn1wjj2isshsa4qc0-exiv2-0.26.2018.06.09

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: exiv2

Partial log (click to expand)

rmdir: failed to remove '/nix/store/9dd89zh08f0synj21nk3lh7vpp963p6s-exiv2-0.26.2018.06.09/lib': Directory not empty
Patching '/nix/store/2f6zg73inm31kskafig630k625mrwdwl-exiv2-0.26.2018.06.09-dev/lib/pkgconfig/exiv2.pc' includedir to output /nix/store/2f6zg73inm31kskafig630k625mrwdwl-exiv2-0.26.2018.06.09-dev
gzipping man pages under /nix/store/9dd89zh08f0synj21nk3lh7vpp963p6s-exiv2-0.26.2018.06.09/share/man/
strip is /nix/store/qfxcr8c4fg7lkybrny9n2sb77bmippdx-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/9dd89zh08f0synj21nk3lh7vpp963p6s-exiv2-0.26.2018.06.09/lib  /nix/store/9dd89zh08f0synj21nk3lh7vpp963p6s-exiv2-0.26.2018.06.09/bin
patching script interpreter paths in /nix/store/9dd89zh08f0synj21nk3lh7vpp963p6s-exiv2-0.26.2018.06.09
strip is /nix/store/qfxcr8c4fg7lkybrny9n2sb77bmippdx-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/2f6zg73inm31kskafig630k625mrwdwl-exiv2-0.26.2018.06.09-dev/lib
patching script interpreter paths in /nix/store/2f6zg73inm31kskafig630k625mrwdwl-exiv2-0.26.2018.06.09-dev
/nix/store/9dd89zh08f0synj21nk3lh7vpp963p6s-exiv2-0.26.2018.06.09

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: exiv2

Partial log (click to expand)

strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09/lib  /nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09/bin
patching script interpreter paths in /nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09
checking for references to /build in /nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09...
shrinking RPATHs of ELF executables and libraries in /nix/store/fzv7la79b7yly74c87j9fgf57879ayn7-exiv2-0.26.2018.06.09-dev
strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fzv7la79b7yly74c87j9fgf57879ayn7-exiv2-0.26.2018.06.09-dev/lib
patching script interpreter paths in /nix/store/fzv7la79b7yly74c87j9fgf57879ayn7-exiv2-0.26.2018.06.09-dev
checking for references to /build in /nix/store/fzv7la79b7yly74c87j9fgf57879ayn7-exiv2-0.26.2018.06.09-dev...
/nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09

@ckauhaus
Copy link
Contributor

ckauhaus commented Aug 5, 2018

Don't forget to add the missing license field to the metadata (GPL2)

@vcunat
Copy link
Member Author

vcunat commented Aug 5, 2018

Yeah, I know about that detail.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: exiv2

Partial log (click to expand)

/nix/store/9dd89zh08f0synj21nk3lh7vpp963p6s-exiv2-0.26.2018.06.09

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: exiv2

Partial log (click to expand)

/nix/store/dx9hgbkha2zmmz2mn1wjj2isshsa4qc0-exiv2-0.26.2018.06.09

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: exiv2

Partial log (click to expand)

strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09/lib  /nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09/bin
patching script interpreter paths in /nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09
checking for references to /build in /nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09...
shrinking RPATHs of ELF executables and libraries in /nix/store/fzv7la79b7yly74c87j9fgf57879ayn7-exiv2-0.26.2018.06.09-dev
strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fzv7la79b7yly74c87j9fgf57879ayn7-exiv2-0.26.2018.06.09-dev/lib
patching script interpreter paths in /nix/store/fzv7la79b7yly74c87j9fgf57879ayn7-exiv2-0.26.2018.06.09-dev
checking for references to /build in /nix/store/fzv7la79b7yly74c87j9fgf57879ayn7-exiv2-0.26.2018.06.09-dev...
/nix/store/wr9bifs9p3chc84b1f6vmdpr10avanxz-exiv2-0.26.2018.06.09

@xeji xeji merged commit b909d80 into NixOS:master Aug 5, 2018
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