Thu Jan 27 03:31:22 2022 UTC ()
heimdal: correct build fix patch

The previous version of this patch added build dependencies at the
wrong point: we need the headers generated by the time the object is
compiled, not by the time the final binary is linked. (This matches the
actual upstream change set.)


(gutteridge)
diff -r1.53 -r1.54 pkgsrc/security/heimdal/distinfo
diff -r1.2 -r1.3 pkgsrc/security/heimdal/patches/patch-lib_hx509_Makefile.in
cvs diff -r1.53 -r1.54 pkgsrc/security/heimdal/distinfo (expand / switch to unified diff)

--- pkgsrc/security/heimdal/distinfo 2021/11/17 08:46:02 1.53
+++ pkgsrc/security/heimdal/distinfo 2022/01/27 03:31:21 1.54
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.53 2021/11/17 08:46:02 wiz Exp $ 1$NetBSD: distinfo,v 1.54 2022/01/27 03:31:21 gutteridge Exp $
2 2
3BLAKE2s (heimdal-7.7.0.tar.gz) = c56e08d20b8c4f7ce749e5dfbf643b2b8c0f1ca057719e95cc9eb69c48e49df6 3BLAKE2s (heimdal-7.7.0.tar.gz) = c56e08d20b8c4f7ce749e5dfbf643b2b8c0f1ca057719e95cc9eb69c48e49df6
4SHA512 (heimdal-7.7.0.tar.gz) = 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99 4SHA512 (heimdal-7.7.0.tar.gz) = 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
5Size (heimdal-7.7.0.tar.gz) = 10189293 bytes 5Size (heimdal-7.7.0.tar.gz) = 10189293 bytes
6SHA1 (patch-kdc_krb5tgs.c) = 76a5cd9031a44a51e5e11c1e1226ff1ae52b9628 6SHA1 (patch-kdc_krb5tgs.c) = 76a5cd9031a44a51e5e11c1e1226ff1ae52b9628
7SHA1 (patch-lib_hdb_hdb-mitdb.c) = 37fd0cc328986e68212c4eaea106c422dea87192 7SHA1 (patch-lib_hdb_hdb-mitdb.c) = 37fd0cc328986e68212c4eaea106c422dea87192
8SHA1 (patch-lib_hx509_Makefile.in) = 1b691f89c71ace03898cbb6f167dcd1339ae46d3 8SHA1 (patch-lib_hx509_Makefile.in) = 1f8efecaf79ef2726d047bf21b9cb0b8be230dce
cvs diff -r1.2 -r1.3 pkgsrc/security/heimdal/patches/Attic/patch-lib_hx509_Makefile.in (expand / switch to unified diff)

--- pkgsrc/security/heimdal/patches/Attic/patch-lib_hx509_Makefile.in 2021/11/05 09:14:28 1.2
+++ pkgsrc/security/heimdal/patches/Attic/patch-lib_hx509_Makefile.in 2022/01/27 03:31:21 1.3
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-lib_hx509_Makefile.in,v 1.2 2021/11/05 09:14:28 wiz Exp $ 1$NetBSD: patch-lib_hx509_Makefile.in,v 1.3 2022/01/27 03:31:21 gutteridge Exp $
2 2
3Wait for generated includes. 3Wait for generated includes.
4https://github.com/heimdal/heimdal/issues/851 4https://github.com/heimdal/heimdal/issues/851
5 5
6--- lib/hx509/Makefile.in.orig 2021-11-04 17:38:39.000000000 +0000 6--- lib/hx509/Makefile.in.orig 2019-06-07 06:23:17.000000000 +0000
7+++ lib/hx509/Makefile.in 7+++ lib/hx509/Makefile.in
8@@ -218,6 +218,7 @@ nodist_hxtool_OBJECTS = hxtool-commands. 8@@ -2082,7 +2082,7 @@ $(srcdir)/hx509-private.h: $(dist_libhx5
9 hxtool_OBJECTS = $(dist_hxtool_OBJECTS) $(nodist_hxtool_OBJECTS) 9 hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)
10 hxtool_DEPENDENCIES = libhx509.la $(top_builddir)/lib/asn1/libasn1.la \ 10 $(heim_verbose)$(SLC) $(srcdir)/hxtool-commands.in
11 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 11
12+ $(nodist_include_HEADERS) \ 12-$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h
13 $(top_builddir)/lib/sl/libsl.la 13+$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS)
14 test_expr_SOURCES = test_expr.c 14
15 test_expr_OBJECTS = test_expr.$(OBJEXT) 15 clean-local:
 16 @echo "cleaning PKITS" ; rm -rf PKITS_data