From 060520597180db9f9d31392dcb024cc9c1296bdf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 21 Feb 2015 16:58:21 +0100
Subject: [PATCH] xbps: merge patch from master to restore file timestamps as
 regular user.

---
 srcpkgs/xbps-static/template                  |  2 +-
 ...-timestamps-while-unpacking-as-regul.patch | 41 +++++++++++++++++++
 srcpkgs/xbps/template                         |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xbps/patches/0010-Restore-pkg-file-timestamps-while-unpacking-as-regul.patch

diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index 687a1f42da6..5b7d7b3ff4c 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -3,7 +3,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
 version=0.43.1
-revision=8
+revision=9
 build_style=configure
 short_desc="The XBPS package system utilities - static binaries"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/xbps/patches/0010-Restore-pkg-file-timestamps-while-unpacking-as-regul.patch b/srcpkgs/xbps/patches/0010-Restore-pkg-file-timestamps-while-unpacking-as-regul.patch
new file mode 100644
index 00000000000..6a0fa13ef26
--- /dev/null
+++ b/srcpkgs/xbps/patches/0010-Restore-pkg-file-timestamps-while-unpacking-as-regul.patch
@@ -0,0 +1,41 @@
+From ae8ce645421962402b046cd2a34c27aa3c38609a Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@gmail.com>
+Date: Sat, 21 Feb 2015 16:52:27 +0100
+Subject: [PATCH] Restore pkg file timestamps while unpacking as regular user.
+
+Requested by @dominikh.
+---
+ NEWS                                 |  3 +++
+ include/xbps_api_impl.h              | 10 +++++-----
+ tests/xbps/xbps-create/basic_test.sh | 25 +++++++++++++++++++++++++
+ 3 files changed, 33 insertions(+), 5 deletions(-)
+
+diff --git a/include/xbps_api_impl.h b/include/xbps_api_impl.h
+index b177bf8..a9fb07c 100644
+--- include/xbps_api_impl.h
++++ include/xbps_api_impl.h
+@@ -1,5 +1,5 @@
+ /*-
+- * Copyright (c) 2010-2014 Juan Romero Pardines.
++ * Copyright (c) 2010-2015 Juan Romero Pardines.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -46,10 +46,10 @@
+ #include "compat.h"
+ 
+ #define EXTRACT_FLAGS	ARCHIVE_EXTRACT_SECURE_NODOTDOT | \
+-			ARCHIVE_EXTRACT_SECURE_SYMLINKS
+-#define FEXTRACT_FLAGS	ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | \
+-			ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_UNLINK | \
+-			EXTRACT_FLAGS
++			ARCHIVE_EXTRACT_SECURE_SYMLINKS | \
++			ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_PERM | \
++			ARCHIVE_EXTRACT_UNLINK
++#define FEXTRACT_FLAGS	ARCHIVE_EXTRACT_OWNER | EXTRACT_FLAGS
+ 
+ #ifndef __UNCONST
+ #define __UNCONST(a)	((void *)(unsigned long)(const void *)(a))
+-- 
+2.3.0
+
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 00f1d1e768f..a8c222a2108 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.43.1
-revision=8
+revision=9
 bootstrap=yes
 build_style=configure
 short_desc="The XBPS package system utilities"