Index: head/devel/libmsocket/Makefile =================================================================== --- head/devel/libmsocket/Makefile (revision 484259) +++ head/devel/libmsocket/Makefile (revision 484260) @@ -1,45 +1,44 @@ # Created by: Matt Harris # $FreeBSD$ 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 OPTIONS_DEFINE= DEBUG USES= tar:bzip2 desthack ssl USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-throttling \ --with-libevent=${LOCALBASE} PLIST_FILES= lib/libmsocket.so \ lib/libmsocket.so.0.1 \ lib/libmsocket.a \ include/msocket.h \ include/msocketutils.h CFLAGS_aarch64+=-fPIC -DPIC CFLAGS_amd64+= -fPIC -DPIC CFLAGS_i386+= -fPIC -DPIC DEBUG_CONFIGURE_ON= --enable-debug post-patch: ${REINPLACE_CMD} 's, withval=$$with_libevent; cf_enable_libevent=$$enableval, withval=$$with_libevent; cf_enable_libevent=$$with_libevent,' \ ${WRKSRC}/configure post-install: ${LN} -sf libmsocket.so.0.1 ${STAGEDIR}${PREFIX}/lib/libmsocket.so .include Index: head/devel/libmsocket/files/patch-file.c =================================================================== --- head/devel/libmsocket/files/patch-file.c (revision 484259) +++ head/devel/libmsocket/files/patch-file.c (revision 484260) @@ -1,52 +1,52 @@ ---- 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; + long ngroups_max; if (!fs) { -@@ -212,13 +213,14 @@ +@@ -212,13 +213,14 @@ short lms_file_icanrw(struct stat *fs) return(1); } - glist = (gid_t *)malloc(NGROUPS + 1); + ngroups_max = sysconf(_SC_NGROUPS_MAX) + 1; + glist = (gid_t *)malloc(sizeof(gid_t) * ngroups_max); if (!glist) { return(-1); } - if ((grpcnt = getgroups((NGROUPS + 1), glist)) < 0) + if ((grpcnt = getgroups(ngroups_max, glist)) < 0) { 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; + long ngroups_max; if (!fs) { -@@ -298,13 +301,14 @@ +@@ -298,13 +301,14 @@ short lms_file_icanr(struct stat *fs) return(1); } - glist = (gid_t *)malloc(NGROUPS + 1); + ngroups_max = sysconf(_SC_NGROUPS_MAX) + 1; + glist = (gid_t *)malloc(sizeof(gid_t) * ngroups_max); if (!glist) { return(-1); } - if ((grpcnt = getgroups((NGROUPS + 1), glist)) < 0) + if ((grpcnt = getgroups(ngroups_max, glist)) < 0) { free(glist); return(-1); Index: head/devel/libmsocket/files/patch-ssl.c =================================================================== --- head/devel/libmsocket/files/patch-ssl.c (nonexistent) +++ head/devel/libmsocket/files/patch-ssl.c (revision 484260) @@ -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(); Property changes on: head/devel/libmsocket/files/patch-ssl.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