diff options
author | arved <arved@FreeBSD.org> | 2007-04-18 00:32:27 +0800 |
---|---|---|
committer | arved <arved@FreeBSD.org> | 2007-04-18 00:32:27 +0800 |
commit | db9e333cc7edc5ab3afc83ac801787a14f4d41f4 (patch) | |
tree | f1207e18a7aa00bfa89a0db1bfa34a2059fc227d /security/matrixssl | |
parent | ddb4f8e925fbfd8c833f8ca9575e13021fe6edc4 (diff) | |
download | freebsd-ports-graphics-db9e333cc7edc5ab3afc83ac801787a14f4d41f4.tar.gz freebsd-ports-graphics-db9e333cc7edc5ab3afc83ac801787a14f4d41f4.tar.zst freebsd-ports-graphics-db9e333cc7edc5ab3afc83ac801787a14f4d41f4.zip |
Update to 1.8.3
Diffstat (limited to 'security/matrixssl')
-rw-r--r-- | security/matrixssl/Makefile | 6 | ||||
-rw-r--r-- | security/matrixssl/distinfo | 6 | ||||
-rw-r--r-- | security/matrixssl/files/patch-Makefile | 76 | ||||
-rw-r--r-- | security/matrixssl/files/patch-examples-sslSocket.h | 18 | ||||
-rw-r--r-- | security/matrixssl/files/patch-os-linux-linux.c | 53 | ||||
-rw-r--r-- | security/matrixssl/files/patch-os-osLayer.h | 11 | ||||
-rw-r--r-- | security/matrixssl/pkg-plist | 6 |
7 files changed, 43 insertions, 133 deletions
diff --git a/security/matrixssl/Makefile b/security/matrixssl/Makefile index 74acf24a241..32cc34de01e 100644 --- a/security/matrixssl/Makefile +++ b/security/matrixssl/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= matrixssl -PORTVERSION= 1.7.3 +PORTVERSION= 1.8.3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles @@ -15,7 +15,7 @@ MAINTAINER= arved@FreeBSD.org COMMENT= Small alternative SSL implementation USE_GMAKE= yes -WRKSRC= ${WRKDIR}/matrixssl/src +WRKSRC= ${WRKDIR}/${DISTNAME}/src INSTALLS_SHLIB= yes do-install: @@ -26,7 +26,7 @@ do-install: ${CP} ${WRKSRC}/../doc/* ${DOCSDIR} ${MKDIR} ${EXAMPLESDIR} ${CP} ${WRKSRC}/../examples/* ${EXAMPLESDIR} - cd ${EXAMPLESDIR}; ${RM} *.vcproj *.sln *.orig + -cd ${EXAMPLESDIR}; ${RM} *.vcproj *.sln *.orig .endif .include <bsd.port.mk> diff --git a/security/matrixssl/distinfo b/security/matrixssl/distinfo index e4a0bc54ec2..67f95c65413 100644 --- a/security/matrixssl/distinfo +++ b/security/matrixssl/distinfo @@ -1,3 +1,3 @@ -MD5 (matrixssl-1-7-3-open.tar.gz) = b80faff3e389000b9a161dda4812112d -SHA256 (matrixssl-1-7-3-open.tar.gz) = 66b60065eb1cc3fc6d98cb161b50ceef4eb48bdccdc919b6773d9bf5b6e44b28 -SIZE (matrixssl-1-7-3-open.tar.gz) = 346585 +MD5 (matrixssl-1-8-3-open.tar.gz) = 1cfc2622b01b5457538c0d8ec58790bf +SHA256 (matrixssl-1-8-3-open.tar.gz) = af0992ff2a07896dfcd128a6fd2f6eb8e1b21bc7aa9a55b4cbdc0b0b2f44f818 +SIZE (matrixssl-1-8-3-open.tar.gz) = 417545 diff --git a/security/matrixssl/files/patch-Makefile b/security/matrixssl/files/patch-Makefile index f3726d4814e..14188cc72dd 100644 --- a/security/matrixssl/files/patch-Makefile +++ b/security/matrixssl/files/patch-Makefile @@ -1,66 +1,10 @@ ---- Makefile.orig Thu Aug 18 02:20:28 2005 -+++ Makefile Fri Mar 17 17:06:22 2006 -@@ -5,11 +5,11 @@ - # Copyright (c) PeerSec Networks, 2002-2005. All Rights Reserved. - # - --CC = gcc - STRIP = strip - AR = ar - RANLIB = ranlib - O = .o -+SOBJ = .O - SO = .so - A = .a - E = -@@ -37,6 +37,26 @@ - pki/rsaPki$(O) \ - pki/x509$(O) - -+SOBJECTS = \ -+ cipherSuite$(SOBJ) \ -+ matrixSsl$(SOBJ) \ -+ sslDecode$(SOBJ) \ -+ sslEncode$(SOBJ) \ -+ sslv3$(SOBJ) \ -+ os/debug$(SOBJ) \ -+ os/linux/linux$(SOBJ) \ -+ crypto/peersec/arc4$(SOBJ) \ -+ crypto/peersec/base64$(SOBJ) \ -+ crypto/peersec/des3$(SOBJ) \ -+ crypto/peersec/md5$(SOBJ) \ -+ crypto/peersec/md2$(SOBJ) \ -+ crypto/peersec/mpi$(SOBJ) \ -+ crypto/peersec/rsa$(SOBJ) \ -+ crypto/peersec/sha1$(SOBJ) \ -+ pki/asn1$(SOBJ) \ -+ pki/rsaPki$(SOBJ) \ -+ pki/x509$(SOBJ) -+ - # - # Debug flags (Define MATRIXSSL_DEBUG in shell to build debug) - # bash: export MATRIXSSL_DEBUG=1 -@@ -69,8 +89,8 @@ - # Compile options - # - SHARED = -shared --CFLAGS = $(DFLAGS) -DLINUX -I./ --LDFLAGS = -lc -lpthread -+CFLAGS += -DLINUX -I./ ${PTHREAD_CFLAGS} -+LDFLAGS += ${PTHREAD_LIBS} - - # - # Override variables for compilation on Mac OS X (Darwin) -@@ -110,7 +130,11 @@ - # - # Build the library - # --$(LIBRARY): $(OBJECTS) -+%.O: %.c -+ $(CC) -c $(CFLAGS) -fPIC -o $@ $^ -+ -+ -+$(LIBRARY): $(SOBJECTS) - $(CC) $(SHARED) -o $@ $^ $(LDFLAGS) - $(STRIP) $(LIBRARY) - +--- Makefile.orig Tue Apr 17 18:14:59 2007 ++++ Makefile Tue Apr 17 18:15:10 2007 +@@ -5,7 +5,6 @@ + # Copyright (c) PeerSec Networks, 2002-2007. All Rights Reserved.
+ #
+
+-CC = gcc
+ STRIP = strip
+ AR = ar
+ RANLIB = ranlib
diff --git a/security/matrixssl/files/patch-examples-sslSocket.h b/security/matrixssl/files/patch-examples-sslSocket.h index 80c8f1c04e6..ded2927f0df 100644 --- a/security/matrixssl/files/patch-examples-sslSocket.h +++ b/security/matrixssl/files/patch-examples-sslSocket.h @@ -1,10 +1,10 @@ ---- ../examples/sslSocket.h.orig Fri Mar 17 16:32:41 2006 -+++ ../examples/sslSocket.h Fri Mar 17 16:32:59 2006 -@@ -50,6 +50,7 @@ - #define getSocketError() WSAGetLastError() - #elif LINUX - #include <sys/socket.h> +--- ../examples/sslSocket.h.orig Tue Apr 17 18:22:16 2007 ++++ ../examples/sslSocket.h Tue Apr 17 18:22:39 2007 +@@ -49,6 +49,7 @@ + #define WOULD_BLOCK WSAEWOULDBLOCK
+ #define getSocketError() WSAGetLastError()
+ #elif LINUX
+ #include <sys/types.h> - #include <netinet/in.h> - #include <netinet/tcp.h> - #include <arpa/inet.h> + #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
diff --git a/security/matrixssl/files/patch-os-linux-linux.c b/security/matrixssl/files/patch-os-linux-linux.c index 82768402897..782f19480ee 100644 --- a/security/matrixssl/files/patch-os-linux-linux.c +++ b/security/matrixssl/files/patch-os-linux-linux.c @@ -1,41 +1,14 @@ ---- os/linux/linux.c.orig Fri Mar 17 16:03:55 2006 -+++ os/linux/linux.c Fri Mar 17 16:04:27 2006 -@@ -39,7 +39,7 @@ - - #include "../osLayer.h" - --#if defined(__i386__) || defined(RDTSC) -+#if (defined(__i386__) || defined(RDTSC))&& !defined(__FreeBSD__) - #include <asm/timex.h> - /* - As defined in asm/timex.h for x386: -@@ -86,7 +86,7 @@ - /* - Initialize times - */ --#if defined(__i386__) || defined(RDTSC) -+#if (defined(__i386__) || defined(RDTSC)) && !defined(__FreeBSD__) - if ((cpuInfo = fopen ("/proc/cpuinfo","r")) == NULL) { - matrixStrDebugMsg("Error opening /proc/cpuinfo\n", NULL); - return -2; +--- os/linux/linux.c.orig Tue Apr 17 18:12:00 2007 ++++ os/linux/linux.c Tue Apr 17 18:13:10 2007 @@ -122,7 +122,11 @@ - #ifdef USE_MULTITHREADING - pthread_mutexattr_init(&attr); - #ifndef OSX -+#ifndef PTHREAD_MUTEX_RECURSIVE_NP -+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -+#else - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); -+#endif /* PTHREAD_MUTEX_RECURSIVE_NP */ - #endif /* !OSX */ - #endif /* USE_MULTITHREADING */ - return psOpenMalloc(MAX_MEMORY_USAGE); -@@ -252,7 +256,7 @@ - /* - Use a platform specific high resolution timer - */ --#if defined(__i386__) || defined(RDTSC) -+#if (defined(__i386__) || defined(RDTSC)) && !defined(__FreeBSD__) - - int32 sslInitMsecs(sslTime_t *t) - { + #ifdef USE_MULTITHREADING
+ pthread_mutexattr_init(&attr);
+ #ifndef OSX
++#ifndef PTHREAD_MUTEX_RECURSIVE_NP
++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
++#else
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
++#endif
+ #endif /* !OSX */
+ #endif /* USE_MULTITHREADING */
+ return psOpenMalloc(MAX_MEMORY_USAGE);
diff --git a/security/matrixssl/files/patch-os-osLayer.h b/security/matrixssl/files/patch-os-osLayer.h deleted file mode 100644 index 4cdcb0423b5..00000000000 --- a/security/matrixssl/files/patch-os-osLayer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- os/osLayer.h.orig Fri Mar 17 16:06:31 2006 -+++ os/osLayer.h Fri Mar 17 16:06:34 2006 -@@ -119,7 +119,7 @@ - long sec; - long usec; - } sslTime_t; --#elif (defined(__i386__) || defined(RDTSC)) -+#elif (defined(__i386__) || defined(RDTSC)) && !defined(__FreeBSD__) - typedef unsigned long long LARGE_INTEGER; - typedef LARGE_INTEGER sslTime_t; - #elif WINCE diff --git a/security/matrixssl/pkg-plist b/security/matrixssl/pkg-plist index 986cc9889f8..aa8d6a788dc 100644 --- a/security/matrixssl/pkg-plist +++ b/security/matrixssl/pkg-plist @@ -2,12 +2,13 @@ include/matrixCommon.h include/matrixSsl.h lib/libmatrixssl.so lib/libmatrixsslstatic.a +%%PORTDOCS%%%%DOCSDIR%%/MatrixSSLReadme.pdf %%PORTDOCS%%%%DOCSDIR%%/MatrixSSLApi.pdf %%PORTDOCS%%%%DOCSDIR%%/MatrixSSLDeveloperGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/MatrixSSLKeyGeneration.pdf %%PORTDOCS%%%%DOCSDIR%%/MatrixSSLPortingGuide.pdf -%%PORTDOCS%%%%DOCSDIR%%/MatrixSSLQuickStart.pdf %%PORTDOCS%%%%DOCSDIR%%/MatrixSSLSocketApi.pdf +%%PORTDOCS%%%%DOCSDIR%%/MatrixSSL1.8ReleaseNotes.pdf %%PORTDOCS%%%%EXAMPLESDIR%%/CAcertSrv.pem %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile %%PORTDOCS%%%%EXAMPLESDIR%%/certSrv.p12 @@ -17,5 +18,8 @@ lib/libmatrixsslstatic.a %%PORTDOCS%%%%EXAMPLESDIR%%/privkeySrv.pem %%PORTDOCS%%%%EXAMPLESDIR%%/sslSocket.c %%PORTDOCS%%%%EXAMPLESDIR%%/sslSocket.h +%%PORTDOCS%%%%EXAMPLESDIR%%/CAcertSrv.der +%%PORTDOCS%%%%EXAMPLESDIR%%/privkeySrv.der +%%PORTDOCS%%%%EXAMPLESDIR%%/certSrv.der %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% |