exiv2: 0.27.2 -> 0.27.3 #96648

paperdigits · 2020-08-30T02:39:04Z

Motivation for this change

Upgrade exiv2 to the latest released version.

Things done

jtojnar

Changes look mostly okay:
- https://github.com/Exiv2/exiv2/releases/tag/v0.27.3
- Exiv2 RoadMap Exiv2/exiv2#1018 (comment)
It might be possible to remove these two lines:

nixpkgs/pkgs/development/libraries/exiv2/default.nix

Line 80 in 250735e

export LD_LIBRARY_PATH="$(realpath ../build/lib)"

nixpkgs/pkgs/development/libraries/exiv2/default.nix

Line 89 in 250735e

export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib

since set LD_LIBRARY_PATH when running tests Exiv2/exiv2#1213 should do that.
Python tests have been run by default for a while now, we can remove:

nixpkgs/pkgs/development/libraries/exiv2/default.nix

Lines 97 to 99 in 250735e

postCheck = ''

(cd ../tests/ && python3 runner.py)

'';
🔴 There is a regression in aarch64-linux builds compared to previous update:

https://github.com/NixOS/nixpkgs/pull/67453/checks?check_run_id=203082000

Upstream issue: exiv2 0.27.3 fails to build on PPC Exiv2/exiv2#1244
Upstream pull request fixing that (likely not backportable): cmake/compilerFlags.cmake: properly detect availability of flags Exiv2/exiv2#1252

Edit: This workaround might work https://github.com/Exiv2/exiv2/commit/1ea63ccb345a4498b41cb8842622ba7ecc9fd484.patch

Could you add a comment that

nixpkgs/pkgs/development/libraries/exiv2/default.nix

Lines 111 to 117 in 250735e

    
             # Fix CMake export paths. 
        
             postFixup = '' 
        
               sed -i "$dev/lib/cmake/exiv2/exiv2Config.cmake" \ 
        
                   -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${_IMPORT_PREFIX}@$dev@" \ 
        
                   -e "/Compute the installation prefix/ a set(_IMPORT_PREFIX \"$out\")" \ 
        
                   -e "/^get_filename_component(_IMPORT_PREFIX/ d" 
        
             '';

(introduced in f1a58ab)

and

nixpkgs/pkgs/development/libraries/exiv2/default.nix

Lines 40 to 44 in 250735e

    
           # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly 
        
           # (setting it to an absolute path causes include files to go to $out/$out/include, 
        
           #  because the absolute path is interpreted with root at $out). 
        
           "-DCMAKE_INSTALL_INCLUDEDIR=include" 
        
           "-DCMAKE_INSTALL_LIBDIR=lib"

(introduced in exiv2: fix exiv2.pc file #81091)

can be removed once cmake: Fix paths with absolute GNUInstallDirs Exiv2/exiv2#1263 is merged?

paperdigits · 2020-08-30T22:34:28Z

@jtojnar thanks for the quick review. I think I've hit every point you've made.

jtojnar · 2020-08-31T00:10:49Z

pkgs/development/libraries/exiv2/default.nix

    "-DCMAKE_INSTALL_INCLUDEDIR=include"
    "-DCMAKE_INSTALL_LIBDIR=lib"
  ];

