krb5: Remove artifaccts of my initial builds

The files being removed were artifacts of my initial builds using
a process to extract files used by the port during its build. It
was later discovered they were not needed but they were not removed
from the build at the time.

tools/build/mk/OptionalObsoleteFiles.inc removes the extraneous files
from an installed system. These files are not supposed to be installed.

There are three parts of this patch.

1. Don't install them in the first place.

2. Remove the files if they were previously installed.

3. Ensure they are removed when switching back to Heimdal from MIT.

Reported by:	fluffy
Fixes:		ee3960cba1

krb5/plugins/preauth/spake/Makefile

@@ -28,13 +28,6 @@ SRCS=	edwards25519.c \
 	spake_kdc.c \
 	util.c
 
-INCS=	edwards25519_fiat.h \
-	edwards25519_tables.h \
-	groups.h \
-	iana.h \
-	trace.h \
-	util.h
-
 CFLAGS+=-I${KRB5_DIR}/plugins/preauth/spake \
 	-I${KRB5_DIR}/include \
 	-I${KRB5_SRCTOP}/include

krb5/plugins/preauth/test/Makefile

@@ -24,8 +24,6 @@ SRCS=	cltest.c \
 	common.c \
 	kdctest.c
 
-INCS=	common.h
-
 CFLAGS+=-I${KRB5_DIR}/plugins/preauth/test \
 	-I${KRB5_DIR}/include \
 	-I${KRB5_SRCTOP}/include

tools/build/mk/OptionalObsoleteFiles.inc

@@ -2731,12 +2731,16 @@ OLD_FILES+=usr/include/asn1-common.h
 OLD_FILES+=usr/include/asn1_err.h
 OLD_FILES+=usr/include/base64.h
 OLD_FILES+=usr/include/cms_asn1.h
+OLD_FILES+=usr/include/common.h
 OLD_FILES+=usr/include/crmf_asn1.h
 OLD_FILES+=usr/include/der-private.h
 OLD_FILES+=usr/include/der-protos.h
 OLD_FILES+=usr/include/der.h
 OLD_FILES+=usr/include/digest_asn1.h
+OLD_FILES+=usr/include/edwards25519_fiat.h
+OLD_FILES+=usr/include/edwards25519_tables.h
 OLD_FILES+=usr/include/getarg.h
+OLD_FILES+=usr/include/groups.h
 OLD_FILES+=usr/include/gssapi/gssapi_krb5.h
 OLD_FILES+=usr/include/hdb-protos.h
 OLD_FILES+=usr/include/hdb.h
@@ -2753,6 +2757,7 @@ OLD_FILES+=usr/include/hx509-private.h
 OLD_FILES+=usr/include/hx509-protos.h
 OLD_FILES+=usr/include/hx509.h
 OLD_FILES+=usr/include/hx509_err.h
+OLD_FILES+=usr/include/iana.h
 OLD_FILES+=usr/include/k524_err.h
 OLD_FILES+=usr/include/kadm5/admin.h
 OLD_FILES+=usr/include/kadm5/kadm5-private.h
@@ -2791,6 +2796,8 @@ OLD_FILES+=usr/include/resolve.h
 OLD_FILES+=usr/include/rfc2459_asn1.h
 OLD_FILES+=usr/include/roken-common.h
 OLD_FILES+=usr/include/rtbl.h
+OLD_FILES+=usr/include/trace.h
+OLD_FILES+=usr/include/util.h
 OLD_FILES+=usr/include/wind.h
 OLD_FILES+=usr/include/wind_err.h
 OLD_FILES+=usr/include/xdbm.h
@@ -3619,6 +3626,10 @@ OLD_FILES+=usr/bin/sim_client
 OLD_FILES+=usr/bin/uuclient
 OLD_FILES+=etc/rc.d/kpropd
 OLD_FILES+=usr/include/com_err.h
+OLD_FILES+=usr/include/common.h
+OLD_FILES+=usr/include/edwards25519_fiat.h
+OLD_FILES+=usr/include/edwards25519_tables.h
+OLD_FILES+=usr/include/groups.h
 OLD_FILES+=usr/include/gssapi.h
 OLD_FILES+=usr/include/gssapi/gssapi.h
 OLD_FILES+=usr/include/gssapi/gssapi_alloc.h
@@ -3642,6 +3653,7 @@ OLD_FILES+=usr/include/gssrpc/svc.h
 OLD_FILES+=usr/include/gssrpc/svc_auth.h
 OLD_FILES+=usr/include/gssrpc/types.h
 OLD_FILES+=usr/include/gssrpc/xdr.h
