summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-12-07 15:15:53 +0000
committerjoerg <joerg@pkgsrc.org>2011-12-07 15:15:53 +0000
commitbaf891bb2e28b7b3232900aa2577883de7bce017 (patch)
tree637a959f9ab804d741f4a42c5991060018875b7b
parent42ed1b02a0a68cf3f95c1a6ebebffbc5b4f8e833 (diff)
downloadpkgsrc-baf891bb2e28b7b3232900aa2577883de7bce017.tar.gz
Fix merge error
-rw-r--r--devel/eet/Makefile3
-rw-r--r--devel/eet/distinfo4
-rw-r--r--devel/eet/patches/patch-aa6
3 files changed, 7 insertions, 6 deletions
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index f00baeabb0f..b52176d06c6 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2011/12/05 17:20:14 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2011/12/07 15:15:53 joerg Exp $
#
DISTNAME= eet-1.5.0
+PKGREVISION= 1
CATEGORIES= devel archivers
MASTER_SITES= http://download.enlightenment.org/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index 5bfab5b3f44..0bc3f923126 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2011/12/05 17:20:14 joerg Exp $
+$NetBSD: distinfo,v 1.10 2011/12/07 15:15:53 joerg Exp $
SHA1 (eet-1.5.0.tar.bz2) = 7c4156ab5459f58ca1db6b87f3640b7243ca238b
RMD160 (eet-1.5.0.tar.bz2) = 85febf450bacea32a280abd9937b321fbd223108
Size (eet-1.5.0.tar.bz2) = 518901 bytes
-SHA1 (patch-aa) = a77c8cbe3ae143d89c654893fe9ff058991a0168
+SHA1 (patch-aa) = 3915ca93e3310900850ff499d141460295d3046b
diff --git a/devel/eet/patches/patch-aa b/devel/eet/patches/patch-aa
index f626a47cd68..8ad65d575a0 100644
--- a/devel/eet/patches/patch-aa
+++ b/devel/eet/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2011/12/05 17:20:14 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2011/12/07 15:15:53 joerg Exp $
--- src/lib/eet_cipher.c.orig 2011-11-21 02:09:15.000000000 +0000
+++ src/lib/eet_cipher.c
-@@ -407,8 +407,19 @@ on_error:
+@@ -407,8 +407,18 @@ on_error:
dh = EVP_PKEY_get1_DH(key->private_key);
if (dh)
{
+ BIO *b;
fprintf(out, "Private key (DH):\n");
- DHparams_print_fp(out, dh);
+- DHparams_print_fp(out, dh);
+ if ((b=BIO_new(BIO_s_file())) == NULL)
+ {
+ DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB);