Date: Wed, 26 Sep 2012 02:26:48 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172062: security/sslwrap: Support PLIST_FILES Message-ID: <20120926022648.00b57fd0810e6e820cb15ec0@yahoo.com> Resent-Message-ID: <201209251820.q8PIKJCQ035292@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172062
>Category: ports
>Synopsis: security/sslwrap: Support PLIST_FILES
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 25 18:20:19 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Add LICENSE
- Support PLIST_FILES
Remove file:
files/patch-apps.h
files/patch-s_cb.c
files/patch-s_server.c
files/patch-s_socket.c
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/security/sslwrap/Makefile security/sslwrap/Makefile
--- /usr/ports/security/sslwrap/Makefile 2011-11-19 08:30:12.000000000 +0900
+++ security/sslwrap/Makefile 2012-09-25 03:42:11.000000000 +0900
@@ -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: ports/security/sslwrap/Makefile,v 1.18 2011/11/18 23:30:12 ehaupt Exp $
-#
PORTNAME= sslwrap
PORTVERSION= 2.0.6
@@ -15,25 +11,27 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Another SSL Wrapper application, which uses SSLEay/OpenSSL
+WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g}
+
USE_OPENSSL= YES
-WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g}
+PORTDOCS= README docs.html
+PLIST_FILES= bin/sslwrap
-DOCS= README docs.html
+.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 -urN /usr/ports/security/sslwrap/files/patch-apps.h security/sslwrap/files/patch-apps.h
--- /usr/ports/security/sslwrap/files/patch-apps.h 2003-10-16 14:34:33.000000000 +0900
+++ security/sslwrap/files/patch-apps.h 1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/security/sslwrap/files/patch-s_cb.c security/sslwrap/files/patch-s_cb.c
--- /usr/ports/security/sslwrap/files/patch-s_cb.c 2003-10-16 14:34:33.000000000 +0900
+++ security/sslwrap/files/patch-s_cb.c 1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/security/sslwrap/files/patch-s_server.c security/sslwrap/files/patch-s_server.c
--- /usr/ports/security/sslwrap/files/patch-s_server.c 2003-10-16 14:34:33.000000000 +0900
+++ security/sslwrap/files/patch-s_server.c 1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/security/sslwrap/files/patch-s_socket.c security/sslwrap/files/patch-s_socket.c
--- /usr/ports/security/sslwrap/files/patch-s_socket.c 2003-10-16 14:34:33.000000000 +0900
+++ security/sslwrap/files/patch-s_socket.c 1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/security/sslwrap/pkg-plist security/sslwrap/pkg-plist
--- /usr/ports/security/sslwrap/pkg-plist 2008-09-12 17:51:36.000000000 +0900
+++ security/sslwrap/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,4 +0,0 @@
-bin/sslwrap
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/docs.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120926022648.00b57fd0810e6e820cb15ec0>