diff options
author | drochner <drochner> | 2011-07-08 11:47:28 +0000 |
---|---|---|
committer | drochner <drochner> | 2011-07-08 11:47:28 +0000 |
commit | 5933f863544898de8ca47e6abb62ae3732f09bc3 (patch) | |
tree | 8de301e4dd3e6dadc511bacac754fcf64f3c230d | |
parent | f167cda8b33fe76a99b0f7a7fde47ad286740268 (diff) | |
download | pkgsrc-5933f863544898de8ca47e6abb62ae3732f09bc3.tar.gz |
depend on libgcrypt explicitely
(gnutls used to pull it in for us, but this will be cleaned up)
also remove an assumption about time_t size which fails on NetBSD-current
-rw-r--r-- | security/libprelude/Makefile | 3 | ||||
-rw-r--r-- | security/libprelude/distinfo | 3 | ||||
-rw-r--r-- | security/libprelude/patches/patch-am | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile index d6fd00ae5ba..139bc3be887 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2011/04/22 13:42:43 obache Exp $ +# $NetBSD: Makefile,v 1.42 2011/07/08 11:47:28 drochner Exp $ # COMMENT= LibPrelude libraries and c++ easy bindings @@ -27,5 +27,6 @@ CFLAGS= -O0 -ggdb .include "../../devel/libltdl/convenience.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../security/gnutls/libgnutls-config.mk" +.include "../../security/libgcrypt/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo index ceecda1502a..e2e34a118c1 100644 --- a/security/libprelude/distinfo +++ b/security/libprelude/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2009/12/18 12:33:25 hasso Exp $ +$NetBSD: distinfo,v 1.33 2011/07/08 11:47:28 drochner Exp $ SHA1 (libprelude-0.9.24.1.tar.gz) = b8c0c43efb33f3da741feac59b7a5482adf56282 RMD160 (libprelude-0.9.24.1.tar.gz) = 0a2688cf5c44e834c07eaba36d333155b2ca226d @@ -14,3 +14,4 @@ SHA1 (patch-ai) = 53a16f270a9048f74849c0cd02b517e821bdf08a SHA1 (patch-aj) = e4019c1a71ecdf33540d603ba2e0ba09bd2b6f7b SHA1 (patch-ak) = d5ba7700db11bee688d56e1b92f3663e6637237d SHA1 (patch-al) = a3c150d76c91e33703d9ee05cd32e5d6f7b1264a +SHA1 (patch-am) = 5581c999105a5d3b616e090afc105781e66eb888 diff --git a/security/libprelude/patches/patch-am b/security/libprelude/patches/patch-am new file mode 100644 index 00000000000..f8b3afba90d --- /dev/null +++ b/security/libprelude/patches/patch-am @@ -0,0 +1,15 @@ +$NetBSD: patch-am,v 1.1 2011/07/08 11:47:28 drochner Exp $ + +--- libmissing/mktime.c.orig 2009-05-12 07:49:42.000000000 +0000 ++++ libmissing/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); ++#if 0 + verify (long_int_year_and_yday_are_wide_enough, + INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); ++#endif + + /* Compute intervening leap days correctly even if year is negative. + Take care to avoid integer overflow here. */ |