diff --git a/recipes/krb5/all/conandata.yml b/recipes/krb5/all/conandata.yml index 65a041b05ffb46..519c9c724016c7 100644 --- a/recipes/krb5/all/conandata.yml +++ b/recipes/krb5/all/conandata.yml @@ -3,10 +3,12 @@ sources: url: "https://kerberos.org/dist/krb5/1.19/krb5-1.19.2.tar.gz" sha256: "10453fee4e3a8f8ce6129059e5c050b8a65dab1c257df68b99b3112eaa0cdf6a" patches: - "1.18.2": - - patch_file: "patches/1.18.2-0001-use-PKG_CHECK_MODULES-for-openssl.patch" - patch_type: "conan" - patch_description: "use-PKG_CHECK_MODULES-for-openssl" - - patch_file: "patches/1.18.2-0003-no-html+tests.patch" + "1.19.2": + - patch_file: "patches/1.19.2-0001-no-html+tests.patch" patch_type: "conan" patch_description: "no-html+tests" + - patch_file: "patches/1.19.2-0002-no-tests.patch" + patch_type: "conan" + patch_description: "no-tests" + + diff --git a/recipes/krb5/all/conanfile.py b/recipes/krb5/all/conanfile.py index c90c2b95df1ab2..232a9f7d7a5d47 100644 --- a/recipes/krb5/all/conanfile.py +++ b/recipes/krb5/all/conanfile.py @@ -113,7 +113,7 @@ def requirements(self): if not is_msvc(self): self.requires("libverto/0.3.2") if self.options.get_safe("with_tls") == "openssl": - self.requires("openssl/[>=1.1 <4]") + self.requires("openssl/1.1.1s") if self.options.get_safe("with_tcl"): self.requires("tcl/8.6.10") diff --git a/recipes/krb5/all/patches/1.18.2-0003-no-html+tests.patch b/recipes/krb5/all/patches/1.19.2-0001-no-html+tests.patch similarity index 100% rename from recipes/krb5/all/patches/1.18.2-0003-no-html+tests.patch rename to recipes/krb5/all/patches/1.19.2-0001-no-html+tests.patch diff --git a/recipes/krb5/all/patches/1.19.2-0002-no-tests.patch b/recipes/krb5/all/patches/1.19.2-0002-no-tests.patch new file mode 100644 index 00000000000000..6277a45dd0a98e --- /dev/null +++ b/recipes/krb5/all/patches/1.19.2-0002-no-tests.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 8f14e9bf2..dfb6843c9 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -30,7 +30,7 @@ SUBDIRS=util include lib \ + plugins/preauth/spake \ + plugins/preauth/test \ + plugins/tls/k5tls \ +- kdc kadmin kprop clients appl tests \ ++ kdc kadmin kprop clients appl \ + config-files build-tools man doc @po@ + WINSUBDIRS=include util lib ccapi windows clients appl plugins\preauth\spake + BUILDTOP=$(REL).