Attachment 218979 Details for Bug 250531 – security/pecl-mcrypt: unbreak with php80 v2

[patch] security/pecl-mcrypt: unbreak with php80 v2

security-pecl-mcrypt.diff (text/plain), 2.41 KB, created by Dima Panov on 2020-10-22 16:19:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2020-10-22 16:19:42 UTC

Size: 2.41 KB

patch

obsolete

>Index: security/pecl-mcrypt/Makefile
>===================================================================
>--- security/pecl-mcrypt/Makefile	(revision 552987)
>+++ security/pecl-mcrypt/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	mcrypt
> PORTVERSION=	1.0.3
>+PORTREVISION=	1
> CATEGORIES=	security pear
> 
> MAINTAINER=	pizzamig@FreeBSD.org
>Index: security/pecl-mcrypt/files/patch-mcrypt.c
>===================================================================
>--- security/pecl-mcrypt/files/patch-mcrypt.c	(nonexistent)
>+++ security/pecl-mcrypt/files/patch-mcrypt.c	(working copy)
>@@ -0,0 +1,69 @@
>+--- mcrypt.c.orig	2019-09-17 16:24:14 UTC
>++++ mcrypt.c
>+@@ -629,7 +629,7 @@ PHP_FUNCTION(mcrypt_generic)
>+ 
>+ 	if (data_len == 0) {
>+ 		php_error_docref(NULL, E_WARNING, "An empty string was passed");
>+-		RETURN_FALSE
>++		RETURN_FALSE;
>+ 	}
>+ 
>+ 	if (data_len > INT_MAX) {
>+@@ -683,7 +683,7 @@ PHP_FUNCTION(mdecrypt_generic)
>+ 
>+ 	if (data_len == 0) {
>+ 		php_error_docref(NULL, E_WARNING, "An empty string was passed");
>+-		RETURN_FALSE
>++		RETURN_FALSE;
>+ 	}
>+ 
>+ 	/* Check blocksize */
>+@@ -762,10 +762,10 @@ PHP_FUNCTION(mcrypt_generic_deinit)
>+ 
>+ 	if (mcrypt_generic_deinit(pm->td) < 0) {
>+ 		php_error_docref(NULL, E_WARNING, "Could not terminate encryption specifier");
>+-		RETURN_FALSE
>++		RETURN_FALSE;
>+ 	}
>+ 	pm->init = 0;
>+-	RETURN_TRUE
>++	RETURN_TRUE;
>+ }
>+ /* }}} */
>+ 
>+@@ -776,9 +776,9 @@ PHP_FUNCTION(mcrypt_enc_is_block_algorithm_mode)
>+ 	MCRYPT_GET_TD_ARG
>+ 
>+ 	if (mcrypt_enc_is_block_algorithm_mode(pm->td) == 1) {
>+-		RETURN_TRUE
>++		RETURN_TRUE;
>+ 	} else {
>+-		RETURN_FALSE
>++		RETURN_FALSE;
>+ 	}
>+ }
>+ /* }}} */
>+@@ -790,9 +790,9 @@ PHP_FUNCTION(mcrypt_enc_is_block_algorithm)
>+ 	MCRYPT_GET_TD_ARG
>+ 
>+ 	if (mcrypt_enc_is_block_algorithm(pm->td) == 1) {
>+-		RETURN_TRUE
>++		RETURN_TRUE;
>+ 	} else {
>+-		RETURN_FALSE
>++		RETURN_FALSE;
>+ 	}
>+ }
>+ /* }}} */
>+@@ -804,9 +804,9 @@ PHP_FUNCTION(mcrypt_enc_is_block_mode)
>+ 	MCRYPT_GET_TD_ARG
>+ 
>+ 	if (mcrypt_enc_is_block_mode(pm->td) == 1) {
>+-		RETURN_TRUE
>++		RETURN_TRUE;
>+ 	} else {
>+-		RETURN_FALSE
>++		RETURN_FALSE;
>+ 	}
>+ }
>+ /* }}} */
>
>Property changes on: pecl-mcrypt/files/patch-mcrypt.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 250531: 218977 | 218979 | 218995