krb5: fix builld, update to openssl3

2026-04-22 19:50:05 +02:00 · 2024-08-10 17:56:03 +02:00
parent 6f00b538da
commit a669fecf54
2 changed files with 56 additions and 47 deletions
--- a/net-misc/krb5/krb5-1.20.recipe
+++ b/net-misc/krb5/krb5-1.20.recipe
@@ -7,7 +7,7 @@ products as well."
 HOMEPAGE="https://web.mit.edu/kerberos/"
 COPYRIGHT="1985-2022 by the Massachusetts Institute of Technology and its contributors"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://kerberos.org/dist/krb5/$portVersion/krb5-$portVersion.tar.gz"
 CHECKSUM_SHA256="7e022bdd3c851830173f9faaa006a230a0e0fdad4c953e85bff4bf0da036e12f"
 PATCHES="krb5-$portVersion.patchset"
@@ -95,7 +95,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcmocka$secondaryArchSuffix
 	devel:libedit$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix <= 3
 	"
 BUILD_PREREQUIRES="
 	cmd:autoreconf
--- a/net-misc/krb5/patches/krb5-1.20.patchset
+++ b/net-misc/krb5/patches/krb5-1.20.patchset
@@ -1,4 +1,4 @@
-From f4b22d41666d3f440bfa13f9d14eb2fc1730b021 Mon Sep 17 00:00:00 2001
+From ab9910f8728b67fc5d9be3a7226b95c222ba8d65 Mon Sep 17 00:00:00 2001
 From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
 Date: Mon, 19 Jul 2021 20:29:42 +0000
 Subject: Add support for Haiku.
@@ -198,10 +198,10 @@ index 9ae8f8b..6ec3877 100644
 #define	RET_SUCCESS	 0
 #define	RET_SPECIAL	 1
 -- 
-2.30.2
+2.45.2


-From 1b36444a3eae8e49df04abc5ef0198d76147303f Mon Sep 17 00:00:00 2001
+From 31d405758ed070b0f8c673cbcdc9eb8bcd808266 Mon Sep 17 00:00:00 2001
 From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
 Date: Tue, 20 Jul 2021 13:16:44 +0000
 Subject: haiku: also include /boot/system/lib for RUN_ENV
@@ -222,10 +222,10 @@ index e7a421a..6aede95 100644
        PROFFLAGS=-pg
        ;;
 -- 
-2.30.2
+2.45.2


-From d9f0e038c256f55209c1061ed436aecd77d8ae8c Mon Sep 17 00:00:00 2001
+From a198509a1dc46e408ab3430fcf4445de0ee2ffae Mon Sep 17 00:00:00 2001
 From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
 Date: Thu, 22 Jul 2021 11:52:18 +0000
 Subject: Replace <sys/errno.h> with <errno.h>
@@ -284,10 +284,10 @@ index 1c120c0..a645682 100644
 
 /*
 -- 
-2.30.2
+2.45.2


-From e8e4b419eea0cc76223cc7f686247c7ca1b886f4 Mon Sep 17 00:00:00 2001
+From 1879fb221dc8839493f934b764ea92a8bc06494b Mon Sep 17 00:00:00 2001
 From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
 Date: Thu, 22 Jul 2021 21:09:19 +0000
 Subject: libdb2: add <stdint.h>
@@ -311,10 +311,10 @@ index 6ec3877..0583fc2 100644
 #define	RET_ERROR	-1		/* Return values. */
 #define	RET_SUCCESS	 0
 -- 
-2.30.2
+2.45.2


-From 02e54a11fe41beaa1c65953b9f05acd2437a0399 Mon Sep 17 00:00:00 2001
+From 76d2b2b7fec8a6360f8f99adae0b23f13c4fd46e Mon Sep 17 00:00:00 2001
 From: Trung Nguyen <trungnt282910@gmail.com>
 Date: Fri, 24 Jun 2022 15:54:05 +0700
 Subject: haiku: Use different t_trace.ref
@@ -398,10 +398,10 @@ index 0000000..5b00eed
 +krb5_keytab, display name: FILE:/etc/krb5.keytab
 +krb5_creds *, display clientprinc -> serverprinc: @ATHENA.MIT.EDU -> @ZEUS.MIT.EDU
 -- 
-2.30.2
+2.45.2


-From 657f17d761c8331b3588236f7d5d84d4da9a3fe4 Mon Sep 17 00:00:00 2001
+From 156692ec6b5fa22bb171022bfa532d302c6dc069 Mon Sep 17 00:00:00 2001
 From: Trung Nguyen <trungnt282910@gmail.com>
 Date: Tue, 28 Jun 2022 13:14:38 +0700
 Subject: haiku: Fix tests
