From 63f7cb0cef561858f88af281a861ecc358424bde Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 15 Jun 2019 10:24:37 +0000 Subject: [PATCH] Update to heimdal-7.7.0. --- security/heimdal/Makefile | 8 ++++---- security/heimdal/distinfo | 4 ++-- .../heimdal/patches/patch-lib_hdb_hdb-mitdb_c | 19 +++++++++++++++++++ security/heimdal/pkg/PLIST-devel-docs | 4 +++- 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 security/heimdal/patches/patch-lib_hdb_hdb-mitdb_c diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 925d46bbbda..7a1755b1a19 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.33 2019/05/16 15:28:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.34 2019/06/15 10:24:37 ajacoutot Exp $ COMMENT-main= Kerberos 5 implementation COMMENT-devel-docs= Heimdal C functions documentation COMMENT-libs= Heimdal libraries and headers -V= 7.6.0 +V= 7.7.0 DISTNAME= heimdal-${V} PKGNAME-main= ${DISTNAME} @@ -25,7 +25,7 @@ SHARED_LIBS += hx509 1.0 # 5.0 SHARED_LIBS += krb5 22.0 # 26.0 SHARED_LIBS += heimntlm 1.0 # 1.0 SHARED_LIBS += gssapi 9.0 # 3.0 -SHARED_LIBS += hdb 3.0 # 11.0 +SHARED_LIBS += hdb 3.1 # 11.0 SHARED_LIBS += kadm5srv 3.0 # 8.1 SHARED_LIBS += kadm5clnt 3.0 # 7.1 SHARED_LIBS += kdc 3.0 # 2.0 @@ -35,7 +35,7 @@ HOMEPAGE= http://www.h5l.org/ MAINTAINER= Antoine Jacoutot # BSD -PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE= Yes MULTI_PACKAGES= -main -devel-docs -libs diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo index 8c46c9c943d..865ed29f8bd 100644 --- a/security/heimdal/distinfo +++ b/security/heimdal/distinfo @@ -1,2 +1,2 @@ -SHA256 (heimdal-7.6.0.tar.gz) = r7mW4n5yL1G/TZ6NHVHkfNEL+hpBqEEGr5JuVjmlLk0= -SIZE (heimdal-7.6.0.tar.gz) = 10186832 +SHA256 (heimdal-7.7.0.tar.gz) = 8C0zFNY0zFXrnPBKHq4NlrKT5Fofg33p2JToABYbfRs= +SIZE (heimdal-7.7.0.tar.gz) = 10189293 diff --git a/security/heimdal/patches/patch-lib_hdb_hdb-mitdb_c b/security/heimdal/patches/patch-lib_hdb_hdb-mitdb_c new file mode 100644 index 00000000000..faea936e092 --- /dev/null +++ b/security/heimdal/patches/patch-lib_hdb_hdb-mitdb_c @@ -0,0 +1,19 @@ +$OpenBSD: patch-lib_hdb_hdb-mitdb_c,v 1.1 2019/06/15 10:24:37 ajacoutot Exp $ + +From 3bcc031939d4f8cf600839d1e92b252c250d4d79 Mon Sep 17 00:00:00 2001 +From: Daria Phoebe Brashear +Date: Thu, 19 Oct 2017 14:06:12 -0500 +Subject: [PATCH] hdb-mitdb: correct missing equals in initialization + +Index: lib/hdb/hdb-mitdb.c +--- lib/hdb/hdb-mitdb.c.orig ++++ lib/hdb/hdb-mitdb.c +@@ -1116,7 +1116,7 @@ krb5_error_code + hdb_mitdb_create(krb5_context context, HDB **db, + const char *filename) + { +- MITDB **mdb (MITDB **)db; ++ MITDB **mdb = (MITDB **)db; + *mdb = calloc(1, sizeof(**mdb)); + if (*mdb == NULL) { + krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); diff --git a/security/heimdal/pkg/PLIST-devel-docs b/security/heimdal/pkg/PLIST-devel-docs index 01715a961b7..86021b4b523 100644 --- a/security/heimdal/pkg/PLIST-devel-docs +++ b/security/heimdal/pkg/PLIST-devel-docs @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-devel-docs,v 1.2 2016/12/17 14:58:31 ajacoutot Exp $ +@comment $OpenBSD: PLIST-devel-docs,v 1.3 2019/06/15 10:24:37 ajacoutot Exp $ @man man/man3/DES_cbc_cksum.3 @man man/man3/DES_cbc_encrypt.3 @man man/man3/DES_cfb64_encrypt.3 @@ -239,6 +239,7 @@ @man man/man3/hdb_password.3 @man man/man3/hdb_remove.3 @man man/man3/hdb_rename.3 +@man man/man3/hdb_set_sync.3 @man man/man3/hdb_store.3 @man man/man3/hdb_unlock.3 @man man/man3/heim_ntlm_build_ntlm1_master.3 @@ -894,6 +895,7 @@ @man man/man3/krb5_principal_get_realm.3 @man man/man3/krb5_principal_get_type.3 @man man/man3/krb5_principal_intro.3 +@man man/man3/krb5_principal_is_anonymous.3 @man man/man3/krb5_principal_is_gss_hostbased_service.3 @man man/man3/krb5_principal_is_krbtgt.3 @man man/man3/krb5_principal_is_lkdc.3