diff options
Diffstat (limited to 'resources/tools/block_replacer')
-rw-r--r-- | resources/tools/block_replacer/apache2gpl.sh | 2 | ||||
-rw-r--r-- | resources/tools/block_replacer/gpl2apache.sh | 5 | ||||
-rw-r--r-- | resources/tools/block_replacer/gpl_block.txt | 32 | ||||
-rw-r--r-- | resources/tools/block_replacer/gpl_long_block.txt | 20 | ||||
-rw-r--r-- | resources/tools/block_replacer/replace.py | 2 |
5 files changed, 46 insertions, 15 deletions
diff --git a/resources/tools/block_replacer/apache2gpl.sh b/resources/tools/block_replacer/apache2gpl.sh index f248393d50..67b51f200c 100644 --- a/resources/tools/block_replacer/apache2gpl.sh +++ b/resources/tools/block_replacer/apache2gpl.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/resources/tools/block_replacer/gpl2apache.sh b/resources/tools/block_replacer/gpl2apache.sh index a1ef8df075..b9450d0be4 100644 --- a/resources/tools/block_replacer/gpl2apache.sh +++ b/resources/tools/block_replacer/gpl2apache.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -25,3 +25,6 @@ fi find "${1}" \( -name "*.py" -o -name "*.sh" \) -print0 | xargs -0 \ python3 replace.py "gpl_block.txt" "apache_block.txt" + +find "${1}" \( -name "*.py" -o -name "*.sh" \) -print0 | xargs -0 \ +python3 replace.py "gpl_long_block.txt" "apache_block.txt" diff --git a/resources/tools/block_replacer/gpl_block.txt b/resources/tools/block_replacer/gpl_block.txt index 2dbbb2af06..891171c954 100644 --- a/resources/tools/block_replacer/gpl_block.txt +++ b/resources/tools/block_replacer/gpl_block.txt @@ -1,13 +1,21 @@ # -# This file 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 file 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 file. If not, see <https://www.gnu.org/licenses/>. +# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later +# +# Licensed under the Apache License 2.0 or +# GNU General Public License v2.0 or later; you may not use this file +# except in compliance with one of these Licenses. You +# may obtain a copy of the Licenses at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html +# +# Note: If this file is linked with Scapy, which is GPLv2+, your use of it +# must be under GPLv2+. If at any point in the future it is no longer linked +# with Scapy (or other GPLv2+ licensed software), you are free to choose +# Apache 2. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/resources/tools/block_replacer/gpl_long_block.txt b/resources/tools/block_replacer/gpl_long_block.txt new file mode 100644 index 0000000000..fb3c9d0e1b --- /dev/null +++ b/resources/tools/block_replacer/gpl_long_block.txt @@ -0,0 +1,20 @@ +# +# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later +# +# Licensed under the Apache License 2.0 or +# GNU General Public License v2.0 or later; you may not use this file +# except in compliance with one of these Licenses. You +# may obtain a copy of the Licenses at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html +# +# Note: If this file is linked with Scapy, which is GPLv2+, your use of it +# must be under GPLv2+. If at any point in the future it is no longer linked +# with Scapy (or other GPLv2+ licensed software), you are free to choose Apache 2. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/resources/tools/block_replacer/replace.py b/resources/tools/block_replacer/replace.py index 02d1889331..5154c51be1 100644 --- a/resources/tools/block_replacer/replace.py +++ b/resources/tools/block_replacer/replace.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: |