Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 4B33E1A9217 for ; Tue, 19 Jan 2021 16:51:33 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8178084DA4; Tue, 19 Jan 2021 16:51:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BC0CC84DA1 for ; Tue, 19 Jan 2021 16:51:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id BuMWux1wrA2F for ; Tue, 19 Jan 2021 16:51:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 252F784D31 for ; Tue, 19 Jan 2021 16:51:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1DC84FA9D; Tue, 19 Jan 2021 16:51:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1611075091111860" MIME-Version: 1.0 Date: Tue, 19 Jan 2021 16:51:31 +0000 From: "Brook Milligan" Subject: CVS commit: pkgsrc/security/mit-krb5 To: pkgsrc-changes@NetBSD.org Reply-To: brook@netbsd.org X-Mailer: log_accum Message-Id: <20210119165131.1DC84FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1611075091111860 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: brook Date: Tue Jan 19 16:51:31 UTC 2021 Modified Files: pkgsrc/security/mit-krb5: distinfo pkgsrc/security/mit-krb5/patches: patch-aclocal.m4 Log Message: security/mit-krb5: revert previous commit The fix in the previous patch was already in the updated package, despite information from upstream. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 pkgsrc/security/mit-krb5/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/mit-krb5/patches/patch-aclocal.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1611075091111860 Content-Disposition: inline Content-Length: 3580 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/mit-krb5/distinfo diff -u pkgsrc/security/mit-krb5/distinfo:1.75 pkgsrc/security/mit-krb5/distinfo:1.76 --- pkgsrc/security/mit-krb5/distinfo:1.75 Tue Jan 19 16:18:03 2021 +++ pkgsrc/security/mit-krb5/distinfo Tue Jan 19 16:51:30 2021 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.75 2021/01/19 16:18:03 brook Exp $ +$NetBSD: distinfo,v 1.76 2021/01/19 16:51:30 brook Exp $ SHA1 (krb5-1.18.3.tar.gz) = fdbb31fab5bdea24fc464d09bdbc245740648f1a RMD160 (krb5-1.18.3.tar.gz) = b8a3c3542433442e18984456773b0a2749fc6282 SHA512 (krb5-1.18.3.tar.gz) = cf0bf6cf8f622fa085954e6da998d952cf64dc7ccc319972ed81ea0542089cabf2d0e8243df84da01ad6f40584768ca2f02d108630c6741fa7b3d7d98c887c01 Size (krb5-1.18.3.tar.gz) = 8715312 bytes SHA1 (patch-Makefile.in) = 24f915d7a4340b9a4a454b9b67c94147fdc49c34 -SHA1 (patch-aclocal.m4) = d9903b91dfe7c1d580f5e9687fb963bc2e8d4529 +SHA1 (patch-aclocal.m4) = 07b5d9ae38c74eaea6ba62aed9062dca1bf7f3fb SHA1 (patch-build-tools_krb5-config.in) = 4ab922df1d86d86f9ef043f2c5cdf048c0477d3a SHA1 (patch-ccapi_test_test__ccapi.sh) = 5210f31dd23e6f556d40f5ff2b436bf395eef4d0 SHA1 (patch-config_lib.in) = 974db26486b3239e4fcd53be7280b32c802f6007 Index: pkgsrc/security/mit-krb5/patches/patch-aclocal.m4 diff -u pkgsrc/security/mit-krb5/patches/patch-aclocal.m4:1.3 pkgsrc/security/mit-krb5/patches/patch-aclocal.m4:1.4 --- pkgsrc/security/mit-krb5/patches/patch-aclocal.m4:1.3 Tue Jan 19 16:18:03 2021 +++ pkgsrc/security/mit-krb5/patches/patch-aclocal.m4 Tue Jan 19 16:51:30 2021 @@ -1,28 +1,11 @@ -$NetBSD: patch-aclocal.m4,v 1.3 2021/01/19 16:18:03 brook Exp $ +$NetBSD: patch-aclocal.m4,v 1.4 2021/01/19 16:51:30 brook Exp $ Don't make sunpro warnings into errors (warnings are seen in gcc too) Add --enable-pkgsrc-libtool option -Mainline autoconf generates no shell code for AC_CONFIG_AUX_DIR(). -Call it unconditionally to avoid a syntax error. See -https://github.com/krb5/krb5/commit/f78edbe30816f049e1360cb6e203fabfdf7b98df. - ---- aclocal.m4.orig 2020-05-22 00:21:40.000000000 +0000 +--- aclocal.m4.orig 2018-05-03 14:34:47.000000000 +0000 +++ aclocal.m4 -@@ -13,11 +13,7 @@ fi - ac_topdir=$srcdir/$ac_reltopdir - ac_config_fragdir=$ac_reltopdir/config - # echo "Looking for $srcdir/$ac_config_fragdir" --if test -d "$srcdir/$ac_config_fragdir"; then -- AC_CONFIG_AUX_DIR(K5_TOPDIR/config) --else -- AC_MSG_ERROR([can not find config/ directory in $ac_reltopdir]) --fi -+AC_CONFIG_AUX_DIR(K5_TOPDIR/config) - ])dnl - dnl - dnl Version info. -@@ -631,7 +627,7 @@ else +@@ -633,7 +633,7 @@ else if test "x$krb5_ac_warn_cflags_set" = xset ; then AC_MSG_NOTICE(not adding extra warning flags because WARN_CFLAGS was set) else @@ -31,7 +14,7 @@ https://github.com/krb5/krb5/commit/f78e fi if test "x$krb5_ac_warn_cxxflags_set" = xset ; then AC_MSG_NOTICE(not adding extra warning flags because WARN_CXXFLAGS was set) -@@ -1066,6 +1062,9 @@ AC_SUBST(SHLIBVEXT) +@@ -1068,6 +1068,9 @@ AC_SUBST(SHLIBVEXT) AC_SUBST(SHLIBSEXT) AC_SUBST(DEPLIBEXT) AC_SUBST(PFLIBEXT) @@ -41,7 +24,7 @@ https://github.com/krb5/krb5/commit/f78e AC_SUBST(LIBINSTLIST) AC_SUBST(DYNOBJEXT) AC_SUBST(MAKE_DYNOBJ_COMMAND) -@@ -1083,6 +1082,7 @@ AC_SUBST(OBJLISTS) +@@ -1085,6 +1088,7 @@ AC_SUBST(OBJLISTS) AC_SUBST(STOBJEXT) AC_SUBST(SHOBJEXT) AC_SUBST(PFOBJEXT) @@ -49,7 +32,7 @@ https://github.com/krb5/krb5/commit/f78e AC_SUBST(PICFLAGS) AC_SUBST(PROFFLAGS)]) -@@ -1197,11 +1197,42 @@ else +@@ -1199,11 +1203,42 @@ else KDB5_PLUGIN_DEPLIBS= KDB5_PLUGIN_LIBS= fi --_----------=_1611075091111860--