CVS commit: pkgsrc/security/php-pecl-mcrypt

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Mar  5 15:24:19 UTC 2025

Modified Files:
        pkgsrc/security/php-pecl-mcrypt: distinfo
Added Files:
        pkgsrc/security/php-pecl-mcrypt/patches: patch-.._package.xml
            patch-mcrypt.c

Log Message:
security/php-pecl-mcrypt: fix build problem with php84

Fix build problem with php84, noted by wiz@.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/php-pecl-mcrypt/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/php-pecl-mcrypt/patches/patch-.._package.xml \
    pkgsrc/security/php-pecl-mcrypt/patches/patch-mcrypt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/php-pecl-mcrypt/distinfo
diff -u pkgsrc/security/php-pecl-mcrypt/distinfo:1.9 pkgsrc/security/php-pecl-mcrypt/distinfo:1.10
--- pkgsrc/security/php-pecl-mcrypt/distinfo:1.9        Sun Jan  7 15:41:17 2024
+++ pkgsrc/security/php-pecl-mcrypt/distinfo    Wed Mar  5 15:24:18 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.9 2024/01/07 15:41:17 taca Exp $
+$NetBSD: distinfo,v 1.10 2025/03/05 15:24:18 taca Exp $
 
 BLAKE2s (php-mcrypt/mcrypt-1.0.7.tgz) = 0ac7e8d3a550563755da9dd966acac039f178e34ed119026c57089683c18cbbf
 SHA512 (php-mcrypt/mcrypt-1.0.7.tgz) = 1b579af868a2db073520437ad6a93513c2591bc865d982dc7926591e712614995148d13bacc1b4b207ddecda4bad219b67010a39ea17e1ec6e180d4fd69182ff
 Size (php-mcrypt/mcrypt-1.0.7.tgz) = 27060 bytes
+SHA1 (patch-.._package.xml) = d139719b045f73996373fe5fae7d0ded9a486821
+SHA1 (patch-mcrypt.c) = 5fbfdefe0ae0fc08ba0956cf9d1c8cd85c83ba8a

Added files:

Index: pkgsrc/security/php-pecl-mcrypt/patches/patch-.._package.xml
diff -u /dev/null pkgsrc/security/php-pecl-mcrypt/patches/patch-.._package.xml:1.1
--- /dev/null   Wed Mar  5 15:24:19 2025
+++ pkgsrc/security/php-pecl-mcrypt/patches/patch-.._package.xml        Wed Mar  5 15:24:18 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-.._package.xml,v 1.1 2025/03/05 15:24:18 taca Exp $
+
+Update file's md5 after patch.
+
+--- ../package.xml.orig        2023-12-19 10:55:02.000000000 +0000
++++ ../package.xml
+@@ -92,7 +92,7 @@
+    <file md5sum="4b8429b52aa3b9ed54b6f3c3a01f95b3" name="tests/vectors.txt" role="test" />
+    <file md5sum="b7cfabd517a52fe262d494c70ac40366" name="config.m4" role="src" />
+    <file md5sum="79427c4645a176502ec00e420f463a77" name="config.w32" role="src" />
+-   <file md5sum="5cf24d083c22116f03ac838c659a06a6" name="mcrypt.c" role="src" />
++   <file md5sum="907e071db60c8b03526c1363e98bd16b" name="mcrypt.c" role="src" />
+    <file md5sum="f89c8dd8ceb67cc8e97f058a0ec6110b" name="mcrypt_filter.c" role="src" />
+    <file md5sum="7657d3d1ad7d4030833ba1cce8ac8499" name="php_mcrypt.h" role="src" />
+    <file md5sum="b7db75bfa122dccd192534b3bd2d0d79" name="php_mcrypt_filter.h" role="src" />
Index: pkgsrc/security/php-pecl-mcrypt/patches/patch-mcrypt.c
diff -u /dev/null pkgsrc/security/php-pecl-mcrypt/patches/patch-mcrypt.c:1.1
--- /dev/null   Wed Mar  5 15:24:19 2025
+++ pkgsrc/security/php-pecl-mcrypt/patches/patch-mcrypt.c      Wed Mar  5 15:24:18 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-mcrypt.c,v 1.1 2025/03/05 15:24:18 taca Exp $
+
+Fix build on PHP 8.4 (and maybe later).
+
+--- mcrypt.c.orig      2023-12-19 10:55:02.000000000 +0000
++++ mcrypt.c
+@@ -38,7 +38,11 @@
+ #include "php_ini.h"
+ #include "php_globals.h"
+ #include "ext/standard/info.h"
++#if PHP_VERSION_ID < 80400
+ #include "ext/standard/php_rand.h"
++#else
++#include "ext/random/php_random.h"
++#endif
+ #include "zend_smart_str.h"
+ #include "php_mcrypt_filter.h"
+