diff options
| author | gdt <gdt@pkgsrc.org> | 2014-03-19 17:50:00 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2014-03-19 17:50:00 +0000 |
| commit | ee4d1dcbe25ac0e42a2b578c09150a20c6119c45 (patch) | |
| tree | 0039883d34548c7a7e04a6ca878c4f5a8e986afb /sysutils | |
| parent | 3e0dd8c380cb33bb4e634f29344d604a15ec8171 (diff) | |
| download | pkgsrc-ee4d1dcbe25ac0e42a2b578c09150a20c6119c45.tar.gz | |
Add patch to avoid buggy utimensat on NetBSD 6.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/bup/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/bup/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/bup/patches/patch-lib_bup___helpers.c | 26 |
3 files changed, 27 insertions, 7 deletions
diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile index f2ed31db7bc..fe079a13b2e 100644 --- a/sysutils/bup/Makefile +++ b/sysutils/bup/Makefile @@ -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 --git a/sysutils/bup/distinfo b/sysutils/bup/distinfo index ea99b4957bb..fc0368b71a6 100644 --- a/sysutils/bup/distinfo +++ b/sysutils/bup/distinfo @@ -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 @@ RMD160 (bup-man-0.25.zip) = 8d023cc394ae006ec1a24924176d72a52208558f 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 --git a/sysutils/bup/patches/patch-lib_bup___helpers.c b/sysutils/bup/patches/patch-lib_bup___helpers.c index a0bb6235d11..f05d1cfacd1 100644 --- a/sysutils/bup/patches/patch-lib_bup___helpers.c +++ b/sysutils/bup/patches/patch-lib_bup___helpers.c @@ -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 @@ $NetBSD: patch-lib_bup___helpers.c,v 1.1 2014/03/19 13:15:13 gdt Exp $ 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 @@ $NetBSD: patch-lib_bup___helpers.c,v 1.1 2014/03/19 13:15:13 gdt Exp $ 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); } |