From e522e774cae2240279fc48c349fc513c9d3353ee Mon Sep 17 00:00:00 2001 From: Kyle D Date: Fri, 5 Jan 2024 09:38:56 -0800 Subject: [PATCH 1/9] Add merge arrow direction and update styling (#28523) Close https://github.com/go-gitea/gitea/issues/28522 ~Adds some [negative margin](https://tailwindcss.com/docs/margin#using-negative-values) helper css classes using tailwind's [prefix syntax](https://tailwindcss.com/docs/configuration#prefix)~ ### Before ![image](https://github.com/go-gitea/gitea/assets/12700993/5bdabf91-facd-41c8-8e36-e1535beb9409) ### After ![image](https://github.com/go-gitea/gitea/assets/12700993/a6f11f6f-9e64-45b6-b9d7-dfea53fbc6d7) --- templates/repo/diff/compare.tmpl | 4 ++-- web_src/css/repo.css | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 0e8a598a651f6..42a7bf3c2a2d9 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -36,7 +36,7 @@ {{- end -}} {{- end -}}
- {{svg "octicon-git-compare"}} + {{svg "octicon-git-compare"}}
{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_base"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_base"}}{{end}}: {{$BaseCompareName}}:{{$.BaseBranch}} @@ -105,7 +105,7 @@
- {{.CompareSeparator}} + {{svg "octicon-arrow-left" 16}}
{{.CompareSeparator}}
{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_compare"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_head"}}{{end}}: {{$HeadCompareName}}:{{$.HeadBranch}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index e37788505e673..6b6be99f74c84 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1166,8 +1166,10 @@ flex-wrap: wrap; } -.repository .choose.branch .svg { - margin-right: 10px; +.repository .choose .compare-separator { + width: 100%; + margin-top: -1rem; + text-align: center; } .repository.compare.pull .comment.form .content::before, From e75e9a0e7e53851e344633abe402979cdbece15b Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 6 Jan 2024 17:30:03 +0800 Subject: [PATCH 2/9] Fix panic when parsing empty pgsql host (#28708) Regression of #27723 Fix #28705 --- modules/setting/database.go | 2 +- modules/setting/database_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/setting/database.go b/modules/setting/database.go index b68f250f787ef..015c918d93a4a 100644 --- a/modules/setting/database.go +++ b/modules/setting/database.go @@ -168,7 +168,7 @@ func getPostgreSQLConnectionString(dbHost, dbUser, dbPasswd, dbName, dbsslMode s RawQuery: dbParam, } query := connURL.Query() - if dbHost[0] == '/' { // looks like a unix socket + if strings.HasPrefix(dbHost, "/") { // looks like a unix socket query.Add("host", dbHost) connURL.Host = ":" + port } diff --git a/modules/setting/database_test.go b/modules/setting/database_test.go index 1d5b416504b18..14e0a6ac021f4 100644 --- a/modules/setting/database_test.go +++ b/modules/setting/database_test.go @@ -65,6 +65,10 @@ func Test_getPostgreSQLConnectionString(t *testing.T) { SSLMode string Output string }{ + { + Host: "", // empty means default + Output: "postgres://:@127.0.0.1:5432?sslmode=", + }, { Host: "/tmp/pg.sock", User: "testuser", From 7215224112043fbf66343be33693fb73f28e2260 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 7 Jan 2024 01:14:10 +0800 Subject: [PATCH 3/9] Improve frontend guideline (#28711) It has been a consensus for long time during reviewing: "avoiding inline styles as much as possible". --- docs/content/contributing/guidelines-frontend.en-us.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/content/contributing/guidelines-frontend.en-us.md b/docs/content/contributing/guidelines-frontend.en-us.md index 0d9e510e70039..aa1759d9c974d 100644 --- a/docs/content/contributing/guidelines-frontend.en-us.md +++ b/docs/content/contributing/guidelines-frontend.en-us.md @@ -48,11 +48,12 @@ We recommend [Google HTML/CSS Style Guide](https://google.github.io/styleguide/h 10. Avoid mixing different events in one event listener, prefer to use individual event listeners for every event. 11. Custom event names are recommended to use `ce-` prefix. 12. Gitea's tailwind-style CSS classes use `gt-` prefix (`gt-relative`), while Gitea's own private framework-level CSS classes use `g-` prefix (`g-modal-confirm`). +13. Avoid inline scripts & styles as much as possible, it's recommended to put JS code into JS files and use CSS classes. If inline scripts & styles are unavoidable, explain the reason why it can't be avoided. ### Accessibility / ARIA In history, Gitea heavily uses Fomantic UI which is not an accessibility-friendly framework. -Gitea uses some patches to make Fomantic UI more accessible (see the `aria.js` and `aria.md`), +Gitea uses some patches to make Fomantic UI more accessible (see `aria.md` and related JS files), but there are still many problems which need a lot of work and time to fix. ### Framework Usage From a43c7b81af2dad95149d2dc67edc141e1ab92d7c Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Sun, 7 Jan 2024 00:27:22 +0000 Subject: [PATCH 4/9] [skip ci] Updated translations via Crowdin --- options/locale/locale_fr-FR.ini | 13 +++++++++++++ options/locale/locale_ja-JP.ini | 1 + 2 files changed, 14 insertions(+) diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 898e351d42110..f3a264c1c8599 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -17,6 +17,7 @@ template=Modèle language=Langue notifications=Notifications active_stopwatch=Suivi du temps actif +tracked_time_summary=Résumé du pointage d’après les filtres de la liste des tickets create_new=Créer… user_profile_and_more=Profil et réglages… signed_in_as=Connecté en tant que @@ -887,6 +888,7 @@ webauthn_nickname=Pseudonyme webauthn_delete_key=Retirer la clé de sécurité webauthn_delete_key_desc=Si vous retirez une clé de sécurité, vous ne pourrez plus l'utiliser pour vous connecter. Continuer ? webauthn_key_loss_warning=Si vous perdez vos clés de sécurité, vous perdrez l’accès à votre compte. +webauthn_alternative_tip=Vous devriez configurer une méthode d’authentification supplémentaire. manage_account_links=Gérer les comptes liés manage_account_links_desc=Ces comptes externes sont liés à votre compte Gitea. @@ -923,6 +925,7 @@ visibility.private=Privé visibility.private_tooltip=Visible uniquement aux membres des organisations que vous avez rejointes [repo] +new_repo_helper=Un dépôt contient tous les fichiers d’un projet, ainsi que l’historique de leurs modifications. Vous avez déjà ça ailleurs ? Migrez-le ici. owner=Propriétaire owner_helper=Certaines organisations peuvent ne pas apparaître dans la liste déroulante en raison d'une limite maximale du nombre de dépôts. repo_name=Nom du dépôt @@ -1796,6 +1799,10 @@ pulls.close=Fermer la demande d’ajout pulls.closed_at=`a fermé cette demande d'ajout %[2]s.` pulls.reopened_at=`a rouvert cette demande d'ajout %[2]s.` pulls.cmd_instruction_hint=`Voir les instructions en ligne de commande.` +pulls.cmd_instruction_checkout_title=Basculer +pulls.cmd_instruction_checkout_desc=Depuis votre dépôt, basculer sur une nouvelle branche et tester des modifications. +pulls.cmd_instruction_merge_title=Fusionner +pulls.cmd_instruction_merge_desc=Fusionner les modifications et mettre à jour sur Gitea. pulls.clear_merge_message=Effacer le message de fusion pulls.clear_merge_message_hint=Effacer le message de fusion ne supprimera que le message de la révision, mais pas les pieds de révision générés tels que "Co-Authored-By:". @@ -2307,6 +2314,7 @@ settings.dismiss_stale_approvals_desc=Lorsque des nouvelles révisions changent settings.require_signed_commits=Exiger des révisions signées settings.require_signed_commits_desc=Rejeter les soumissions sur cette branche lorsqu'ils ne sont pas signés ou vérifiables. settings.protect_branch_name_pattern=Motif de nom de branche protégé +settings.protect_branch_name_pattern_desc=Motifs de nom de branche protégé. Consultez la documentation pour la syntaxe du motif. Exemples : main, release/** settings.protect_patterns=Motifs settings.protect_protected_file_patterns=Liste des fichiers et motifs protégés settings.protect_protected_file_patterns_desc=Liste de fichiers et de motifs, séparés par un point-virgule « ; », qui ne pourront pas être modifiés même si les utilisateurs disposent des droits sur la branche. Voir la syntaxe glob. Exemples : .drone.yml ; /docs/**/*.txt. @@ -2852,6 +2860,7 @@ emails.updated=Courriel mis à jour emails.not_updated=Impossible de mettre à jour l’adresse courriel demandée : %v emails.duplicate_active=Cette adresse courriel est déjà active pour un autre utilisateur. emails.change_email_header=Mettre à jour les propriétés du courriel +emails.change_email_text=Êtes-vous sûr de vouloir mettre à jour cette adresse courriel ? orgs.org_manage_panel=Gestion des organisations orgs.name=Nom @@ -2876,6 +2885,7 @@ packages.package_manage_panel=Gestion des paquets packages.total_size=Taille totale : %s packages.unreferenced_size=Taille non référencée : %s packages.cleanup=Purger les données expirées +packages.cleanup.success=Les données expirées ont été nettoyées avec succès packages.owner=Propriétaire packages.creator=Créateur packages.name=Nom @@ -3520,6 +3530,9 @@ runs.status=Statut runs.actors_no_select=Tous les acteurs runs.status_no_select=Touts les statuts runs.no_results=Aucun résultat correspondant. +runs.no_workflows=Il n'y a pas encore de workflows. +runs.no_workflows.quick_start=Vous ne savez pas comment commencer avec Gitea Action ? Consultez le guide de démarrage rapide. +runs.no_workflows.documentation=Pour plus d’informations sur les Actions Gitea, voir la documentation. runs.no_runs=Le flux de travail n'a pas encore d'exécution. runs.empty_commit_message=(message de révision vide) diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index e5fa9e59843ae..9216277955c7a 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -3525,6 +3525,7 @@ runs.commit=コミット runs.scheduled=スケジュール済み runs.pushed_by=pushed by runs.invalid_workflow_helper=ワークフロー設定ファイルは無効です。あなたの設定ファイルを確認してください: %s +runs.no_matching_online_runner_helper=ラベルに一致するオンラインのランナーが見つかりません: %s runs.actor=アクター runs.status=ステータス runs.actors_no_select=すべてのアクター From c5901b622dd5fae8da336b94150e63292489afed Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 7 Jan 2024 18:20:22 +0800 Subject: [PATCH 5/9] Avoid unnecessary 500 panic when a commit doesn't exist (#28719) In #26851, it assumed that `Commit` always exists when `PageIsDiff==true`. But for a 404 page, the `Commit` doesn't exist, so the following code would cause panic because nil value can't be passed as string parameter to `IsMultilineCommitMessage(string)` (or the StringUtils.Cut in later PRs) --- templates/base/head_opengraph.tmpl | 2 +- tests/integration/repo_test.go | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/base/head_opengraph.tmpl b/templates/base/head_opengraph.tmpl index 19d924610cd54..f1f38999d2ef4 100644 --- a/templates/base/head_opengraph.tmpl +++ b/templates/base/head_opengraph.tmpl @@ -17,7 +17,7 @@ {{else if or .PageIsDiff .IsViewFile}} - {{if .PageIsDiff}} + {{if and .PageIsDiff .Commit}} {{- $commitMessageParts := StringUtils.Cut .Commit.Message "\n" -}} {{- $commitMessageBody := index $commitMessageParts 1 -}} {{- if $commitMessageBody -}} diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index f5417b100cfef..f141b6dcb1e20 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -12,6 +12,7 @@ import ( "time" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/tests" "github.com/PuerkitoBio/goquery" @@ -448,3 +449,12 @@ func TestGeneratedSourceLink(t *testing.T) { assert.Equal(t, "/user27/repo49/src/commit/aacbdfe9e1c4b47f60abe81849045fa4e96f1d75/test/test.txt", dataURL) }) } + +func TestViewCommit(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + req := NewRequest(t, "GET", "/user2/repo1/commit/0123456789012345678901234567890123456789") + req.Header.Add("Accept", "text/html") + resp := MakeRequest(t, req, http.StatusNotFound) + assert.True(t, test.IsNormalPageCompleted(resp.Body.String()), "non-existing commit should render 404 page") +} From 9296c31ff7c42a6d3ddc9a1d7a54b084d786425e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 7 Jan 2024 18:50:03 +0800 Subject: [PATCH 6/9] Fix incorrect URL for "Reference in New Issue" (#28716) Gitea prefers to use relative URLs in code (to make multiple domain work for some users) So it needs to use `toAbsoluteUrl` to generate a full URL when click "Reference in New Issues" And add some comments in the test code --- tests/integration/issue_test.go | 19 +++++++++++++++++++ web_src/js/features/repo-issue.js | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index b1080c998a361..4b3f581c2b22f 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -607,3 +607,22 @@ func TestUpdateIssueDeadline(t *testing.T) { assert.EqualValues(t, "2022-04-06", apiIssue.Deadline.Format("2006-01-02")) } + +func TestIssueReferenceURL(t *testing.T) { + defer tests.PrepareTestEnv(t)() + session := loginUser(t, "user2") + + issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}) + + req := NewRequest(t, "GET", fmt.Sprintf("%s/issues/%d", repo.FullName(), issue.Index)) + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + // the "reference" uses relative URLs, then JS code will convert them to absolute URLs for current origin, in case users are using multiple domains + ref, _ := htmlDoc.Find(`.timeline-item.comment.first .reference-issue`).Attr("data-reference") + assert.EqualValues(t, "/user2/repo1/issues/1#issue-1", ref) + + ref, _ = htmlDoc.Find(`.timeline-item.comment:not(.first) .reference-issue`).Attr("data-reference") + assert.EqualValues(t, "/user2/repo1/issues/1#issuecomment-2", ref) +} diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index d995b56a5556d..6908e0c912342 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -4,6 +4,7 @@ import {showTemporaryTooltip, createTippy} from '../modules/tippy.js'; import {hideElem, showElem, toggleElem} from '../utils/dom.js'; import {setFileFolding} from './file-fold.js'; import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js'; +import {toAbsoluteUrl} from '../utils.js'; const {appSubUrl, csrfToken} = window.config; @@ -526,7 +527,7 @@ export function initRepoIssueReferenceIssue() { const $this = $(this); const content = $(`#${$this.data('target')}`).text(); const poster = $this.data('poster-username'); - const reference = $this.data('reference'); + const reference = toAbsoluteUrl($this.data('reference')); const $modal = $($this.data('modal')); $modal.find('textarea[name="content"]').val(`${content}\n\n_Originally posted by @${poster} in ${reference}_`); $modal.modal('show'); From 79da4bbc566cd3b1c028ca0b747c196fc02990f7 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 7 Jan 2024 23:18:04 +0800 Subject: [PATCH 7/9] Suggest to use Type=simple for systemd service (#28717) Although the systemd notify support was added, it seems that there are some problems (#28553, for the "non-installed" instance) --- contrib/systemd/gitea.service | 3 +-- modules/graceful/manager_common.go | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/systemd/gitea.service b/contrib/systemd/gitea.service index c097fb0d17632..d205c6ee8ba6e 100644 --- a/contrib/systemd/gitea.service +++ b/contrib/systemd/gitea.service @@ -52,7 +52,7 @@ After=network.target # Uncomment the next line if you have repos with lots of files and get a HTTP 500 error because of that # LimitNOFILE=524288:524288 RestartSec=2s -Type=notify +Type=simple User=git Group=git WorkingDirectory=/var/lib/gitea/ @@ -62,7 +62,6 @@ WorkingDirectory=/var/lib/gitea/ ExecStart=/usr/local/bin/gitea web --config /etc/gitea/app.ini Restart=always Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea -WatchdogSec=30s # If you install Git to directory prefix other than default PATH (which happens # for example if you install other versions of Git side-to-side with # distribution version), uncomment below line and add that prefix to PATH diff --git a/modules/graceful/manager_common.go b/modules/graceful/manager_common.go index aaf008670ce9d..27196e1531a84 100644 --- a/modules/graceful/manager_common.go +++ b/modules/graceful/manager_common.go @@ -10,6 +10,9 @@ import ( "time" ) +// FIXME: it seems that there is a bug when using systemd Type=notify: the "Install Page" (INSTALL_LOCK=false) doesn't notify properly. +// At the moment, no idea whether it also affects Windows Service, or whether it's a regression bug. It needs to be investigated later. + type systemdNotifyMsg string const ( From a04f8c0f81f55a8b927ce0fad8127db39396f892 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 7 Jan 2024 23:41:46 +0800 Subject: [PATCH 8/9] Move the captcha script loader to the template which really needs it (#28718) It improves the maintainability for the templates. Now `base/footer.tmpl` doesn't need to depend on "captcha" feature. --- templates/base/footer.tmpl | 12 ------------ templates/user/auth/captcha.tmpl | 3 +++ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 31c669a921945..d65a3626a48e1 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -13,18 +13,6 @@ {{template "base/footer_content" .}} - -{{if .EnableCaptcha}} - {{if eq .CaptchaType "recaptcha"}} - - {{end}} - {{if eq .CaptchaType "hcaptcha"}} - - {{end}} - {{if eq .CaptchaType "cfturnstile"}} - - {{end}} -{{end}} {{template "custom/footer" .}} diff --git a/templates/user/auth/captcha.tmpl b/templates/user/auth/captcha.tmpl index c4e58d01342b0..1c3379e62939e 100644 --- a/templates/user/auth/captcha.tmpl +++ b/templates/user/auth/captcha.tmpl @@ -11,10 +11,12 @@
+ {{else if eq .CaptchaType "hcaptcha"}}
+ {{else if eq .CaptchaType "mcaptcha"}}
@@ -25,4 +27,5 @@
+ {{end}}{{end}} From f4ea8d9a6caa3118ded80b15e11b2e9a09d1a270 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Mon, 8 Jan 2024 00:26:06 +0000 Subject: [PATCH 9/9] [skip ci] Updated licenses and gitignores --- options/license/Apache-1.1 | 8 +- options/license/BSD-Systemics-W3Works | 62 ++++++++++++ options/license/Bison-exception-1.24 | 4 + options/license/CC-BY-3.0-AU | 136 ++++++++++++++++++++++++++ options/license/ISC-Veillard | 9 ++ options/license/Unicode-3.0 | 39 ++++++++ options/license/mailprio | 9 ++ 7 files changed, 263 insertions(+), 4 deletions(-) create mode 100644 options/license/BSD-Systemics-W3Works create mode 100644 options/license/Bison-exception-1.24 create mode 100644 options/license/CC-BY-3.0-AU create mode 100644 options/license/ISC-Veillard create mode 100644 options/license/Unicode-3.0 create mode 100644 options/license/mailprio diff --git a/options/license/Apache-1.1 b/options/license/Apache-1.1 index 2f0168af9c91a..b2e3bf4d89198 100644 --- a/options/license/Apache-1.1 +++ b/options/license/Apache-1.1 @@ -1,4 +1,4 @@ -Apache License 1.1 +The Apache Software License, Version 1.1 Copyright (c) 2000 The Apache Software Foundation. All rights reserved. @@ -14,8 +14,8 @@ Alternately, this acknowledgment may appear in the software itself, if and where 4. The names "Apache" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact apache@apache.org. -5. Products derived from this software may not be called "Apache" [ex. "Jakarta," "Apache," or "Apache Commons,"] nor may "Apache" [ex. the names] appear in their name, without prior written permission of the Apache Software Foundation. +5. Products derived from this software may not be called "Apache" nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. -THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR ITS 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. +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR ITS 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. - This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation. For more information on the Apache Software Foundation, please see http://www.apache.org/. Portions of this software are based upon public domain software originally written at the National Center for Supercomputing Applications, University of Illinois, Urbana-Champaign. + This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation. For more information on the Apache Software Foundation, please see . Portions of this software are based upon public domain software originally written at the National Center for Supercomputing Applications, University of Illinois, Urbana-Champaign. diff --git a/options/license/BSD-Systemics-W3Works b/options/license/BSD-Systemics-W3Works new file mode 100644 index 0000000000000..73428e86cab16 --- /dev/null +++ b/options/license/BSD-Systemics-W3Works @@ -0,0 +1,62 @@ +Copyright (C) 1995, 1996 Systemics Ltd (http://www.systemics.com/) + +Modifications and Current Implimentation Copyright (C) 2000 W3Works, LLC. + +All rights reserved. + +Current implimentation contains modifications made by W3Works, LLC. The +modifications remain copyright of W3Works, LLC and attribution for these +modification should be made to W3Works, LLC. These modifications and +this copyright must remain with this package. + +Additions to the Restrictions set out below are: +1. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product inculdes software developed by W3Works, LLC (http://www.w3works.com) + + NO ADDITIONAL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE EXTENDED BY THIS DISTRIBUTION. + + Any subsequent derrivations of this package must retainl this copyright. + + +Original Copyright Below + +This library and applications are FREE FOR COMMERCIAL AND NON-COMMERCIAL USE +as long as the following conditions are adhered to. + +Copyright remains with Systemics Ltd, and as such any Copyright notices +in the code are not to be removed. If this code is used in a product, +Systemics should be given attribution as the author of the parts used. +This can be in the form of a textual message at program startup or +in documentation (online or textual) provided with the package. + +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 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. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Systemics Ltd (http://www.systemics.com/) + + THIS SOFTWARE IS PROVIDED BY SYSTEMICS LTD ``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 AUTHOR 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. + + The licence and distribution terms for any publically available version or + derivative of this code cannot be changed. i.e. this code cannot simply be + copied and put under another distribution licence + [including the GNU Public Licence.] diff --git a/options/license/Bison-exception-1.24 b/options/license/Bison-exception-1.24 new file mode 100644 index 0000000000000..7f3c3009eeed5 --- /dev/null +++ b/options/license/Bison-exception-1.24 @@ -0,0 +1,4 @@ +As a special exception, when this file is copied by Bison into a +Bison output file, you may use that output file without restriction. +This special exception was added by the Free Software Foundation +in version 1.24 of Bison. diff --git a/options/license/CC-BY-3.0-AU b/options/license/CC-BY-3.0-AU new file mode 100644 index 0000000000000..c6cd440054051 --- /dev/null +++ b/options/license/CC-BY-3.0-AU @@ -0,0 +1,136 @@ +Creative Commons Attribution 3.0 Australia + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENCE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. +Licence + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENCE ("LICENCE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORISED UNDER THIS LICENCE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENCE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + a. "Collection" means the Work in its entirety in unmodified form along with one or more other separate and independent works, assembled into a collective whole. A Collection may, for example, include a periodical, encyclopedia or anthology. A Collection will not be considered a Derivative Work for the purposes of this Licence. + b. "Derivative Work" means material in any form that is created by editing, modifying or adapting the Work, a substantial part of the Work, or the Work and other pre-existing works. Derivative Works may, for example, include a translation, adaptation, musical arrangement, dramatisation, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be transformed or adapted, except that a Collection will not be considered a Derivative Work for the purpose of this Licence. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this Licence. + c. "Distribute" means to make available to the public by any means, including publication, electronic communication, or broadcast. + d. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this Licence. + e. "Original Author" means the individual, individuals, entity or entities who created the Work. + f. "Reproduce" means to make a copy of the Work in any material form (eg storage in digital form). + g. "Work" means the material (including any work or other subject matter) protected by copyright which is offered under the terms of this Licence. This may include (without limitation) a literary, dramatic, musical or artistic work; a sound recording or cinematograph film; a published edition of a literary, dramatic, musical or artistic work; or a television or sound broadcast. + h. "You" means an individual or entity exercising rights under this Licence who has not previously violated the terms of this Licence with respect to the Work, or who has received express permission from the Licensor to exercise rights under this Licence despite a previous violation. + +2. Fair Dealing and Other Rights + +Nothing in this Licence is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions under copyright law or any other applicable laws. + +3. Licence Grant + +3A Grant of Rights + +Provided that the terms set out in this Licence are satisfied, the Licensor grants to You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) licence to exercise the following rights: + a. Reproduce the Work; + b. incorporate the Work into one or more Collections; + c. Reproduce the Work as incorporated in any Collection; + d. create and Reproduce one or more Derivative Works; and + e. Distribute and publicly perform the Work, a Derivative Work or the Work as incorporated in any Collection. + +3B Media and Formats + +The above rights may be exercised in any media or format whether now known or hereafter created. They include the right to make modifications that are technically necessary to exercise the rights in other media and formats. + +3C Other Rights Reserved + +All rights not expressly granted by the Licensor are reserved. The Licensor waives the right to collect royalties for any exercise by You of the rights granted under this Licence. + +4. Restrictions + +The licence granted above is limited by the following restrictions. + +4A Restrictions on Distribution and Public Performance of the Work + + a. You may Distribute and publicly perform the Work only under the terms of this Licence. + b. You must include a copy of, or the Uniform Resource Identifier (such as a web link) for, this Licence with every copy of the Work You Distribute or publicly perform. + c. You must not offer or impose any terms on the Work that restrict this Licence or the ability of a recipient of the Work from You to exercise the rights granted to them by this Licence. + d. You are not granted the right to sublicense the Work. The rights of recipients of the Work from You are governed by clause 9. + e. You must keep intact all notices that refer to this Licence and to the disclaimer of warranties with every copy of the Work You Distribute or publicly perform. + f. When You Distribute or publicly perform the Work, You must not impose any technological measures on it that restrict the ability of a recipient of the Work from You to exercise the rights granted to them by this Licence. + g. For the avoidance of doubt, while this clause 4A applies to the Work as incorporated into a Collection, it does not require other material within the Collection, or the Collection apart from the Work itself, to be made subject to this Licence. + +4B Attribution and Notice Requirements + + a. When You Distribute or publicly perform the Work or any Derivative Work or Collection You must keep intact all copyright notices for the Work. + b. When You Distribute or publicly perform the Work or any Derivative Work or Collection You must provide, in a manner reasonable to the medium or means You are using: + i. the name or pseudonym (if provided) of the Original Author and/or of any other party (such as a sponsor institute, publishing entity or journal) that the Original Author or Licensor has requested be attributed (such as in the copyright notice or terms of use). In this clause 4B these parties are referred to as "Attribution Parties"; + ii. the title of the Work (if provided); and + iii. to the extent reasonably practicable, any Uniform Resource Identifier (such as a web link) that the Licensor specifies should be associated with the Work that refers to the copyright notice or licensing information for the Work. + c. For any Derivative Work You Distribute or publicly perform, You must take reasonable steps to clearly identify that changes were made to the Work. For example, a translation could be marked "The original work was translated from English to Spanish". + d. In the case of a Derivative Work or Collection, the above attribution should, at a minimum, appear as part of any credits for other contributing authors and be as prominent as the credits for those other authors. + e. You must, to the extent practicable, remove the above attribution from any Collection or Derivative Work if requested to do so by the Licensor or Original Author. + f. For the avoidance of doubt, You may only use the credit required by this clause 4B for the purpose of attribution in the manner set out above. By exercising Your rights under this Licence, You must not assert or imply: + i. any connection between the Original Author, Licensor or any other Attribution Party and You or Your use of the Work; or + ii. sponsorship or endorsement by the Original Author, Licensor or any other Attribution Party of You or Your use of the Work, + without their separate, express prior written permission. + +4C Moral Rights + +Moral rights remain unaffected to the extent they are recognised and nonwaivable at law. In this clause 4C, "moral rights" means the personal rights granted by law to the Original Author of a copyright work. For example, Part IX of the Copyright Act 1968 (Cth) grants authors the right of integrity of authorship, the right of attribution of authorship, and the right not to have authorship falsely attributed. + +5. Representations, Warranties and Disclaimer + +Except as expressly stated in this Licence or otherwise agreed to by the parties in writing, and to the full extent permitted by applicable law, the Licensor offers the Work "as-is" and makes no representations, warranties or conditions of any kind concerning the Work, express, implied, statutory or otherwise. This includes, without limitation, any representations, warranties or conditions regarding: + a. the contents or accuracy of the Work; + i. title, merchantability, or fitness for a particular purpose; + ii. non-infringement; + iii. the absence of latent or other defects; or + iv. the presence or absence of errors, whether or not discoverable. + b. The Trade Practices Act 1974 (Cth), and the corresponding State and Territory fair trading legislation, imply certain warranties and conditions in certain circumstances, such as the right to supply or fitness for purpose of goods or services supplied to a consumer. Clause 5(a) cannot and is not intended to exclude, restrict or modify these warranties. + +6. Limit of Liability + + a. To the full extent permitted by applicable law, and except for any liability arising from contrary agreement, in no event will the Licensor be liable to You on any legal basis (including without limitation, negligence) for any loss or damage whatsoever, including (without limitation): + i. loss of production or operation time, loss, damage or corruption of data or records; or + ii. loss of anticipated savings, opportunity, revenue, profit or goodwill, or other economic loss; or + iii. any special, incidental, consequential, punitive or exemplary damages arising out of or in connection with this Licence or the use of the Work, even if the Licensor has been advised of the possibility of such damages. + b. If applicable legislation implies warranties or conditions, or imposes obligations or liability on the Licensor in respect of this Licence that cannot be wholly or partly excluded, restricted or modified, the Licensor’s liability is limited, to the full extent permitted by the applicable legislation, at its option, to: + i. in the case of goods, any one or more of the following: + * the replacement of the goods or the supply of equivalent goods; + * the repair of the goods; + * the payment of the cost of replacing the goods or of acquiring equivalent goods; + * the payment of the cost of having the goods repaired; or + ii. in the case of services: + * the supplying of the services again; or + * the payment of the cost of having the services supplied again. + c. The Trade Practices Act 1974 (Cth), and the corresponding State and Territory fair trading legislation, restrict the limitation of liability in certain circumstances, such as a contract for the supply of goods or services of a kind ordinarily acquired for personal, domestic, or household use. Clauses 6(a) and 6(b) cannot and are not intended to apply in circumstances where it is prohibited by law. + +7. Termination + +This Licence and the rights granted to You under this Licence shall terminate automatically upon any breach by You of the terms of the Licence. Individuals or entities who have received a Derivative Work or a Collection from You pursuant to this Licence, however, will not have their licences terminated provided they remain in full compliance with those licences. Clauses 1, 2, 5, 6, 7, 8, 9, 10, 11, 12 and 13 shall survive any termination of this Licence. + +8. Licensor’s Rights Retained + +Subject to the above terms, the Licence granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding this, the Licensor reserves the right to release the Work under different licence terms or to stop distributing the Work at any time. However, any such release will not serve to withdraw this Licence (or any other licence that has been granted under the terms of this Licence), and this Licence will continue in full force and effect unless terminated as stated above. + +9. Licence Grant to Recipients of the Work from You + +Each time You Distribute or publicly perform the Work, a Derivative Work or a Collection the Licensor offers the recipient a licence to the Work on the same terms as are granted to You under this Licence. + +10. Severability + +If any provision of this Licence is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Licence. Without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +11. Waivers and Consents + +No term of this Licence shall be deemed waived and no breach consented to unless such waiver or consent is in writing and signed by the relevant party. + +12. Entire Agreement + +This Licence constitutes the entire agreement between the parties. To the full extent permitted by law, there are no understandings, agreements or representations with respect to the Work not specified here. The Licensor shall not be bound by any additional provisions that may appear in any communication from You. This Licence may not be modified without the written agreement of the Licensor and You. + +13. Governing Law + +The construction, validity and performance of this Licence shall be governed by the laws in force in the Australian Capital Territory, Australia. + +Creative Commons Notice + +Creative Commons is not a party to this Licence, and, to the full extent permitted by applicable law, makes no representation or warranty whatsoever in connection with the Work. To the full extent permitted by applicable law, Creative Commons will not be liable to You or any party on any legal theory (including, without limitation, negligence) for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this licence. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. Except for the limited purpose of indicating to the public that the Work is licensed under the Licence, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons’ then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. + +Creative Commons may be contacted at https://creativecommons.org/ . diff --git a/options/license/ISC-Veillard b/options/license/ISC-Veillard new file mode 100644 index 0000000000000..c3bd5455c952c --- /dev/null +++ b/options/license/ISC-Veillard @@ -0,0 +1,9 @@ +Copyright (C) 2003-2012 Daniel Veillard. +Permission to use, copy, +modify, and distribute this software for any purpose with or +without fee is hereby granted, provided that the above copyright +notice and this permission notice appear in all copies. THIS +SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS +AND CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. diff --git a/options/license/Unicode-3.0 b/options/license/Unicode-3.0 new file mode 100644 index 0000000000000..11f2842a303a7 --- /dev/null +++ b/options/license/Unicode-3.0 @@ -0,0 +1,39 @@ +UNICODE LICENSE V3 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2023 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE 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 OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. diff --git a/options/license/mailprio b/options/license/mailprio new file mode 100644 index 0000000000000..e004e4b683d31 --- /dev/null +++ b/options/license/mailprio @@ -0,0 +1,9 @@ +Copyright 1994, 1996, Tony Sanders + +Rights are hereby granted to download, use, modify, sell, copy, and +redistribute this software so long as the original copyright notice +and this list of conditions remain intact and modified versions are +noted as such. + +I would also very much appreciate it if you could send me a copy of +any changes you make so I can possibly integrate them into my version.