diff --git a/config/lib.json b/config/lib.json index 394649f3..558357c8 100644 --- a/config/lib.json +++ b/config/lib.json @@ -107,7 +107,8 @@ "ldap", "krb5", "idn2", - "psl" + "psl", + "gsasl" ], "lib-suggests-macos": [ "libssh2", @@ -904,6 +905,21 @@ "idn2" ] }, + "gsasl": { + "source": "gsasl", + "pkg-configs": [ + "libgsasl" + ], + "headers": [ + "gsasl.h" + ], + "lib-depends": [ + "idn2" + ], + "lib-suggests": [ + "krb5" + ] + }, "pthreads4w": { "source": "pthreads4w", "static-libs-windows": [ diff --git a/config/source.json b/config/source.json index d4793c35..de249ad1 100644 --- a/config/source.json +++ b/config/source.json @@ -1200,6 +1200,16 @@ "path": "LICENSE" } }, + "gsasl": { + "type": "filelist", + "url": "https://ftp.gnu.org/gnu/gsasl/", + "regex": "/href=\\\"(?gsasl-(?[^\\\"]+)\\.tar\\.gz)\\\"/", + "prefer-stable": true, + "license": { + "type": "file", + "path": "COPYING.LESSER" + } + }, "yaml": { "type": "git", "path": "php-src/ext/yaml", diff --git a/src/SPC/builder/linux/library/gsasl.php b/src/SPC/builder/linux/library/gsasl.php new file mode 100644 index 00000000..34a8ca64 --- /dev/null +++ b/src/SPC/builder/linux/library/gsasl.php @@ -0,0 +1,12 @@ +optionalLib('idn2', ...cmake_boolean_args('USE_LIBIDN2')) ->optionalLib('psl', ...cmake_boolean_args('CURL_USE_LIBPSL')) ->optionalLib('krb5', ...cmake_boolean_args('CURL_USE_GSSAPI')) + ->optionalLib('gsasl', ...cmake_boolean_args('USE_GSASL')) ->optionalLib('idn2', ...cmake_boolean_args('CURL_USE_IDN2')) ->optionalLib('libcares', '-DENABLE_ARES=ON') ->addConfigureArgs( diff --git a/src/SPC/builder/unix/library/gsasl.php b/src/SPC/builder/unix/library/gsasl.php new file mode 100644 index 00000000..74b9950d --- /dev/null +++ b/src/SPC/builder/unix/library/gsasl.php @@ -0,0 +1,25 @@ +optionalLib('idn2', ...ac_with_args('libidn2', true)) + ->optionalLib('krb5', ...ac_with_args('gssapi', true)) + ->configure( + '--disable-nls', + '--disable-rpath', + '--disable-doc', + ) + ->make(); + $this->patchPkgconfPrefix(['libgsasl.pc']); + $this->patchLaDependencyPrefix(); + } +} diff --git a/src/SPC/builder/unix/library/krb5.php b/src/SPC/builder/unix/library/krb5.php index 03c071f5..1834e494 100644 --- a/src/SPC/builder/unix/library/krb5.php +++ b/src/SPC/builder/unix/library/krb5.php @@ -22,7 +22,7 @@ trait krb5 'LDFLAGS' => '-Wl,--allow-multiple-definition', ]) ->optionalLib('ldap', '--with-ldap', '--without-ldap') - ->optionalLib('libedit', '--with-readline', '--without-readline') + ->optionalLib('libedit', '--with-libedit', '--without-libedit') ->configure( '--disable-nls', '--disable-rpath',