From db18abd336eaf92044928a30b08778352839c3da Mon Sep 17 00:00:00 2001 From: Riyyi Date: Sat, 11 Sep 2021 13:22:52 +0200 Subject: [PATCH] Config: Update Emacs copyright notice snippets --- .config/emacs/snippets/cc-mode/al2 | 12 +----------- .config/emacs/snippets/cc-mode/bsd2 | 21 +------------------- .config/emacs/snippets/cc-mode/bsd3 | 25 +----------------------- .config/emacs/snippets/cc-mode/gpl2 | 14 +------------ .config/emacs/snippets/cc-mode/gpl2-only | 10 ++++++++++ .config/emacs/snippets/cc-mode/gpl3 | 13 +----------- .config/emacs/snippets/cc-mode/gpl3-only | 10 ++++++++++ .config/emacs/snippets/cc-mode/mit | 17 +--------------- 8 files changed, 26 insertions(+), 96 deletions(-) create mode 100644 .config/emacs/snippets/cc-mode/gpl2-only create mode 100644 .config/emacs/snippets/cc-mode/gpl3-only diff --git a/.config/emacs/snippets/cc-mode/al2 b/.config/emacs/snippets/cc-mode/al2 index 5b6d9be..3298be4 100644 --- a/.config/emacs/snippets/cc-mode/al2 +++ b/.config/emacs/snippets/cc-mode/al2 @@ -5,16 +5,6 @@ /* * Copyright (C) `(format-time-string "%Y")` ${1:Author} ${2:<${3:Email}>} * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. + * SPDX-License-Identifier: Apache-2.0 */ $0 diff --git a/.config/emacs/snippets/cc-mode/bsd2 b/.config/emacs/snippets/cc-mode/bsd2 index d42ea11..0b7ee52 100644 --- a/.config/emacs/snippets/cc-mode/bsd2 +++ b/.config/emacs/snippets/cc-mode/bsd2 @@ -5,25 +5,6 @@ /* * Copyright (C) `(format-time-string "%Y")` ${1:Author} ${2:<${3:Email}>} * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ $0 diff --git a/.config/emacs/snippets/cc-mode/bsd3 b/.config/emacs/snippets/cc-mode/bsd3 index 1db951f..85b1bca 100644 --- a/.config/emacs/snippets/cc-mode/bsd3 +++ b/.config/emacs/snippets/cc-mode/bsd3 @@ -5,29 +5,6 @@ /* * Copyright (C) `(format-time-string "%Y")` ${1:Author} ${2:<${3:Email}>} * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause */ $0 \ No newline at end of file diff --git a/.config/emacs/snippets/cc-mode/gpl2 b/.config/emacs/snippets/cc-mode/gpl2 index 8f81b6b..45c6efe 100644 --- a/.config/emacs/snippets/cc-mode/gpl2 +++ b/.config/emacs/snippets/cc-mode/gpl2 @@ -5,18 +5,6 @@ /* * Copyright (C) `(format-time-string "%Y")` ${1:Author} ${2:<${3:Email}>} * - * 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. + * SPDX-License-Identifier: GPL-2.0-or-later */ $0 diff --git a/.config/emacs/snippets/cc-mode/gpl2-only b/.config/emacs/snippets/cc-mode/gpl2-only new file mode 100644 index 0000000..7c99d9c --- /dev/null +++ b/.config/emacs/snippets/cc-mode/gpl2-only @@ -0,0 +1,10 @@ +# -*- mode: snippet -*- +# name: gpl2-only +# key: gpl2-only +# -- +/* + * Copyright (C) `(format-time-string "%Y")` ${1:Author} ${2:<${3:Email}>} + * + * SPDX-License-Identifier: GPL-2.0-only + */ +$0 diff --git a/.config/emacs/snippets/cc-mode/gpl3 b/.config/emacs/snippets/cc-mode/gpl3 index d4fb0e1..cb49e27 100644 --- a/.config/emacs/snippets/cc-mode/gpl3 +++ b/.config/emacs/snippets/cc-mode/gpl3 @@ -5,17 +5,6 @@ /* * Copyright (C) `(format-time-string "%Y")` ${1:Author} ${2:<${3:Email}>} * - * 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 3 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, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ $0 \ No newline at end of file diff --git a/.config/emacs/snippets/cc-mode/gpl3-only b/.config/emacs/snippets/cc-mode/gpl3-only new file mode 100644 index 0000000..af7e948 --- /dev/null +++ b/.config/emacs/snippets/cc-mode/gpl3-only @@ -0,0 +1,10 @@ +# -*- mode: snippet -*- +# name: gpl3-only +# key: gpl3-only +# -- +/* + * Copyright (C) `(format-time-string "%Y")` ${1:Author} ${2:<${3:Email}>} + * + * SPDX-License-Identifier: GPL-3.0-only + */ +$0 \ No newline at end of file diff --git a/.config/emacs/snippets/cc-mode/mit b/.config/emacs/snippets/cc-mode/mit index 1d77c3a..4301cd3 100644 --- a/.config/emacs/snippets/cc-mode/mit +++ b/.config/emacs/snippets/cc-mode/mit @@ -5,21 +5,6 @@ /* * Copyright (C) `(format-time-string "%Y")` ${1:Author} ${2:<${3:Email}>} * - * 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. + * SPDX-License-Identifier: MIT */ $0 \ No newline at end of file