Skip to content

Commit 5f366c5

Browse files
brbbrb
committed
Change licenses
Dual-license bpf/ with BSD-2 and GPL-2.0, and userspace with Apache-2.0. Signed-off-by: Martynas Pumputis <[email protected]>
1 parent 4554207 commit 5f366c5

File tree

12 files changed

+596
-368
lines changed

12 files changed

+596
-368
lines changed

‎LICENSE‎

Lines changed: 201 additions & 340 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,14 @@ make release
125125

126126
## Contributing
127127

128-
`pwru` is an open source project licensed under [GPLv2](LICENSE). Everybody is
129-
welcome to contribute. Contributors are required to follow the
130-
[Contributor Covenant Code of Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)
131-
and must adhere to the [Developer Certificate of Origin](https://developercertificate.org/)
132-
by adding a Signed-off-by line to their commit messages.
128+
`pwru` is an open source project. The userspace code is licensed under
129+
[Apache-2.0](LICENSE), while the BPF under [BSD 2-Clause](bpf/LICENSE.BSD-2-Clause]
130+
and [GPL-2.0](bpf/LICENSE.GPL-2.0). Everybody is welcome to contribute.
131+
Contributors are required to follow the [Contributor Covenant Code of
132+
Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct/) and
133+
must adhere to the [Developer Certificate of
134+
Origin](https://developercertificate.org/) by adding a Signed-off-by line to
135+
their commit messages.
133136

134137
## Community
135138

‎bpf/LICENSE.BSD-2-Clause‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Copyright Authors of Cilium. All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without
4+
modification, are permitted provided that the following conditions are met:
5+
6+
1. Redistributions of source code must retain the above copyright notice,
7+
this list of conditions and the following disclaimer.
8+
9+
2. Redistributions in binary form must reproduce the above copyright
10+
notice, this list of conditions and the following disclaimer in the
11+
documentation and/or other materials provided with the distribution.
12+
13+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
14+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
16+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
17+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
23+
POSSIBILITY OF SUCH DAMAGE.

‎bpf/LICENSE.GPL-2.0‎

Lines changed: 341 additions & 0 deletions
Large diffs are not rendered by default.

‎bpf/kprobe_pwru.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0-only
2-
/* Copyright (C) 2020-2021 Martynas Pumputis */
3-
/* Copyright (C) 2021 Authors of Cilium */
1+
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
/* Copyright Martynas Pumputis */
3+
/* Copyright Authors of Cilium */
44

55
/*
66
* WARNING: `bpf_printk()` has special intention in this program: it is used for
@@ -321,4 +321,4 @@ PWRU_ADD_KPROBE(5)
321321
#undef PWRU_HAS_GET_FUNC_IP
322322
#undef PWRU_KPROBE_TYPE
323323

324-
char __license[] SEC("license") = "GPL";
324+
char __license[] SEC("license") = "Dual BSD/GPL";

‎internal/pwru/config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0-only
2-
/* Copyright (C) 2020-2021 Martynas Pumputis */
3-
/* Copyright (C) 2021-2022 Authors of Cilium */
1+
// SPDX-License-Identifier: Apache-2.0
2+
/* Copyright Martynas Pumputis */
3+
/* Copyright Authors of Cilium */
44

55
package pwru
66

‎internal/pwru/output.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0-only
2-
/* Copyright (C) 2020-2021 Martynas Pumputis */
3-
/* Copyright (C) 2021 Authors of Cilium */
1+
// SPDX-License-Identifier: Apache-2.0
2+
/* Copyright Martynas Pumputis */
3+
/* Copyright Authors of Cilium */
44

55
package pwru
66

‎internal/pwru/types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0-only
2-
/* Copyright (C) 2020-2021 Martynas Pumputis */
3-
/* Copyright (C) 2021-2022 Authors of Cilium */
1+
// SPDX-License-Identifier: Apache-2.0
2+
/* Copyright Martynas Pumputis */
3+
/* Copyright Authors of Cilium */
44

55
package pwru
66

‎internal/pwru/utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0-only
2-
/* Copyright (C) 2020-2021 Martynas Pumputis */
3-
/* Copyright (C) 2021 Authors of Cilium */
1+
// SPDX-License-Identifier: Apache-2.0
2+
/* Copyright Martynas Pumputis */
3+
/* Copyright Authors of Cilium */
44

55
package pwru
66

‎main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0-only
2-
/* Copyright (C) 2020-2021 Martynas Pumputis */
3-
/* Copyright (C) 2021-2022 Authors of Cilium */
1+
// SPDX-License-Identifier: Apache-2.0
2+
/* Copyright Martynas Pumputis */
3+
/* Copyright Authors of Cilium */
44

55
package main
66

0 commit comments

Comments
 (0)