From ae67368e545c6949821a1f46467384a85742a9f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Jul 2012 12:13:59 -0400
Subject: [PATCH] exif / libexif: Update to 0.6.21

Addresses CVE-2012-2812, CVE-2012-2813, CVE-2012-2814, CVE-2012-2836,
CVE-2012-2837, CVE-2012-2840, CVE-2012-2841 and CVE-2012-2845.
---
 pkgs/development/libraries/libexif/default.nix |  4 ++--
 pkgs/tools/graphics/exif/default.nix           | 17 +++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index a9b60feff2f..48c66cb6070 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libexif-0.6.20";
+  name = "libexif-0.6.21";
 
   src = fetchurl {
     url = "mirror://sourceforge/libexif/${name}.tar.bz2";
-    sha256 = "05fphfmgrni6838v0lkcqv88fbw7r1mdw3ypy3bh567vv05x4wm7";
+    sha256 = "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n";
   };
 
   buildInputs = [ gettext ];
diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix
index 94bf2e2cb0d..a8599980d94 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -1,12 +1,17 @@
-{stdenv, fetchurl, pkgconfig, libexif, popt}:
+{ stdenv, fetchurl, pkgconfig, libexif, popt }:
 
-stdenv.mkDerivation {
-  name = "exif-0.6.15";
+stdenv.mkDerivation rec {
+  name = "exif-0.6.21";
 
   src = fetchurl {
-    url = mirror://sourceforge/libexif/exif-0.6.15.tar.bz2;
-    sha256 = "19kxl72l1iqq747k58rir7v4ld1676j3dmjdc1pik9hjlgdb1yj1";
+    url = "mirror://sourceforge/libexif/${name}.tar.bz2";
+    sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr";
   };
 
-  buildInputs = [pkgconfig libexif popt];
+  buildInputs = [ pkgconfig libexif popt ];
+  
+  meta = {
+    homepage = http://libexif.sourceforge.net/;
+    description = "A utility to read and manipulate EXIF data in digital photographs";
+  };
 }