diff options
| author | tnn <tnn@pkgsrc.org> | 2009-06-17 08:40:57 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-06-17 08:40:57 +0000 |
| commit | 86e22b43e2b21d218c2174b440e6e12710c8f33b (patch) | |
| tree | f5fa6ecbb7713f0aec91489d9def576ec81a2efd /net/lftp | |
| parent | f9f991357cdd1b615832a5b35b8f224752d76a26 (diff) | |
| download | pkgsrc-86e22b43e2b21d218c2174b440e6e12710c8f33b.tar.gz | |
Add companion patch to previous commit.
Fix build on NetBSD-current/i386 by papering over a build time assertion.
(Probably due to 64-bit time_t.)
Diffstat (limited to 'net/lftp')
| -rw-r--r-- | net/lftp/distinfo | 3 | ||||
| -rw-r--r-- | net/lftp/patches/patch-ag | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/net/lftp/distinfo b/net/lftp/distinfo index 0bd80c0a7ee..4931d9f1473 100644 --- a/net/lftp/distinfo +++ b/net/lftp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2009/06/17 08:34:07 tnn Exp $ +$NetBSD: distinfo,v 1.46 2009/06/17 08:40:57 tnn Exp $ SHA1 (lftp-3.7.14.tar.bz2) = b36819aa9624057f1c9067867579c2ac509c72e7 RMD160 (lftp-3.7.14.tar.bz2) = b6c7bfc5d33b607203afa6784c2db5ece6d2716b @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 32e1fba23d4d6bd0b06bacbe503cb9b39d2bf825 SHA1 (patch-ad) = a8a335baf0c9a2a89c58c7395c879d2e8b0c4407 SHA1 (patch-ae) = 3ee418b94cc1afb7b2db5bc550fd966d346368a4 SHA1 (patch-af) = 69c414ab28cbdfb86e4981fb7eaa7985b8384838 +SHA1 (patch-ag) = 9eda126e106cee0cae6be691ad8bece921c9c0a9 diff --git a/net/lftp/patches/patch-ag b/net/lftp/patches/patch-ag new file mode 100644 index 00000000000..7db1886168a --- /dev/null +++ b/net/lftp/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1 2009/06/17 08:40:57 tnn Exp $ + +--- lib/mktime.c.orig 2009-01-16 08:58:41.000000000 +0100 ++++ lib/mktime.c +@@ -165,8 +165,10 @@ ydhms_diff (long int year1, long int yda + int year0, int yday0, int hour0, int min0, int sec0) + { + verify (C99_integer_division, -1 / 2 == 0); ++/* This assertion fails on NetBSD-current/i386 due to 64-bit time_t + verify (long_int_year_and_yday_are_wide_enough, + INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); ++*/ + + /* Compute intervening leap days correctly even if year is negative. + Take care to avoid integer overflow here. */ |