diff options
83 files changed, 224 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6bf4e80..89a4dff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ # Copyright © 2015-2018 Collabora Ltd. # +# SPDX-License-Identifier: MIT +# # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation files # (the "Software"), to deal in the Software without restriction, diff --git a/.travis.yml b/.travis.yml index a4f1539..3e0b25e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ # Copyright © 2015-2018 Collabora Ltd. # +# SPDX-License-Identifier: MIT +# # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation files # (the "Software"), to deal in the Software without restriction, @@ -1,10 +1,22 @@ The D-Bus glib bindings are licensed to you under your choice of the Academic Free License version 2.1, or the GNU General Public License version 2. Both -licenses are included here. Some of the standalone binaries are under the GPL -only; in particular, but not limted to, tests/decode-gcov.c. Each source code -file is marked with the proper copyright information. +licenses are included here. +In SPDX terms, this is: +SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + +Exceptions are noted in individual source files. In particular: + +* dbus/dbus-bash-completion-helper.c is licensed more restrictively: + it is under GPL-2.0-or-later, without the AFL-2.1 dual-license option. + See that file for details. + +* Some source files are more permissively licensed, with a + LGPL-2.1-or-later or MIT option, or under the MIT license only. + See individual source files for details. + +----------------------------------------------------------------------- The Academic Free License v. 2.1 @@ -203,6 +215,9 @@ as is the case for the other licenses. without modification). This ensures that the owner of the copyright to the license will control changes. The Apache license contains a copyright notice, but the BSD, MIT and UoI/NCSA licenses do not. + +----------------------------------------------------------------------- + -- START OF GNU GENERAL PUBLIC LICENSE -- diff --git a/dbus/dbus-bash-completion-helper.c b/dbus/dbus-bash-completion-helper.c index ac79039..6240ed6 100644 --- a/dbus/dbus-bash-completion-helper.c +++ b/dbus/dbus-bash-completion-helper.c @@ -3,6 +3,8 @@ * * Copyright (C) 2008 David Zeuthen <davidz@redhat.com> * + * SPDX-License-Identifier: GPL-2.0-or-later + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/dbus/dbus-binding-tool-glib.c b/dbus/dbus-binding-tool-glib.c index 2a3ff03..8734515 100644 --- a/dbus/dbus-binding-tool-glib.c +++ b/dbus/dbus-binding-tool-glib.c @@ -4,6 +4,8 @@ * Copyright (C) 2003, 2004, 2005 Red Hat, Inc. * Copyright (C) 2005 Nokia * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-binding-tool-glib.h b/dbus/dbus-binding-tool-glib.h index 9abe7d0..f0d336a 100644 --- a/dbus/dbus-binding-tool-glib.h +++ b/dbus/dbus-binding-tool-glib.h @@ -3,6 +3,8 @@ * * Copyright (C) 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gidl.c b/dbus/dbus-gidl.c index cde4d79..3b96e46 100644 --- a/dbus/dbus-gidl.c +++ b/dbus/dbus-gidl.c @@ -4,6 +4,8 @@ * * Copyright (C) 2003, 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gidl.h b/dbus/dbus-gidl.h index d9837ce..b33f8c4 100644 --- a/dbus/dbus-gidl.h +++ b/dbus/dbus-gidl.h @@ -4,6 +4,8 @@ * * Copyright (C) 2003 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-glib-lowlevel.h b/dbus/dbus-glib-lowlevel.h index d08f951..6add4c6 100644 --- a/dbus/dbus-glib-lowlevel.h +++ b/dbus/dbus-glib-lowlevel.h @@ -4,6 +4,8 @@ * Copyright (C) 2002, 2003 CodeFactory AB * Copyright (C) 2003, 2004 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-glib-tool.c b/dbus/dbus-glib-tool.c index ce9ad75..de3474b 100644 --- a/dbus/dbus-glib-tool.c +++ b/dbus/dbus-glib-tool.c @@ -3,6 +3,8 @@ * * Copyright (C) 2003, 2004 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-glib-tool.h b/dbus/dbus-glib-tool.h index 58f25d2..50426df 100644 --- a/dbus/dbus-glib-tool.h +++ b/dbus/dbus-glib-tool.h @@ -3,6 +3,8 @@ * * Copyright (C) 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-glib.c b/dbus/dbus-glib.c index d969b56..05a4cea 100644 --- a/dbus/dbus-glib.c +++ b/dbus/dbus-glib.c @@ -3,6 +3,8 @@ * * Copyright (C) 2004 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h index 9aa71c1..52225f1 100644 --- a/dbus/dbus-glib.h +++ b/dbus/dbus-glib.h @@ -4,6 +4,8 @@ * Copyright (C) 2002, 2003 CodeFactory AB * Copyright (C) 2003, 2004 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gloader-expat.c b/dbus/dbus-gloader-expat.c index 9a53f02..ab5686d 100644 --- a/dbus/dbus-gloader-expat.c +++ b/dbus/dbus-gloader-expat.c @@ -3,6 +3,8 @@ * * Copyright (C) 2003 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gmarshal.c b/dbus/dbus-gmarshal.c index 65f13c7..becde30 100644 --- a/dbus/dbus-gmarshal.c +++ b/dbus/dbus-gmarshal.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include "dbus-gmarshal.h" diff --git a/dbus/dbus-gmarshal.h b/dbus/dbus-gmarshal.h index 2cdb3d7..2e6e190 100644 --- a/dbus/dbus-gmarshal.h +++ b/dbus/dbus-gmarshal.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ #ifndef ___dbus_g_marshal_MARSHAL_H__ #define ___dbus_g_marshal_MARSHAL_H__ diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c index 8d06723..4925cd8 100644 --- a/dbus/dbus-gobject.c +++ b/dbus/dbus-gobject.c @@ -4,6 +4,8 @@ * Copyright (C) 2003, 2004, 2005 Red Hat, Inc. * Copyright (C) 2005 Nokia * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gobject.h b/dbus/dbus-gobject.h index cf97cd0..bb99a19 100644 --- a/dbus/dbus-gobject.h +++ b/dbus/dbus-gobject.h @@ -3,6 +3,8 @@ * * Copyright (C) 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gparser.c b/dbus/dbus-gparser.c index af74e30..5ae277f 100644 --- a/dbus/dbus-gparser.c +++ b/dbus/dbus-gparser.c @@ -3,6 +3,8 @@ * * Copyright (C) 2003, 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gparser.h b/dbus/dbus-gparser.h index 347b39b..08a84ec 100644 --- a/dbus/dbus-gparser.h +++ b/dbus/dbus-gparser.h @@ -3,6 +3,8 @@ * * Copyright (C) 2003 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c index ddf8bbe..4c72320 100644 --- a/dbus/dbus-gproxy.c +++ b/dbus/dbus-gproxy.c @@ -4,6 +4,8 @@ * Copyright (C) 2003, 2004, 2005 Red Hat, Inc. * Copyright (C) 2005 Nokia * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gsignature.c b/dbus/dbus-gsignature.c index ed0880e..5dc4984 100644 --- a/dbus/dbus-gsignature.c +++ b/dbus/dbus-gsignature.c @@ -3,6 +3,8 @@ * * Copyright (C) 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gsignature.h b/dbus/dbus-gsignature.h index 08757e1..0e049f3 100644 --- a/dbus/dbus-gsignature.h +++ b/dbus/dbus-gsignature.h @@ -1,3 +1,26 @@ +/* -*- mode: C; c-file-style: "gnu" -*- */ +/* + * Copyright (C) 2005-2006 Red Hat, Inc. + * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * + * Licensed under the Academic Free License version 2.1 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef DBUS_GOBJECT_SIGNATURE_H #define DBUS_GOBJECT_SIGNATURE_H diff --git a/dbus/dbus-gtest-main.c b/dbus/dbus-gtest-main.c index 9ff65ac..64ce0e9 100644 --- a/dbus/dbus-gtest-main.c +++ b/dbus/dbus-gtest-main.c @@ -3,6 +3,8 @@ * * Copyright (C) 2003 Red Hat Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gtest.c b/dbus/dbus-gtest.c index c9572ef..c1b4ad9 100644 --- a/dbus/dbus-gtest.c +++ b/dbus/dbus-gtest.c @@ -3,6 +3,8 @@ * * Copyright (C) 2002, 2003 Red Hat Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gtest.h b/dbus/dbus-gtest.h index 21661fc..8955878 100644 --- a/dbus/dbus-gtest.h +++ b/dbus/dbus-gtest.h @@ -3,6 +3,8 @@ * * Copyright (C) 2003 Red Hat Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gthread.c b/dbus/dbus-gthread.c index a88141b..b61bb45 100644 --- a/dbus/dbus-gthread.c +++ b/dbus/dbus-gthread.c @@ -3,6 +3,8 @@ * * Copyright (C) 2002 CodeFactory AB * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gtool-test.h b/dbus/dbus-gtool-test.h index b8dbf31..032bb47 100644 --- a/dbus/dbus-gtool-test.h +++ b/dbus/dbus-gtool-test.h @@ -3,6 +3,8 @@ * * Copyright (C) 2003 Red Hat Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gtype-specialized-priv.h b/dbus/dbus-gtype-specialized-priv.h index c80ebfc..7e55ced 100644 --- a/dbus/dbus-gtype-specialized-priv.h +++ b/dbus/dbus-gtype-specialized-priv.h @@ -3,6 +3,8 @@ * * Copyright (C) 2009 Collabora Ltd. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gtype-specialized.c b/dbus/dbus-gtype-specialized.c index 46fdef8..5b3d166 100644 --- a/dbus/dbus-gtype-specialized.c +++ b/dbus/dbus-gtype-specialized.c @@ -4,6 +4,8 @@ * Copyright (C) 2005 Red Hat, Inc. * Copyright (C) 2007 Codethink Ltd. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gtype-specialized.h b/dbus/dbus-gtype-specialized.h index e40cdc7..26b4e1f 100644 --- a/dbus/dbus-gtype-specialized.h +++ b/dbus/dbus-gtype-specialized.h @@ -3,6 +3,8 @@ * * Copyright (C) 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gutils.c b/dbus/dbus-gutils.c index f70c760..b71d727 100644 --- a/dbus/dbus-gutils.c +++ b/dbus/dbus-gutils.c @@ -3,6 +3,8 @@ * * Copyright (C) 2003 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gutils.h b/dbus/dbus-gutils.h index 8468a55..4889a7b 100644 --- a/dbus/dbus-gutils.h +++ b/dbus/dbus-gutils.h @@ -3,6 +3,8 @@ * * Copyright (C) 2003 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gvalue-parse-variant.c b/dbus/dbus-gvalue-parse-variant.c index 29c4336..23ec841 100644 --- a/dbus/dbus-gvalue-parse-variant.c +++ b/dbus/dbus-gvalue-parse-variant.c @@ -2,6 +2,8 @@ * * Copyright © 2010 Collabora Ltd. <http://www.collabora.co.uk/> * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gvalue-parse-variant.h b/dbus/dbus-gvalue-parse-variant.h index 9759972..22794a7 100644 --- a/dbus/dbus-gvalue-parse-variant.h +++ b/dbus/dbus-gvalue-parse-variant.h @@ -2,6 +2,8 @@ * * Copyright © 2010 Collabora Ltd. <http://www.collabora.co.uk/> * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gvalue-utils.c b/dbus/dbus-gvalue-utils.c index b517620..0a8b2f7 100644 --- a/dbus/dbus-gvalue-utils.c +++ b/dbus/dbus-gvalue-utils.c @@ -3,6 +3,8 @@ * * Copyright (C) 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gvalue-utils.h b/dbus/dbus-gvalue-utils.h index 7f411fc..9f64131 100644 --- a/dbus/dbus-gvalue-utils.h +++ b/dbus/dbus-gvalue-utils.h @@ -3,6 +3,8 @@ * * Copyright (C) 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c index fc3d78c..5bb2b19 100644 --- a/dbus/dbus-gvalue.c +++ b/dbus/dbus-gvalue.c @@ -4,6 +4,8 @@ * Copyright (C) 2004 Ximian, Inc. * Copyright (C) 2005 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus/dbus-gvalue.h b/dbus/dbus-gvalue.h index 35e05be..7a90b1c 100644 --- a/dbus/dbus-gvalue.h +++ b/dbus/dbus-gvalue.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifndef DBUS_GOBJECT_VALUE_H #define DBUS_GOBJECT_VALUE_H diff --git a/dbus/examples/example-client.c b/dbus/examples/example-client.c index fe310fd..4c6744c 100644 --- a/dbus/examples/example-client.c +++ b/dbus/examples/example-client.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <dbus/dbus-glib.h> diff --git a/dbus/examples/example-service.c b/dbus/examples/example-service.c index 19d2efd..28ee660 100644 --- a/dbus/examples/example-service.c +++ b/dbus/examples/example-service.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <dbus/dbus-glib.h> diff --git a/dbus/examples/example-signal-emitter.c b/dbus/examples/example-signal-emitter.c index 0693dff..0a17272 100644 --- a/dbus/examples/example-signal-emitter.c +++ b/dbus/examples/example-signal-emitter.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <dbus/dbus-glib.h> diff --git a/dbus/examples/example-signal-recipient.c b/dbus/examples/example-signal-recipient.c index 0ebd2d0..5c6dc99 100644 --- a/dbus/examples/example-signal-recipient.c +++ b/dbus/examples/example-signal-recipient.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <dbus/dbus-glib.h> diff --git a/dbus/examples/statemachine/statemachine-client.c b/dbus/examples/statemachine/statemachine-client.c index f0b0457..6bdaafa 100644 --- a/dbus/examples/statemachine/statemachine-client.c +++ b/dbus/examples/statemachine/statemachine-client.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <dbus/dbus-glib.h> diff --git a/dbus/examples/statemachine/statemachine-server.c b/dbus/examples/statemachine/statemachine-server.c index b92cb0e..5f85d3f 100644 --- a/dbus/examples/statemachine/statemachine-server.c +++ b/dbus/examples/statemachine/statemachine-server.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <dbus/dbus-glib.h> diff --git a/dbus/examples/statemachine/statemachine-server.h b/dbus/examples/statemachine/statemachine-server.h index 360be3a..9b9e140 100644 --- a/dbus/examples/statemachine/statemachine-server.h +++ b/dbus/examples/statemachine/statemachine-server.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifndef _SM_SERVER_H #define _SM_SERVER_H diff --git a/dbus/examples/statemachine/statemachine.c b/dbus/examples/statemachine/statemachine.c index 239d38c..f0bb285 100644 --- a/dbus/examples/statemachine/statemachine.c +++ b/dbus/examples/statemachine/statemachine.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <stdio.h> diff --git a/dbus/examples/statemachine/statemachine.h b/dbus/examples/statemachine/statemachine.h index ac6047b..b4cff02 100644 --- a/dbus/examples/statemachine/statemachine.h +++ b/dbus/examples/statemachine/statemachine.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifndef _SM_OBJECT_H #define _SM_OBJECT_H diff --git a/test/core/error-mapping.c b/test/core/error-mapping.c index d66985f..84837fd 100644 --- a/test/core/error-mapping.c +++ b/test/core/error-mapping.c @@ -5,6 +5,8 @@ * Copyright © 2006-2011 Nokia Corporation * Copyright © 2006 Steve Frécinaux * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/test/core/manual/invalid-usage.c b/test/core/manual/invalid-usage.c index 95a2591..6ca4b1f 100644 --- a/test/core/manual/invalid-usage.c +++ b/test/core/manual/invalid-usage.c @@ -7,6 +7,8 @@ * Copyright © 2006-2011 Nokia Corporation * Copyright © 2006 Steve Frécinaux * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/test/core/my-object-subclass.c b/test/core/my-object-subclass.c index 7b4ae9e..a5e4035 100644 --- a/test/core/my-object-subclass.c +++ b/test/core/my-object-subclass.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <string.h> #include <glib/gi18n.h> diff --git a/test/core/my-object-subclass.h b/test/core/my-object-subclass.h index edb03cd..9b8afd3 100644 --- a/test/core/my-object-subclass.h +++ b/test/core/my-object-subclass.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifndef __MY_OBJECT_SUBCLASS_H__ #define __MY_OBJECT_SUBCLASS_H__ diff --git a/test/core/my-object.c b/test/core/my-object.c index 62cb55a..02839cb 100644 --- a/test/core/my-object.c +++ b/test/core/my-object.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <string.h> #include <glib/gi18n.h> diff --git a/test/core/my-object.h b/test/core/my-object.h index 95d84e2..6f985ee 100644 --- a/test/core/my-object.h +++ b/test/core/my-object.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifndef __MY_OBJECT_H__ #define __MY_OBJECT_H__ diff --git a/test/core/peer-client.c b/test/core/peer-client.c index 9a944f1..836f6c4 100644 --- a/test/core/peer-client.c +++ b/test/core/peer-client.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <stdio.h> diff --git a/test/core/peer-on-bus.c b/test/core/peer-on-bus.c index a1eb231..4a62420 100644 --- a/test/core/peer-on-bus.c +++ b/test/core/peer-on-bus.c @@ -3,6 +3,8 @@ * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright © 2009-2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later OR MIT + * * In preparation for dbus-glib relicensing (if it ever happens), this file is * licensed under (at your option) either the AFL v2.1, the GPL v2 or later, * or an MIT/X11-style license: diff --git a/test/core/peer-server.c b/test/core/peer-server.c index b44daac..7b69c8b 100644 --- a/test/core/peer-server.c +++ b/test/core/peer-server.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <stdio.h> diff --git a/test/core/private.c b/test/core/private.c index 30df437..b37ae20 100644 --- a/test/core/private.c +++ b/test/core/private.c @@ -3,6 +3,8 @@ * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright © 2009-2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later OR MIT + * * In preparation for dbus-glib relicensing (if it ever happens), this file is * licensed under (at your option) either the AFL v2.1, the GPL v2 or later, * or an MIT/X11-style license: diff --git a/test/core/proxy-noc.c b/test/core/proxy-noc.c index 5c798ff..3f10eb3 100644 --- a/test/core/proxy-noc.c +++ b/test/core/proxy-noc.c @@ -4,6 +4,8 @@ * Copyright © 2011 Nokia Corporation * Copyright © 2013 Collabora Ltd. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation files * (the "Software"), to deal in the Software without restriction, diff --git a/test/core/proxy-peer.c b/test/core/proxy-peer.c index 8c1b867..b225d94 100644 --- a/test/core/proxy-peer.c +++ b/test/core/proxy-peer.c @@ -3,6 +3,8 @@ * Author: Simon McVittie <simon.mcvittie@collabora.co.uk> * Copyright © 2011 Nokia Corporation * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation files * (the "Software"), to deal in the Software without restriction, diff --git a/test/core/registrations.c b/test/core/registrations.c index 0eea468..2c32e5a 100644 --- a/test/core/registrations.c +++ b/test/core/registrations.c @@ -3,6 +3,8 @@ * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright © 2009-2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later OR MIT + * * In preparation for dbus-glib relicensing (if it ever happens), this file is * licensed under (at your option) either the AFL v2.1, the GPL v2 or later, * or an MIT/X11-style license: diff --git a/test/core/shared-bus.c b/test/core/shared-bus.c index 0ab575c..0f18880 100644 --- a/test/core/shared-bus.c +++ b/test/core/shared-bus.c @@ -5,6 +5,8 @@ * Copyright © 2006-2008 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright © 2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/test/core/test-dbus-glib.c b/test/core/test-dbus-glib.c index 1ae2ec7..4e050b2 100644 --- a/test/core/test-dbus-glib.c +++ b/test/core/test-dbus-glib.c @@ -6,6 +6,8 @@ * Copyright © 2006-2011 Nokia Corporation * Copyright © 2006 Steve Frécinaux * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/test/core/test-gvariant.c b/test/core/test-gvariant.c index fc1406e..6031afa 100644 --- a/test/core/test-gvariant.c +++ b/test/core/test-gvariant.c @@ -2,6 +2,8 @@ * * Copyright © 2010 Collabora Ltd. <http://www.collabora.co.uk/> * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/test/core/test-profile.c b/test/core/test-profile.c index fe2f476..015d200 100644 --- a/test/core/test-profile.c +++ b/test/core/test-profile.c @@ -3,6 +3,8 @@ * * Copyright (C) 2003, 2004 Red Hat Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c index 8da330a..8712b17 100644 --- a/test/core/test-service-glib.c +++ b/test/core/test-service-glib.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> /* -*- mode: C; c-file-style: "gnu" -*- */ diff --git a/test/core/test-types.c b/test/core/test-types.c index 58f309c..00b522c 100644 --- a/test/core/test-types.c +++ b/test/core/test-types.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <stdio.h> diff --git a/test/core/test-variant-recursion.c b/test/core/test-variant-recursion.c index 8278d9f..bc6df8e 100644 --- a/test/core/test-variant-recursion.c +++ b/test/core/test-variant-recursion.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> /* -*- mode: C; c-file-style: "gnu" -*- */ diff --git a/test/core/unsupported-type.c b/test/core/unsupported-type.c index d8e397b..ac4d7df 100644 --- a/test/core/unsupported-type.c +++ b/test/core/unsupported-type.c @@ -2,6 +2,8 @@ * Copyright © 2009-2014 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright © 2009-2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later OR MIT + * * In preparation for dbus-glib relicensing (if it ever happens), this file is * licensed under (at your option) either the AFL v2.1, the GPL v2 or later, * or an MIT/X11-style license: diff --git a/test/errors.c b/test/errors.c index 95a47d9..468dec7 100644 --- a/test/errors.c +++ b/test/errors.c @@ -3,6 +3,8 @@ * Copyright © 2004 Red Hat, Inc. * Copyright © 2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/test/interfaces/test-client.c b/test/interfaces/test-client.c index c3348e4..b2d0104 100644 --- a/test/interfaces/test-client.c +++ b/test/interfaces/test-client.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <stdlib.h> diff --git a/test/interfaces/test-dup-prop.c b/test/interfaces/test-dup-prop.c index 467ac4b..8c27fb7 100644 --- a/test/interfaces/test-dup-prop.c +++ b/test/interfaces/test-dup-prop.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifdef HAVE_CONFIG_H # include <config.h> #endif diff --git a/test/interfaces/test-dup-prop.h b/test/interfaces/test-dup-prop.h index cc20ea7..2dda026 100644 --- a/test/interfaces/test-dup-prop.h +++ b/test/interfaces/test-dup-prop.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifndef __TEST_DUP_PROP_H__ #define __TEST_DUP_PROP_H__ diff --git a/test/interfaces/test-interfaces.c b/test/interfaces/test-interfaces.c index 2cb4f91..de56669 100644 --- a/test/interfaces/test-interfaces.c +++ b/test/interfaces/test-interfaces.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifdef HAVE_CONFIG_H # include <config.h> #endif diff --git a/test/interfaces/test-interfaces.h b/test/interfaces/test-interfaces.h index 7a2b81d..6c56c0f 100644 --- a/test/interfaces/test-interfaces.h +++ b/test/interfaces/test-interfaces.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifndef __TEST_INTERFACES_H__ #define __TEST_INTERFACES_H__ diff --git a/test/interfaces/test-objects.c b/test/interfaces/test-objects.c index e82fa08..3533453 100644 --- a/test/interfaces/test-objects.c +++ b/test/interfaces/test-objects.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include "test-objects.h" diff --git a/test/interfaces/test-objects.h b/test/interfaces/test-objects.h index b7bf438..372d391 100644 --- a/test/interfaces/test-objects.h +++ b/test/interfaces/test-objects.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #ifndef __TEST_OBJECTS_H__ #define __TEST_OBJECTS_H__ diff --git a/test/interfaces/test-server.c b/test/interfaces/test-server.c index d9c1d91..7d55723 100644 --- a/test/interfaces/test-server.c +++ b/test/interfaces/test-server.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <stdlib.h> diff --git a/test/specialized-types.c b/test/specialized-types.c index 01216b3..7c8b0ed 100644 --- a/test/specialized-types.c +++ b/test/specialized-types.c @@ -3,6 +3,8 @@ * Copyright © 2005 Red Hat, Inc. * Copyright © 2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/test/test-service.c b/test/test-service.c index 10ef50a..9247487 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later */ + #include <config.h> #include <stdio.h> diff --git a/tools/ci-Dockerfile.in b/tools/ci-Dockerfile.in index e198b0d..ba7e47c 100644 --- a/tools/ci-Dockerfile.in +++ b/tools/ci-Dockerfile.in @@ -1,3 +1,27 @@ +# Copyright © 2015-2016 Collabora Ltd. +# +# SPDX-License-Identifier: MIT +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + FROM @ci_docker@ ENV container docker diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 4b84ae4..4bb724a 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -2,6 +2,8 @@ # Copyright © 2015-2018 Collabora Ltd. # +# SPDX-License-Identifier: MIT +# # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation files # (the "Software"), to deal in the Software without restriction, diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 6beb1f9..a2ec733 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -2,6 +2,8 @@ # Copyright © 2015-2016 Collabora Ltd. # +# SPDX-License-Identifier: MIT +# # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation files # (the "Software"), to deal in the Software without restriction, |