Skip to content

Commit a7f47e4

Browse files
committed
Update public domain license, add SPDX identifiers
Switch the license of the essentially public domain source files from a license statement I borrowed from the IETF to a more standard FSF all-permissive license. Add SPDX-License-Identifier headers to all substantial source files, and add a test to check for them.
1 parent 2696038 commit a7f47e4

File tree

194 files changed

+1059
-581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+1059
-581
lines changed

.gitignore

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# Ignore list for Git. -*- conf -*-
2+
#
3+
# Copyright 2008-2014, 2016, 2018 Russ Allbery <[email protected]>
4+
#
5+
# Copying and distribution of this file, with or without modification, are
6+
# permitted in any medium without royalty provided the copyright notice and
7+
# this notice are preserved. This file is offered as-is, without any
8+
# warranty.
9+
#
10+
# SPDX-License-Identifier: FSFAP
11+
112
/Makefile
213
/Makefile.in
314
/aclocal.m4

Makefile.am

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Automake makefile for rra-c-util.
22
#
33
# Written by Russ Allbery <[email protected]
4-
# Copyright 2015, 2016, 2017 Russ Allbery <[email protected]>
5-
# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014
4+
# Copyright 2015-2018 Russ Allbery <[email protected]>
5+
# Copyright 2008-2014
66
# The Board of Trustees of the Leland Stanford Junior University
77
#
8-
# See LICENSE for licensing terms.
8+
# SPDX-License-Identifier: MIT
99

1010
ACLOCAL_AMFLAGS = -I m4
1111
EXTRA_DIST = .gitignore .travis.yml LICENSE README.md bootstrap \
@@ -20,8 +20,8 @@ EXTRA_DIST = .gitignore .travis.yml LICENSE README.md bootstrap \
2020
tests/data/generate-krb5-conf tests/data/krb5-pam.conf \
2121
tests/data/perl.conf tests/data/perlcriticrc tests/data/perltidyrc \
2222
tests/data/valgrind.supp tests/docs/pod-spelling-t tests/docs/pod-t \
23-
tests/docs/urls-t tests/fakepam/README tests/kafs/basic-t \
24-
tests/perl/critic-t tests/perl/minimum-version-t \
23+
tests/docs/spdx-license-t tests/docs/urls-t tests/fakepam/README \
24+
tests/kafs/basic-t tests/perl/critic-t tests/perl/minimum-version-t \
2525
tests/perl/module-version-t tests/perl/strict-t \
2626
tests/tap/kerberos.sh tests/tap/libtap.sh \
2727
tests/tap/perl/Test/RRA.pm tests/tap/perl/Test/RRA/Automake.pm \

NEWS

+7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ rra-c-util 7.1 (unreleased)
1313
Add maintainer check-cppcheck target to run cppcheck across the source
1414
base with a standard configuration. Fix all issues found by cppcheck.
1515

16+
Switch the license of the essentially public domain source files from
17+
a license statement I borrowed from the IETF to a more standard FSF
18+
all-permissive license.
19+
20+
Add SPDX-License-Identifier headers to all substantial source files,
21+
and add a test to check for them.
22+
1623
Skip more Autoconf and Automake files in the all_files function of
1724
Test::RRA::Automake.
1825

bootstrap

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
#!/bin/sh
22
#
33
# Run this shell script to bootstrap as necessary after a fresh checkout.
4+
#
5+
# Copyright 2008, 2012-2013, 2016, 2018 Russ Allbery <[email protected]>
6+
#
7+
# SPDX-License-Identifier: MIT
48

59
set -e
610

711
# Regenerate all the autotools files.
812
autoreconf -i --force
913

1014
# Generate manual pages.
11-
version=`grep '^rra-c-util' NEWS | head -1 | cut -d' ' -f2`
12-
for doc in xmalloc ; do
13-
pod2man --release="$version" --center="rra-c-util" --section=3 \
14-
--name=`echo "$doc" | tr a-z A-Z` docs/api/"$doc".pod \
15+
version=$(grep '^rra-c-util' NEWS | head -1 | cut -d' ' -f2)
16+
for doc in xmalloc; do
17+
pod2man --release="$version" --center="rra-c-util" --section=3 \
18+
--name=$(echo "$doc" | tr a-z A-Z) docs/api/"$doc".pod \
1519
> docs/api/"$doc".3
1620
done

