[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=87129d6

The following commit has been merged in the master branch:
commit 87129d61f6fb53baabaadce75a8091e41fd99bda
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Jan 2 10:58:58 2016 +0000

    #1147  Report uid, euid and gid in exiv2 --verbose --version
---
 src/version.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/version.cpp b/src/version.cpp
index 4d499a8..613e35e 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -33,6 +33,11 @@ EXIV2_RCSID("@(#) $Id$")
 
 #include "config.h"
 
+// #1147
+#ifndef _MSC_VER
+#include <uuid/uuid.h>
+#endif
+
 #ifndef EXV_USE_SSH
 #define EXV_USE_SSH 0
 #endif
@@ -543,6 +548,18 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
             output(os,keys,"library",*lib);
     }
 
+// #1147
+#ifndef _MSC_VER
+    uuid_t* p_uid ;
+	uid_t uid = getuid()   ; uuid_string_t s_uid ; p_uid= (uuid_t*) &uid ; uuid_unparse(*p_uid,s_uid);
+    uid_t eid = geteuid()  ; uuid_string_t s_eid ; p_uid= (uuid_t*) &eid ; uuid_unparse(*p_uid,s_eid);
+    uid_t gid = getgid()   ; uuid_string_t s_gid ; p_uid= (uuid_t*) &gid ; uuid_unparse(*p_uid,s_gid);
+
+    output(os,keys,"uid"               , s_uid           );
+    output(os,keys,"euid"              , s_eid           );
+    output(os,keys,"gid"               , s_gid           );
+#endif
+
     output(os,keys,"have_regex"        ,have_regex       );
     output(os,keys,"have_strerror_r"   ,have_strerror_r  );
     output(os,keys,"have_gmtime_r"     ,have_gmtime_r    );

-- 
exiv2 packaging