Fixes

conan-io · Nov 19, 2022 · 0db6304 · 0db6304
1 parent 270ecd1
commit 0db6304
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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.1q")
+            self.requires("openssl/1.1.1s")
         if self.options.get_safe("with_tcl"):
             self.requires("tcl/8.6.10")
 
@@ -169,7 +169,7 @@ def build(self):
                 replace_in_file(self, "kdb5_util.c",
                                 "krb5_keyblock master_keyblock;",
                                 "extern krb5_keyblock master_keyblock;")
-            with chdir(self, os.path.join(self.source_folder,"src", "tests", "create")):                    
+            with chdir(self, os.path.join(self.source_folder,"src", "tests", "create")):
                 replace_in_file(self, "kdb5_mkdums.c",
                                 "krb5_keyblock master_keyblock;",
                                 "extern krb5_keyblock master_keyblock;")
@@ -178,14 +178,14 @@ def build(self):
                                 "static krb5_principal master_princ;")
                 replace_in_file(self, "kdb5_mkdums.c",
                                 "krb5_pointer master_random;",
-                                "static krb5_pointer master_random;")                                                
+                                "static krb5_pointer master_random;")
             with chdir(self, os.path.join(self.source_folder,"src", "tests", "verify")):
                 replace_in_file(self, "kdb5_verify.c",
                                 "krb5_keyblock master_keyblock;",
                                 "extern krb5_keyblock master_keyblock;")
                 replace_in_file(self, "kdb5_verify.c",
                                 "krb5_principal master_princ;",
-                                "static krb5_principal master_princ;")                                                    
+                                "static krb5_principal master_princ;")
         apply_conandata_patches(self)
         if is_msvc(self):
             self._build_msvc()
@@ -229,7 +229,7 @@ def package_info(self):
         self.cpp_info.components["mit-krb5"].libs = [krb5_lib] + crypto_libs + [krb5support]
         if not is_msvc(self):
             self.cpp_info.components["mit-krb5"].libs.append("com_err")  # is a common library, that can potentially be packaged (but I don't know who "owns" it)
-            
+
         if self.options.get_safe('with_tls') == "openssl":
             self.cpp_info.components["mit-krb5"].requires.append("openssl::ssl")
         self.cpp_info.components["mit-krb5"].names["pkg_config"] = "mit-krb5"

diff --git a/recipes/krb5/all/test_package/conanfile.py b/recipes/krb5/all/test_package/conanfile.py
@@ -7,7 +7,7 @@ class TestPackageConan(ConanFile):
     generators = "cmake", "pkg_config"
 
     def build_requirements(self):
-        self.build_requires("pkgconf/1.7.3")
+        self.build_requires("pkgconf/1.9.3")
 
     def build(self):
         cmake = CMake(self)