configure.ac

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
dnl Autoconf configuration for rra-c-util.
22
dnl
33
dnl Written by Russ Allbery <[email protected]>
4-
dnl Copyright 2000, 2003, 2013, 2014, 2015, 2016, 2017
5-
dnl Russ Allbery <[email protected]>
6-
dnl Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
7-
dnl 2012, 2013, 2014
4+
dnl Copyright 2000, 2003, 2013-2018 Russ Allbery <[email protected]>
5+
dnl Copyright 2002-2014
86
dnl The Board of Trustees of the Leland Stanford Junior University
97
dnl
108
dnl This file is free software; the authors give unlimited permission to copy
119
dnl and/or distribute it, with or without modifications, as long as this
1210
dnl notice is preserved.
11+
dnl
12+
dnl SPDX-License-Identifier: FSFULLR
1313

1414
dnl I use this introductory boilerplate for all configure.ac files, changing
1515
dnl the AC_INIT arguments as appropriate.

docs/api/xmalloc.pod

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
=for stopwords
22
xmalloc xcalloc xrealloc nmemb extern const resized rra-c-util Allbery
3+
SPDX-License-Identifier FSFAP
34

45
=head1 NAME
56

@@ -102,4 +103,6 @@ permitted in any medium without royalty provided the copyright notice and
102103
this notice are preserved. This file is offered as-is, without any
103104
warranty.
104105

106+
SPDX-License-Identifier: FSFAP
107+
105108
=cut

kafs/kafs.c

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
3939
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
4040
* DEALINGS IN THE SOFTWARE.
41+
*
42+
* SPDX-License-Identifier: MIT
4143
*/
4244

4345
#include <config.h>

kafs/sys-darwin10.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
1414
*
1515
* Written by Russ Allbery <[email protected]>
16-
* Copyright 2006, 2007, 2009, 2010, 2011
16+
* Copyright 2006-2007, 2009-2011
1717
* The Board of Trustees of the Leland Stanford Junior University
1818
*
1919
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -33,6 +33,8 @@
3333
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
3434
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
3535
* DEALINGS IN THE SOFTWARE.
36+
*
37+
* SPDX-License-Identifier: MIT
3638
*/
3739

3840
/*

kafs/sys-darwin8.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
1616
*
1717
* Written by Russ Allbery <[email protected]>
18-
* Copyright 2006, 2007, 2009, 2010
18+
* Copyright 2006-2007, 2009-2010
1919
* The Board of Trustees of the Leland Stanford Junior University
2020
*
2121
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -35,6 +35,8 @@
3535
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
3636
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
3737
* DEALINGS IN THE SOFTWARE.
38+
*
39+
* SPDX-License-Identifier: MIT
3840
*/
3941

4042
/*

kafs/sys-linux.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
1515
*
1616
* Written by Russ Allbery <[email protected]>
17-
* Copyright 2006, 2007, 2009
17+
* Copyright 2006-2007, 2009
1818
* The Board of Trustees of the Leland Stanford Junior University
1919
*
2020
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -34,6 +34,8 @@
3434
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
3535
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
3636
* DEALINGS IN THE SOFTWARE.
37+
*
38+
* SPDX-License-Identifier: MIT
3739
*/
3840

3941
/*

kafs/sys-solaris.c

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
3636
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
3737
* DEALINGS IN THE SOFTWARE.
38+
*
39+
* SPDX-License-Identifier: MIT
3840
*/
3941

4042
/*

kafs/sys-syscall.c

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
* which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
1515
*
1616
* Written by Russ Allbery <[email protected]>
17+
* Copyright 2009, 2011, 2013
18+
* The Board of Trustees of the Leland Stanford Junior University
1719
*
18-
* The authors hereby relinquish any claim to any copyright that they may have
19-
* in this work, whether granted under contract or by operation of law or
20-
* international treaty, and hereby commit to the public, at large, that they
21-
* shall not, at any time in the future, seek to enforce any copyright in this
22-
* work against any person or entity, or prevent any person or entity from
23-
* copying, publishing, distributing or creating derivative works of this
24-
* work.
20+
* Copying and distribution of this file, with or without modification, are
21+
* permitted in any medium without royalty provided the copyright notice and
22+
* this notice are preserved. This file is offered as-is, without any
23+
* warranty.
24+
*
25+
* SPDX-License-Identifier: FSFAP
2526
*/
2627

2728
#include <afs/param.h>

