Merge branch 'main' into ext/rar

config/ext.json

@@ -118,7 +118,7 @@
     "iconv": {
         "type": "builtin",
         "arg-type": "with-prefix",
-        "lib-depends-windows": [
+        "lib-depends": [
             "libiconv"
         ]
     },
@@ -132,12 +132,12 @@
     },
     "imap": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "custom",
         "lib-depends": [
             "imap"
         ],
         "lib-suggests": [
-            "kerberos"
+            "openssl"
         ]
     },
     "inotify": {
@@ -234,7 +234,8 @@
         "type": "builtin",
         "arg-type": "custom",
         "lib-depends": [
-            "openssl"
+            "openssl",
+            "zlib"
         ],
         "ext-depends": [
             "zlib"

config/lib.json

@@ -141,6 +141,15 @@
             "libxml2"
         ]
     },
+    "imap": {
+        "source": "imap",
+        "static-libs-unix": [
+            "libc-client.a"
+        ],
+        "lib-suggests": [
+            "openssl"
+        ]
+    },
     "ldap": {
         "source": "ldap",
         "static-libs-unix": [
@@ -302,8 +311,7 @@
         ],
         "lib-suggests-windows": [
             "icu",
-            "xz",
-            "pthreads4w"
+            "xz"
         ]
     },
     "libxslt": {
@@ -441,18 +449,6 @@
             "zstd"
         ]
     },
-    "pthreads4w": {
-        "source": "pthreads4w",
-        "static-libs-windows": [
-            "libpthreadVC3.lib"
-        ],
-        "headers-windows": [
-            "_ptw32.h",
-            "pthread.h",
-            "sched.h",
-            "semaphore.h"
-        ]
-    },
     "readline": {
         "source": "readline",
         "static-libs-unix": [

config/source.json

@@ -121,9 +121,9 @@
         }
     },
     "freetype": {
-        "type": "filelist",
-        "url": "https://download-mirror.savannah.gnu.org/releases/freetype/",
-        "regex": "/href=\"(?<file>freetype-(?<version>[^\"]+)\\.tar\\.xz)\"/",
+        "type": "git",
+        "rev": "VER-2-13-2",
+        "url": "https://github.com/freetype/freetype",
         "license": {
             "type": "file",
             "path": "LICENSE.TXT"
@@ -154,6 +154,15 @@
             "path": "LICENSE"
         }
     },
+    "imap": {
+        "type": "git",
+        "url": "https://github.com/static-php/imap.git",
+        "rev": "master",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "inotify": {
         "type": "url",
         "url": "https://pecl.php.net/get/inotify",
@@ -218,7 +227,7 @@
     },
     "libmcrypt": {
         "type": "url",
-        "url": "https://nchc.dl.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz",
+        "url": "https://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz",
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -235,7 +244,7 @@
     },
     "libpng": {
         "type": "git",
-        "url": "https://git.code.sf.net/p/libpng/code",
+        "url": "https://github.com/glennrp/libpng.git",
         "rev": "libpng16",
         "license": {
             "type": "file",
@@ -304,7 +313,7 @@
     },
     "mcrypt": {
         "type": "url",
-        "url": "https://jaist.dl.sourceforge.net/project/mcrypt/MCrypt/2.6.8/mcrypt-2.6.8.tar.gz",
+        "url": "https://downloads.sourceforge.net/project/mcrypt/MCrypt/2.6.8/mcrypt-2.6.8.tar.gz",
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -403,15 +412,6 @@
             "path": "LICENSE"
         }
     },
-    "pthreads4w": {
-        "type": "git",
-        "rev": "master",
-        "url": "https://git.code.sf.net/p/pthreads4w/code",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "readline": {
         "type": "filelist",
         "url": "https://ftp.gnu.org/pub/gnu/readline/",