Attachment 198092 Details for Bug 232219 – Fix OpenSSL 1.1.x build

[patch] Fix OpenSSL 1.1.x build

radmind (text/plain), 4.02 KB, created by Nathan on 2018-10-13 05:29:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-10-13 05:29:06 UTC

Size: 4.02 KB

patch

obsolete

>sysutils/radmind: Fix OpenSSL build
>
>PR:		231931
>Submitted by:	Nathan <ndowens@yahoo.com>
>
>Index: sysutils/radmind/Makefile
>===================================================================
>--- sysutils/radmind/Makefile	(revision 481687)
>+++ sysutils/radmind/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	radmind
> PORTVERSION=	1.14.1
>-PORTREVISION=	2014052201
>+PORTREVISION=	2014052202
> CATEGORIES=	sysutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
>Index: sysutils/radmind/files/patch-cksum.c
>===================================================================
>--- sysutils/radmind/files/patch-cksum.c	(nonexistent)
>+++ sysutils/radmind/files/patch-cksum.c	(working copy)
>@@ -0,0 +1,86 @@
>+--- cksum.c.orig	2018-10-13 05:20:43 UTC
>++++ cksum.c
>+@@ -41,20 +41,20 @@ do_fcksum( int fd, char *cksum_b64 )
>+     off_t		size = 0;
>+     unsigned char	buf[ 8192 ];
>+     extern EVP_MD	*md;
>+-    EVP_MD_CTX		mdctx;
>++    EVP_MD_CTX		*mdctx;
>+     unsigned char 	md_value[ EVP_MAX_MD_SIZE ];
>+ 
>+-    EVP_DigestInit( &mdctx, md );
>++    EVP_DigestInit( mdctx, md );
>+ 
>+     while (( rr = read( fd, buf, sizeof( buf ))) > 0 ) {
>+ 	size += rr;
>+-	EVP_DigestUpdate( &mdctx, buf, (unsigned int)rr );
>++	EVP_DigestUpdate( mdctx, buf, (unsigned int)rr );
>+     }
>+     if ( rr < 0 ) {
>+ 	return( -1 );
>+     }
>+ 
>+-    EVP_DigestFinal( &mdctx, md_value, &md_len );
>++    EVP_DigestFinal( mdctx, md_value, &md_len );
>+     base64_e( md_value, md_len, cksum_b64 );
>+ 
>+     return( size );
>+@@ -103,13 +103,13 @@ do_acksum( char *path, char *cksum_b64, struct applefi
>+     struct as_entry		as_entries_endian[ 3 ];
>+     unsigned int		md_len;
>+     extern EVP_MD		*md;
>+-    EVP_MD_CTX          	mdctx;
>++    EVP_MD_CTX          	*mdctx;
>+     unsigned char       	md_value[ EVP_MAX_MD_SIZE ];
>+ 
>+-    EVP_DigestInit( &mdctx, md ); 
>++    EVP_DigestInit( mdctx, md ); 
>+ 
>+     /* checksum applesingle header */
>+-    EVP_DigestUpdate( &mdctx, (char *)&as_header, AS_HEADERLEN );
>++    EVP_DigestUpdate( mdctx, (char *)&as_header, AS_HEADERLEN );
>+     size += (size_t)AS_HEADERLEN;
>+ 
>+     /* endian handling, sum big-endian header entries */
>+@@ -120,12 +120,12 @@ do_acksum( char *path, char *cksum_b64, struct applefi
>+     as_entry_netswap( &as_entries_endian[ AS_DFE ] );
>+ 
>+     /* checksum header entries */
>+-    EVP_DigestUpdate( &mdctx, (char *)&as_entries_endian,
>++    EVP_DigestUpdate( mdctx, (char *)&as_entries_endian,
>+ 		(unsigned int)( 3 * sizeof( struct as_entry )));
>+     size += sizeof( 3 * sizeof( struct as_entry ));
>+ 
>+     /* checksum finder info data */
>+-    EVP_DigestUpdate( &mdctx, afinfo->ai.ai_data, FINFOLEN );
>++    EVP_DigestUpdate( mdctx, afinfo->ai.ai_data, FINFOLEN );
>+     size += FINFOLEN;
>+ 
>+     /* checksum rsrc fork data */
>+@@ -140,7 +140,7 @@ do_acksum( char *path, char *cksum_b64, struct applefi
>+ 	    return( -1 );
>+ 	}
>+ 	while (( rc = read( rfd, buf, sizeof( buf ))) > 0 ) {
>+-	    EVP_DigestUpdate( &mdctx, buf, (unsigned int)rc );
>++	    EVP_DigestUpdate( mdctx, buf, (unsigned int)rc );
>+ 	    size += (size_t)rc;
>+ 	}
>+ 	if ( close( rfd ) < 0 ) {
>+@@ -156,7 +156,7 @@ do_acksum( char *path, char *cksum_b64, struct applefi
>+     }
>+     /* checksum data fork */
>+     while (( rc = read( dfd, buf, sizeof( buf ))) > 0 ) {
>+-	EVP_DigestUpdate( &mdctx, buf, (unsigned int)rc );
>++	EVP_DigestUpdate( mdctx, buf, (unsigned int)rc );
>+ 	size += (size_t)rc;
>+     }
>+     if ( rc < 0 ) {
>+@@ -166,7 +166,7 @@ do_acksum( char *path, char *cksum_b64, struct applefi
>+ 	return( -1 );
>+     }
>+ 
>+-    EVP_DigestFinal( &mdctx, md_value, &md_len );
>++    EVP_DigestFinal( mdctx, md_value, &md_len );
>+     base64_e( ( char*)&md_value, md_len, cksum_b64 );
>+ 
>+     return( size );
>
>Property changes on: sysutils/radmind/files/patch-cksum.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

Actions: View | Diff

Attachments on bug 232219: 198092 | 198378