+OLD_FILES+=usr/include/iana.h
 OLD_FILES+=usr/include/kadm5/admin.h
 OLD_FILES+=usr/include/kadm5/chpass_util_strings.h
 OLD_FILES+=usr/include/kadm5/kadm_err.h
@@ -3663,6 +3675,8 @@ OLD_FILES+=usr/include/krb5/plugin.h
 OLD_FILES+=usr/include/krb5/preauth_plugin.h
 OLD_FILES+=usr/include/krb5/pwqual_plugin.h
 OLD_FILES+=usr/include/profile.h
+OLD_FILES+=usr/include/trace.h
+OLD_FILES+=usr/include/util.h
 OLD_FILES+=usr/include/verto-module.h
 OLD_FILES+=usr/include/verto.h
 OLD_FILES+=usr/lib/krb5/plugins/kdb/db2.so
@@ -4809,12 +4823,16 @@ OLD_FILES+=usr/include/asn1-common.h
 OLD_FILES+=usr/include/asn1_err.h
 OLD_FILES+=usr/include/base64.h
 OLD_FILES+=usr/include/cms_asn1.h
+OLD_FILES+=usr/include/common.h
 OLD_FILES+=usr/include/crmf_asn1.h
 OLD_FILES+=usr/include/der-private.h
 OLD_FILES+=usr/include/der-protos.h
 OLD_FILES+=usr/include/der.h
 OLD_FILES+=usr/include/digest_asn1.h
+OLD_FILES+=usr/include/edwards25519_fiat.h
+OLD_FILES+=usr/include/edwards25519_tables.h
 OLD_FILES+=usr/include/getarg.h
+OLD_FILES+=usr/include/groups.h
 OLD_FILES+=usr/include/hdb-protos.h
 OLD_FILES+=usr/include/hdb.h
 OLD_FILES+=usr/include/hdb_asn1.h
@@ -4830,6 +4848,7 @@ OLD_FILES+=usr/include/hx509-private.h
 OLD_FILES+=usr/include/hx509-protos.h
 OLD_FILES+=usr/include/hx509.h
 OLD_FILES+=usr/include/hx509_err.h
+OLD_FILES+=usr/include/iana.h
 OLD_FILES+=usr/include/k524_err.h
 OLD_FILES+=usr/include/kadm5/kadm5-private.h
 OLD_FILES+=usr/include/kadm5/kadm5-protos.h
@@ -4863,6 +4882,8 @@ OLD_FILES+=usr/include/resolve.h
 OLD_FILES+=usr/include/rfc2459_asn1.h
 OLD_FILES+=usr/include/roken-common.h
 OLD_FILES+=usr/include/rtbl.h
+OLD_FILES+=usr/include/trace.h
+OLD_FILES+=usr/include/util.h
 OLD_FILES+=usr/include/wind.h
 OLD_FILES+=usr/include/wind_err.h
 OLD_FILES+=usr/include/xdbm.h
@@ -5667,6 +5688,10 @@ OLD_FILES+=usr/bin/sim_client
 OLD_FILES+=usr/bin/uuclient
 OLD_FILES+=etc/rc.d/kpropd
 OLD_FILES+=usr/include/com_err.h
+OLD_FILES+=usr/include/common.h
+OLD_FILES+=usr/include/edwards25519_fiat.h
+OLD_FILES+=usr/include/edwards25519_tables.h
+OLD_FILES+=usr/include/groups.h
 OLD_FILES+=usr/include/gssapi.h
 OLD_FILES+=usr/include/gssapi/gssapi_ext.h
 OLD_FILES+=usr/include/gssapi/gssapi_oid.h
@@ -5694,6 +5719,7 @@ OLD_FILES+=usr/include/gssrpc/svc.h
 OLD_FILES+=usr/include/gssrpc/svc_auth.h
 OLD_FILES+=usr/include/gssrpc/types.h
 OLD_FILES+=usr/include/gssrpc/xdr.h
+OLD_FILES+=usr/include/iana.h
 OLD_FILES+=usr/include/kadm5/admin.h
 OLD_FILES+=usr/include/kadm5/chpass_util_strings.h
 OLD_FILES+=usr/include/kadm5/kadm_err.h
@@ -5715,6 +5741,8 @@ OLD_FILES+=usr/include/krb5/plugin.h
 OLD_FILES+=usr/include/krb5/preauth_plugin.h
 OLD_FILES+=usr/include/krb5/pwqual_plugin.h
 OLD_FILES+=usr/include/profile.h
+OLD_FILES+=usr/include/trace.h
+OLD_FILES+=usr/include/util.h
 OLD_FILES+=usr/include/verto-module.h
 OLD_FILES+=usr/include/verto.h
 OLD_FILES+=usr/lib/krb5/plugins/kdb/db2.so