Index: head/net/stone/Makefile
===================================================================
--- head/net/stone/Makefile	(revision 561455)
+++ head/net/stone/Makefile	(revision 561456)
@@ -1,48 +1,43 @@
 # Created by: Yoshihiko Sarumaru <mistral@imasy.or.jp>
 # $FreeBSD$
 
 PORTNAME=	stone
 PORTVERSION=	2.3e
 CATEGORIES=	net
 MASTER_SITES=	http://www.gcd.org/sengoku/stone/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TCP/IP packet repeater in the application layer
 
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.3d-2.3.2.7
 
 USE_RC_SUBR=	stone
 .if !defined(WITHOUT_SSL)
 USES=		ssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_SSL)
 ALL_TARGET=	bsd-pop
 MAKE_ARGS=	POP_LIBS="-lmd" LIBS="-DUNIX_DAEMON"
 post-extract:
 	${TOUCH} ${WRKSRC}/global.h
 .else
 ALL_TARGET=	bsd-ssl
 MAKE_ARGS=	SSL_FLAGS="-DUSE_SSL -I${OPENSSLINC}" \
 		SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" LIBS="-DUNIX_DAEMON"
 .endif
 
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	incomplete definition of type 'struct ssl_session_st'
-BROKEN_FreeBSD_13=	incomplete definition of type 'struct ssl_session_st'
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^CFLAGS/d' ${WRKSRC}/${MAKEFILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stone ${STAGEDIR}${PREFIX}/bin/stone
 	${INSTALL_MAN} ${FILESDIR}/stone.1 ${STAGEDIR}${PREFIX}/man/man1/stone.1
 	${INSTALL_MAN} ${FILESDIR}/stone.1.ja ${STAGEDIR}${PREFIX}/man/ja/man1/stone.1
 	${INSTALL_DATA} ${FILESDIR}/stone.cnf ${STAGEDIR}${PREFIX}/etc/stone.cnf.sample
 
 .include <bsd.port.post.mk>
Index: head/net/stone/files/patch-stone.c
===================================================================
--- head/net/stone/files/patch-stone.c	(nonexistent)
+++ head/net/stone/files/patch-stone.c	(revision 561456)
@@ -0,0 +1,58 @@
+--- stone.c.orig	2008-02-04 23:00:00 UTC
++++ stone.c
+@@ -2452,15 +2452,16 @@ int modPairDest(Pair *p1, struct sockaddr *dst, sockle
+ 	    unsigned char **match;
+ 	    if (Debug > 2) {
+ 		char str[SSL_MAX_SSL_SESSION_ID_LENGTH * 2 + 1];
+-		int len = sess->session_id_length;
++		const unsigned char *sid; unsigned len;
++		sid = SSL_SESSION_get_id(sess, &len);
+ 		int i;
+ 		if (len > SSL_MAX_SSL_SESSION_ID_LENGTH)
+ 		    len = SSL_MAX_SSL_SESSION_ID_LENGTH;
+ 		for (i=0; i < len; i++)
+-		    sprintf(&str[i*2], "%02x", sess->session_id[i]);
++		    sprintf(&str[i*2], "%02x", sid[i]);
+ 		str[i*2] = '\0';
+ 		message(LOG_DEBUG, "%d TCP %d: SSL session ID=%s len=%d",
+-			p2->stone->sd, p2->sd, str, sess->session_id_length);
++			p2->stone->sd, p2->sd, str, len);
+ 	    }
+ 	    match = SSL_SESSION_get_ex_data(sess, MatchIndex);
+ 	    if (match && p2->stone->ssl_server) {
+@@ -3265,7 +3266,7 @@ int doSSL_accept(Pair *pair) {
+     if (Debug > 7)
+ 	message(LOG_DEBUG, "%d TCP %d: SSL_accept ret=%d, state=%x, "
+ 		"finished=%x, in_init=%x/%x", pair->stone->sd,
+-		sd, ret, SSL_state(ssl), SSL_is_init_finished(ssl),
++		sd, ret, SSL_get_state(ssl), SSL_is_init_finished(ssl),
+ 		SSL_in_init(ssl), SSL_in_accept_init(ssl));
+     if (ret > 0) {	/* success */
+ 	if (SSL_in_accept_init(ssl)) {
+@@ -8875,7 +8876,7 @@ void sslopts_default(SSLOpts *opts, int isserver) {
+ 	opts->meth = SSLv23_server_method();
+ #elif !defined(OPENSSL_NO_SSL3)
+ 	opts->meth = SSLv3_server_method();
+-#elif !defined(OPENSSL_NO_SSL2)
++#elif !defined(OPENSSL_NO_SSL2) && OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	opts->meth = SSLv2_server_method();
+ #endif
+     } else {
+@@ -8885,7 +8886,7 @@ void sslopts_default(SSLOpts *opts, int isserver) {
+ 	opts->meth = SSLv23_client_method();
+ #elif !defined(OPENSSL_NO_SSL3)
+ 	opts->meth = SSLv3_client_method();
+-#elif !defined(OPENSSL_NO_SSL2)
++#elif !defined(OPENSSL_NO_SSL2) && OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	opts->meth = SSLv2_client_method();
+ #endif
+     }
+@@ -8976,7 +8977,7 @@ int sslopts(int argc, int argi, char *argv[], SSLOpts 
+ 	if (isserver) opts->meth = SSLv3_server_method();
+ 	else opts->meth = SSLv3_client_method();
+ #endif
+-#ifndef OPENSSL_NO_SSL2
++#if !defined(OPENSSL_NO_SSL2) && OPENSSL_VERSION_NUMBER < 0x10100000L
+     } else if (!strcmp(argv[argi], "ssl2")) {
+ 	if (isserver) opts->meth = SSLv2_server_method();
+ 	else opts->meth = SSLv2_client_method();

Property changes on: head/net/stone/files/patch-stone.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property