From 2526534ad7fe17a8d77bb482f051ee8f683d02f3 Mon Sep 17 00:00:00 2001 From: Amy Gale Ruth Bowersox Date: Fri, 13 Mar 2026 14:31:45 -0600 Subject: [PATCH] added SPDX identifiers to email, exports, and htmlcheck packages, and to the setup database scripts --- email/message.go | 2 ++ email/sender.go | 2 ++ email/subscription.go | 2 ++ email/templates/comm_massmail.jet | 2 ++ email/templates/conf_mass_poster.jet | 2 ++ email/templates/conf_mass_reader.jet | 2 ++ email/templates/email_confirm.jet | 2 ++ email/templates/invite_private.jet | 2 ++ email/templates/invite_public.jet | 2 ++ email/templates/mailpost.jet | 2 ++ email/templates/pass_change.jet | 2 ++ email/templates/pass_remind.jet | 2 ++ email/templates/topic_mass_poster.jet | 2 ++ email/templates/topic_mass_reader.jet | 2 ++ exports/vcard_xml.go | 2 ++ exports/vcif_xml.go | 2 ++ exports/viu_xml.go | 2 ++ htmlcheck/checker.go | 2 ++ htmlcheck/checker_config.go | 2 ++ htmlcheck/configs.yaml | 2 ++ htmlcheck/dict_composite.go | 2 ++ htmlcheck/dict_trie.go | 2 ++ htmlcheck/dictionary.go | 2 ++ htmlcheck/emoticon_rewriter.go | 2 ++ htmlcheck/emoticons.yaml | 2 ++ htmlcheck/filter.go | 2 ++ htmlcheck/rewriter.go | 2 ++ htmlcheck/tags.go | 2 ++ htmlcheck/url_rewriter.go | 2 ++ setup/migrate-venice.sql | 2 ++ setup/mysql-database.sql | 2 ++ 31 files changed, 62 insertions(+) diff --git a/email/message.go b/email/message.go index f0dbe4b..b9ef529 100644 --- a/email/message.go +++ b/email/message.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // Package email contains support for E-mail messages sent by Amsterdam. diff --git a/email/sender.go b/email/sender.go index 7522ff0..1db6798 100644 --- a/email/sender.go +++ b/email/sender.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // Package email contains support for E-mail messages sent by Amsterdam. diff --git a/email/subscription.go b/email/subscription.go index 5c07d4f..68da612 100644 --- a/email/subscription.go +++ b/email/subscription.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // Package email contains support for E-mail messages sent by Amsterdam. diff --git a/email/templates/comm_massmail.jet b/email/templates/comm_massmail.jet index 4e12825..077c692 100644 --- a/email/templates/comm_massmail.jet +++ b/email/templates/comm_massmail.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ text }} diff --git a/email/templates/conf_mass_poster.jet b/email/templates/conf_mass_poster.jet index d25d3f8..22a72ec 100644 --- a/email/templates/conf_mass_poster.jet +++ b/email/templates/conf_mass_poster.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ text }} diff --git a/email/templates/conf_mass_reader.jet b/email/templates/conf_mass_reader.jet index 9f74988..345898d 100644 --- a/email/templates/conf_mass_reader.jet +++ b/email/templates/conf_mass_reader.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ text }} diff --git a/email/templates/email_confirm.jet b/email/templates/email_confirm.jet index fbd87a6..71fdc29 100644 --- a/email/templates/email_confirm.jet +++ b/email/templates/email_confirm.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ .SetSubject("Amsterdam Email Confirmation") }} Welcome to the Amsterdam conferencing system! In order to fully activate your diff --git a/email/templates/invite_private.jet b/email/templates/invite_private.jet index 86cbf16..e498ff8 100644 --- a/email/templates/invite_private.jet +++ b/email/templates/invite_private.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ .SetSubject("Invitation to " + comm.Name + " Community")}} Hi! I would like to invite you to join the "{{ comm.Name }}" community on diff --git a/email/templates/invite_public.jet b/email/templates/invite_public.jet index a339d05..f49ef35 100644 --- a/email/templates/invite_public.jet +++ b/email/templates/invite_public.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ .SetSubject("Invitation to " + comm.Name + " Community")}} Hi! I would like to invite you to join the "{{ comm.Name }}" community on diff --git a/email/templates/mailpost.jet b/email/templates/mailpost.jet index cb6441c..6478764 100644 --- a/email/templates/mailpost.jet +++ b/email/templates/mailpost.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ .SetSubject("New Post in " + topicName)}} The following message was just posted by "{{ userName }}" to the diff --git a/email/templates/pass_change.jet b/email/templates/pass_change.jet index dd071d4..beb9abe 100644 --- a/email/templates/pass_change.jet +++ b/email/templates/pass_change.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ .SetSubject("Amsterdam Password Changed") }} The password for your account "{{ username }}" has been changed. The new diff --git a/email/templates/pass_remind.jet b/email/templates/pass_remind.jet index 7afbc69..d39cca9 100644 --- a/email/templates/pass_remind.jet +++ b/email/templates/pass_remind.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ .SetSubject("Amsterdam Password Reminder Message") }} Here is the password reminder for your account "{{ username }}" as you requested: diff --git a/email/templates/topic_mass_poster.jet b/email/templates/topic_mass_poster.jet index 1821329..d4efe51 100644 --- a/email/templates/topic_mass_poster.jet +++ b/email/templates/topic_mass_poster.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ text }} diff --git a/email/templates/topic_mass_reader.jet b/email/templates/topic_mass_reader.jet index dd7e892..bae24fa 100644 --- a/email/templates/topic_mass_reader.jet +++ b/email/templates/topic_mass_reader.jet @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 *} {{ text }} diff --git a/exports/vcard_xml.go b/exports/vcard_xml.go index 6cd8dec..43c0227 100644 --- a/exports/vcard_xml.go +++ b/exports/vcard_xml.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // Package exports contains interfacing code for external data formats. package exports diff --git a/exports/vcif_xml.go b/exports/vcif_xml.go index 0222f73..36feaf3 100644 --- a/exports/vcif_xml.go +++ b/exports/vcif_xml.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // Package exports contains interfacing code for external data formats. package exports diff --git a/exports/viu_xml.go b/exports/viu_xml.go index 4208fda..438ea0d 100644 --- a/exports/viu_xml.go +++ b/exports/viu_xml.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // Package exports contains interfacing code for external data formats. package exports diff --git a/htmlcheck/checker.go b/htmlcheck/checker.go index ec71a09..5c2c847 100644 --- a/htmlcheck/checker.go +++ b/htmlcheck/checker.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/checker_config.go b/htmlcheck/checker_config.go index 88c6e68..164b002 100644 --- a/htmlcheck/checker_config.go +++ b/htmlcheck/checker_config.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/configs.yaml b/htmlcheck/configs.yaml index 093bd64..fe216ff 100644 --- a/htmlcheck/configs.yaml +++ b/htmlcheck/configs.yaml @@ -6,6 +6,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. # +# SPDX-License-Identifier: MPL-2.0 +# configs: - name: "post-body" wordWrap: 55 diff --git a/htmlcheck/dict_composite.go b/htmlcheck/dict_composite.go index 71b7e63..041f60d 100644 --- a/htmlcheck/dict_composite.go +++ b/htmlcheck/dict_composite.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/dict_trie.go b/htmlcheck/dict_trie.go index 36478da..104792d 100644 --- a/htmlcheck/dict_trie.go +++ b/htmlcheck/dict_trie.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/dictionary.go b/htmlcheck/dictionary.go index ee5c56f..8a96740 100644 --- a/htmlcheck/dictionary.go +++ b/htmlcheck/dictionary.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/emoticon_rewriter.go b/htmlcheck/emoticon_rewriter.go index abefb68..6d3a8b8 100644 --- a/htmlcheck/emoticon_rewriter.go +++ b/htmlcheck/emoticon_rewriter.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/emoticons.yaml b/htmlcheck/emoticons.yaml index dbfea0c..1efbd09 100644 --- a/htmlcheck/emoticons.yaml +++ b/htmlcheck/emoticons.yaml @@ -6,6 +6,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. # +# SPDX-License-Identifier: MPL-2.0 +# prefixChars: ":;" emoticons: - name: smile diff --git a/htmlcheck/filter.go b/htmlcheck/filter.go index 59ed830..57c787c 100644 --- a/htmlcheck/filter.go +++ b/htmlcheck/filter.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/rewriter.go b/htmlcheck/rewriter.go index 77dfdf6..357110f 100644 --- a/htmlcheck/rewriter.go +++ b/htmlcheck/rewriter.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/tags.go b/htmlcheck/tags.go index 5ebf5f1..0fc3dbe 100644 --- a/htmlcheck/tags.go +++ b/htmlcheck/tags.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/htmlcheck/url_rewriter.go b/htmlcheck/url_rewriter.go index f190d25..8c8347f 100644 --- a/htmlcheck/url_rewriter.go +++ b/htmlcheck/url_rewriter.go @@ -5,6 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 */ // The htmlcheck package contains the HTML Checker. package htmlcheck diff --git a/setup/migrate-venice.sql b/setup/migrate-venice.sql index 2eb1c99..5c6e98c 100644 --- a/setup/migrate-venice.sql +++ b/setup/migrate-venice.sql @@ -8,6 +8,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. # +# SPDX-License-Identifier: MPL-2.0 +# ALTER TABLE globals RENAME COLUMN max_sig_mbr_page TO max_comm_mbr_page; ALTER TABLE globals RENAME COLUMN sig_create_lvl TO comm_create_lvl; diff --git a/setup/mysql-database.sql b/setup/mysql-database.sql index 6962678..9ebf1f6 100644 --- a/setup/mysql-database.sql +++ b/setup/mysql-database.sql @@ -8,6 +8,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. # +# SPDX-License-Identifier: MPL-2.0 +# ############################################################################## # Table Creation