History

License cleanup: add SPDX license identifier to uapi header files with a license

Many user space API headers have licensing information, which is either incomplete, badly formatted or just a shorthand for referring to the license under which the file is supposed to be. This makes it hard for compliance tools to determine the correct license. Update these files with an SPDX license identifier. The identifier was chosen based on the license information in the file. GPL/LGPL licensed headers get the matching GPL/LGPL SPDX license identifier with the added 'WITH Linux-syscall-note' exception, which is the officially assigned exception identifier for the kernel syscall exception: NOTE! This copyright does *not* cover user programs that use kernel services by normal system calls - this is merely considered normal use of the kernel, and does *not* fall under the heading of "derived work". This exception makes it possible to include GPL headers into non GPL code, without confusing license compliance tools. Headers which have either explicit dual licensing or are just licensed under a non GPL license are updated with the corresponding SPDX identifier and the GPLv2 with syscall exception identifier. The format is: ((GPL-2.0 WITH Linux-syscall-note) OR SPDX-ID-OF-OTHER-LICENSE) SPDX license identifiers are a legally binding shorthand, which can be used instead of the full boiler plate text. The update does not remove existing license information as this has to be done on a case by case basis and the copyright holders might have to be consulted. This will happen in a separate step. This patch is based on work done by Thomas Gleixner and Kate Stewart and Philippe Ombredanne. See the previous patch in this series for the methodology of how this patch was researched.

Greg Kroah-Hartman committed 9 years ago

Commit e2be04c1 parent 6f52b16522 files · +522 −0Browse files

Showing the changes to include/uapi/linux/netfilter (11 of 522 files). Show all

Unified · Split

11 files
  1. include/uapi/linux/netfilter/ipset/ip_set.h +1 −0
  2. include/uapi/linux/netfilter/xt_AUDIT.h +1 −0
  3. include/uapi/linux/netfilter/xt_CHECKSUM.h +1 −0
  4. include/uapi/linux/netfilter/xt_DSCP.h +1 −0
  5. include/uapi/linux/netfilter/xt_IDLETIMER.h +1 −0
  6. include/uapi/linux/netfilter/xt_NFQUEUE.h +1 −0
  7. include/uapi/linux/netfilter/xt_connmark.h +1 −0
  8. include/uapi/linux/netfilter/xt_conntrack.h +1 −0
  9. include/uapi/linux/netfilter/xt_dscp.h +1 −0
  10. include/uapi/linux/netfilter/xt_ecn.h +1 −0
  11. include/uapi/linux/netfilter/xt_osf.h +1 −0
include/uapi/linux/netfilter/ipset/ip_set.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>2/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
2 * Patrick Schaaf <bof@bof.de>3 * Patrick Schaaf <bof@bof.de>
3 * Martin Josefsson <gandalf@wlug.westbo.se>4 * Martin Josefsson <gandalf@wlug.westbo.se>
include/uapi/linux/netfilter/xt_AUDIT.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/*2/*
2 * Header file for iptables xt_AUDIT target3 * Header file for iptables xt_AUDIT target
3 *4 *
include/uapi/linux/netfilter/xt_CHECKSUM.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/* Header file for iptables ipt_CHECKSUM target2/* Header file for iptables ipt_CHECKSUM target
2 *3 *
3 * (C) 2002 by Harald Welte <laforge@gnumonks.org>4 * (C) 2002 by Harald Welte <laforge@gnumonks.org>
include/uapi/linux/netfilter/xt_DSCP.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/* x_tables module for setting the IPv4/IPv6 DSCP field2/* x_tables module for setting the IPv4/IPv6 DSCP field
2 *3 *
3 * (C) 2002 Harald Welte <laforge@gnumonks.org>4 * (C) 2002 Harald Welte <laforge@gnumonks.org>
include/uapi/linux/netfilter/xt_IDLETIMER.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/*2/*
2 * linux/include/linux/netfilter/xt_IDLETIMER.h3 * linux/include/linux/netfilter/xt_IDLETIMER.h
3 *4 *
include/uapi/linux/netfilter/xt_NFQUEUE.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/* iptables module for using NFQUEUE mechanism2/* iptables module for using NFQUEUE mechanism
2 *3 *
3 * (C) 2005 Harald Welte <laforge@netfilter.org>4 * (C) 2005 Harald Welte <laforge@netfilter.org>
include/uapi/linux/netfilter/xt_connmark.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
1#ifndef _XT_CONNMARK_H2#ifndef _XT_CONNMARK_H
2#define _XT_CONNMARK_H3#define _XT_CONNMARK_H
3 4
include/uapi/linux/netfilter/xt_conntrack.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
1/* Header file for kernel module to match connection tracking information.2/* Header file for kernel module to match connection tracking information.
2 * GPL (C) 2001 Marc Boucher (marc@mbsi.ca).3 * GPL (C) 2001 Marc Boucher (marc@mbsi.ca).
3 */4 */
include/uapi/linux/netfilter/xt_dscp.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/* x_tables module for matching the IPv4/IPv6 DSCP field2/* x_tables module for matching the IPv4/IPv6 DSCP field
2 *3 *
3 * (C) 2002 Harald Welte <laforge@gnumonks.org>4 * (C) 2002 Harald Welte <laforge@gnumonks.org>
include/uapi/linux/netfilter/xt_ecn.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/* iptables module for matching the ECN header in IPv4 and TCP header2/* iptables module for matching the ECN header in IPv4 and TCP header
2 *3 *
3 * (C) 2002 Harald Welte <laforge@gnumonks.org>4 * (C) 2002 Harald Welte <laforge@gnumonks.org>
include/uapi/linux/netfilter/xt_osf.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
1/*2/*
2 * Copyright (c) 2003+ Evgeniy Polyakov <johnpol@2ka.mxt.ru>3 * Copyright (c) 2003+ Evgeniy Polyakov <johnpol@2ka.mxt.ru>
3 *4 *