summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2004-07-06 22:31:10 +0000
committerwiz <wiz@pkgsrc.org>2004-07-06 22:31:10 +0000
commitbf5019b589f8960778a64b8a947a0c84b5574c24 (patch)
tree23c87013fde45b304aa5dee05c11064c1cd15ac8 /comms
parenta0b0e370e1b66c5b6226582024eec19b2cdc4cf4 (diff)
downloadpkgsrc-bf5019b589f8960778a64b8a947a0c84b5574c24.tar.gz
Make build on -current and with openssl-0.9.6*.
Closes PR 26089 by Michael van Elst.
Diffstat (limited to 'comms')
-rw-r--r--comms/jpilot/distinfo4
-rw-r--r--comms/jpilot/patches/patch-ab12
2 files changed, 10 insertions, 6 deletions
diff --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo
index 58d583180ea..35378777129 100644
--- a/comms/jpilot/distinfo
+++ b/comms/jpilot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2004/06/27 21:10:40 wiz Exp $
+$NetBSD: distinfo,v 1.13 2004/07/06 22:31:10 wiz Exp $
SHA1 (jpilot-0.99.5.tar.gz) = 357807f50edb301db81ab9f7aaedcb5541e86eec
Size (jpilot-0.99.5.tar.gz) = 1033716 bytes
SHA1 (patch-aa) = f24450c6851f295163fa5440a6d60009466d33fc
-SHA1 (patch-ab) = 8de4a495141b6c3c7003cea5cbcedbbfd6929663
+SHA1 (patch-ab) = 23314c3f0bf01a30bdd6e61ff01d7545be154391
SHA1 (patch-ad) = e1e7ce9e7cc1bd1e901f6763799cdfd03f3cd605
diff --git a/comms/jpilot/patches/patch-ab b/comms/jpilot/patches/patch-ab
index 65f6faba57c..bf929dac22f 100644
--- a/comms/jpilot/patches/patch-ab
+++ b/comms/jpilot/patches/patch-ab
@@ -1,13 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2003/10/20 12:16:40 hubertf Exp $
+$NetBSD: patch-ab,v 1.7 2004/07/06 22:31:10 wiz Exp $
--- KeyRing/keyring.c.orig 2002-12-25 07:19:04.000000000 +0100
+++ KeyRing/keyring.c
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,12 @@
/* Opensll header files */
#include <openssl/md5.h>
--#include <openssl/des.h>
-+#include <kerberosIV/des.h>
++#include <openssl/opensslv.h>
++#if OPENSSL_VERSION_NUMBER < 0x0090700fL
+ #include <openssl/des.h>
++#else
++#include <des.h>
++#endif
#include "libplugin.h"