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

alpine url bug fix and AGPL License version issue #3744

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: agpl-3.0-plus OR commercial-license
Copy link
Member

Choose a reason for hiding this comment

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

While the change is correct note that the rule filenames reflect the license-expression of the rule and a change in the license-expression needs to happen like this:

  1. Deprecate the current rule using the is_deprecated attribute
  2. Reindex the licenses with scancode-reindex-licenses (This will remove the deprecated rule from the index so you can add a new one, otherwise two rules with the same text cannot exist in the index)
  3. Add a new rule for just agpl-3.0-plus and add notes about the origin, that this was previously the src/agpl-3.0-plus_or_commercial-license_4.RULE rule. Add the issue reference in the commit. (You can paste the rule content at etc/scripts/licenses/buildrules-template.txt and then run python etc/scripts/licenses/buildrules.py etc/scripts/licenses/buildrules-template.txt in an activated virtualenv, and this will create the rule automatically, with the appropriate filename)

license_expression: agpl-3.0-plus
is_license_notice: yes
relevance: 100
ignorable_urls:
Expand Down
2 changes: 1 addition & 1 deletion src/packagedcode/alpine.py
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ def c_git_commit_handler(value, **kwargs):
"""
Return a git VCS URL from a package commit.
"""
return {f'vcs_url': f'git+http://git.alpinelinux.org/aports/commit/?id={value}'}
return {f'vcs_url': f'git+https://git.alpinelinux.org/aports/commit/?id={value}'}


