diff options
| -rw-r--r-- | security/Makefile | 1 | ||||
| -rw-r--r-- | security/nettle/Makefile | 12 | ||||
| -rw-r--r-- | security/nettle/distinfo | 6 | ||||
| -rw-r--r-- | security/nettle/files/patch-Makefile.in | 10 | ||||
| -rw-r--r-- | security/nettle/files/patch-configure | 11 | ||||
| -rw-r--r-- | security/nettle/files/patch-examples_nettle-openssl.c | 13 | ||||
| -rw-r--r-- | security/nettle/pkg-plist | 41 | ||||
| -rw-r--r-- | security/nettle2/Makefile | 51 | ||||
| -rw-r--r-- | security/nettle2/distinfo | 3 | ||||
| -rw-r--r-- | security/nettle2/files/patch-Makefile.in | 23 | ||||
| -rw-r--r-- | security/nettle2/files/patch-nettle2.info | 11 | ||||
| -rw-r--r-- | security/nettle2/pkg-descr | 6 | ||||
| -rw-r--r-- | security/nettle2/pkg-plist | 74 |
13 files changed, 34 insertions, 228 deletions
diff --git a/security/Makefile b/security/Makefile index 478d67e02e3d..0f310a9e1a06 100644 --- a/security/Makefile +++ b/security/Makefile @@ -301,7 +301,6 @@ SUBDIR += nessus-plugins SUBDIR += netpgp SUBDIR += nettle - SUBDIR += nettle2 SUBDIR += newpki-client SUBDIR += newpki-lib SUBDIR += newpki-server diff --git a/security/nettle/Makefile b/security/nettle/Makefile index d92a6a72ca2f..4549949d9f64 100644 --- a/security/nettle/Makefile +++ b/security/nettle/Makefile @@ -1,4 +1,5 @@ # ex:ts=8 +# ex:ts=8 # New ports collection makefile for: nettle # Date created: Dec 6, 2001 # Whom: ijliao @@ -7,8 +8,7 @@ # PORTNAME= nettle -PORTVERSION= 1.15 -PORTREVISION= 2 +PORTVERSION= 2.0 CATEGORIES= security MASTER_SITES= http://www.lysator.liu.se/~nisse/archive/ \ ftp://ftp.lysator.liu.se/pub/security/lsh/ @@ -23,20 +23,20 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" CONFIGURE_ARGS= --enable-shared + LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -DOCS= NEWS README TODO nettle.html +DOCS= NEWS README TODO nettle.html nettle.pdf EXAMPLES= examples/*.c examples/*.h INFO= nettle -post-extract: - @${RM} -f ${WRKSRC}/nettle.info* - post-install: +.if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} +.endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} diff --git a/security/nettle/distinfo b/security/nettle/distinfo index f67158cfbbd7..5dbc8e58ff04 100644 --- a/security/nettle/distinfo +++ b/security/nettle/distinfo @@ -1,3 +1,3 @@ -MD5 (nettle-1.15.tar.gz) = 6b0fd004359660b65ff3eca77b3d5fa6 -SHA256 (nettle-1.15.tar.gz) = d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac -SIZE (nettle-1.15.tar.gz) = 829862 +MD5 (nettle-2.0.tar.gz) = d813bc76b1042d76100efbc6a955d7df +SHA256 (nettle-2.0.tar.gz) = 65b9e230b953bfb075f10473917e216df9b825fc325b88f69cdf756ffa17cbd6 +SIZE (nettle-2.0.tar.gz) = 883732 diff --git a/security/nettle/files/patch-Makefile.in b/security/nettle/files/patch-Makefile.in deleted file mode 100644 index a46bc2fb063b..000000000000 --- a/security/nettle/files/patch-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig Tue Nov 1 09:34:09 2005 -+++ Makefile.in Tue Nov 1 09:34:24 2005 -@@ -221,7 +221,6 @@ - $(INSTALL_PROGRAM) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE) - [ -z "$(SHLIBSONAME)" ] \ - || (cd $(DESTDIR)$(libdir) \ -- && ln -sf $(SHLIBFILE) $(SHLIBSONAME) \ - && ln -sf $(SHLIBFILE) $(SHLIBFORLINK) ) - - install-info: nettle.info diff --git a/security/nettle/files/patch-configure b/security/nettle/files/patch-configure deleted file mode 100644 index dceae170135b..000000000000 --- a/security/nettle/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Nov 1 09:35:20 2005 -+++ configure Tue Nov 1 09:36:28 2005 -@@ -2990,7 +2990,7 @@ - *) - SHLIBFORLINK=libnettle.so - SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)' -- SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)' -+ SHLIBFILE='$(SHLIBSONAME)' - SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)' - # FIXME: It might make some sense to link with -lgmp - SHLIBLIBS='' diff --git a/security/nettle/files/patch-examples_nettle-openssl.c b/security/nettle/files/patch-examples_nettle-openssl.c deleted file mode 100644 index 985dabbf146c..000000000000 --- a/security/nettle/files/patch-examples_nettle-openssl.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- examples/nettle-openssl.c.orig -+++ examples/nettle-openssl.c -@@ -35,6 +35,7 @@ - #define NCOMPAT - #define OPENSSL_DISABLE_OLD_DES_SUPPORT - -+#include <sys/types.h> - #include <assert.h> - - #include <openssl/aes.h> diff --git a/security/nettle/pkg-plist b/security/nettle/pkg-plist index af66fcaaa691..709bfbf0dadd 100644 --- a/security/nettle/pkg-plist +++ b/security/nettle/pkg-plist @@ -37,26 +37,35 @@ include/nettle/sexp.h include/nettle/sha.h include/nettle/twofish.h include/nettle/yarrow.h -@dirrm include/nettle +lib/libhogweed.a +lib/libhogweed.so +lib/libhogweed.so.1 +lib/libhogweed.so.1.0 lib/libnettle.a lib/libnettle.so -lib/libnettle.so.2 +lib/libnettle.so.3 +lib/libnettle.so.3.0 %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/nettle.html +%%PORTDOCS%%%%DOCSDIR%%/nettle.pdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eratosthenes.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt1.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-benchmark.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-openssl.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/next-prime.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/read_rsa_key.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-decrypt.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-encrypt.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-keygen.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-session.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-sign.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-verify.c +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%EXAMPLESDIR%%/getopt.c -%%EXAMPLESDIR%%/getopt.h -%%EXAMPLESDIR%%/getopt1.c -%%EXAMPLESDIR%%/io.c -%%EXAMPLESDIR%%/io.h -%%EXAMPLESDIR%%/nettle-benchmark.c -%%EXAMPLESDIR%%/nettle-openssl.c -%%EXAMPLESDIR%%/rsa-decrypt.c -%%EXAMPLESDIR%%/rsa-encrypt.c -%%EXAMPLESDIR%%/rsa-keygen.c -%%EXAMPLESDIR%%/rsa-session.h -%%EXAMPLESDIR%%/rsa-sign.c -%%EXAMPLESDIR%%/rsa-verify.c -@dirrm %%EXAMPLESDIR%% +@dirrm include/nettle diff --git a/security/nettle2/Makefile b/security/nettle2/Makefile deleted file mode 100644 index 3f7bbbf9ee1d..000000000000 --- a/security/nettle2/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# ex:ts=8 -# New ports collection makefile for: nettle2 -# Date created: 13 Sep 2009 -# Whom: corky1951@comcast.net -# -# $FreeBSD$ -# - -PORTNAME= nettle2 -PORTVERSION= 2.0 -CATEGORIES= security -MASTER_SITES= http://www.lysator.liu.se/~nisse/archive/ \ - ftp://ftp.lysator.liu.se/pub/security/lsh/ -DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} - -MAINTAINER= corky1951@comcast.net -COMMENT= A low-level cryptographic library - -LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 - -USE_GMAKE= yes -USE_OPENSSL= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" -CONFIGURE_ARGS= --enable-shared \ - --includedir=${PREFIX}/include/${DISTNAME} \ - --bindir=${PREFIX}/bin/${DISTNAME} \ - --libdir=${PREFIX}/lib/${DISTNAME} - -LDFLAGS+= -L${LOCALBASE}/lib -USE_LDCONFIG= yes - -DOCS= NEWS README TODO nettle.html nettle.pdf -EXAMPLES= examples/*.c examples/*.h - -INFO= nettle2 - -post-extract: - @${MV} ${WRKSRC}/nettle.info ${WRKSRC}/nettle2.info - -post-install: -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/security/nettle2/distinfo b/security/nettle2/distinfo deleted file mode 100644 index 5dbc8e58ff04..000000000000 --- a/security/nettle2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (nettle-2.0.tar.gz) = d813bc76b1042d76100efbc6a955d7df -SHA256 (nettle-2.0.tar.gz) = 65b9e230b953bfb075f10473917e216df9b825fc325b88f69cdf756ffa17cbd6 -SIZE (nettle-2.0.tar.gz) = 883732 diff --git a/security/nettle2/files/patch-Makefile.in b/security/nettle2/files/patch-Makefile.in deleted file mode 100644 index 4beadec89ad5..000000000000 --- a/security/nettle2/files/patch-Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ ---- Makefile.in.orig 2009-09-12 23:27:08.000000000 -0700 -+++ Makefile.in 2009-09-12 23:29:42.000000000 -0700 -@@ -26,7 +26,7 @@ - TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) shadata$(EXEEXT) \ - $(LIBTARGETS) @IF_SHARED@ $(SHLIBTARGETS) - --DOCTARGETS = nettle.info nettle.html nettle.pdf -+DOCTARGETS = nettle2.info nettle.html nettle.pdf - - all check install uninstall: - $(MAKE) $@-here -@@ -277,9 +277,9 @@ - # installed. But it seems most make programs don't set $<, $^, $? and - # friends for ordinary explicit rules. - --install-info: nettle.info -+install-info: nettle2.info - $(MKDIR_P) $(DESTDIR)$(infodir) -- f=nettle.info ; \ -+ f=nettle2.info ; \ - [ -f $$f ] || f="$(srcdir)/$$f" ; \ - $(INSTALL_DATA) "$$f" $(DESTDIR)$(infodir) ; \ - if (install-info --version && \ diff --git a/security/nettle2/files/patch-nettle2.info b/security/nettle2/files/patch-nettle2.info deleted file mode 100644 index e36ad4a23fe8..000000000000 --- a/security/nettle2/files/patch-nettle2.info +++ /dev/null @@ -1,11 +0,0 @@ ---- nettle2.info.orig 2009-06-08 11:27:11.000000000 -0700 -+++ nettle2.info 2009-09-13 10:54:29.000000000 -0700 -@@ -12,7 +12,7 @@ - - INFO-DIR-SECTION Encryption - START-INFO-DIR-ENTRY --* Nettle: (nettle). A low-level cryptographic library. -+* Nettle2: (nettle2). A low-level cryptographic library. - END-INFO-DIR-ENTRY - - diff --git a/security/nettle2/pkg-descr b/security/nettle2/pkg-descr deleted file mode 100644 index e9e262fcac2d..000000000000 --- a/security/nettle2/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Nettle is a cryptographic library that is designed to fit easily in more or -less any context: In crypto toolkits for object-oriented languages (C++, -Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel -space. - -WWW: http://www.lysator.liu.se/~nisse/nettle/ diff --git a/security/nettle2/pkg-plist b/security/nettle2/pkg-plist deleted file mode 100644 index f8a6ac7e01dc..000000000000 --- a/security/nettle2/pkg-plist +++ /dev/null @@ -1,74 +0,0 @@ -bin/nettle-2.0/nettle-lfib-stream -bin/nettle-2.0/pkcs1-conv -bin/nettle-2.0/sexp-conv -include/nettle-2.0/nettle/aes.h -include/nettle-2.0/nettle/arcfour.h -include/nettle-2.0/nettle/arctwo.h -include/nettle-2.0/nettle/asn1.h -include/nettle-2.0/nettle/base16.h -include/nettle-2.0/nettle/base64.h -include/nettle-2.0/nettle/bignum.h -include/nettle-2.0/nettle/blowfish.h -include/nettle-2.0/nettle/buffer.h -include/nettle-2.0/nettle/cast128.h -include/nettle-2.0/nettle/cbc.h -include/nettle-2.0/nettle/ctr.h -include/nettle-2.0/nettle/des-compat.h -include/nettle-2.0/nettle/des.h -include/nettle-2.0/nettle/dsa.h -include/nettle-2.0/nettle/hmac.h -include/nettle-2.0/nettle/knuth-lfib.h -include/nettle-2.0/nettle/macros.h -include/nettle-2.0/nettle/md2.h -include/nettle-2.0/nettle/md4.h -include/nettle-2.0/nettle/md5-compat.h -include/nettle-2.0/nettle/md5.h -include/nettle-2.0/nettle/memxor.h -include/nettle-2.0/nettle/nettle-meta.h -include/nettle-2.0/nettle/nettle-stdint.h -include/nettle-2.0/nettle/nettle-types.h -include/nettle-2.0/nettle/pgp.h -include/nettle-2.0/nettle/pkcs1.h -include/nettle-2.0/nettle/realloc.h -include/nettle-2.0/nettle/rsa-compat.h -include/nettle-2.0/nettle/rsa.h -include/nettle-2.0/nettle/serpent.h -include/nettle-2.0/nettle/sexp.h -include/nettle-2.0/nettle/sha.h -include/nettle-2.0/nettle/twofish.h -include/nettle-2.0/nettle/yarrow.h -lib/nettle-2.0/libhogweed.a -lib/nettle-2.0/libhogweed.so -lib/nettle-2.0/libhogweed.so.1 -lib/nettle-2.0/libhogweed.so.1.0 -lib/nettle-2.0/libnettle.a -lib/nettle-2.0/libnettle.so -lib/nettle-2.0/libnettle.so.3 -lib/nettle-2.0/libnettle.so.3.0 -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/nettle.html -%%PORTDOCS%%%%DOCSDIR%%/nettle.pdf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eratosthenes.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt1.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-benchmark.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-openssl.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/next-prime.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/read_rsa_key.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-decrypt.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-encrypt.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-keygen.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-session.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-sign.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-verify.c -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm lib/nettle-2.0 -@dirrm include/nettle-2.0/nettle -@dirrm include/nettle-2.0 -@dirrm bin/nettle-2.0 |