diff options
| author | Micah Cowan <micah@cowan.name> | 2007-11-28 00:05:33 -0800 |
|---|---|---|
| committer | Micah Cowan <micah@cowan.name> | 2007-11-28 00:05:33 -0800 |
| commit | 86395b297b58c8c9b43d7ca8c42b831d4926dac6 (patch) | |
| tree | 35da7f3db4cb6c42cb869e5e5dac6803c51d2a5d /util | |
| parent | f8ab4aa89c4c604b27e9fb56716ff2a5c99e744e (diff) | |
| download | wget-86395b297b58c8c9b43d7ca8c42b831d4926dac6.tar.gz | |
Updated licensing exception for OpenSSL from the SFLC.
Diffstat (limited to 'util')
| -rw-r--r-- | util/Makefile.in | 19 | ||||
| -rwxr-xr-x | util/dist-wget | 19 |
2 files changed, 20 insertions, 18 deletions
diff --git a/util/Makefile.in b/util/Makefile.in index a4681f4d..d55074b2 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -14,15 +14,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# In addition, as a special exception, the Free Software Foundation -# gives permission to link the code of its release of Wget with the -# OpenSSL project's "OpenSSL" library (or with modified versions of it -# that use the same license as the "OpenSSL" library), and distribute -# the linked executables. You must obey the GNU General Public License -# in all respects for all of the code used other than "OpenSSL". If you -# modify this file, you may extend this exception to your version of the -# file, but you are not obligated to do so. If you do not wish to do -# so, delete this exception statement from your version. +# Additional permission under GNU GPL version 3 section 7 + +# If you modify this program, or any covered work, by linking or +# combining it with the OpenSSL project's OpenSSL library (or a +# modified version of that library), containing parts covered by the +# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation +# grants you additional permission to convey the resulting work. +# Corresponding Source for a non-source form of such a combination +# shall include the source code for the parts of OpenSSL used as well +# as that of the covered work. # # Version: @VERSION@ diff --git a/util/dist-wget b/util/dist-wget index fd984059..32883a4d 100755 --- a/util/dist-wget +++ b/util/dist-wget @@ -15,15 +15,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# In addition, as a special exception, the Free Software Foundation -# gives permission to link the code of its release of Wget with the -# OpenSSL project's "OpenSSL" library (or with modified versions of it -# that use the same license as the "OpenSSL" library), and distribute -# the linked executables. You must obey the GNU General Public License -# in all respects for all of the code used other than "OpenSSL". If you -# modify this file, you may extend this exception to your version of the -# file, but you are not obligated to do so. If you do not wish to do -# so, delete this exception statement from your version. +# Additional permission under GNU GPL version 3 section 7 + +# If you modify this program, or any covered work, by linking or +# combining it with the OpenSSL project's OpenSSL library (or a +# modified version of that library), containing parts covered by the +# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation +# grants you additional permission to convey the resulting work. +# Corresponding Source for a non-source form of such a combination +# shall include the source code for the parts of OpenSSL used as well +# as that of the covered work. ## # |