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.

Sign up for GitHub

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

Correct FSF address. #465

Merged
merged 3 commits into from
Mar 3, 2018
Merged

Correct FSF address. #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8364d26
Correct FSF address.
Jan 29, 2018
5e09b65
Correct license notice to latest version recommended by GNU.
Jan 30, 2018
0609ff6
Merge branch 'master' into master
Mar 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions encfs/autosprintf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@
Copyright (C) 2002 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.

This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Note: this comment does not block merging.

This phrasing is already in here (I didn't notice it before). Something to consider going forward: https://opensource.stackexchange.com/questions/1777/why-is-gplv2-incompatible-with-gplv3

Quote from commenter "DevSolar":

GPLv2+ code that's been "upped" to GPLv3 has to remain GPLv3. The person you got the GPLv2+ code from has no way to merge back any downstream (GPLv3) changes back into his (GPLv2+) codebase.

Should we consider removing or (at your option) any later version or accept if anybody just so happens to want to merge GPLv3 code back to us we decide later to upgrade this project to GPLv3?

In general, I'm not personally comfortable with open ended legal comments like that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is normal ended and the same phrase was in original license notice.

Copy link
Collaborator

@samrocketman samrocketman Mar 3, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think it's normal nor acceptable to have such open ended terms. My personal opinion of course. I would be OK if GPLv3 was compatible with GPLv2 but that's not how it is in the current language of GPLv3. "Or later version" is super open ended legally and could mean anything down the line. I respectfully disagree with your opinion.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Not sure what you mean with "not normal", this is the standard text from GNU https://www.gnu.org/licenses/gpl-2.0.html#SEC4

Copy link
Collaborator

Choose a reason for hiding this comment

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

In legal terms it's not normal in my opinion.


This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.

You should have received a copy of the GNU Library General Public
License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. */
You should have received a copy of the GNU Library General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */

/* Tell glibc's <stdio.h> to provide a prototype for vasprintf().
This must come before <config.h> because <config.h> may include
Expand Down
18 changes: 8 additions & 10 deletions encfs/autosprintf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
/* Class autosprintf - formatted output to an ostream.
Copyright (C) 2002 Free Software Foundation, Inc.

This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.

You should have received a copy of the GNU Library General Public
License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. */
You should have received a copy of the GNU Library General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */

#ifndef _AUTOSPRINTF_H
#define _AUTOSPRINTF_H
Expand Down