From f43bd97f796d2da40d2933fab9889af7dc84e2ee Mon Sep 17 00:00:00 2001 From: shannonjr Date: Wed, 23 Aug 2006 10:51:25 +0000 Subject: 1) Fixed problem where 64-bit minimums are set using 32-bit arithmetic 2) PLIST correction --- security/libprelude/PLIST | 5 ++++- security/libprelude/distinfo | 3 ++- security/libprelude/patches/patch-ad | 31 +++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 security/libprelude/patches/patch-ad diff --git a/security/libprelude/PLIST b/security/libprelude/PLIST index 69f32be2015..60c1c38d18f 100644 --- a/security/libprelude/PLIST +++ b/security/libprelude/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2006/08/17 11:31:40 shannonjr Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/08/23 10:51:25 shannonjr Exp $ bin/libprelude-config bin/prelude-adduser include/libprelude/common.h @@ -102,6 +102,9 @@ share/examples/libprelude/client.conf share/examples/libprelude/global.conf share/examples/libprelude/idmef-client.conf share/examples/libprelude/tls.conf +${PYSITELIB}/_prelude.so +${PYSITELIB}/prelude.py +${PYSITELIB}/prelude.pyc @dirrm share/examples/libprelude @dirrm share/doc/libprelude @dirrm include/libprelude diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo index c8274469399..7390f18788e 100644 --- a/security/libprelude/distinfo +++ b/security/libprelude/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2006/08/17 11:31:40 shannonjr Exp $ +$NetBSD: distinfo,v 1.12 2006/08/23 10:51:25 shannonjr Exp $ SHA1 (libprelude-0.9.10.1.tar.gz) = 4172c790a403c11eff06a8fc7d6cc73d9e3e30e0 RMD160 (libprelude-0.9.10.1.tar.gz) = d8b07a88b0ff8a57d49aac80d07d515e3cab6a15 @@ -6,3 +6,4 @@ Size (libprelude-0.9.10.1.tar.gz) = 1788966 bytes SHA1 (patch-aa) = 1d788517feb2ef687777ae6640033d9f177b07f8 SHA1 (patch-ab) = 592f42a6d9217c502eb49e8fb0ba7d17a49f2ada SHA1 (patch-ac) = 9cb75b90f961fd75faca146881d70262a3cf7d1c +SHA1 (patch-ad) = e590779a4158cb1daef40cf4e00e262b9549120d diff --git a/security/libprelude/patches/patch-ad b/security/libprelude/patches/patch-ad new file mode 100644 index 00000000000..4f8081d7449 --- /dev/null +++ b/security/libprelude/patches/patch-ad @@ -0,0 +1,31 @@ +$NetBSD: patch-ad,v 1.3 2006/08/23 10:51:25 shannonjr Exp $ + +--- ./bindings/python/_prelude.c.orig 2006-07-25 07:30:30.000000000 -0600 ++++ ./bindings/python/_prelude.c +@@ -49118,7 +49118,7 @@ SWIGEXPORT void SWIG_init(void) { + PyDict_SetItemString(d,"PRELUDE_INT32_MIN", SWIG_From_int((int)((-2147483647-1)))); + } + { +- PyDict_SetItemString(d,"PRELUDE_INT64_MIN", SWIG_From_long((long)((-9223372036854775807L-1)))); ++ PyDict_SetItemString(d,"PRELUDE_INT64_MIN", PyLong_FromLongLong((long long)((-9223372036854775807LL-1)))); + } + { + PyDict_SetItemString(d,"PRELUDE_INT8_MAX", SWIG_From_int((int)((127)))); +@@ -49130,7 +49130,7 @@ SWIGEXPORT void SWIG_init(void) { + PyDict_SetItemString(d,"PRELUDE_INT32_MAX", SWIG_From_int((int)((2147483647)))); + } + { +- PyDict_SetItemString(d,"PRELUDE_INT64_MAX", SWIG_From_long((long)((9223372036854775807L)))); ++ PyDict_SetItemString(d,"PRELUDE_INT64_MAX", PyLong_FromLongLong((long long)((9223372036854775807LL)))); + } + { + PyDict_SetItemString(d,"PRELUDE_UINT8_MAX", SWIG_From_int((int)((255)))); +@@ -49142,7 +49142,7 @@ SWIGEXPORT void SWIG_init(void) { + PyDict_SetItemString(d,"PRELUDE_UINT32_MAX", SWIG_From_unsigned_SS_int((unsigned int)((4294967295U)))); + } + { +- PyDict_SetItemString(d,"PRELUDE_UINT64_MAX", SWIG_From_unsigned_SS_long((unsigned long)((18446744073709551615UL)))); ++ PyDict_SetItemString(d,"PRELUDE_UINT64_MAX", PyLong_FromUnsignedLongLong((unsigned long long)((18446744073709551615ULL)))); + } + PyDict_SetItemString(d,"PRELUDE_PRId64", SWIG_FromCharPtr("ld")); + PyDict_SetItemString(d,"PRELUDE_PRIi64", SWIG_FromCharPtr("li")); -- cgit v1.2.3