def A_arch_handler(value, **kwargs):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -242,7 +242,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"copyright": null,
"holder": null,
"declared_license_expression": "mit",
Expand Down Expand Up @@ -346,7 +346,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -495,7 +495,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -707,7 +707,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=aab68f8c9ab434a46710de8e12fb3206e2930a59",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=aab68f8c9ab434a46710de8e12fb3206e2930a59",
"copyright": null,
"holder": null,
"declared_license_expression": "mit",
Expand Down Expand Up @@ -1162,7 +1162,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=16988f3c77f035072956655194770e15cbc61257",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=16988f3c77f035072956655194770e15cbc61257",
"copyright": null,
"holder": null,
"declared_license_expression": "mpl-2.0 AND mit",
Expand Down Expand Up @@ -1266,7 +1266,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"copyright": null,
"holder": null,
"declared_license_expression": "openssl-ssleay",
Expand Down Expand Up @@ -1460,7 +1460,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"copyright": null,
"holder": null,
"declared_license_expression": "openssl-ssleay",
Expand Down Expand Up @@ -1564,7 +1564,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -1656,7 +1656,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=6754a9005594de4243aad9b2744546971078c6c7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=6754a9005594de4243aad9b2744546971078c6c7",
"copyright": null,
"holder": null,
"declared_license_expression": "zlib",
Expand Down Expand Up @@ -1760,7 +1760,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=34d90ac8388e88126893f5d27ea35d304e65e5ab",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=34d90ac8388e88126893f5d27ea35d304e65e5ab",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -1861,7 +1861,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=d7ae612a3cc5f827289d915783b4cbf8c7207947",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=d7ae612a3cc5f827289d915783b4cbf8c7207947",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -1953,7 +1953,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"copyright": null,
"holder": null,
"declared_license_expression": "mit AND bsd-new AND gpl-2.0-plus",
Expand Down Expand Up @@ -2081,7 +2081,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=60424133be2e79bbfeff3d58147a22886f817ce2",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=60424133be2e79bbfeff3d58147a22886f817ce2",
"copyright": null,
"holder": null,
"declared_license_expression": "bsd-simplified AND bsd-new",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -124,7 +124,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"copyright": null,
"holder": null,
"declared_license_expression": "mit",
Expand Down Expand Up @@ -217,7 +217,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -310,7 +310,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -421,7 +421,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=aab68f8c9ab434a46710de8e12fb3206e2930a59",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=aab68f8c9ab434a46710de8e12fb3206e2930a59",
"copyright": null,
"holder": null,
"declared_license_expression": "mit",
Expand Down Expand Up @@ -676,7 +676,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=16988f3c77f035072956655194770e15cbc61257",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=16988f3c77f035072956655194770e15cbc61257",
"copyright": null,
"holder": null,
"declared_license_expression": "mpl-2.0 AND mit",
Expand Down Expand Up @@ -769,7 +769,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"copyright": null,
"holder": null,
"declared_license_expression": "openssl-ssleay",
Expand Down Expand Up @@ -871,7 +871,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"copyright": null,
"holder": null,
"declared_license_expression": "openssl-ssleay",
Expand Down Expand Up @@ -964,7 +964,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -1045,7 +1045,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=6754a9005594de4243aad9b2744546971078c6c7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=6754a9005594de4243aad9b2744546971078c6c7",
"copyright": null,
"holder": null,
"declared_license_expression": "zlib",
Expand Down Expand Up @@ -1138,7 +1138,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=34d90ac8388e88126893f5d27ea35d304e65e5ab",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=34d90ac8388e88126893f5d27ea35d304e65e5ab",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -1219,7 +1219,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=d7ae612a3cc5f827289d915783b4cbf8c7207947",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=d7ae612a3cc5f827289d915783b4cbf8c7207947",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -1300,7 +1300,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"copyright": null,
"holder": null,
"declared_license_expression": "mit AND bsd-new AND gpl-2.0-plus",
Expand Down Expand Up @@ -1381,7 +1381,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=60424133be2e79bbfeff3d58147a22886f817ce2",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=60424133be2e79bbfeff3d58147a22886f817ce2",
"copyright": null,
"holder": null,
"declared_license_expression": "bsd-simplified AND bsd-new",
Expand Down Expand Up @@ -2206,7 +2206,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -2410,7 +2410,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"copyright": null,
"holder": null,
"declared_license_expression": "mit",
Expand Down Expand Up @@ -2506,7 +2506,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -2647,7 +2647,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=cb70ca5c6d6db0399d2dd09189c5d57827bce5cd",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -2862,7 +2862,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=aab68f8c9ab434a46710de8e12fb3206e2930a59",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=aab68f8c9ab434a46710de8e12fb3206e2930a59",
"copyright": null,
"holder": null,
"declared_license_expression": "mit",
Expand Down Expand Up @@ -3309,7 +3309,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=16988f3c77f035072956655194770e15cbc61257",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=16988f3c77f035072956655194770e15cbc61257",
"copyright": null,
"holder": null,
"declared_license_expression": "mpl-2.0 AND mit",
Expand Down Expand Up @@ -3405,7 +3405,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"copyright": null,
"holder": null,
"declared_license_expression": "openssl-ssleay",
Expand Down Expand Up @@ -3591,7 +3591,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=26153b65138c876d57e81750f6de6baab6d5bd5b",
"copyright": null,
"holder": null,
"declared_license_expression": "openssl-ssleay",
Expand Down Expand Up @@ -3687,7 +3687,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=e58f0e341603e9facc1e675722367174b45e0d0c",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -3774,7 +3774,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=6754a9005594de4243aad9b2744546971078c6c7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=6754a9005594de4243aad9b2744546971078c6c7",
"copyright": null,
"holder": null,
"declared_license_expression": "zlib",
Expand Down Expand Up @@ -3870,7 +3870,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=34d90ac8388e88126893f5d27ea35d304e65e5ab",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=34d90ac8388e88126893f5d27ea35d304e65e5ab",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -3987,7 +3987,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=d7ae612a3cc5f827289d915783b4cbf8c7207947",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=d7ae612a3cc5f827289d915783b4cbf8c7207947",
"copyright": null,
"holder": null,
"declared_license_expression": "gpl-2.0",
Expand Down Expand Up @@ -4074,7 +4074,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=ee13d43a53938d8a04ba787b9423f3270a3c14a7",
"copyright": null,
"holder": null,
"declared_license_expression": "mit AND bsd-new AND gpl-2.0-plus",
Expand Down Expand Up @@ -4208,7 +4208,7 @@
"sha512": null,
"bug_tracking_url": null,
"code_view_url": null,
"vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=60424133be2e79bbfeff3d58147a22886f817ce2",
"vcs_url": "git+https://git.alpinelinux.org/aports/commit/?id=60424133be2e79bbfeff3d58147a22886f817ce2",
"copyright": null,
"holder": null,
"declared_license_expression": "bsd-simplified AND bsd-new",
Expand Down