aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2012-12-20 02:23:04 +0000
committerGabor Pali <pgj@FreeBSD.org>2012-12-20 02:23:04 +0000
commitf6f83c9efc2c46d2970746758e2c682bb8a518ec (patch)
tree290f2ea61305744bf0f477895c56b92acaeb361f /security
parentaf071cfdc1f8578bd1523b823e683074a3139a34 (diff)
downloadports-f6f83c9efc2c46d2970746758e2c682bb8a518ec.tar.gz
ports-f6f83c9efc2c46d2970746758e2c682bb8a518ec.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/Makefile1
-rw-r--r--security/hs-Crypto/Makefile10
-rw-r--r--security/hs-Crypto/distinfo4
-rw-r--r--security/hs-Crypto/pkg-descr2
-rw-r--r--security/hs-HsOpenSSL/Makefile7
-rw-r--r--security/hs-HsOpenSSL/distinfo4
-rw-r--r--security/hs-HsOpenSSL/pkg-descr2
-rw-r--r--security/hs-RSA/Makefile12
-rw-r--r--security/hs-RSA/distinfo4
-rw-r--r--security/hs-RSA/pkg-descr2
-rw-r--r--security/hs-SHA/Makefile10
-rw-r--r--security/hs-SHA/distinfo4
-rw-r--r--security/hs-SHA/pkg-descr2
-rw-r--r--security/hs-certificate/Makefile16
-rw-r--r--security/hs-certificate/distinfo4
-rw-r--r--security/hs-certificate/pkg-descr2
-rw-r--r--security/hs-cipher-aes/Makefile15
-rw-r--r--security/hs-cipher-aes/distinfo2
-rw-r--r--security/hs-cipher-aes/pkg-descr13
-rw-r--r--security/hs-clientsession/Makefile8
-rw-r--r--security/hs-clientsession/distinfo4
-rw-r--r--security/hs-clientsession/pkg-descr2
-rw-r--r--security/hs-cprng-aes/Makefile12
-rw-r--r--security/hs-cprng-aes/distinfo4
-rw-r--r--security/hs-cprng-aes/pkg-descr2
-rw-r--r--security/hs-crypto-api/Makefile7
-rw-r--r--security/hs-crypto-api/pkg-descr2
-rw-r--r--security/hs-crypto-conduit/Makefile10
-rw-r--r--security/hs-crypto-conduit/distinfo4
-rw-r--r--security/hs-crypto-conduit/pkg-descr2
-rw-r--r--security/hs-crypto-pubkey-types/Makefile10
-rw-r--r--security/hs-crypto-pubkey-types/distinfo4
-rw-r--r--security/hs-crypto-pubkey-types/pkg-descr2
-rw-r--r--security/hs-cryptocipher/Makefile9
-rw-r--r--security/hs-cryptocipher/distinfo4
-rw-r--r--security/hs-cryptocipher/pkg-descr2
-rw-r--r--security/hs-cryptohash/Makefile8
-rw-r--r--security/hs-cryptohash/distinfo4
-rw-r--r--security/hs-cryptohash/pkg-descr8
-rw-r--r--security/hs-digest/Makefile8
-rw-r--r--security/hs-digest/distinfo4
-rw-r--r--security/hs-digest/pkg-descr2
-rw-r--r--security/hs-entropy/Makefile7
-rw-r--r--security/hs-entropy/pkg-descr2
-rw-r--r--security/hs-monadcryptorandom/Makefile10
-rw-r--r--security/hs-monadcryptorandom/distinfo4
-rw-r--r--security/hs-monadcryptorandom/pkg-descr2
-rw-r--r--security/hs-pem/Makefile7
-rw-r--r--security/hs-pem/pkg-descr2
-rw-r--r--security/hs-pureMD5/Makefile10
-rw-r--r--security/hs-pureMD5/distinfo4
-rw-r--r--security/hs-pureMD5/pkg-descr5
-rw-r--r--security/hs-pwstore-fast/Makefile9
-rw-r--r--security/hs-pwstore-fast/distinfo4
-rw-r--r--security/hs-pwstore-fast/pkg-descr2
-rw-r--r--security/hs-skein/Makefile8
-rw-r--r--security/hs-skein/distinfo4
-rw-r--r--security/hs-skein/pkg-descr2
-rw-r--r--security/hs-tls-extra/Makefile14
-rw-r--r--security/hs-tls-extra/distinfo4
-rw-r--r--security/hs-tls-extra/pkg-descr2
-rw-r--r--security/hs-tls/Makefile26
-rw-r--r--security/hs-tls/distinfo4
-rw-r--r--security/hs-tls/pkg-descr16
64 files changed, 139 insertions, 247 deletions
diff --git a/security/Makefile b/security/Makefile
index b691755efb3c..8a6d626ec650 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -190,6 +190,7 @@
SUBDIR += hs-RSA
SUBDIR += hs-SHA
SUBDIR += hs-certificate
+ SUBDIR += hs-cipher-aes
SUBDIR += hs-clientsession
SUBDIR += hs-cprng-aes
SUBDIR += hs-crypto-api
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index 40d91f535e73..94b6c6c72962 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-Crypto
-# Date created: July 5, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= Crypto
-PORTVERSION= 4.2.5
-PORTREVISION= 1
+PORTVERSION= 4.2.5.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +10,7 @@ COMMENT= Collects together existing Haskell cryptographic functions
FILE_LICENSE= ReadMe.tex
CABAL_SETUP= Setup.hs
-USE_CABAL= QuickCheck>=2.4.0.1 HUnit random
+USE_CABAL= HUnit QuickCheck>=2.4.0.1 random
EXECUTABLE= HMACTest QuickTest RSATest SHA1Test SymmetricTest WordListTest
diff --git a/security/hs-Crypto/distinfo b/security/hs-Crypto/distinfo
index 989ac2a02f3c..99ef37f7fdc9 100644
--- a/security/hs-Crypto/distinfo
+++ b/security/hs-Crypto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Crypto-4.2.5.tar.gz) = 68754f0827f067707a1bf3d62f61e2b42f05ebf0c560a31a442a622974446473
-SIZE (cabal/Crypto-4.2.5.tar.gz) = 57486
+SHA256 (cabal/Crypto-4.2.5.1.tar.gz) = 6ad5e0533d0aaaf2f30049d166881a845cc190780798661815da9b4914a0af66
+SIZE (cabal/Crypto-4.2.5.1.tar.gz) = 56474
diff --git a/security/hs-Crypto/pkg-descr b/security/hs-Crypto/pkg-descr
index 55c7064eaa62..e911c81ea9b2 100644
--- a/security/hs-Crypto/pkg-descr
+++ b/security/hs-Crypto/pkg-descr
@@ -3,4 +3,4 @@ Word128, Word192 and Word256 and Beyond, PKCS5 Padding, Various Encryption
Modes e.g. Cipher Block Chaining all in one package, with HUnit and
QuickCheck tests, and examples.
-WWW: http://hackage.haskell.org/package/Crypto
+WWW: http://hackage.haskell.org/package/Crypto
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index 7c2706ae7181..f345db2502a4 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-HsOpenSSL
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= HsOpenSSL
-PORTVERSION= 0.10.3.2
+PORTVERSION= 0.10.3.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-HsOpenSSL/distinfo b/security/hs-HsOpenSSL/distinfo
index 0b09f356191a..5c62f550dc87 100644
--- a/security/hs-HsOpenSSL/distinfo
+++ b/security/hs-HsOpenSSL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HsOpenSSL-0.10.3.2.tar.gz) = ee647a59161b79f32b943878abe65ee7c5a623dfe5af5444cf1b2ac43fa5b496
-SIZE (cabal/HsOpenSSL-0.10.3.2.tar.gz) = 62941
+SHA256 (cabal/HsOpenSSL-0.10.3.3.tar.gz) = 4519afea3bf551ea314247149df4b6bd7db5c56823424e17e2f42d0645b3a211
+SIZE (cabal/HsOpenSSL-0.10.3.3.tar.gz) = 62767
diff --git a/security/hs-HsOpenSSL/pkg-descr b/security/hs-HsOpenSSL/pkg-descr
index 740ce6965371..91b18e5ea9cc 100644
--- a/security/hs-HsOpenSSL/pkg-descr
+++ b/security/hs-HsOpenSSL/pkg-descr
@@ -8,4 +8,4 @@ saner than HsOpenSSL especially for initialisation and error handlings.
So PHO (the initial author of HsOpenSSL) highly encourages you to use
and improve the tls package instead as long as possible.
-WWW: https://github.com/phonohawk/HsOpenSSL
+WWW: https://github.com/phonohawk/HsOpenSSL
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 30aef7812354..11a45a1d0854 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-RSA
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= RSA
-PORTVERSION= 1.2.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.2.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +10,7 @@ COMMENT= Implementation of RSA, using the padding schemes of PKCS#1 v2.1
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= crypto-api>=0.10 crypto-pubkey-types monadcryptorandom SHA
+USE_CABAL= crypto-api>=0.10 crypto-pubkey-types>=0.2 monadcryptorandom SHA
OPTIONS_DEFINE= MD5 BINARY
OPTIONS_DEFAULT= MD5 BINARY
@@ -24,7 +18,7 @@ OPTIONS_DEFAULT= MD5 BINARY
MD5_DESC= Include support for using MD5
BINARY_DESC= Use the binary package for serialization
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MMD5}
CONFIGURE_ARGS+= --flags="IncludeMD5"
diff --git a/security/hs-RSA/distinfo b/security/hs-RSA/distinfo
index 0a358bd288cd..7d51cf257bbb 100644
--- a/security/hs-RSA/distinfo
+++ b/security/hs-RSA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/RSA-1.2.1.0.tar.gz) = 8a053ddce835c5ec75e69147f7522a132c68c21235fb696c7c0d67e2651fa593
-SIZE (cabal/RSA-1.2.1.0.tar.gz) = 12187
+SHA256 (cabal/RSA-1.2.2.0.tar.gz) = 55845a812a48bc8e0764f8ff3e06a58814da32d61105c798bf976a6040b08a74
+SIZE (cabal/RSA-1.2.2.0.tar.gz) = 12208
diff --git a/security/hs-RSA/pkg-descr b/security/hs-RSA/pkg-descr
index 275de8ba78e9..b2bd24f25762 100644
--- a/security/hs-RSA/pkg-descr
+++ b/security/hs-RSA/pkg-descr
@@ -4,4 +4,4 @@ not necessarily the fastest ones on the planet. Particularly key generation.
The algorithms included are based of RFC 3447, or the Public-Key Cryptography
Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).
-WWW: http://hackage.haskell.org/package/RSA
+WWW: http://hackage.haskell.org/package/RSA
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index b696fd0b73a9..e9a51d64de1f 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-SHA
-# Date created: January 8, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= SHA
-PORTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTVERSION= 1.6.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -21,7 +15,7 @@ OPTIONS_DEFINE= EXE
EXE_DESC= Build a SHA2-384 executable similar to 'md5sum'
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
CONFIGURE_ARGS+= --flags="-Test"
diff --git a/security/hs-SHA/distinfo b/security/hs-SHA/distinfo
index 2fa92f4543d2..d849fae1b8a4 100644
--- a/security/hs-SHA/distinfo
+++ b/security/hs-SHA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/SHA-1.5.0.1.tar.gz) = 0f2dd56aee5db5bfbee45ea19a64ddaf8bd2107dbe456bd3b44ea8e92128d2db
-SIZE (cabal/SHA-1.5.0.1.tar.gz) = 2714086
+SHA256 (cabal/SHA-1.6.1.tar.gz) = fdb9924aa31493ad198e3b3498a8204cc7013e0ef86215faf1c4e435a7166aec
+SIZE (cabal/SHA-1.6.1.tar.gz) = 2714264
diff --git a/security/hs-SHA/pkg-descr b/security/hs-SHA/pkg-descr
index 53efdd7237b7..4b4ad15e38e2 100644
--- a/security/hs-SHA/pkg-descr
+++ b/security/hs-SHA/pkg-descr
@@ -5,4 +5,4 @@ and RFC test vectors for the various functions. While some attention has
been paid to performance, these do not presently reach the speed of
well-tuned libraries, like OpenSSL.
-WWW: http://hackage.haskell.org/package/SHA
+WWW: http://hackage.haskell.org/package/SHA
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index c732c661bb31..edfe2000799b 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-certificate
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= certificate
-PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.3.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,17 +11,19 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= asn1-data>=0.6.1.3 crypto-pubkey-types>=0.1 mtl pem>=0.1
+USE_CABAL= asn1-data>=0.7.1 crypto-pubkey-types>=0.1 cryptohash mtl \
+ pem>=0.1
OPTIONS_DEFINE= EXECUTABLE
+OPTIONS_DEFAULT=
EXECUTABLE_DESC= Build the executable
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MEXECUTABLE}
CONFIGURE_ARGS+= --flags="executable"
-USE_CABAL+= cmdargs text>=0.11 cryptohash cryptocipher>=0.3.0
+USE_CABAL+= cmdargs text>=0.11 cryptocipher>=0.3.0
EXECUTABLE+= certificate
.else
CONFIGURE_ARGS+= --flags="-executable"
diff --git a/security/hs-certificate/distinfo b/security/hs-certificate/distinfo
index 5bf49ac92bfc..70d387caa957 100644
--- a/security/hs-certificate/distinfo
+++ b/security/hs-certificate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/certificate-1.2.3.tar.gz) = ea58605935d00b191e6fb31e79cec486129bc527ec19d1c0911b1475c430c476
-SIZE (cabal/certificate-1.2.3.tar.gz) = 13844
+SHA256 (cabal/certificate-1.3.3.tar.gz) = 0267809fa087e14f1097e22895b7566e703ed953c8090ed35bd631d3fa907d10
+SIZE (cabal/certificate-1.3.3.tar.gz) = 14811
diff --git a/security/hs-certificate/pkg-descr b/security/hs-certificate/pkg-descr
index 1aa954888f16..86aed60434e8 100644
--- a/security/hs-certificate/pkg-descr
+++ b/security/hs-certificate/pkg-descr
@@ -2,4 +2,4 @@ Certificates and Key reader/writer. At the moment only X509 certificate
and unencrypted private key are supported, but will include PGP
certificate and pkcs8 private keys.
-WWW: http://github.com/vincenthz/hs-certificate
+WWW: http://github.com/vincenthz/hs-certificate
diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile
new file mode 100644
index 000000000000..67b6ee6eadcf
--- /dev/null
+++ b/security/hs-cipher-aes/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cipher-aes
+PORTVERSION= 0.1.5
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Fast AES cipher implementation with advanced mode of operations
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cipher-aes/distinfo b/security/hs-cipher-aes/distinfo
new file mode 100644
index 000000000000..53143ba658b9
--- /dev/null
+++ b/security/hs-cipher-aes/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cipher-aes-0.1.5.tar.gz) = 760e49b229443a44f36de0bb8a8acdadb2c87791fe5867f26a7a7a0e055e1858
+SIZE (cabal/cipher-aes-0.1.5.tar.gz) = 27390
diff --git a/security/hs-cipher-aes/pkg-descr b/security/hs-cipher-aes/pkg-descr
new file mode 100644
index 000000000000..4cbde4b35121
--- /dev/null
+++ b/security/hs-cipher-aes/pkg-descr
@@ -0,0 +1,13 @@
+Fast AES cipher implementation with advanced mode of operations. The modes
+of operations available are ECB (Electronic code book), CBC (Cipher block
+chaining), CTR (Counter), XTS (XEX with ciphertext stealing), GCM (Galois
+Counter Mode). The AES implementation uses AES-NI when available (on x86
+and x86-64 architecture), but fallback gracefully to a software C
+implementation. The software implementation uses S-Boxes, which might
+suffer for cache timing issues. However do notes that most other known
+software implementations, including very popular one (openssl, gnutls)
+also uses same implementation. If it matters for your case, you should
+make sure you have AES-NI available, or you'll need to use a different
+implementation.
+
+WWW: http://github.com/vincenthz/hs-cipher-aes
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index c04a5389deef..2b231aaed57f 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-clientsession
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= clientsession
-PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTVERSION= 0.8.0.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-clientsession/distinfo b/security/hs-clientsession/distinfo
index c44ca3f6e59f..97266eb163a8 100644
--- a/security/hs-clientsession/distinfo
+++ b/security/hs-clientsession/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/clientsession-0.7.5.tar.gz) = 794748fdc009493a72cd591e8ea3624f2932789f2eaccdbd39a4016d00a65fe0
-SIZE (cabal/clientsession-0.7.5.tar.gz) = 6858
+SHA256 (cabal/clientsession-0.8.0.1.tar.gz) = bbe77263b6c12a3cf72ad3d9c1465deca8d938edb2c6dd159c8a5c3f7909d264
+SIZE (cabal/clientsession-0.8.0.1.tar.gz) = 7024
diff --git a/security/hs-clientsession/pkg-descr b/security/hs-clientsession/pkg-descr
index 5a0cc3f39994..99e7df406587 100644
--- a/security/hs-clientsession/pkg-descr
+++ b/security/hs-clientsession/pkg-descr
@@ -2,4 +2,4 @@ Achieves security through AES-CTR encryption and Skein-MAC-512-256
authentication. Uses Base64 encoding to avoid any issues with
characters.
-WWW: http://github.com/yesodweb/clientsession/tree/master
+WWW: http://github.com/yesodweb/clientsession/tree/master
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index 0ccca95a953b..b193b828259e 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-cprng-aes
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cprng-aes
-PORTVERSION= 0.2.3
-PORTREVISION= 2
+PORTVERSION= 0.2.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,8 +10,8 @@ COMMENT= Crypto Pseudo Random Number Generator using AES
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3.0 crypto-api>=0.8 cryptocipher>=0.2.5 entropy>=0.2 \
- random
+USE_CABAL= cereal>=0.3.0 cipher-aes>=0.1 crypto-api>=0.8 cryptocipher \
+ entropy>=0.2 random
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cprng-aes/distinfo b/security/hs-cprng-aes/distinfo
index 312a61e58b6a..f46175c95e23 100644
--- a/security/hs-cprng-aes/distinfo
+++ b/security/hs-cprng-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cprng-aes-0.2.3.tar.gz) = c35a07a941069e4bc3530f1ca4912a3717b20c62600dfcee3c7c3b35d687d7f7
-SIZE (cabal/cprng-aes-0.2.3.tar.gz) = 3596
+SHA256 (cabal/cprng-aes-0.2.4.tar.gz) = b2688c576c15a936e73f25334ec1202d4a199f13987c2a0d0caa5c73a4276166
+SIZE (cabal/cprng-aes-0.2.4.tar.gz) = 3832
diff --git a/security/hs-cprng-aes/pkg-descr b/security/hs-cprng-aes/pkg-descr
index 4e9630d7c273..085a7fbcbb97 100644
--- a/security/hs-cprng-aes/pkg-descr
+++ b/security/hs-cprng-aes/pkg-descr
@@ -1,4 +1,4 @@
Simple crypto pseudo-random-number-generator with really good randomness
property.
-WWW: http://github.com/vincenthz/hs-cprng-aes
+WWW: http://github.com/vincenthz/hs-cprng-aes
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index 390fb3c78a63..df5c86dbb702 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-crypto-api
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= crypto-api
PORTVERSION= 0.10.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-api/pkg-descr b/security/hs-crypto-api/pkg-descr
index f64fd4a3ff8a..c8b4a72f7dd2 100644
--- a/security/hs-crypto-api/pkg-descr
+++ b/security/hs-crypto-api/pkg-descr
@@ -6,4 +6,4 @@ the Classes module. Any concepts or functions of general use to more
than one cryptographic algorithm (ex: padding) is within scope of this
package.
-WWW: http://trac.haskell.org/crypto-api/wiki
+WWW: http://trac.haskell.org/crypto-api/wiki
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index 66c28dbc9bdf..8b0d26f188d2 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-crypto-conduit
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= crypto-conduit
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.4.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3 conduit>=0.4 crypto-api>=0.9 transformers>=0.2
+USE_CABAL= cereal>=0.3 conduit>=0.5 crypto-api>=0.9 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-conduit/distinfo b/security/hs-crypto-conduit/distinfo
index afa0c91bfae4..72d3f10c9db3 100644
--- a/security/hs-crypto-conduit/distinfo
+++ b/security/hs-crypto-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-conduit-0.3.2.tar.gz) = 2d92fe4200034843772319632e0d5c092aafe5d4f7c2d16109972ec681a1c625
-SIZE (cabal/crypto-conduit-0.3.2.tar.gz) = 6945
+SHA256 (cabal/crypto-conduit-0.4.1.tar.gz) = 9be3468c1a7d8a7c7e2004b1408414c1cc308db2fc3e8a8ca669b98119b7bfbd
+SIZE (cabal/crypto-conduit-0.4.1.tar.gz) = 6954
diff --git a/security/hs-crypto-conduit/pkg-descr b/security/hs-crypto-conduit/pkg-descr
index 6d2112e37e78..3d70763093e3 100644
--- a/security/hs-crypto-conduit/pkg-descr
+++ b/security/hs-crypto-conduit/pkg-descr
@@ -2,4 +2,4 @@ This package contains everything that you need to use a cryptographic
package that supports the crypto-api package using conduits from the
conduit package.
-WWW: https://github.com/meteficha/crypto-conduit
+WWW: https://github.com/meteficha/crypto-conduit
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index 3de98969aef0..16d934a36db2 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-crypto-pubkey-types
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= crypto-pubkey-types
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,5 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= crypto-api>=0.5
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-pubkey-types/distinfo b/security/hs-crypto-pubkey-types/distinfo
index 619685758bb0..6f1057c42934 100644
--- a/security/hs-crypto-pubkey-types/distinfo
+++ b/security/hs-crypto-pubkey-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-pubkey-types-0.1.1.tar.gz) = 2bce552b0aa45f2457e4d6ab369777114465b0a9fba455e64ad0766a03f81432
-SIZE (cabal/crypto-pubkey-types-0.1.1.tar.gz) = 2307
+SHA256 (cabal/crypto-pubkey-types-0.2.0.tar.gz) = b82746801c1bba43173bf26f609245b70111fde6b3d77826b7ce85caba9f3fab
+SIZE (cabal/crypto-pubkey-types-0.2.0.tar.gz) = 2364
diff --git a/security/hs-crypto-pubkey-types/pkg-descr b/security/hs-crypto-pubkey-types/pkg-descr
index af2fce852dae..eab1c8ae32b6 100644
--- a/security/hs-crypto-pubkey-types/pkg-descr
+++ b/security/hs-crypto-pubkey-types/pkg-descr
@@ -1,3 +1,3 @@
Generic cryptography public keys algorithm types.
-WWW: http://github.com/vincenthz/hs-crypto-pubkey-types
+WWW: http://github.com/vincenthz/hs-crypto-pubkey-types
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index 68301998eee3..ac9d1e3a75d5 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-cryptocipher
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cryptocipher
-PORTVERSION= 0.3.5
+PORTVERSION= 0.3.6
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal cpu>=0.1 crypto-api>=0.5 crypto-pubkey-types>=0.1 \
+USE_CABAL= cereal cpu>=0.1 crypto-api>=0.5 crypto-pubkey-types>=0.2 \
primitive tagged vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-cryptocipher/distinfo b/security/hs-cryptocipher/distinfo
index 488d0654b58a..2d2307a208fc 100644
--- a/security/hs-cryptocipher/distinfo
+++ b/security/hs-cryptocipher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptocipher-0.3.5.tar.gz) = 3a25ee19403089a38b4402cd38149c100b2ef6475a1eabc1b42d149a720e0c0b
-SIZE (cabal/cryptocipher-0.3.5.tar.gz) = 46567
+SHA256 (cabal/cryptocipher-0.3.6.tar.gz) = dadc3c6ec17ab05cfa177a901f20b28b93a3e88bf8afe4cf57cd021b01a74a64
+SIZE (cabal/cryptocipher-0.3.6.tar.gz) = 43901
diff --git a/security/hs-cryptocipher/pkg-descr b/security/hs-cryptocipher/pkg-descr
index 61d6e70ca041..f825dbfb4f09 100644
--- a/security/hs-cryptocipher/pkg-descr
+++ b/security/hs-cryptocipher/pkg-descr
@@ -1,3 +1,3 @@
Symmetrical Block, Stream, and PubKey Ciphers.
-WWW: http://github.com/vincenthz/hs-cryptocipher
+WWW: http://github.com/vincenthz/hs-cryptocipher
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index c8b2f6fed56b..3856df03bd5f 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-cryptohash
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cryptohash
-PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTVERSION= 0.7.9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash/distinfo b/security/hs-cryptohash/distinfo
index 16ae388f8e42..9650349b4b7c 100644
--- a/security/hs-cryptohash/distinfo
+++ b/security/hs-cryptohash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptohash-0.7.5.tar.gz) = 0fe7c6a46d9b8c38e0a4756350eeb47a87f7804586d57047978057518598a1a3
-SIZE (cabal/cryptohash-0.7.5.tar.gz) = 39149
+SHA256 (cabal/cryptohash-0.7.9.tar.gz) = 1f264146aac46599ce90151caab21b65ecee7dd15a4122f1ae23653a8b612bdf
+SIZE (cabal/cryptohash-0.7.9.tar.gz) = 59641
diff --git a/security/hs-cryptohash/pkg-descr b/security/hs-cryptohash/pkg-descr
index f60c7732bff3..09fe1ebf7571 100644
--- a/security/hs-cryptohash/pkg-descr
+++ b/security/hs-cryptohash/pkg-descr
@@ -1,8 +1,6 @@
A collection of crypto hashes, with a practical incremental and one-pass,
pure APIs, with performance close to the fastest implementations available
-in others languages.
+in others languages. The implementations are made in C with a haskell FFI
+wrapper that hide the C implementation.
-The implementations are made in C with a haskell FFI wrapper that hide the
-C implementation.
-
-WWW: http://github.com/vincenthz/hs-cryptohash
+WWW: http://github.com/vincenthz/hs-cryptohash
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index 1baa1a644594..42604d59f842 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-digest-ghc
-# Date created: January 22, 2009
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= digest
-PORTVERSION= 0.0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.0.1.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-digest/distinfo b/security/hs-digest/distinfo
index e5d2a836dd9d..567e7d6cbbf8 100644
--- a/security/hs-digest/distinfo
+++ b/security/hs-digest/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/digest-0.0.1.1.tar.gz) = 7bb8b85959cfb3c6539aa2f2104c14aec9758a3a5d6039aba975299fdcd704d4
-SIZE (cabal/digest-0.0.1.1.tar.gz) = 3781
+SHA256 (cabal/digest-0.0.1.2.tar.gz) = 641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11
+SIZE (cabal/digest-0.0.1.2.tar.gz) = 3790
diff --git a/security/hs-digest/pkg-descr b/security/hs-digest/pkg-descr
index 3b66ffa2fdbf..cb183080d59a 100644
--- a/security/hs-digest/pkg-descr
+++ b/security/hs-digest/pkg-descr
@@ -2,4 +2,4 @@ This package provides efficient cryptographic hash implementations for
strict and lazy bytestrings. For now, CRC32 and Adler32 are supported;
they are implemented as FFI bindings to efficient code from zlib.
-WWW: http://hackage.haskell.org/package/digest
+WWW: http://hackage.haskell.org/package/digest
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index 00e91591ce46..ada20191254a 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-entropy
-# Date created: July 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= entropy
PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/pkg-descr b/security/hs-entropy/pkg-descr
index 9446ad8adef8..628e96257a25 100644
--- a/security/hs-entropy/pkg-descr
+++ b/security/hs-entropy/pkg-descr
@@ -3,4 +3,4 @@ A platform independent method to obtain cryptographically strong entropy
for cryptographically strong (number-theoretically sound) PRNGs should
see the DRBG package too!
-WWW: http://trac.haskell.org/crypto-api/wiki
+WWW: http://trac.haskell.org/crypto-api/wiki
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index cb30acb9fac3..86a7f8ba77a7 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-monadcryptorandom
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= monadcryptorandom
-PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTVERSION= 0.5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= A monad for using CryptoRandomGen
LICENSE= BSD
-USE_CABAL= crypto-api>=0.2 mtl>=2.0 transformers>=0.2
+USE_CABAL= crypto-api>=0.2 mtl>=2.0 tagged>=0.2 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-monadcryptorandom/distinfo b/security/hs-monadcryptorandom/distinfo
index 557b944c7007..2d574a5e3a0b 100644
--- a/security/hs-monadcryptorandom/distinfo
+++ b/security/hs-monadcryptorandom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monadcryptorandom-0.4.1.tar.gz) = e169e92973095d009c2775ba998f361662d4c2c41d6661407f6ba44ab2fba307
-SIZE (cabal/monadcryptorandom-0.4.1.tar.gz) = 3938
+SHA256 (cabal/monadcryptorandom-0.5.tar.gz) = 4b70ceb0dee5df63a7c2dde8c77b0002505b6c33382a6075e8b5d6ed5e4d4ba7
+SIZE (cabal/monadcryptorandom-0.5.tar.gz) = 4116
diff --git a/security/hs-monadcryptorandom/pkg-descr b/security/hs-monadcryptorandom/pkg-descr
index 67c1c1b033cc..13394c7ae8f2 100644
--- a/security/hs-monadcryptorandom/pkg-descr
+++ b/security/hs-monadcryptorandom/pkg-descr
@@ -1,3 +1,3 @@
A monad for using CryptoRandomGen.
-WWW: http://trac.haskell.org/crypto-api/wiki
+WWW: https://github.com/TomMD/monadcryptorandom
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 799cf6c8f721..412d22d99ffb 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-pem
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pem
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pem/pkg-descr b/security/hs-pem/pkg-descr
index fab65351ae0a..cf6783557b20 100644
--- a/security/hs-pem/pkg-descr
+++ b/security/hs-pem/pkg-descr
@@ -1,3 +1,3 @@
Privacy Enhanced Mail (PEM) format reader and writer.
-WWW: http://github.com/vincenthz/hs-pem
+WWW: http://github.com/vincenthz/hs-pem
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index baa58982c89a..06e0a5d66352 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-pureMD5
-# Date created: 2010-08-17
-# Whom: Ashish SHUKLA <ashish@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= pureMD5
-PORTVERSION= 2.1.0.3
-PORTREVISION= 2
+PORTVERSION= 2.1.2.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell implementation of MD5 algorithm
+COMMENT= A Haskell-only implementation of MD5 digest (hash) yalgorithm
LICENSE= BSD
diff --git a/security/hs-pureMD5/distinfo b/security/hs-pureMD5/distinfo
index 87dda0c23755..f91dff9b45e3 100644
--- a/security/hs-pureMD5/distinfo
+++ b/security/hs-pureMD5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pureMD5-2.1.0.3.tar.gz) = 3102d2ddd9084faf0a25d168b150aeca02aad9bba62d80f9b8ec13fccdd21472
-SIZE (cabal/pureMD5-2.1.0.3.tar.gz) = 6087
+SHA256 (cabal/pureMD5-2.1.2.1.tar.gz) = 6768174686d5eaef76b487f6f8160a932c48012668fbe542e7aba489134956ff
+SIZE (cabal/pureMD5-2.1.2.1.tar.gz) = 5824
diff --git a/security/hs-pureMD5/pkg-descr b/security/hs-pureMD5/pkg-descr
index 20a9cc538e38..b2e68477642f 100644
--- a/security/hs-pureMD5/pkg-descr
+++ b/security/hs-pureMD5/pkg-descr
@@ -1,3 +1,4 @@
-An unrolled implementation of MD5 purely in Haskell.
+A Haskell-only implementation of the MD5 digest (hash) algorithm. This
+now supports the crypto-api class interface.
-WWW: http://hackage.haskell.org/package/pureMD5
+WWW: http://hackage.haskell.org/package/pureMD5
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index ce87c046a09a..9a2dfd635a43 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-pwstore-fast
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pwstore-fast
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,6 +10,7 @@ COMMENT= Secure password storage
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 random>=1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-pwstore-fast/distinfo b/security/hs-pwstore-fast/distinfo
index ae315517b12c..357088dd3a9a 100644
--- a/security/hs-pwstore-fast/distinfo
+++ b/security/hs-pwstore-fast/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pwstore-fast-2.2.tar.gz) = caa44e13f2746f9cf0efb3b2bf0194064b52675a28d3c14ddc4d31234bde690d
-SIZE (cabal/pwstore-fast-2.2.tar.gz) = 6565
+SHA256 (cabal/pwstore-fast-2.3.tar.gz) = 7cc5f483e3d2e2e5e0c9f0b6f0e91eccc97eb6ed96b7e9ce00e55d0a80259404
+SIZE (cabal/pwstore-fast-2.3.tar.gz) = 6739
diff --git a/security/hs-pwstore-fast/pkg-descr b/security/hs-pwstore-fast/pkg-descr
index 9cd7d764fe0b..d9cb994be0fe 100644
--- a/security/hs-pwstore-fast/pkg-descr
+++ b/security/hs-pwstore-fast/pkg-descr
@@ -5,4 +5,4 @@ Haskell library, pwstore-purehaskell has the exact same API, but uses
only pure Haskell. It is about 25 times slower than this package, but
still quite usable.
-WWW: https://github.com/PeterScott/pwstore
+WWW: https://github.com/PeterScott/pwstore
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index 9cfb15ab670b..ef50324cbe03 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-skein
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= skein
-PORTVERSION= 0.1.0.7
-PORTREVISION= 1
+PORTVERSION= 0.1.0.10
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/distinfo b/security/hs-skein/distinfo
index 3fdc8ccd16df..a2bf2a0269b9 100644
--- a/security/hs-skein/distinfo
+++ b/security/hs-skein/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/skein-0.1.0.7.tar.gz) = e2c5f4b45a2649f78e4e53adb08203f26e3f39a0a34597a06460e078c25dd08f
-SIZE (cabal/skein-0.1.0.7.tar.gz) = 116710
+SHA256 (cabal/skein-0.1.0.10.tar.gz) = 6c269a0f7cfafb2026846b089353fba168257628d84342ceffaa62d2bdf0d163
+SIZE (cabal/skein-0.1.0.10.tar.gz) = 117764
diff --git a/security/hs-skein/pkg-descr b/security/hs-skein/pkg-descr
index 7a3c2ddcd7af..5229e86d9116 100644
--- a/security/hs-skein/pkg-descr
+++ b/security/hs-skein/pkg-descr
@@ -8,4 +8,4 @@ a message authentication code (Skein-MAC).
[1] http://www.skein-hash.info/
-WWW: http://patch-tag.com/r/felipe/skein
+WWW: https://github.com/meteficha/skein
diff --git a/security/hs-tls-extra/Makefile b/security/hs-tls-extra/Makefile
index 8195250b1ece..a02c85e230c6 100644
--- a/security/hs-tls-extra/Makefile
+++ b/security/hs-tls-extra/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-tls-extra
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= tls-extra
-PORTVERSION= 0.4.6
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,9 +11,9 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= certificate>=1.2.0 crypto-api>=0.5 cryptocipher>=0.3.0 \
- cryptohash>=0.6 mtl network>=2.3 pem>=0.1.0 text>=0.5 \
- tls>=0.9.4 vector
+USE_CABAL= certificate>=1.3.0 cipher-aes>=0.1 crypto-api>=0.5 \
+ cryptocipher>=0.3.0 cryptohash>=0.6 mtl network>=2.3 \
+ pem>=0.1.0 text>=0.5 tls>=1.0.0 vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-tls-extra/distinfo b/security/hs-tls-extra/distinfo
index ae37792d1f87..f9556f9308fa 100644
--- a/security/hs-tls-extra/distinfo
+++ b/security/hs-tls-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-extra-0.4.6.tar.gz) = d69a28f0c350e729c46493bbd433e514765051c0f5a3d8f1607e9e6c492c85f6
-SIZE (cabal/tls-extra-0.4.6.tar.gz) = 7790
+SHA256 (cabal/tls-extra-0.5.0.tar.gz) = 28cf154074aa9ed1c5259818b5b54394a5222a230e6b78993c140f2b292ec4e4
+SIZE (cabal/tls-extra-0.5.0.tar.gz) = 8199
diff --git a/security/hs-tls-extra/pkg-descr b/security/hs-tls-extra/pkg-descr
index 5ef31d0472f3..88ac47cafde3 100644
--- a/security/hs-tls-extra/pkg-descr
+++ b/security/hs-tls-extra/pkg-descr
@@ -1,3 +1,3 @@
A set of extra definitions, default values and helpers for the tls.
-WWW: http://github.com/vincenthz/hs-tls-extra
+WWW: http://github.com/vincenthz/hs-tls-extra
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 510a2db20a54..1f7ec25ea6f5 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-tls
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= tls
-PORTVERSION= 0.9.5
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,22 +11,8 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3 certificate>=1.2.0 crypto-api>=0.5 \
- cryptocipher>=0.3.0 cryptohash>=0.6 mtl
-
-OPTIONS_DEFINE= EXECUTABLE
-
-EXECUTABLE_DESC= Build the executables
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+= --flags="executable"
-USE_CABAL+= cmdargs cprng-aes>=0.2.3 network
-EXECUTABLE+= stunnel checkciphers retrievecertificate simpleclient
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-.endif
+USE_CABAL= cereal>=0.3 certificate>=1.3.0 crypto-api>=0.5 \
+ cryptocipher>=0.3.0 cryptohash>=0.6 mtl network
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-tls/distinfo b/security/hs-tls/distinfo
index dae33b41c938..2e8b794a94c2 100644
--- a/security/hs-tls/distinfo
+++ b/security/hs-tls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-0.9.5.tar.gz) = be446af7097014e4827fbff80df7d607a4b3322d1ce69586b08694d87d8d6ed9
-SIZE (cabal/tls-0.9.5.tar.gz) = 32807
+SHA256 (cabal/tls-1.0.2.tar.gz) = e55472857aea73a4ea719604c983dcb0c3e31beb0aa10d0bc1fc3e2213826b3a
+SIZE (cabal/tls-1.0.2.tar.gz) = 46390
diff --git a/security/hs-tls/pkg-descr b/security/hs-tls/pkg-descr
index acdf7dfc3426..b7cd3db8b79c 100644
--- a/security/hs-tls/pkg-descr
+++ b/security/hs-tls/pkg-descr
@@ -1,12 +1,8 @@
Native Haskell TLS and SSL protocol implementation for server and
-client.
+client. This provides a high-level implementation of a sensitive
+security protocol, eliminating a common set of security issues through
+the use of the advanced type system, high level constructions and common
+Haskell features. Currently implement the SSL3.0, TLS1.0, TLS1.1 and
+TLS1.2 protocol, with only RSA supported for Key Exchange.
-This provides a high-level implementation of a sensitive security
-protocol, eliminating a common set of security issues through the use of
-the advanced type system, high level constructions and common Haskell
-features.
-
-Currently implement the SSL3.0, TLS1.0, TLS1.1 and TLS1.2 protocol, with
-only RSA supported for Key Exchange.
-
-WWW: http://github.com/vincenthz/hs-tls
+WWW: http://github.com/vincenthz/hs-tls