[pkgsrc/trunk]: pkgsrc/sysutils/bup Add patch to avoid buggy utimensat on Net...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6aa1ed50e03d
branches:  trunk
changeset: 632209:6aa1ed50e03d
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Mar 19 17:50:00 2014 +0000

description:
Add patch to avoid buggy utimensat on NetBSD 6.

diffstat:

 sysutils/bup/Makefile                          |   4 ++--
 sysutils/bup/distinfo                          |   4 ++--
 sysutils/bup/patches/patch-lib_bup___helpers.c |  26 +++++++++++++++++++++++---
 3 files changed, 27 insertions(+), 7 deletions(-)

diffs (75 lines):

diff -r 1e880d1861e8 -r 6aa1ed50e03d sysutils/bup/Makefile
--- a/sysutils/bup/Makefile     Wed Mar 19 16:44:08 2014 +0000
+++ b/sysutils/bup/Makefile     Wed Mar 19 17:50:00 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2014/03/19 13:15:13 gdt Exp $
+# $NetBSD: Makefile,v 1.16 2014/03/19 17:50:00 gdt Exp $
 
 DISTNAME=      bup-0.25
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  # manually packaged since master site is git repository
 # and only available via https
diff -r 1e880d1861e8 -r 6aa1ed50e03d sysutils/bup/distinfo
--- a/sysutils/bup/distinfo     Wed Mar 19 16:44:08 2014 +0000
+++ b/sysutils/bup/distinfo     Wed Mar 19 17:50:00 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2014/03/19 13:15:13 gdt Exp $
+$NetBSD: distinfo,v 1.6 2014/03/19 17:50:00 gdt Exp $
 
 SHA1 (bup-0.25.tar.gz) = f32ba39582d0e8875632f282c54f7377ed2a4df9
 RMD160 (bup-0.25.tar.gz) = d578dc87330c49090c25a212d6c5fe4561c8ad0c
@@ -8,4 +8,4 @@
 Size (bup-man-0.25.zip) = 40779 bytes
 SHA1 (patch-Makefile) = b37a1f2d584c987430e948c5c04d97def8a5334c
 SHA1 (patch-config_configure) = 9360a8be2cef559d93f1a5301f1f397f31da7d72
-SHA1 (patch-lib_bup___helpers.c) = e803ede14d59d28b97f11bfe5d1536ddc21b999f
+SHA1 (patch-lib_bup___helpers.c) = df146a325e4ca912552f09176a605c26267cfe8b
diff -r 1e880d1861e8 -r 6aa1ed50e03d sysutils/bup/patches/patch-lib_bup___helpers.c
--- a/sysutils/bup/patches/patch-lib_bup___helpers.c    Wed Mar 19 16:44:08 2014 +0000
+++ b/sysutils/bup/patches/patch-lib_bup___helpers.c    Wed Mar 19 17:50:00 2014 +0000
@@ -1,4 +1,9 @@
-$NetBSD: patch-lib_bup___helpers.c,v 1.1 2014/03/19 13:15:13 gdt Exp $
+$NetBSD: patch-lib_bup___helpers.c,v 1.2 2014/03/19 17:50:00 gdt Exp $
+
+First and third hunks are from upstream.
+
+Second hunk is to work around broken utimensat in NetBSD 6.
+Should be applied upstream.
 
 --- lib/bup/_helpers.c.orig    2013-12-10 01:30:45.000000000 +0000
 +++ lib/bup/_helpers.c
@@ -11,7 +16,22 @@
  
  static PyObject *selftest(PyObject *self, PyObject *args)
  {
-@@ -990,6 +992,9 @@ static int normalize_timespec_values(con
+@@ -763,6 +765,14 @@ static PyObject *bup_set_linux_file_attr
+ #endif /* def BUP_HAVE_FILE_ATTRS */
+ 
+ 
++/*
++ * Check for defective UTIMENSAT support (NetBSD 6), and if so,
++ * pretend we don't have it.
++ */
++#if !defined(AT_FDCWD) || !defined(AT_SYMLINK_NOFOLLOW)
++#undef HAVE_UTIMENSAT
++#endif
++
+ #if defined(HAVE_UTIMENSAT) || defined(HAVE_FUTIMES) || defined(HAVE_LUTIMES)
+ 
+ static int bup_parse_xutime_args(char **path,
+@@ -990,6 +1000,9 @@ static int normalize_timespec_values(con
      (((x) >= 0) ? PyLong_FromUnsignedLongLong(x) : PyLong_FromLongLong(x))
  
  
@@ -21,7 +41,7 @@
  static PyObject *stat_struct_to_py(const struct stat *st,
                                     const char *filename,
                                     int fd)
-@@ -1028,6 +1033,7 @@ static PyObject *stat_struct_to_py(const
+@@ -1028,6 +1041,7 @@ static PyObject *stat_struct_to_py(const
                           (long) ctime_ns);
  }