m4/apache.m4

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ dnl
2222
dnl This file is free software; the authors give unlimited permission to copy
2323
dnl and/or distribute it, with or without modifications, as long as this
2424
dnl notice is preserved.
25+
dnl
26+
dnl SPDX-License-Identifier: FSFULLR
2527

2628
dnl Headers to include when probing for Apache properties.
2729
AC_DEFUN([RRA_INCLUDES_APACHE], [[

m4/apr.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ dnl The canonical version of this file is maintained in the rra-c-util
1616
dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
1717
dnl
1818
dnl Written by Russ Allbery <[email protected]>
19-
dnl Copyright 2010, 2011
19+
dnl Copyright 2010-2011
2020
dnl The Board of Trustees of the Leland Stanford Junior University
2121
dnl
2222
dnl This file is free software; the authors give unlimited permission to copy
2323
dnl and/or distribute it, with or without modifications, as long as this
2424
dnl notice is preserved.
25+
dnl
26+
dnl SPDX-License-Identifier: FSFULLR
2527

2628
dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
2729
dnl versions that include the Apache flags. Used as a wrapper, with

m4/aprutil.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ dnl The canonical version of this file is maintained in the rra-c-util
1717
dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
1818
dnl
1919
dnl Written by Russ Allbery <[email protected]>
20-
dnl Copyright 2010, 2011
20+
dnl Copyright 2010-2011
2121
dnl The Board of Trustees of the Leland Stanford Junior University
2222
dnl
2323
dnl This file is free software; the authors give unlimited permission to copy
2424
dnl and/or distribute it, with or without modifications, as long as this
2525
dnl notice is preserved.
26+
dnl
27+
dnl SPDX-License-Identifier: FSFULLR
2628

2729
dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
2830
dnl versions that include the Apache flags. Used as a wrapper, with

m4/bdb.m4

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ dnl
3535
dnl This file is free software; the authors give unlimited permission to copy
3636
dnl and/or distribute it, with or without modifications, as long as this
3737
dnl notice is preserved.
38+
dnl
39+
dnl SPDX-License-Identifier: FSFULLR
3840

3941
dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
4042
dnl versions that include the Berkeley DB flags. Used as a wrapper, with

m4/clang.m4

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ dnl
1010
dnl This file is free software; the authors give unlimited permission to copy
1111
dnl and/or distribute it, with or without modifications, as long as this
1212
dnl notice is preserved.
13+
dnl
14+
dnl SPDX-License-Identifier: FSFULLR
1315

1416
dnl Source used by RRA_PROG_CC_CLANG.
1517
AC_DEFUN([_RRA_PROG_CC_CLANG_SOURCE], [[

m4/curl.m4

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ dnl
2424
dnl This file is free software; the authors give unlimited permission to copy
2525
dnl and/or distribute it, with or without modifications, as long as this
2626
dnl notice is preserved.
27+
dnl
28+
dnl SPDX-License-Identifier: FSFULLR
2729

2830
dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
2931
dnl versions that include the cURL flags. Used as a wrapper, with

m4/gssapi.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@ dnl The canonical version of this file is maintained in the rra-c-util
2222
dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
2323
dnl
2424
dnl Written by Russ Allbery <[email protected]>
25-
dnl Copyright 2005, 2006, 2007, 2008, 2009, 2011, 2012
25+
dnl Copyright 2005-2009, 2011-2012
2626
dnl The Board of Trustees of the Leland Stanford Junior University
2727
dnl
2828
dnl This file is free software; the authors give unlimited permission to copy
2929
dnl and/or distribute it, with or without modifications, as long as this
3030
dnl notice is preserved.
31+
dnl
32+
dnl SPDX-License-Identifier: FSFULLR
3133

3234
dnl Headers to include when probing for Kerberos library properties.
3335
AC_DEFUN([RRA_INCLUDES_GSSAPI], [[

m4/inet-ntoa.m4

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ dnl
99
dnl The canonical version of this file is maintained in the rra-c-util
1010
dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
1111
dnl
12-
dnl Copyright 1999, 2000, 2001, 2003 Russ Allbery <[email protected]>
13-
dnl Copyright 2008, 2009
12+
dnl Copyright 1999-2001, 2003 Russ Allbery <[email protected]>
13+
dnl Copyright 2008-2009
1414
dnl The Board of Trustees of the Leland Stanford Junior University
1515
dnl
1616
dnl This file is free software; the authors give unlimited permission to copy
1717
dnl and/or distribute it, with or without modifications, as long as this
1818
dnl notice is preserved.
19+
dnl
20+
dnl SPDX-License-Identifier: FSFULLR
1921

2022
dnl Source used by RRA_FUNC_INET_NTOA.
2123
AC_DEFUN([_RRA_FUNC_INET_NTOA_SOURCE], [[

m4/kadm5clnt.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ dnl The canonical version of this file is maintained in the rra-c-util
2121
dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
2222
dnl
2323
dnl Written by Russ Allbery <[email protected]>
24-
dnl Copyright 2005, 2006, 2007, 2008, 2009, 2011, 2013
24+
dnl Copyright 2005-2009, 2011, 2013
2525
dnl The Board of Trustees of the Leland Stanford Junior University
2626
dnl
2727
dnl This file is free software; the authors give unlimited permission to copy
2828
dnl and/or distribute it, with or without modifications, as long as this
2929
dnl notice is preserved.
30+
dnl
31+
dnl SPDX-License-Identifier: FSFULLR
3032

3133
dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
3234
dnl versions that include the kadmin client flags. Used as a wrapper, with

m4/kafs.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@ dnl The canonical version of this file is maintained in the rra-c-util
3535
dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
3636
dnl
3737
dnl Written by Russ Allbery <[email protected]>
38-
dnl Copyright 2008, 2009, 2010
38+
dnl Copyright 2008-2010
3939
dnl The Board of Trustees of the Leland Stanford Junior University
4040
dnl
4141
dnl This file is free software; the authors give unlimited permission to copy
4242
dnl and/or distribute it, with or without modifications, as long as this
4343
dnl notice is preserved.
44+
dnl
45+
dnl SPDX-License-Identifier: FSFULLR
4446

4547
dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
4648
dnl versions that include the libkafs flags. Used as a wrapper, with

m4/krb5-config.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ dnl The canonical version of this file is maintained in the rra-c-util
1111
dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
1212
dnl
1313
dnl Written by Russ Allbery <[email protected]>
14-
dnl Copyright 2011, 2012
14+
dnl Copyright 2011-2012
1515
dnl The Board of Trustees of the Leland Stanford Junior University
1616
dnl
1717
dnl This file is free software; the authors give unlimited permission to copy
1818
dnl and/or distribute it, with or without modifications, as long as this
1919
dnl notice is preserved.
20+
dnl
21+
dnl SPDX-License-Identifier: FSFULLR
2022

2123
dnl Check for krb5-config in the user's path and set PATH_KRB5_CONFIG. This
2224
dnl is moved into a separate macro so that it can be loaded via AC_REQUIRE,

m4/krb5-pkinit.m4

+7-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@ dnl
88
dnl and defines HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PKINIT_9_ARGS if it takes
99
dnl only nine arguments.
1010
dnl
11+
dnl Written by Russ Allbery <[email protected]>
12+
dnl Copyright 2007, 2018 Russ Allbery <[email protected]>
1113
dnl Copyright 2011
1214
dnl The Board of Trustees of the Leland Stanford Junior University
13-
dnl Copyright 2007 Russ Allbery <[email protected]>
1415
dnl
15-
dnl See LICENSE for licensing terms.
16+
dnl This file is free software; the authors give unlimited permission to copy
17+
dnl and/or distribute it, with or without modifications, as long as this
18+
dnl notice is preserved.
19+
dnl
20+
dnl SPDX-License-Identifier: FSFULLR
1621

1722
dnl Check whether krb5_get_init_creds_opt_set_pkinit takes eleven arguments
1823
dnl (0.8 release candidates and later) or only nine (0.7). Defines

m4/krb5.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ dnl The canonical version of this file is maintained in the rra-c-util
5050
dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
5151
dnl
5252
dnl Written by Russ Allbery <[email protected]>
53-
dnl Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014
53+
dnl Copyright 2005-2011, 2013-2014
5454
dnl The Board of Trustees of the Leland Stanford Junior University
5555
dnl
5656
dnl This file is free software; the authors give unlimited permission to copy
5757
dnl and/or distribute it, with or without modifications, as long as this
5858
dnl notice is preserved.
59+
dnl
60+
dnl SPDX-License-Identifier: FSFULLR
5961

6062
dnl Ignore Automake conditionals if not using Automake.
6163
m4_define_default([AM_CONDITIONAL], [:])

0 commit comments

Comments
 (0)