svn commit: r484551 - in branches/2018Q4/devel/libmsocket: . files
Antoine Brodin
antoine at FreeBSD.org
Fri Nov 9 22:46:31 UTC 2018
Author: antoine
Date: Fri Nov 9 22:46:30 2018
New Revision: 484551
URL: https://svnweb.freebsd.org/changeset/ports/484551
Log:
MFH: r484260
Fix build for 12 with opendssl 1.1.0+
Regenerate patches with makepatch
Add license
Reported by: pkg-fallout
Added:
branches/2018Q4/devel/libmsocket/files/patch-ssl.c
- copied unchanged from r484260, head/devel/libmsocket/files/patch-ssl.c
Modified:
branches/2018Q4/devel/libmsocket/Makefile
branches/2018Q4/devel/libmsocket/files/patch-file.c
Directory Properties:
branches/2018Q4/ (props changed)
Modified: branches/2018Q4/devel/libmsocket/Makefile
==============================================================================
--- branches/2018Q4/devel/libmsocket/Makefile Fri Nov 9 22:27:32 2018 (r484550)
+++ branches/2018Q4/devel/libmsocket/Makefile Fri Nov 9 22:46:30 2018 (r484551)
@@ -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 at 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: branches/2018Q4/devel/libmsocket/files/patch-file.c
==============================================================================
--- branches/2018Q4/devel/libmsocket/files/patch-file.c Fri Nov 9 22:27:32 2018 (r484550)
+++ branches/2018Q4/devel/libmsocket/files/patch-file.c Fri Nov 9 22:46:30 2018 (r484551)
@@ -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);
}
Copied: branches/2018Q4/devel/libmsocket/files/patch-ssl.c (from r484260, head/devel/libmsocket/files/patch-ssl.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q4/devel/libmsocket/files/patch-ssl.c Fri Nov 9 22:46:30 2018 (r484551, copy of r484260, head/devel/libmsocket/files/patch-ssl.c)
@@ -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();
More information about the svn-ports-branches
mailing list