Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: line ending for sieve scripts should be clrf #10002

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

kesselb
Copy link
Contributor

@kesselb kesselb commented Aug 15, 2024

Found while working on mail filters.

We should follow the rfc and use clrf as line ending.

Ref https://www.rfc-editor.org/rfc/rfc5228#section-2.2

@kesselb kesselb force-pushed the chore/noid/newlines-for-sieve-ooo branch from 245c7dc to 5816c06 Compare August 15, 2024 18:33
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Looks good and still works as expected.

CI should work after a rebase.

@kesselb kesselb force-pushed the chore/noid/newlines-for-sieve-ooo branch from 5816c06 to b20dd5b Compare August 16, 2024 13:25
@st3iny
Copy link
Member

st3iny commented Aug 16, 2024

To fix compliance with reuse:

diff --git a/REUSE.toml b/REUSE.toml
index 01a10b282..189a2e704 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -90,7 +90,7 @@ SPDX-FileCopyrightText = "2022 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

 [[annotations]]
-path = ["src/tests/data/[email protected]", "src/tests/data/[email protected]", "src/tests/data/[email protected]", "src/tests/data/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/imap.localhost.ca.crt", "tests/data/smime-certs/domain.tld.ca.crt", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/decrypted-message-body.txt", "tests/data/decrypted-signed-opaque-message-body.txt", "tests/data/encrypted-message.txt", "tests/data/encrypted-signed-opaque-message.txt", "tests/data/sieve-vacation-cleaned.txt", "tests/data/sieve-vacation-off.txt", "tests/data/sieve-vacation-on-no-end-date.txt", "tests/data/sieve-vacation-on-no-tz.txt", "tests/data/sieve-vacation-on-special-chars-message.txt", "tests/data/sieve-vacation-on-special-chars-subject.txt", "tests/data/sieve-vacation-on-subject-placeholder.txt", "tests/data/sieve-vacation-on.txt", "tests/data/signed-message.txt", "tests/data/signed-opaque-message.txt"]
+path = ["src/tests/data/[email protected]", "src/tests/data/[email protected]", "src/tests/data/[email protected]", "src/tests/data/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/imap.localhost.ca.crt", "tests/data/smime-certs/domain.tld.ca.crt", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/smime-certs/[email protected]", "tests/data/decrypted-message-body.txt", "tests/data/decrypted-signed-opaque-message-body.txt", "tests/data/encrypted-message.txt", "tests/data/encrypted-signed-opaque-message.txt", "tests/data/sieve-vacation-cleaned.sieve", "tests/data/sieve-vacation-off.sieve", "tests/data/sieve-vacation-on-no-end-date.sieve", "tests/data/sieve-vacation-on-no-tz.sieve", "tests/data/sieve-vacation-on-special-chars-message.sieve", "tests/data/sieve-vacation-on-special-chars-subject.sieve", "tests/data/sieve-vacation-on-subject-placeholder.sieve", "tests/data/sieve-vacation-on.sieve", "tests/data/signed-message.txt", "tests/data/signed-opaque-message.txt"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

@kesselb kesselb force-pushed the chore/noid/newlines-for-sieve-ooo branch from b20dd5b to 1f54a38 Compare August 16, 2024 13:47
@st3iny st3iny merged commit 6b32ffc into main Aug 16, 2024
29 checks passed
@st3iny st3iny deleted the chore/noid/newlines-for-sieve-ooo branch August 16, 2024 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants