Drop obsolete license exception

OpenSSL has been Apache 2 for a while now, so there's no need for this
silly compatibility exception.

Author: twm

README.md

@@ -87,12 +87,3 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, see <http://www.gnu.org/licenses>.
-
-Additional permission under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or combining it
-with OpenSSL (or a modified version of that library), containing parts covered
-by the terms of the OpenSSL License, the licensors of this Program grant 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.

bin/compile-static.py

@@ -13,16 +13,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 """
 Compile static assets.
 

yarrharr/__init__.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 from importlib.metadata import version
 

yarrharr/application.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 """
 Yarrharr production server via Twisted Web

yarrharr/conf.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 """
 Yarrharr configuration defaults and parsing

yarrharr/context_processors.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 """
 Yarrharr template context processors.

yarrharr/converters.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 from typing import Union
 

yarrharr/enums.py

@@ -12,16 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
+
 from enum import Enum, auto
 
 

yarrharr/fetch.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright © 2016, 2017, 2018, 2019, 2020 Tom Most <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 """
 Feed fetcher based on Twisted Web

yarrharr/management/commands/updatecounts.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright © 2018 Tom Most <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 from django.core.management.base import BaseCommand
 from django.db import transaction

yarrharr/management/commands/updatehtml.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright © 2017, 2018 Tom Most <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 from django.core.management.base import BaseCommand
 from django.db import transaction

yarrharr/migrations/0001_squashed_0012_feed_count_constraint.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 # Generated by Django 3.1.4 on 2020-12-20 08:06
 

yarrharr/migrations/0007_article_raw_title_backfill.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 import html
 

yarrharr/migrations/0008_feed_counts_by_trigger.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 from django.db import migrations, models
 from ._0008_triggers import CREATE_TRIGGERS, DROP_TRIGGERS

yarrharr/migrations/0009_feed_count_constraint.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright © 2018 Tom Most <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 from django.db import migrations, models
 

yarrharr/migrations/_0008_triggers.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 CREATE_TRIGGERS = [
     """

yarrharr/models.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright © 2013, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Tom Most <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,16 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
+
 from datetime import timedelta
 
 from django.db import models

yarrharr/sanitize.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 import re
 import warnings

yarrharr/scripts/fetch.py

@@ -12,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 import argparse
 import os

yarrharr/scripts/yarrharr.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright © 2013, 2014, 2017, 2020 Tom Most <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 import argparse
 import os

yarrharr/settings.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright © 2013, 2014 Tom Most <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,16 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with OpenSSL (or a modified version of that library),
-# containing parts covered by the terms of the OpenSSL License, the
-# licensors of this Program grant 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.
 
 """
 Yarrharr's Django settings module