@@ -556,20 +556,17 @@ index 8ecbdf2..75c501e 100644
 		(void)bind(sock, sa, sa_socklen(sa));
 	}
 -- 
-2.30.2
+2.45.2


-From c7d565559dc60e5e37c031f0e9fbd5bf0b833a6d Mon Sep 17 00:00:00 2001
+From 76117093b0d2cb7c25156434e4de332eb51ae8fc Mon Sep 17 00:00:00 2001
 From: Trung Nguyen <trungnt282910@gmail.com>
 Date: Wed, 29 Jun 2022 15:08:48 +0700
 Subject: haiku: Fix LDCOMBINE flags to include soname

---
- src/config/shlib.conf | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/config/shlib.conf b/src/config/shlib.conf
-index 6aede9564..c12cc0960 100644
+index 6aede95..c12cc09 100644
 --- a/src/config/shlib.conf
 +++ b/src/config/shlib.conf
@@ -297,8 +297,9 @@ mips-*-netbsd*)
@@ -583,11 +580,11 @@ index 6aede9564..c12cc0960 100644
        RPATH_FLAG='-Wl,-rpath -Wl,'
        PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
        CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
--
-2.30.2
+-- 
+2.45.2


-From e4770642e26652907811e61404e64a5a543ab52e Mon Sep 17 00:00:00 2001
+From bc23e0502cbff7531248f4e132f3b5b4f183675f Mon Sep 17 00:00:00 2001
 From: Trung Nguyen <trungnt282910@gmail.com>
 Date: Wed, 29 Jun 2022 21:00:06 +0700
 Subject: haiku: getaddrinfo and gethostbyname workarounds.
@@ -597,22 +594,9 @@ most Haiku systems). Therefore, we have to compare the passed name
 to the output of gethostname.

 The same goes to gethostbyname (used by some test applications).
---
- src/appl/gss-sample/gss-client.c    | 22 +++++++++++
- src/appl/simple/client/sim_client.c |  3 ++
- src/appl/user_user/client.c         |  4 ++
- src/include/fake-addrinfo.h         |  8 ++++
- src/kdc/t_bigreply.py               |  3 +-
- src/lib/rpc/unit-test/client.c      | 18 +++++++++
- src/tests/t_bogus_kdc_req.py        |  3 +-
- src/tests/t_cve-2012-1014.py        |  3 +-
- src/tests/t_cve-2012-1015.py        |  3 +-
- src/tests/t_cve-2021-36222.py       |  3 +-
- src/util/support/fake-addrinfo.c    | 60 ++++++++++++++++++++++++++++-
- 11 files changed, 124 insertions(+), 6 deletions(-)

 diff --git a/src/appl/gss-sample/gss-client.c b/src/appl/gss-sample/gss-client.c
-index 6e2aa3369..9f4016f32 100644
+index 6e2aa33..9f4016f 100644
 --- a/src/appl/gss-sample/gss-client.c
 +++ b/src/appl/gss-sample/gss-client.c
@@ -69,6 +69,28 @@
@@ -645,7 +629,7 @@ index 6e2aa3369..9f4016f32 100644
 static int spnego = 0;
 static gss_OID_desc gss_spnego_mechanism_oid_desc =
 diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
-index 08f06abe5..eab631fae 100644
+index 08f06ab..eab631f 100644
 --- a/src/appl/simple/client/sim_client.c
 +++ b/src/appl/simple/client/sim_client.c
@@ -40,6 +40,9 @@
@@ -659,7 +643,7 @@ index 08f06abe5..eab631fae 100644
 #include "simple.h"
 
 diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c
-index 9a05345ce..79af6ce7e 100644
+index 9a05345..79af6ce 100644
 --- a/src/appl/user_user/client.c
 +++ b/src/appl/user_user/client.c