+  patches = [


Could you keep this just below src, see https://discourse.nixos.org/t/document-attribute-ordering-in-package-expressions/4887.

Hmm, though it does not seem to work here. Maybe we also need to apply Exiv2/exiv2@dd2d181

Patch Exiv2/exiv2@dd2d181 doesn't apply cleanly.

Yes, the conflict would need to be resolved. (And ideally also send pull request upstream against 0.27-maintenance branch.)

I'm not sure how to resolve the conflict and I don't have any arm systems to build against.

I have resolved the conflict in Exiv2/exiv2#1271.

Currently verifying it natively on https://github.com/nix-community/aarch64-build-box (nix-build -A exiv2.all --argstr system aarch64-linux) and locally by cross-compiling (nix-shell -A pkgsCross.aarch64-multiplatform.netpbm).

Edit: confirmed that it builds.

@jtojnar looks good!

paperdigits · 2020-09-04T18:11:00Z

@vcunat I think this can be merged! Should take care of the security advisory.

jtojnar · 2020-09-04T21:30:14Z

pkgs/development/libraries/exiv2/default.nix

  };

  patches = [
-    # included in next release
+    # Fix aarch64 build
    (fetchpatch {


Could you also link the pull request in a comment for easier triage in the future?

jtojnar · 2020-09-04T21:30:25Z

pkgs/development/libraries/exiv2/default.nix

-  '';
-
-  # With CMake we have to enable samples or there won't be
+    # With CMake we have to enable samples or there won't be


This indentation is weird here. Otherwise looks good.

paperdigits · 2020-09-04T21:57:30Z

@jtojnar thanks for the help!

jtojnar · 2020-09-04T22:23:04Z

Thank YOU.

ckauhaus · 2020-09-07T12:28:40Z

@jtojnar Would it be possible to backport this to 20.03 as it is a security fix? (#88282)

ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 labels Aug 30, 2020

jtojnar reviewed Aug 30, 2020

View reviewed changes

paperdigits force-pushed the exiv2-0.27.3 branch from 06da749 to 509dcc3 Compare August 30, 2020 22:26

jtojnar reviewed Aug 31, 2020

View reviewed changes

vcunat mentioned this pull request Sep 3, 2020

Vulnerability roundup 77: exiv2-0.27.2: 1 advisory #73627

Closed

1 task

paperdigits force-pushed the exiv2-0.27.3 branch 3 times, most recently from 2717200 to 7a84dce Compare September 4, 2020 18:00

jtojnar reviewed Sep 4, 2020

View reviewed changes

exiv2: 0.27.2 -> 0.27.3

b181edb

paperdigits force-pushed the exiv2-0.27.3 branch from 7a84dce to b181edb Compare September 4, 2020 21:57

jtojnar merged commit e2a89f8 into NixOS:master Sep 4, 2020

vcunat mentioned this pull request Sep 5, 2020

Vulnerability roundup 75: exiv2-0.27.2: 1 advisory #68559

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

exiv2: 0.27.2 -> 0.27.3 #96648

exiv2: 0.27.2 -> 0.27.3 #96648

paperdigits commented Aug 30, 2020 •

edited

jtojnar left a comment •

edited

paperdigits commented Aug 30, 2020

jtojnar Aug 31, 2020

jtojnar Aug 31, 2020

paperdigits Aug 31, 2020 •

edited

jtojnar Sep 1, 2020 •

edited

paperdigits Sep 4, 2020

jtojnar Sep 4, 2020 •

edited

paperdigits Sep 4, 2020 •

edited

paperdigits commented Sep 4, 2020

jtojnar Sep 4, 2020

paperdigits Sep 4, 2020

jtojnar Sep 4, 2020

paperdigits Sep 4, 2020

paperdigits commented Sep 4, 2020

jtojnar commented Sep 4, 2020

ckauhaus commented Sep 7, 2020

	# Fix CMake export paths.
	postFixup = ''
	sed -i "$dev/lib/cmake/exiv2/exiv2Config.cmake" \
	-e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${_IMPORT_PREFIX}@$dev@" \
	-e "/Compute the installation prefix/ a set(_IMPORT_PREFIX \"$out\")" \
	-e "/^get_filename_component(_IMPORT_PREFIX/ d"
	'';

	# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
	# (setting it to an absolute path causes include files to go to $out/$out/include,
	# because the absolute path is interpreted with root at $out).
	"-DCMAKE_INSTALL_INCLUDEDIR=include"
	"-DCMAKE_INSTALL_LIBDIR=lib"

	postCheck = ''
	(cd ../tests/ && python3 runner.py)
	'';

exiv2: 0.27.2 -> 0.27.3 #96648

exiv2: 0.27.2 -> 0.27.3 #96648

Conversation

paperdigits commented Aug 30, 2020 • edited

Motivation for this change

Things done

jtojnar left a comment • edited

Choose a reason for hiding this comment

paperdigits commented Aug 30, 2020

jtojnar Aug 31, 2020

Choose a reason for hiding this comment

jtojnar Aug 31, 2020

Choose a reason for hiding this comment

paperdigits Aug 31, 2020 • edited

Choose a reason for hiding this comment

jtojnar Sep 1, 2020 • edited

Choose a reason for hiding this comment

paperdigits Sep 4, 2020

Choose a reason for hiding this comment

jtojnar Sep 4, 2020 • edited

Choose a reason for hiding this comment

paperdigits Sep 4, 2020 • edited

Choose a reason for hiding this comment

paperdigits commented Sep 4, 2020

jtojnar Sep 4, 2020

Choose a reason for hiding this comment

paperdigits Sep 4, 2020

Choose a reason for hiding this comment

jtojnar Sep 4, 2020

Choose a reason for hiding this comment

paperdigits Sep 4, 2020

Choose a reason for hiding this comment

paperdigits commented Sep 4, 2020

jtojnar commented Sep 4, 2020

ckauhaus commented Sep 7, 2020

paperdigits commented Aug 30, 2020 •

edited

jtojnar left a comment •

edited

paperdigits Aug 31, 2020 •

edited

jtojnar Sep 1, 2020 •

edited

jtojnar Sep 4, 2020 •

edited

paperdigits Sep 4, 2020 •

edited