diff options
author | pawel <pawel@FreeBSD.org> | 2012-11-10 17:07:42 +0000 |
---|---|---|
committer | pawel <pawel@FreeBSD.org> | 2012-11-10 17:07:42 +0000 |
commit | 212cfe246d722375a14485c6a6f55f0fb9579e2d (patch) | |
tree | a2b2a989994ada921cfd80b8fa3e0b3cac995ec1 | |
parent | e2e269ed0ae0688de9e2969e319248fdba400410 (diff) | |
download | FreeBSD-ports-212cfe246d722375a14485c6a6f55f0fb9579e2d.zip FreeBSD-ports-212cfe246d722375a14485c6a6f55f0fb9579e2d.tar.gz |
- Add LICENSE
- Switch to PLIST_FILES, PORTDOCS
- Remove bunch of patches, replaced by REINPLACE_CMD
PR: ports/172062
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Feature safe: yes
-rw-r--r-- | security/sslwrap/Makefile | 32 | ||||
-rw-r--r-- | security/sslwrap/files/patch-apps.h | 15 | ||||
-rw-r--r-- | security/sslwrap/files/patch-s_cb.c | 15 | ||||
-rw-r--r-- | security/sslwrap/files/patch-s_server.c | 32 | ||||
-rw-r--r-- | security/sslwrap/files/patch-s_socket.c | 11 | ||||
-rw-r--r-- | security/sslwrap/pkg-plist | 4 |
6 files changed, 15 insertions, 94 deletions
diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile index e23bda6..7d824ae 100644 --- a/security/sslwrap/Makefile +++ b/security/sslwrap/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: sslwrap -# Date created: 1999 november 7. -# Whom: Zahemszky, Gabor <ZGabor at CoDe dot HU> -# +# Created by: Zahemszky, Gabor <ZGabor at CoDe dot HU> # $FreeBSD$ -# PORTNAME= sslwrap PORTVERSION= 2.0.6 @@ -15,25 +11,27 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Another SSL Wrapper application, which uses SSLEay/OpenSSL -USE_OPENSSL= YES - WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g} -DOCS= README docs.html +USE_OPENSSL= yes + +PORTDOCS= README docs.html +PLIST_FILES= bin/sslwrap + +.include <bsd.port.options.mk> post-patch: - ${REINPLACE_CMD} -e \ - 's/SSL_OP_NON_EXPORT_FIRST/SSL_OP_CIPHER_SERVER_PREFERENCE/g' \ - ${WRKSRC}/s_server.c - ${REINPLACE_CMD} -e \ - 's,%%OPENSSL%%,openssl/,g' \ - ${WRKSRC}/s_server.c ${WRKSRC}/s_cb.c ${WRKSRC}/apps.h ${WRKSRC}/s_socket.c + @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|SSL_OP_NON_EXPORT_FIRST|SSL_OP_CIPHER_SERVER_PREFERENCE|g ; \ + s|OPENSSL"|"openssl/|g' do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sslwrap ${PREFIX}/bin/sslwrap -.if !defined(NOPORTDOCS) + ${INSTALL_PROGRAM} ${WRKSRC}/sslwrap ${PREFIX}/bin +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ +.for i in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} +.endfor .endif .include <bsd.port.mk> diff --git a/security/sslwrap/files/patch-apps.h b/security/sslwrap/files/patch-apps.h deleted file mode 100644 index fe168da..0000000 --- a/security/sslwrap/files/patch-apps.h +++ /dev/null @@ -1,15 +0,0 @@ ---- apps.h.orig Wed Oct 15 22:28:24 2003 -+++ apps.h Wed Oct 15 22:28:45 2003 -@@ -65,9 +65,9 @@ - #include "../e_os.h" - #endif - --#include OPENSSL"buffer.h" --#include OPENSSL"bio.h" --#include OPENSSL"crypto.h" -+#include "%%OPENSSL%%/buffer.h" -+#include "%%OPENSSL%%/bio.h" -+#include "%%OPENSSL%%/crypto.h" - /*#include "progs.h"*/ - - #ifdef WIN16 diff --git a/security/sslwrap/files/patch-s_cb.c b/security/sslwrap/files/patch-s_cb.c deleted file mode 100644 index d2e75ea..0000000 --- a/security/sslwrap/files/patch-s_cb.c +++ /dev/null @@ -1,15 +0,0 @@ ---- s_cb.c.orig Wed Oct 15 22:29:17 2003 -+++ s_cb.c Wed Oct 15 22:29:31 2003 -@@ -63,9 +63,9 @@ - #include "apps.h" - #undef NON_MAIN - #undef USE_SOCKETS --#include OPENSSL"err.h" --#include OPENSSL"x509.h" --#include OPENSSL"ssl.h" -+#include "%%OPENSSL%%/err.h" -+#include "%%OPENSSL%%/x509.h" -+#include "%%OPENSSL%%/ssl.h" - #include "s_apps.h" - - int verify_depth=0; diff --git a/security/sslwrap/files/patch-s_server.c b/security/sslwrap/files/patch-s_server.c deleted file mode 100644 index 1239879..0000000 --- a/security/sslwrap/files/patch-s_server.c +++ /dev/null @@ -1,32 +0,0 @@ ---- s_server.c.orig Sat Nov 11 14:11:18 2000 -+++ s_server.c Wed Oct 15 22:31:56 2003 -@@ -121,14 +121,14 @@ - #ifdef WIN16 - #define APPS_WIN16 - #endif --#include OPENSSL"lhash.h" --#include OPENSSL"bn.h" -+#include "openssl//lhash.h" -+#include "openssl//bn.h" - #define USE_SOCKETS - #include "apps.h" --#include OPENSSL"err.h" --#include OPENSSL"pem.h" --#include OPENSSL"x509.h" --#include OPENSSL"ssl.h" -+#include "openssl//err.h" -+#include "openssl//pem.h" -+#include "openssl//x509.h" -+#include "openssl//ssl.h" - #include "s_apps.h" - - #ifndef NOPROTO -@@ -468,7 +468,7 @@ - - if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL); - if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG); -- if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST); -+ if (hack) SSL_CTX_set_options(ctx,SSL_OP_CIPHER_SERVER_PREFERENCE); - - if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback); - diff --git a/security/sslwrap/files/patch-s_socket.c b/security/sslwrap/files/patch-s_socket.c deleted file mode 100644 index 37034f5..0000000 --- a/security/sslwrap/files/patch-s_socket.c +++ /dev/null @@ -1,11 +0,0 @@ ---- s_socket.c.orig Wed Oct 15 22:32:33 2003 -+++ s_socket.c Wed Oct 15 22:32:45 2003 -@@ -67,7 +67,7 @@ - #undef USE_SOCKETS - #undef NON_MAIN - #include "s_apps.h" --#include OPENSSL"ssl.h" -+#include "%%OPENSSL%%/ssl.h" - - #ifndef NOPROTO - static struct hostent *GetHostByName(char *name); diff --git a/security/sslwrap/pkg-plist b/security/sslwrap/pkg-plist deleted file mode 100644 index a0efe95..0000000 --- a/security/sslwrap/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/sslwrap -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/docs.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% |