Sun Jan 29 19:23:28 2017 UTC ()
prefer some local include files for tools build


(christos)
diff -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h
diff -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c
diff -r1.4 -r1.5 src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h (expand / switch to unified diff)

--- src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h 2017/01/28 21:31:45 1.2
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h 2017/01/29 19:23:28 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gen_locl.h,v 1.2 2017/01/28 21:31:45 christos Exp $ */ 1/* $NetBSD: gen_locl.h,v 1.3 2017/01/29 19:23:28 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan 4 * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
5 * (Royal Institute of Technology, Stockholm, Sweden). 5 * (Royal Institute of Technology, Stockholm, Sweden).
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 14 *
@@ -42,28 +42,28 @@ @@ -42,28 +42,28 @@
42 42
43#include <assert.h> 43#include <assert.h>
44#include <stdio.h> 44#include <stdio.h>
45#include <stdlib.h> 45#include <stdlib.h>
46#include <string.h> 46#include <string.h>
47#include <limits.h> 47#include <limits.h>
48#include <ctype.h> 48#include <ctype.h>
49#include <time.h> 49#include <time.h>
50#include <errno.h> 50#include <errno.h>
51#include <err.h> 51#include <err.h>
52#include <krb5/roken.h> 52#include <krb5/roken.h>
53#include "hash.h" 53#include "hash.h"
54#include "symbol.h" 54#include "symbol.h"
55#include <krb5/asn1-common.h> 55#include "asn1-common.h"
56#include <krb5/der.h> 56#include "der.h"
57#include "der-private.h" 57#include "der-private.h"
58 58
59void generate_type (const Symbol *); 59void generate_type (const Symbol *);
60void generate_constant (const Symbol *); 60void generate_constant (const Symbol *);
61void generate_type_encode (const Symbol *); 61void generate_type_encode (const Symbol *);
62void generate_type_decode (const Symbol *); 62void generate_type_decode (const Symbol *);
63void generate_type_free (const Symbol *); 63void generate_type_free (const Symbol *);
64void generate_type_length (const Symbol *); 64void generate_type_length (const Symbol *);
65void generate_type_copy (const Symbol *); 65void generate_type_copy (const Symbol *);
66void generate_type_seq (const Symbol *); 66void generate_type_seq (const Symbol *);
67void generate_glue (const Type *, const char*); 67void generate_glue (const Type *, const char*);
68 68
69const char *classname(Der_class); 69const char *classname(Der_class);
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c (expand / switch to unified diff)

--- src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c 2017/01/28 21:31:45 1.2
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c 2017/01/29 19:23:28 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: main.c,v 1.2 2017/01/28 21:31:45 christos Exp $ */ 1/* $NetBSD: main.c,v 1.3 2017/01/29 19:23:28 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan 4 * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
5 * (Royal Institute of Technology, Stockholm, Sweden). 5 * (Royal Institute of Technology, Stockholm, Sweden).
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 14 *
@@ -24,27 +24,27 @@ @@ -24,27 +24,27 @@
24 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 24 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26 * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 26 * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE. 33 * SUCH DAMAGE.
34 */ 34 */
35 35
36#include "gen_locl.h" 36#include "gen_locl.h"
37#include <krb5/getarg.h> 37#include "getarg.h"
38#include "lex.h" 38#include "lex.h"
39 39
40extern FILE *yyin; 40extern FILE *yyin;
41 41
42static getarg_strings preserve; 42static getarg_strings preserve;
43static getarg_strings seq; 43static getarg_strings seq;
44 44
45int 45int
46preserve_type(const char *p) 46preserve_type(const char *p)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < preserve.num_strings; i++) 49 for (i = 0; i < preserve.num_strings; i++)
50 if (strcmp(preserve.strings[i], p) == 0) 50 if (strcmp(preserve.strings[i], p) == 0)
cvs diff -r1.4 -r1.5 src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c (expand / switch to unified diff)

--- src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c 2017/01/28 21:31:50 1.4
+++ src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c 2017/01/29 19:23:28 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: getarg.c,v 1.4 2017/01/28 21:31:50 christos Exp $ */ 1/* $NetBSD: getarg.c,v 1.5 2017/01/29 19:23:28 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan 4 * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
5 * (Royal Institute of Technology, Stockholm, Sweden). 5 * (Royal Institute of Technology, Stockholm, Sweden).
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 14 *
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE. 33 * SUCH DAMAGE.
34 */ 34 */
35 35
36#include <config.h> 36#include <config.h>
37 37
38#include <stdio.h> 38#include <stdio.h>
39#include <stdlib.h> 39#include <stdlib.h>
40#include <string.h> 40#include <string.h>
41#include <krb5/roken.h> 41#include <krb5/roken.h>
42#include <krb5/getarg.h> 42#include <getarg.h>
43 43
44#define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag) 44#define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag)
45 45
46static size_t 46static size_t
47print_arg (char *string, 47print_arg (char *string,
48 size_t len, 48 size_t len,
49 int mdoc, 49 int mdoc,
50 int longp, 50 int longp,
51 struct getargs *arg, 51 struct getargs *arg,
52 char *(i18n)(const char *)) 52 char *(i18n)(const char *))
53{ 53{
54 const char *s; 54 const char *s;
55 55