Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Nov 2018 23:41:33 +0000 (UTC)
From:      Rodrigo Osorio <rodrigo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r484260 - in head/devel/libmsocket: . files
Message-ID:  <201811052341.wA5NfXWX015505@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rodrigo
Date: Mon Nov  5 23:41:32 2018
New Revision: 484260
URL: https://svnweb.freebsd.org/changeset/ports/484260

Log:
  Fix build for 12 with opendssl 1.1.0+
  
  Regenerate patches with makepatch
  Add license
  
  Reported by:	pkg-fallout

Added:
  head/devel/libmsocket/files/patch-ssl.c   (contents, props changed)
Modified:
  head/devel/libmsocket/Makefile
  head/devel/libmsocket/files/patch-file.c

Modified: head/devel/libmsocket/Makefile
==============================================================================
--- head/devel/libmsocket/Makefile	Mon Nov  5 23:39:19 2018	(r484259)
+++ head/devel/libmsocket/Makefile	Mon Nov  5 23:41:32 2018	(r484260)
@@ -3,15 +3,14 @@
 
 PORTNAME=	libmsocket
 PORTVERSION=	0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel net
 MASTER_SITES=	SF/kageki/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Socket abstraction library for C programmers
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	invalid application of 'sizeof' to an incomplete type 'X509' (aka 'struct x509_st')
+LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 

Modified: head/devel/libmsocket/files/patch-file.c
==============================================================================
--- head/devel/libmsocket/files/patch-file.c	Mon Nov  5 23:39:19 2018	(r484259)
+++ head/devel/libmsocket/files/patch-file.c	Mon Nov  5 23:41:32 2018	(r484260)
@@ -1,6 +1,6 @@
---- file.c.orig
+--- file.c.orig	2008-10-12 23:30:58 UTC
 +++ file.c
-@@ -171,6 +171,7 @@
+@@ -171,6 +171,7 @@ short lms_file_icanrw(struct stat *fs)
  	gid_t l;
  	register unsigned int i;
  	int grpcnt;
@@ -8,7 +8,7 @@
  
  	if (!fs)
  	{
-@@ -212,13 +213,14 @@
+@@ -212,13 +213,14 @@ short lms_file_icanrw(struct stat *fs)
  			return(1);
  		}
  
@@ -25,7 +25,7 @@
  		{
  			free(glist);
  			return(-1);
-@@ -257,6 +259,7 @@
+@@ -257,6 +259,7 @@ short lms_file_icanr(struct stat *fs)
  	gid_t l;
  	register unsigned int i;
  	int grpcnt;
@@ -33,7 +33,7 @@
  
  	if (!fs)
  	{
-@@ -298,13 +301,14 @@
+@@ -298,13 +301,14 @@ short lms_file_icanr(struct stat *fs)
  			return(1);
  		}
  

Added: head/devel/libmsocket/files/patch-ssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libmsocket/files/patch-ssl.c	Mon Nov  5 23:41:32 2018	(r484260)
@@ -0,0 +1,15 @@
+--- ssl.c.orig	2018-11-05 23:29:01 UTC
++++ ssl.c
+@@ -872,8 +872,11 @@ lms_ssl_store *_lms_ssl_loadfiles(X509 *
+ 	 * dhp = DH params
+ 	 */
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++    ks->ca = X509_dup(ca);
++#else
+ 	memcpy(ks->ca, ca, sizeof(X509));
+-
++#endif
+ 	ks->crt = X509_new();
+ 	ks->privkey = RSA_new();
+ 	ks->pubkey = RSA_new();



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811052341.wA5NfXWX015505>