Skip to content

Commit

Permalink
try to fix 1.19.2
Browse files Browse the repository at this point in the history
  • Loading branch information
xakod committed May 9, 2023
1 parent 4dd0085 commit 9661527
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 6 deletions.
12 changes: 7 additions & 5 deletions recipes/krb5/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"


2 changes: 1 addition & 1 deletion recipes/krb5/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
13 changes: 13 additions & 0 deletions recipes/krb5/all/patches/1.19.2-0002-no-tests.patch
Original file line number Diff line number Diff line change
@@ -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).

0 comments on commit 9661527

Please sign in to comment.