@@ -33,6 +33,10 @@
@@ -674,7 +658,7 @@ index 9a05345ce..79af6ce7e 100644
 {
     int s;
 diff --git a/src/include/fake-addrinfo.h b/src/include/fake-addrinfo.h
-index 6d18d4f46..3542a09bb 100644
+index 6d18d4f..3542a09 100644
 --- a/src/include/fake-addrinfo.h
 +++ b/src/include/fake-addrinfo.h
@@ -220,6 +220,10 @@ extern int krb5int_getnameinfo (const struct sockaddr *sa, socklen_t salen,
@@ -700,7 +684,7 @@ index 6d18d4f46..3542a09bb 100644
 
 #endif /* FAI_DEFINED */
 diff --git a/src/kdc/t_bigreply.py b/src/kdc/t_bigreply.py
-index ea101ff75..f61914b6f 100644
+index ea101ff..f61914b 100644
 --- a/src/kdc/t_bigreply.py
 +++ b/src/kdc/t_bigreply.py
@@ -1,4 +1,5 @@
@@ -719,7 +703,7 @@ index ea101ff75..f61914b6f 100644
 lenbytes = s.recv(4)
 assert(len(lenbytes) == 4)
 diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/unit-test/client.c
-index c9a812bc5..b04582519 100644
+index c9a812b..b045825 100644
 --- a/src/lib/rpc/unit-test/client.c
 +++ b/src/lib/rpc/unit-test/client.c
@@ -20,6 +20,10 @@
@@ -762,7 +746,7 @@ index c9a812bc5..b04582519 100644
      if (h == NULL) {
 	 fprintf(stderr, "Can't resolve hostname %s\n", host);
 diff --git a/src/tests/t_bogus_kdc_req.py b/src/tests/t_bogus_kdc_req.py
-index a101c0e10..83f5473f4 100755
+index a101c0e..83f5473 100755
 --- a/src/tests/t_bogus_kdc_req.py
 +++ b/src/tests/t_bogus_kdc_req.py
@@ -1,4 +1,5 @@
@@ -781,7 +765,7 @@ index a101c0e10..83f5473f4 100755
 
 # Bogus AS-REQ
 diff --git a/src/tests/t_cve-2012-1014.py b/src/tests/t_cve-2012-1014.py
-index 8447e0ee7..bb4eb862a 100755
+index 8447e0e..bb4eb86 100755
 --- a/src/tests/t_cve-2012-1014.py
 +++ b/src/tests/t_cve-2012-1014.py
@@ -1,4 +1,5 @@
@@ -800,7 +784,7 @@ index 8447e0ee7..bb4eb862a 100755
 x1 = base64.b16decode('6A5E305BA103020105A2030201')
 x2 = base64.b16decode('A44F304DA007030500FEDCBA90A10E30' +
 diff --git a/src/tests/t_cve-2012-1015.py b/src/tests/t_cve-2012-1015.py
-index ae5678cac..b7cc7edcf 100755
+index ae5678c..b7cc7ed 100755
 --- a/src/tests/t_cve-2012-1015.py
 +++ b/src/tests/t_cve-2012-1015.py
@@ -1,4 +1,5 @@
@@ -819,7 +803,7 @@ index ae5678cac..b7cc7edcf 100755
 x1 = base64.b16decode('6A81A030819DA103020105A20302010A' +
                       'A30E300C300AA10402020095A2020400' +
 diff --git a/src/tests/t_cve-2021-36222.py b/src/tests/t_cve-2021-36222.py
-index 57e04993b..0048071fa 100644
+index 57e0499..0048071 100644
 --- a/src/tests/t_cve-2021-36222.py
 +++ b/src/tests/t_cve-2021-36222.py
@@ -1,3 +1,4 @@
@@ -837,7 +821,7 @@ index 57e04993b..0048071fa 100644
 m = ('6A81A0' '30819D'          # [APPLICATION 10] SEQUENCE
      'A103' '0201' '05'         #  [1] pvno = 5
 diff --git a/src/util/support/fake-addrinfo.c b/src/util/support/fake-addrinfo.c
-index 480456ad1..052be0e0f 100644
+index 480456a..052be0e 100644
 --- a/src/util/support/fake-addrinfo.c
 +++ b/src/util/support/fake-addrinfo.c
@@ -136,11 +136,18 @@ extern /*@dependent@*/ char *gai_strerror (int code) /*@*/;
@@ -944,5 +928,30 @@ index 480456ad1..052be0e0f 100644
 +}
 +#endif
 -- 
-2.30.2
+2.45.2
+
+
+From 0f914ada957453eb5f9e6bacbb7aec5b6863f78e Mon Sep 17 00:00:00 2001
+From: PulkoMandy <pulkomandy@pulkomandy.tk>
+Date: Sat, 10 Aug 2024 17:52:40 +0200
+Subject: Fix misplasced parenthese
+
+
+diff --git a/src/aclocal.m4 b/src/aclocal.m4
+index 0a71a4f..582c538 100644
+--- a/src/aclocal.m4
+++ b/src/aclocal.m4
+@@ -409,8 +409,8 @@ else
+       [[struct sockaddr_in6 in;
+         AF_INET6;
+         IN6_IS_ADDR_LINKLOCAL(&in.sin6_addr);]])],
+-    [krb5_cv_inet6=yes], [krb5_cv_inet6=no])])
+-fi
+    [krb5_cv_inet6=yes], [krb5_cv_inet6=no])]
+fi)
+ AC_MSG_RESULT($krb5_cv_inet6)
+ if test "$krb5_cv_inet6" = no && test "$ac_cv_func_inet_ntop" = yes; then
+ AC_MSG_CHECKING(for IPv6 compile-time support with -DINET6)
+-- 
+2.45.2