From owner-svn-ports-head@freebsd.org Mon Nov 5 23:41:34 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B376110F594; Mon, 5 Nov 2018 23:41:34 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D16F17B1D2; Mon, 5 Nov 2018 23:41:33 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B5F21E725; Mon, 5 Nov 2018 23:41:33 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA5NfXYk015508; Mon, 5 Nov 2018 23:41:33 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5NfXWX015505; Mon, 5 Nov 2018 23:41:33 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201811052341.wA5NfXWX015505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Mon, 5 Nov 2018 23:41:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484260 - in head/devel/libmsocket: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rodrigo X-SVN-Commit-Paths: in head/devel/libmsocket: . files X-SVN-Commit-Revision: 484260 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D16F17B1D2 X-Spamd-Result: default: False [-102.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.78)[-0.779,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2018 23:41:34 -0000 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();