Skip to content

Conform text of GPL version 1 to latest FSF version #23230

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

Closed
wants to merge 2 commits into from

Conversation

jkeenan
Copy link
Contributor

@jkeenan jkeenan commented Apr 29, 2025

Compare to https://www.gnu.org/licenses/old-licenses/gpl-1.0.txt

Conform to pod formatting rules

Fixes: GH #22952


  • This set of changes does not require a perldelta entry.

@jkeenan
Copy link
Contributor Author

jkeenan commented Apr 29, 2025

As to the merits of this pull request, see #22952 (comment).

@vaitkus
Copy link
Contributor

vaitkus commented Apr 29, 2025

I did not notice it back when I filed the issue, but there seems to be at least one other copy of the GPL version 1 in this repository included in the Copying file. Also the README file includes the old FSF address.

Not sure if these changes should be bundled into this PR, however, they do seem to revolve around the same issue.

@Grinnz
Copy link
Contributor

Grinnz commented Apr 29, 2025

I think that the license text needs to be indented by one space, as it was before, in order to keep the whole text as a verbatim block in POD.

@@ -661,9 +661,14 @@ perl5380delta
perl5381delta
perl5382delta
perl5383delta
perl5384delta
Copy link
Contributor

Choose a reason for hiding this comment

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

These additions seem unrelated to the GPL changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please see #23231. A step was missed during recent releases, it appears.

Indent all text 1 space for verbatim.  Remove 3 non-printing control
characters found in FSF website to guarantee 'pod2text' will work.
But empty all lines that are all whitespace, so as to reduce number of
lines that have to be mentioned in known_pod_issues.dat.
@jkeenan
Copy link
Contributor Author

jkeenan commented Apr 29, 2025

I re-did the pull request perl @Leont and @Grinnz feedback. I copied and pasted from the FSF website, though I had to eliminate 3 non-printing characters from that site. However this p.r. will have to wait for merging until #23231 is merged into blead. Then we will have to (1) regenerate the known-pod-issues database; (2) squash the commits in this branch before merging.

@jkeenan jkeenan requested a review from Grinnz April 29, 2025 22:25
@vaitkus
Copy link
Contributor

vaitkus commented Apr 30, 2025

It seems that some of the single quotes got reverted back to backticks (' -> `) during the update.

Not sure if this is still relevant, but these backticks were viewed as an issue at some point (see issue #7945).

@ap
Copy link
Contributor

ap commented May 2, 2025

It seems that some of the single quotes got reverted back to backticks (' -> `) during the update.

Not sure if this is still relevant, but these backticks were viewed as an issue at some point (see issue #7945).

Yes.

And un-backticking those quotes would have meant accepting the rewrapping of the text for those hunks, without however reaping the benefit of eliminating the delta against upstream, due to the different quotes. At that point, applying that rewrapping seems silly… which then makes the other rewrapping hunks questionable…

Adding to that, there were several more copies of the old version of the text strewn across the source tree, which this PR didn’t touch. Some of those had various (locally sensible) textual deltas from upstream already, so they couldn’t just be overwritten with the upstream version at all.

All of that drove us to just apply the textual upstream changes, with only a minimal diff, but everywhere (except in CPAN-upstream stuff, of course – feel free @vaitkus to file another ticket against ExtUtils::CBuilder) – which was easier to just do as a quick separate PR.

@ap ap closed this May 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants