Skip to content

Commit

Permalink
Merge pull request #9376 from kikofernandez/kiko/licenses/add-missing…
Browse files Browse the repository at this point in the history
…-licenses/OTP-19478

Add missing licenses
OTP-19478
  • Loading branch information
kikofernandez authored Feb 7, 2025
2 parents 3525113 + 201938e commit 043b384
Show file tree
Hide file tree
Showing 32 changed files with 89 additions and 354 deletions.
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,14 @@ The OTP versions that are affected by this bug.

**Additional context**
Add any other context about the problem here. If you wish to attach Erlang code you can either write it directly in the post using [code tags](https://guides.github.com/features/mastering-markdown/), create a [gist](https://gist.github.com), or attach it as a zip file to this post.

<!--
%CopyrightBegin%
SPDX-FileCopyrightText: Copyright Ericsson AB 2021. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
%CopyrightEnd%
-->
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,15 @@ A clear and concise description of any alternative solutions or features you've

**Additional context**
Add any other context or screenshots about the feature request here.

<!--
%CopyrightBegin%
SPDX-FileCopyrightText: Copyright Ericsson AB 2021. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
%CopyrightEnd%
-->
8 changes: 8 additions & 0 deletions .github/actions/build-base-image/action.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# %CopyrightBegin%
#
# SPDX-FileCopyrightText: Copyright Ericsson AB 2023-2025. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# %CopyrightEnd%

name: Build Base Image
description: 'Builds the base testing image (using cache if possible)'

Expand Down
2 changes: 1 addition & 1 deletion .github/dockerfiles/odbcinst.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Driver = /usr/lib/i386-linux-gnu/odbc/psqlodbca.so
Setup = /usr/lib/i386-linux-gnu/odbc/libodbcpsqlS.so
Debug = 0
CommLog = 1
UsageCount = 2
UsageCount = 2
1 change: 1 addition & 0 deletions .github/workflows/license-scanner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
new:
- added: '**'
- '!**/*.beam'
- '!LICENSES/**/*.txt'
- '!**/*.exe'
- '!**/*.config.cache.static'
## OTP-27.0 tag as base
Expand Down
13 changes: 12 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<!--
%CopyrightBegin%
SPDX-FileCopyrightText: Copyright Ericsson AB 2016-2025. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
%CopyrightEnd%
-->

# Contributing to Erlang/OTP

1. [License](#license)
Expand Down Expand Up @@ -101,7 +111,7 @@ a discussion on the mailing list.
Contributions to Erlang/OTP must be under the Apache 2.0 license, and should
have a SPDX license and copyright identifier. Only in specific cases were no
other alternative exists, Erlang/OTP will consider accepting Pull Requests with
Apache-2.0 compatible licenses.
`Apache-2.0` compatible licenses.

Under no circumstances the Erlang/OTP project will accept non-compatible Apache 2.0 contributions.

Expand All @@ -110,6 +120,7 @@ Erlang/OTP has automatic checks to enforce this policy:
contribution will be manually checked, and will trigger a non-passing test in
Github.


- The [REUSE tool](https://reuse.software/) checks that all files have `SPDX-License-Identifier:` and
`SPDX-FileCopyrightText:`. The License identifier should be `Apache-2.0` in
all cases, and the copyright should be in the format
Expand Down
2 changes: 1 addition & 1 deletion erts/config.h.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */

/* SPDX-License-Identifier: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 */

#ifndef __ERTS_CONFIG_H__
#define __ERTS_CONFIG_H__
Expand Down
168 changes: 0 additions & 168 deletions erts/emulator/openssl/openssl.diff

This file was deleted.

2 changes: 2 additions & 0 deletions erts/emulator/pcre/local_config.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause */
/* %ExternalCopyright% */


#define HAVE_ZLIB_H 1
/* The value of LINK_SIZE determines the number of bytes used to store links
as offsets within the compiled regex. The default is 2, which allows for
Expand Down
1 change: 1 addition & 0 deletions erts/emulator/pcre/pcre_chartables.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ and dead code stripping is activated. This leads to link errors. Pulling in the
header ensures that the array gets flagged as "someone outside this compilation
unit might reference this" and so it will always be supplied to the linker. */

/* SPDX-License-Identifier: BSD-3-Clause */
/* %ExternalCopyright% */

#ifdef HAVE_CONFIG_H
Expand Down
1 change: 1 addition & 0 deletions erts/emulator/pcre/pcre_latin_1_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ library and dead code stripping is activated. This leads to link errors.
Pulling in the header ensures that the array gets flagged as "someone
outside this compilation unit might reference this" and so it will always
be supplied to the linker. */
/* SPDX-License-Identifier: BSD-3-Clause */
/* %ExternalCopyright% */

#ifdef HAVE_CONFIG_H
Expand Down
1 change: 1 addition & 0 deletions erts/emulator/pcre/pcre_ucd.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ by the pcretest program, which redefines the PRIV macro to change
table names from _pcre_xxx to xxxx, thereby avoiding name clashes
with the library. At present, just one of these tables is actually
needed. */
/* SPDX-License-Identifier: BSD-3-Clause */
/* %ExternalCopyright% */
#ifndef PCRE_INCLUDED

Expand Down
1 change: 1 addition & 0 deletions erts/emulator/pcre/ucp.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Unicode Property Table handler *
*************************************************/

/* SPDX-License-Identifier: BSD-3-Clause */
/* %ExternalCopyright% */

#ifndef _UCP_H
Expand Down
2 changes: 2 additions & 0 deletions erts/emulator/zlib/crc32.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* Generated automatically by crc32.c
*/

/* SPDX-License-Identifier: Zlib */

local const z_crc_t FAR crc_table[] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
Expand Down
2 changes: 2 additions & 0 deletions erts/emulator/zlib/inffixed.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* Generated automatically by makefixed().
*/

/* SPDX-License-Identifier: Zlib */

/* WARNING: this file should *not* be used by applications.
It is part of the implementation of this library and is
subject to change. Applications should only use zlib.h.
Expand Down
1 change: 1 addition & 0 deletions erts/emulator/zlib/trees.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* header created automatically with -DGEN_TREES_H */
/* SPDX-License-Identifier: Zlib */

local const ct_data static_ltree[L_CODES+2] = {
{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}},
Expand Down
10 changes: 10 additions & 0 deletions erts/preloaded/src/erl_tracer.erl
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
%%
%% %CopyrightBegin%
%%
%% SPDX-License-Identifier: Apache-2.0
%%
%% SPDX-FileCopyrightText: Copyright Ericsson AB 2015-2024. All Rights Reserved.
%%
%% %CopyrightEnd%
%%

-module(erl_tracer).
-moduledoc """
Erlang tracer behavior.
Expand Down
4 changes: 4 additions & 0 deletions lib/eldap/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
SPDX-License-Identifier: MIT
SPDX-FileCopyrightText: 2010 Torbjorn Tornkvist <tobbe@tornkvist.org>

Hi,

This is 'eldap', the Erlang LDAP library.
Expand Down Expand Up @@ -31,3 +34,4 @@ that uses 'eldap' (as we have done in our products).

Good luck !
/Tobbe

1 change: 1 addition & 0 deletions lib/eldap/asn1/ELDAPv3.asn1
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
-- Copyright (C) The Internet Society (2006). This version of
-- this ASN.1 module is part of RFC 4511; see the RFC itself
-- for full legal notices.
-- SPDX-License-Identifier: MIT
ELDAPv3 DEFINITIONS
IMPLICIT TAGS
EXTENSIBILITY IMPLIED ::=
Expand Down
3 changes: 3 additions & 0 deletions lib/eldap/include/eldap.hrl
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
%% SPDX-License-Identifier: MIT
%% SPDX-FileCopyrightText: 2010 Torbjorn Tornkvist <tobbe@tornkvist.org>

-ifndef( _ELDAP_HRL ).
-define( _ELDAP_HRL , 1 ).

Expand Down
1 change: 1 addition & 0 deletions lib/eldap/src/eldap.app.src
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
%% SPDX-License-Identifier: MIT
{application, eldap,
[{description, "Ldap api"},
{vsn, "%VSN%"},
Expand Down
1 change: 1 addition & 0 deletions lib/erl_interface/config.h.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* SPDX-License-Identifier: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 */

/* Define to 1 if using 'alloca.c'. */
#undef C_ALLOCA
Expand Down
Loading

0 comments on commit 043b384

Please sign in to comment.