- update to 0.7.0

This commit is contained in:
jasper 2011-04-12 10:42:25 +00:00
parent 89aab539ec
commit 08d2039d4b
7 changed files with 52 additions and 88 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2011/04/11 14:52:30 kili Exp $
# $OpenBSD: Makefile,v 1.3 2011/04/12 10:42:25 jasper Exp $
COMMENT= certificates and Key Reader/Writer
DISTNAME= certificate-0.3.2
REVISION= 0
DISTNAME= certificate-0.7.0
CATEGORIES= security
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
@ -19,8 +18,7 @@ MODULES= lang/ghc
MODGHC_BUILD = cabal hackage haddock register
RUN_DEPENDS = devel/hs-base64-bytestring \
devel/hs-binary>=0.5 \
security/hs-asn1-data>=0.2
hs-asn1-data->=0.4.6,<0.5.0:security/hs-asn1-data
BUILD_DEPENDS = ${RUN_DEPENDS}
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (certificate-0.3.2.tar.gz) = F6LIgRiAM7Hx5XqFLiUNrw==
RMD160 (certificate-0.3.2.tar.gz) = tjXOtsqrkCgC0O+FHQj34peaxE0=
SHA1 (certificate-0.3.2.tar.gz) = xq1ykuEXdUMF+gA/kTRKjFZR4Ck=
SHA256 (certificate-0.3.2.tar.gz) = faYFwS/VZlxXeIZNO89alP8GLqM6587/WH5PNooT+vI=
SIZE (certificate-0.3.2.tar.gz) = 7508
MD5 (certificate-0.7.0.tar.gz) = IAMw8oRO8UqbMmDTWl/JpQ==
RMD160 (certificate-0.7.0.tar.gz) = uz4rfqK0cCSjoitzXHnOsZc7S3E=
SHA1 (certificate-0.7.0.tar.gz) = 3sFpaobK8uR9Rm1uXv52Erijefg=
SHA256 (certificate-0.7.0.tar.gz) = UEiBNCsuK9Ttnnfw+jsBwsQ7fBQ8iuoCmxv1PsAtha8=
SIZE (certificate-0.7.0.tar.gz) = 11368

View File

@ -1,11 +1,17 @@
@comment $OpenBSD: PLIST,v 1.2 2011/04/11 14:52:30 kili Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/04/12 10:42:25 jasper Exp $
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/Data/
lib/ghc/${DISTNAME}/Data/Certificate/
lib/ghc/${DISTNAME}/Data/Certificate/Key.hi
lib/ghc/${DISTNAME}/Data/Certificate/KeyDSA.hi
lib/ghc/${DISTNAME}/Data/Certificate/KeyRSA.hi
lib/ghc/${DISTNAME}/Data/Certificate/PEM.hi
lib/ghc/${DISTNAME}/Data/Certificate/X509.hi
lib/ghc/${DISTNAME}/Data/Certificate/X509Cert.hi
lib/ghc/${DISTNAME}/Data/Certificate/X509Internal.hi
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/System/
lib/ghc/${DISTNAME}/System/Certificate/
lib/ghc/${DISTNAME}/System/Certificate/X509.hi
lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
lib/ghc/${DISTNAME}/register.sh
@exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/register.sh -v0
@ -14,9 +20,12 @@ lib/ghc/${DISTNAME}/unregister.sh
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/html/
share/doc/hs-${DISTNAME}/html/Data-Certificate-Key.html
share/doc/hs-${DISTNAME}/html/Data-Certificate-KeyDSA.html
share/doc/hs-${DISTNAME}/html/Data-Certificate-KeyRSA.html
share/doc/hs-${DISTNAME}/html/Data-Certificate-PEM.html
share/doc/hs-${DISTNAME}/html/Data-Certificate-X509.html
share/doc/hs-${DISTNAME}/html/Data-Certificate-X509Cert.html
share/doc/hs-${DISTNAME}/html/System-Certificate-X509.html
share/doc/hs-${DISTNAME}/html/certificate.haddock
share/doc/hs-${DISTNAME}/html/doc-index.html
share/doc/hs-${DISTNAME}/html/frames.html
@ -24,9 +33,12 @@ share/doc/hs-${DISTNAME}/html/haddock-util.js
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
share/doc/hs-${DISTNAME}/html/mini_Data-Certificate-Key.html
share/doc/hs-${DISTNAME}/html/mini_Data-Certificate-KeyDSA.html
share/doc/hs-${DISTNAME}/html/mini_Data-Certificate-KeyRSA.html
share/doc/hs-${DISTNAME}/html/mini_Data-Certificate-PEM.html
share/doc/hs-${DISTNAME}/html/mini_Data-Certificate-X509.html
share/doc/hs-${DISTNAME}/html/mini_Data-Certificate-X509Cert.html
share/doc/hs-${DISTNAME}/html/mini_System-Certificate-X509.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2011/04/11 14:52:30 kili Exp $
# $OpenBSD: Makefile,v 1.3 2011/04/12 10:43:04 jasper Exp $
COMMENT= fast, pure, practical collection of crypto hashes
DISTNAME= cryptohash-0.6.1
REVISION= 0
DISTNAME= cryptohash-0.7.0
CATEGORIES= security
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
@ -21,7 +20,7 @@ MODGHC_BUILD = cabal hackage haddock register
MODGHC_SETUP_CONF_ARGS = -f cryptoapi
RUN_DEPENDS = devel/hs-tagged \
security/hs-crypto-api
security/hs-crypto-api>=0.5
BUILD_DEPENDS = ${RUN_DEPENDS}
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (cryptohash-0.6.1.tar.gz) = QBOcJ4YgAH/nx4QAUAUPow==
RMD160 (cryptohash-0.6.1.tar.gz) = 77f+W+TmG00nz9xmV+bP7OpZals=
SHA1 (cryptohash-0.6.1.tar.gz) = 1QlJ+QgEq2cQsoA8NCusj2yk5Y8=
SHA256 (cryptohash-0.6.1.tar.gz) = 6T60YqvSXC5uoaEqKk73Q+CSILd1qJnznTjznpgzOoo=
SIZE (cryptohash-0.6.1.tar.gz) = 38444
MD5 (cryptohash-0.7.0.tar.gz) = hF3VvAo9BgIewAPMnsPMpw==
RMD160 (cryptohash-0.7.0.tar.gz) = 7RWqlLyTIxOMlyKsCjSZABTF9U0=
SHA1 (cryptohash-0.7.0.tar.gz) = FY4aPzY/88O0yl5lJSKa1xxNf8s=
SHA256 (cryptohash-0.7.0.tar.gz) = 1RKIPXfHCWFLlZV89j0LPQFBZ55RK/meFdk1Finynu4=
SIZE (cryptohash-0.7.0.tar.gz) = 38002

