Update to eet-1.5.0. Includes various performance and memory foot print improvements.diff -r1.19 -r1.20 pkgsrc/devel/eet/Makefile
(joerg)
@@ -1,27 +1,34 @@ | @@ -1,27 +1,34 @@ | |||
1 | # $NetBSD: Makefile,v 1.19 2010/12/23 11:44:26 dsainty Exp $ | 1 | # $NetBSD: Makefile,v 1.20 2011/12/05 17:20:14 joerg Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= eet-1.2.3 | 4 | DISTNAME= eet-1.5.0 | |
5 | PKGREVISION= 2 | |||
6 | CATEGORIES= devel archivers | 5 | CATEGORIES= devel archivers | |
7 | MASTER_SITES= http://download.enlightenment.org/releases/ | 6 | MASTER_SITES= http://download.enlightenment.org/releases/ | |
8 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
9 | 8 | |||
10 | MAINTAINER= yazzy@yazzy.org | 9 | MAINTAINER= joerg@NetBSD.org | |
11 | HOMEPAGE= http://www.enlightenment.org/ | 10 | HOMEPAGE= http://www.enlightenment.org/ | |
12 | COMMENT= Library for speedy storage, retrieval, and compression | 11 | COMMENT= Library for speedy storage, retrieval, and compression | |
13 | 12 | |||
13 | LICENSE= 2-clause-bsd | |||
14 | ||||
14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 15 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
15 | PKG_DESTDIR_SUPPORT= user-destdir | 16 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 17 | |||
17 | USE_TOOLS+= pkg-config | 18 | USE_TOOLS+= pkg-config | |
18 | GNU_CONFIGURE= YES | 19 | GNU_CONFIGURE= YES | |
19 | USE_LIBTOOL= YES | 20 | USE_LIBTOOL= YES | |
20 | 21 | |||
21 | PKGCONFIG_OVERRIDE= eet.pc.in | 22 | PKGCONFIG_OVERRIDE= eet.pc.in | |
22 | 23 | |||
24 | INSTALLATION_DIRS= share/doc/eet | |||
25 | ||||
26 | post-install: | |||
27 | ${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/AUTHORS \ | |||
28 | ${DESTDIR}${PREFIX}/share/doc/eet | |||
29 | ||||
23 | .include "../../devel/eina/buildlink3.mk" | 30 | .include "../../devel/eina/buildlink3.mk" | |
24 | .include "../../devel/zlib/buildlink3.mk" | 31 | .include "../../devel/zlib/buildlink3.mk" | |
25 | .include "../../mk/jpeg.buildlink3.mk" | 32 | .include "../../mk/jpeg.buildlink3.mk" | |
26 | .include "../../security/openssl/buildlink3.mk" | 33 | .include "../../security/openssl/buildlink3.mk" | |
27 | .include "../../mk/bsd.pkg.mk" | 34 | .include "../../mk/bsd.pkg.mk" |
@@ -1,5 +1,14 @@ | @@ -1,5 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2008/06/22 01:21:31 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2011/12/05 17:20:14 joerg Exp $ | |
2 | bin/eet | 2 | bin/eet | |
3 | include/Eet.h | 3 | include/eet-1/Eet.h | |
4 | lib/libeet.la | 4 | lib/libeet.la | |
5 | lib/pkgconfig/eet.pc | 5 | lib/pkgconfig/eet.pc | |
6 | share/doc/eet/AUTHORS | |||
7 | share/doc/eet/COPYING | |||
8 | share/eet/examples/eet-basic.c | |||
9 | share/eet/examples/eet-data-cipher_decipher.c | |||
10 | share/eet/examples/eet-data-file_descriptor_01.c | |||
11 | share/eet/examples/eet-data-file_descriptor_02.c | |||
12 | share/eet/examples/eet-data-nested.c | |||
13 | share/eet/examples/eet-data-simple.c | |||
14 | share/eet/examples/eet-file.c |
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:26 dsainty Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.16 2011/12/05 17:20:14 joerg Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= eet | 3 | BUILDLINK_TREE+= eet | |
4 | 4 | |||
5 | .if !defined(EET_BUILDLINK3_MK) | 5 | .if !defined(EET_BUILDLINK3_MK) | |
6 | EET_BUILDLINK3_MK:= | 6 | EET_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.eet+= eet>=1.0.1 | 8 | BUILDLINK_API_DEPENDS.eet+= eet>=1.5.0 | |
9 | BUILDLINK_ABI_DEPENDS.eet?= eet>=1.2.3nb2 | |||
10 | BUILDLINK_PKGSRCDIR.eet?= ../../devel/eet | 9 | BUILDLINK_PKGSRCDIR.eet?= ../../devel/eet | |
11 | 10 | |||
12 | .include "../../devel/eina/buildlink3.mk" | 11 | .include "../../devel/eina/buildlink3.mk" | |
13 | .include "../../devel/zlib/buildlink3.mk" | 12 | .include "../../devel/zlib/buildlink3.mk" | |
14 | .include "../../mk/jpeg.buildlink3.mk" | 13 | .include "../../mk/jpeg.buildlink3.mk" | |
15 | .include "../../security/openssl/buildlink3.mk" | 14 | .include "../../security/openssl/buildlink3.mk" | |
16 | .endif # EET_BUILDLINK3_MK | 15 | .endif # EET_BUILDLINK3_MK | |
17 | 16 | |||
18 | BUILDLINK_TREE+= -eet | 17 | BUILDLINK_TREE+= -eet |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2009/12/16 21:28:26 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.9 2011/12/05 17:20:14 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (eet-1.2.3.tar.bz2) = 10d49e3fc07c17fa5b52bd87d0ab42edc88c6286 | 3 | SHA1 (eet-1.5.0.tar.bz2) = 7c4156ab5459f58ca1db6b87f3640b7243ca238b | |
4 | RMD160 (eet-1.2.3.tar.bz2) = b33dd25268748fa1f05f76142839962f5b4fbc73 | 4 | RMD160 (eet-1.5.0.tar.bz2) = 85febf450bacea32a280abd9937b321fbd223108 | |
5 | Size (eet-1.2.3.tar.bz2) = 3653700 bytes | 5 | Size (eet-1.5.0.tar.bz2) = 518901 bytes | |
6 | SHA1 (patch-aa) = eef0835cab54ce6ca751b6131457cf8365deda39 | 6 | SHA1 (patch-aa) = a77c8cbe3ae143d89c654893fe9ff058991a0168 |
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2009/06/10 06:40:11 minskim Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2011/12/05 17:20:14 joerg Exp $ | |
2 | 2 | |||
3 | --- src/lib/eet_cipher.c.orig 2009-04-18 09:24:20.000000000 -0700 | 3 | --- src/lib/eet_cipher.c.orig 2011-11-21 02:09:15.000000000 +0000 | |
4 | +++ src/lib/eet_cipher.c | 4 | +++ src/lib/eet_cipher.c | |
5 | @@ -315,8 +315,18 @@ eet_identity_print(Eet_Key *key, FILE *o | 5 | @@ -407,8 +407,19 @@ on_error: | |
6 | dh = EVP_PKEY_get1_DH(key->private_key); | 6 | dh = EVP_PKEY_get1_DH(key->private_key); | |
7 | if (dh) | 7 | if (dh) | |
8 | { | 8 | { | |
9 | + BIO *b; | 9 | + BIO *b; | |
10 | fprintf(out, "Private key (DH):\n"); | 10 | fprintf(out, "Private key (DH):\n"); | |
11 | - DHparams_print_fp(out, dh); | 11 | DHparams_print_fp(out, dh); | |
12 | + if ((b=BIO_new(BIO_s_file())) == NULL) | 12 | + if ((b=BIO_new(BIO_s_file())) == NULL) | |
13 | + { | 13 | + { | |
14 | + DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB); | 14 | + DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB); | |
15 | + } | 15 | + } | |
16 | + else | 16 | + else | |
17 | + { | 17 | + { | |
18 | + BIO_set_fp(b, out, BIO_NOCLOSE); | 18 | + BIO_set_fp(b, out, BIO_NOCLOSE); | |
19 | + DHparams_print(b, dh); | 19 | + DHparams_print(b, dh); | |
20 | + BIO_free(b); | 20 | + BIO_free(b); | |
21 | + } | 21 | + } | |
22 | } | 22 | } | |
23 | 23 | |||
24 | fprintf(out, "Public certificate:\n"); | 24 | fprintf(out, "Public certificate:\n"); |