CVS commit: pkgsrc/security/mit-krb5

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jul 16 10:26:40 UTC 2018

Modified Files:
        pkgsrc/security/mit-krb5: distinfo
Added Files:
        pkgsrc/security/mit-krb5/patches: patch-lib_kdb_kdb__log.c
            patch-slave_kproplog.c

Log Message:
mit-krb5: mmap -Werror=incompatible-pointer-types fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/security/mit-krb5/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/mit-krb5/patches/patch-lib_kdb_kdb__log.c \
    pkgsrc/security/mit-krb5/patches/patch-slave_kproplog.c

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

Modified files:

Index: pkgsrc/security/mit-krb5/distinfo
diff -u pkgsrc/security/mit-krb5/distinfo:1.64 pkgsrc/security/mit-krb5/distinfo:1.65
--- pkgsrc/security/mit-krb5/distinfo:1.64      Fri Jun 15 20:46:01 2018
+++ pkgsrc/security/mit-krb5/distinfo   Mon Jul 16 10:26:40 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2018/06/15 20:46:01 tez Exp $
+$NetBSD: distinfo,v 1.65 2018/07/16 10:26:40 jperkin Exp $
 
 SHA1 (krb5-1.16.1.tar.gz) = 8353f2d900a7d52499c7c2605d5e295f71dd5e67
 RMD160 (krb5-1.16.1.tar.gz) = 26a423032841a67974d377ad65d7361b51aa7058
@@ -21,11 +21,13 @@ SHA1 (patch-include_osconf.hin) = d31a81
 SHA1 (patch-kadmin_cli_ss_wrapper.c) = e32e6180f8d508cb2eb18489ce2fef0a1ad0f51d
 SHA1 (patch-lib_apputils_Makefile.in) = 085004041a2bb8c4bb3074c2e71e71f22f4f06d7
 SHA1 (patch-lib_apputils_udppktinfo.c) = 47ac861181faebfe5f95c28be329ce917ece872c
+SHA1 (patch-lib_kdb_kdb__log.c) = 87052d7940db0f5a41ffce250c19c0b338b37d60
 SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = 74d7d172ec4c8d7f68a093befc6b40c99b119e37
 SHA1 (patch-lib_krb5_ccache_Makefile.in) = 330ae21ec3b290ae16478c2c49a138acac5bf2fd
 SHA1 (patch-plugins_kdb_db2_Makefile.in) = f374fc5915b735075fbb751ef736f4ce54abc289
 SHA1 (patch-plugins_kdb_db2_libdb2_Makefile.in) = b4b7e8e4192b5e5318f1e42c49315789619f3ae9
 SHA1 (patch-plugins_preauth_otp_Makefile.in) = 8c779e3b37cab4138f300f4a09325387092c79f8
 SHA1 (patch-plugins_preauth_pkinit_Makefile.in) = c778366d5bd1cae85424643a582013101fc9632d
+SHA1 (patch-slave_kproplog.c) = a238c8740aeb5e4068775148f03a8692bd514423
 SHA1 (patch-util_k5ev_verto-k5ev.c) = 8f074ddccbaaa03576f0302437aed3aaad1b738d
 SHA1 (patch-util_ss_Makefile.in) = 5ca0bf7295a8f4c1d8e59097863940f88d224ee7

Added files:

Index: pkgsrc/security/mit-krb5/patches/patch-lib_kdb_kdb__log.c
diff -u /dev/null pkgsrc/security/mit-krb5/patches/patch-lib_kdb_kdb__log.c:1.1
--- /dev/null   Mon Jul 16 10:26:40 2018
+++ pkgsrc/security/mit-krb5/patches/patch-lib_kdb_kdb__log.c   Mon Jul 16 10:26:40 2018
@@ -0,0 +1,27 @@
+$NetBSD: patch-lib_kdb_kdb__log.c,v 1.1 2018/07/16 10:26:40 jperkin Exp $
+
+Fix mmap/munmap -Werror=incompatible-pointer-types
+
+--- lib/kdb/kdb_log.c.orig     2018-05-03 14:34:47.000000000 +0000
++++ lib/kdb/kdb_log.c
+@@ -489,7 +489,7 @@ ulog_map(krb5_context context, const cha
+             return errno;
+     }
+ 
+-    ulog = mmap(0, MAXLOGLEN, PROT_READ | PROT_WRITE, MAP_SHARED, ulogfd, 0);
++    ulog = (kdb_hlog_t *)mmap(0, MAXLOGLEN, PROT_READ | PROT_WRITE, MAP_SHARED, ulogfd, 0);
+     if (ulog == MAP_FAILED) {
+         /* Can't map update log file to memory. */
+         close(ulogfd);
+@@ -681,7 +681,11 @@ ulog_fini(krb5_context context)
+     if (log_ctx == NULL)
+         return;
+     if (log_ctx->ulog != NULL)
++#ifdef __sun
++        munmap((caddr_t)log_ctx->ulog, MAXLOGLEN);
++#else
+         munmap(log_ctx->ulog, MAXLOGLEN);
++#endif
+     free(log_ctx);
+     context->kdblog_context = NULL;
+ }
Index: pkgsrc/security/mit-krb5/patches/patch-slave_kproplog.c
diff -u /dev/null pkgsrc/security/mit-krb5/patches/patch-slave_kproplog.c:1.1
--- /dev/null   Mon Jul 16 10:26:40 2018
+++ pkgsrc/security/mit-krb5/patches/patch-slave_kproplog.c     Mon Jul 16 10:26:40 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-slave_kproplog.c,v 1.1 2018/07/16 10:26:40 jperkin Exp $
+
+Fix mmap -Werror=incompatible-pointer-types.
+
+--- slave/kproplog.c.orig      2018-05-03 14:34:47.000000000 +0000
++++ slave/kproplog.c
+@@ -429,7 +429,7 @@ map_ulog(const char *filename)
+         return NULL;
+     if (fstat(fd, &st) < 0)
+         return NULL;
+-    ulog = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
++    ulog = (kdb_hlog_t *)mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+     return (ulog == MAP_FAILED) ? NULL : ulog;
+ }
+