Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

Conflicts:
	apt-private/private-list.cc
	doc/po/de.po
	test/integration/framework

1 files changed, 14 insertions, 12 deletions

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 48c8e9892..f1edb353b 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -19,7 +19,6 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
-#include <utime.h>
 #include <stdio.h>
 #include <errno.h>
 #include <apti18n.h>
@@ -94,32 +93,35 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    }
    
    From.Close();
-   To.Close();
-   
+
    if (Failed == true)
       return false;
-   
+
    // Transfer the modification times
    struct stat Buf;
    if (stat(Path.c_str(),&Buf) != 0)
       return _error->Errno("stat",_("Failed to stat"));
 
-   struct utimbuf TimeBuf;
-   TimeBuf.actime = Buf.st_atime;
-   TimeBuf.modtime = Buf.st_mtime;
-   if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
-      return _error->Errno("utime",_("Failed to set modification time"));
+   struct timespec times[2];
+   times[0].tv_sec = Buf.st_atime;
+   times[1].tv_sec = Buf.st_mtime;
+   times[0].tv_nsec = times[1].tv_nsec = 0;
+   if (futimens(To.Fd(), times) != 0)
+   {
+      To.OpFail();
+      return _error->Errno("futimens",_("Failed to set modification time"));
+   }
+   Res.Size = To.FileSize();
+   To.Close();
 
    if (stat(Itm->DestFile.c_str(),&Buf) != 0)
       return _error->Errno("stat",_("Failed to stat"));
-   
+
    // Return a Done response
    Res.LastModified = Buf.st_mtime;
-   Res.Size = Buf.st_size;
    Res.TakeHashes(Hash);
 
    URIDone(Res);
-   
    return true;
 }
 									/*}}}*/