CVS commit: [pkgsrc-2021Q4] pkgsrc/security/heimdal

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Fri Feb  4 13:06:26 UTC 2022

Modified Files:
        pkgsrc/security/heimdal [pkgsrc-2021Q4]: distinfo
        pkgsrc/security/heimdal/patches [pkgsrc-2021Q4]:
            patch-lib_hx509_Makefile.in

Log Message:
Pullup ticket #6576 - requested by david
security/heimdal: build fix

Revisions pulled up:
- security/heimdal/distinfo                                     1.54
- security/heimdal/patches/patch-lib_hx509_Makefile.in          1.3

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Thu Jan 27 03:31:22 UTC 2022

   Modified Files:
           pkgsrc/security/heimdal: distinfo
           pkgsrc/security/heimdal/patches: patch-lib_hx509_Makefile.in

   Log Message:
   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.)


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.53.2.1 pkgsrc/security/heimdal/distinfo
cvs rdiff -u -r1.2 -r1.2.2.1 \
    pkgsrc/security/heimdal/patches/patch-lib_hx509_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/heimdal/distinfo
diff -u pkgsrc/security/heimdal/distinfo:1.53 pkgsrc/security/heimdal/distinfo:1.53.2.1
--- pkgsrc/security/heimdal/distinfo:1.53       Wed Nov 17 08:46:02 2021
+++ pkgsrc/security/heimdal/distinfo    Fri Feb  4 13:06:26 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2021/11/17 08:46:02 wiz Exp $
+$NetBSD: distinfo,v 1.53.2.1 2022/02/04 13:06:26 tm Exp $
 
 BLAKE2s (heimdal-7.7.0.tar.gz) = c56e08d20b8c4f7ce749e5dfbf643b2b8c0f1ca057719e95cc9eb69c48e49df6
 SHA512 (heimdal-7.7.0.tar.gz) = 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
 Size (heimdal-7.7.0.tar.gz) = 10189293 bytes
 SHA1 (patch-kdc_krb5tgs.c) = 76a5cd9031a44a51e5e11c1e1226ff1ae52b9628
 SHA1 (patch-lib_hdb_hdb-mitdb.c) = 37fd0cc328986e68212c4eaea106c422dea87192
-SHA1 (patch-lib_hx509_Makefile.in) = 1b691f89c71ace03898cbb6f167dcd1339ae46d3
+SHA1 (patch-lib_hx509_Makefile.in) = 1f8efecaf79ef2726d047bf21b9cb0b8be230dce

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