View File

@ -1,15 +1,15 @@
$OpenBSD: patch-cbits_bitfn_h,v 1.2 2010/12/12 20:43:41 jasper Exp $
$OpenBSD: patch-cbits_bitfn_h,v 1.3 2011/04/12 10:43:04 jasper Exp $
- Don't redefine swap32/swap64.
--- cbits/bitfn.h.orig Mon Nov 1 23:27:34 2010
+++ cbits/bitfn.h Sun Dec 12 21:40:45 2010
--- cbits/bitfn.h.orig Tue Apr 12 12:34:26 2011
+++ cbits/bitfn.h Tue Apr 12 12:36:53 2011
@@ -30,14 +30,17 @@
/**********************************************************/
# if (defined(__i386__))
# define ARCH_HAS_SWAP32
+# ifndef swap32
static inline uint32_t swap32(uint32_t a)
static inline uint32_t bitfn_swap32(uint32_t a)
{
asm ("bswap %0" : "=r" (a) : "0" (a));
return a;
@ -19,10 +19,10 @@ $OpenBSD: patch-cbits_bitfn_h,v 1.2 2010/12/12 20:43:41 jasper Exp $
# elif (defined(__arm__))
# define ARCH_HAS_SWAP32
+# ifndef swap32
static inline uint32_t swap32(uint32_t a)
static inline uint32_t bitfn_swap32(uint32_t a)
{
uint32_t tmp = a;
@@ -48,22 +51,25 @@ static inline uint32_t swap32(uint32_t a)
@@ -48,22 +51,28 @@ static inline uint32_t bitfn_swap32(uint32_t a)
: "=r" (a), "=r" (tmp) : "0" (a), "1" (tmp));
return a;
}
@ -32,47 +32,37 @@ $OpenBSD: patch-cbits_bitfn_h,v 1.2 2010/12/12 20:43:41 jasper Exp $
# define ARCH_HAS_SWAP32
# define ARCH_HAS_SWAP64
+# ifndef swap32
static inline uint32_t swap32(uint32_t a)
static inline uint32_t bitfn_swap32(uint32_t a)
{
asm ("bswap %0" : "=r" (a) : "0" (a));
return a;
}
-
+# endif
+# ifndef swap64
static inline uint64_t swap64(uint64_t a)
+
static inline uint64_t bitfn_swap64(uint64_t a)
{
asm ("bswap %0" : "=r" (a) : "0" (a));
return a;
}
-
+# endif
# endif
#endif /* NO_INLINE_ASM */
/**********************************************************/
@@ -111,6 +117,7 @@ static inline void array_swap32(uint32_t *d, uint32_t
@@ -111,12 +120,14 @@ static inline void array_swap32(uint32_t *d, uint32_t
}
#endif
+#ifndef swap64
#ifndef ARCH_HAS_SWAP64
static inline uint64_t swap64(uint64_t a)
static inline uint64_t bitfn_swap64(uint64_t a)
{
@@ -118,6 +125,7 @@ static inline uint64_t swap64(uint64_t a)
(((uint64_t) swap32((uint32_t) a)) << 32);
return ((uint64_t) bitfn_swap32((uint32_t) (a >> 32))) |
(((uint64_t) bitfn_swap32((uint32_t) a)) << 32);
}
#endif
+#endif
#endif
#ifndef ARCH_HAS_ARRAY_SWAP64
static inline void array_swap64(uint64_t *d, uint64_t *s, uint32_t nb)
@@ -161,7 +169,8 @@ static inline void array_copy64(uint64_t *d, uint64_t
#ifdef __MINGW32__
# define LITTLE_ENDIAN 1234
# define BYTE_ORDER LITTLE_ENDIAN
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+ # include <sys/types.h>
# include <sys/endian.h>
#elif defined(__APPLE__)
# include <machine/endian.h>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2011/04/11 14:52:30 kili Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/04/12 10:43:05 jasper Exp $
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/Crypto/
lib/ghc/${DISTNAME}/Crypto/Hash/
@ -11,23 +11,10 @@ lib/ghc/${DISTNAME}/Crypto/Hash/SHA224.hi
lib/ghc/${DISTNAME}/Crypto/Hash/SHA256.hi
lib/ghc/${DISTNAME}/Crypto/Hash/SHA384.hi
lib/ghc/${DISTNAME}/Crypto/Hash/SHA512.hi
lib/ghc/${DISTNAME}/Crypto/Hash/SHA512t.hi
lib/ghc/${DISTNAME}/Crypto/Hash/Skein256.hi
lib/ghc/${DISTNAME}/Crypto/Hash/Skein512.hi
lib/ghc/${DISTNAME}/Crypto/Hash/Tiger.hi
lib/ghc/${DISTNAME}/Data/
lib/ghc/${DISTNAME}/Data/CryptoHash/
lib/ghc/${DISTNAME}/Data/CryptoHash/MD2.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/MD4.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/MD5.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/RIPEMD160.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/SHA1.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/SHA224.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/SHA256.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/SHA384.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/SHA512.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/Skein256.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/Skein512.hi
lib/ghc/${DISTNAME}/Data/CryptoHash/Tiger.hi
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
lib/ghc/${DISTNAME}/register.sh
@ -46,21 +33,10 @@ share/doc/hs-${DISTNAME}/html/Crypto-Hash-SHA224.html
share/doc/hs-${DISTNAME}/html/Crypto-Hash-SHA256.html
share/doc/hs-${DISTNAME}/html/Crypto-Hash-SHA384.html
share/doc/hs-${DISTNAME}/html/Crypto-Hash-SHA512.html
share/doc/hs-${DISTNAME}/html/Crypto-Hash-SHA512t.html
share/doc/hs-${DISTNAME}/html/Crypto-Hash-Skein256.html
share/doc/hs-${DISTNAME}/html/Crypto-Hash-Skein512.html
share/doc/hs-${DISTNAME}/html/Crypto-Hash-Tiger.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-MD2.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-MD4.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-MD5.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-RIPEMD160.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-SHA1.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-SHA224.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-SHA256.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-SHA384.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-SHA512.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-Skein256.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-Skein512.html
share/doc/hs-${DISTNAME}/html/Data-CryptoHash-Tiger.html
share/doc/hs-${DISTNAME}/html/cryptohash.haddock
share/doc/hs-${DISTNAME}/html/doc-index.html
share/doc/hs-${DISTNAME}/html/frames.html
@ -77,21 +53,10 @@ share/doc/hs-${DISTNAME}/html/mini_Crypto-Hash-SHA224.html
share/doc/hs-${DISTNAME}/html/mini_Crypto-Hash-SHA256.html
share/doc/hs-${DISTNAME}/html/mini_Crypto-Hash-SHA384.html
share/doc/hs-${DISTNAME}/html/mini_Crypto-Hash-SHA512.html
share/doc/hs-${DISTNAME}/html/mini_Crypto-Hash-SHA512t.html
share/doc/hs-${DISTNAME}/html/mini_Crypto-Hash-Skein256.html
share/doc/hs-${DISTNAME}/html/mini_Crypto-Hash-Skein512.html
share/doc/hs-${DISTNAME}/html/mini_Crypto-Hash-Tiger.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-MD2.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-MD4.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-MD5.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-RIPEMD160.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-SHA1.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-SHA224.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-SHA256.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-SHA384.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-SHA512.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-Skein256.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-Skein512.html
share/doc/hs-${DISTNAME}/html/mini_Data-CryptoHash-Tiger.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif