From fe0a8c785162fa46013ebc9e44610e7dbf257423 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 24 Sep 2022 14:16:52 +0200
Subject: [PATCH] Replace gnupg and PGP with OpenPGP

This commit replaces the tool names gnupg and PGP with the standard RFC term
OpenPGP. Thanks to Guillem Jover for the inspiration.
---
 ChangeLog                                     |  1 +
 debianmemberportfolio/forms.py                |  4 ++--
 debianmemberportfolio/model/dddatabuilder.py  |  8 ++++----
 debianmemberportfolio/model/keyfinder.py      |  4 ++--
 debianmemberportfolio/model/portfolio.ini     |  4 ++--
 debianmemberportfolio/model/urlbuilder.py     |  8 ++++----
 debianmemberportfolio/templates/base.html     |  4 ++--
 debianmemberportfolio/templates/showform.html | 10 +++++-----
 .../templates/showformscript.js               | 20 +++++++++----------
 debianmemberportfolio/views.py                |  8 ++++----
 docs/source/devdocs.rst                       |  6 +++---
 setup.py                                      |  4 ++--
 12 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9254807..274d149 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 unreleased  Jan Dittberner  <jan@dittberner.info>
 	* add updated translations from Weblate
 	* update dependencies
+	* replace gpg and pgp with OpenPGP (thanks Guillem Jover)
 
 2021-10-24  Jan Dittberner  <jan@dittberner.info>
 	* add updated translations from Weblate
diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py
index 24872ee..fc3d132 100644
--- a/debianmemberportfolio/forms.py
+++ b/debianmemberportfolio/forms.py
@@ -3,7 +3,7 @@
 #
 # Debian Member Portfolio Service views
 #
-# Copyright © 2015-2020 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2015-2022 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of the Debian Member Portfolio Service.
 #
@@ -51,7 +51,7 @@ def gpg_fingerprint(data):
 class DeveloperData(FlaskForm):
     email = StringField('email', validators=[DataRequired(), Email()])
     name = StringField('name', validators=[Optional(), DataRequired()])
-    gpgfp = StringField('gpgfp', filters=[gpg_fingerprint], validators=[
+    openpgpfp = StringField('openpgpfp', filters=[gpg_fingerprint], validators=[
         Optional(), FingerPrint(), Length(min=32, max=40)
     ])
     username = StringField('username', validators=[Optional(), PlainText()])
diff --git a/debianmemberportfolio/model/dddatabuilder.py b/debianmemberportfolio/model/dddatabuilder.py
index c168489..1fa5be1 100644
--- a/debianmemberportfolio/model/dddatabuilder.py
+++ b/debianmemberportfolio/model/dddatabuilder.py
@@ -3,7 +3,7 @@
 #
 # Debian Member Portfolio Service data builder
 #
-# Copyright © 2009-2015 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009-2022 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of the Debian Member Portfolio Service.
 #
@@ -39,13 +39,13 @@ def build_data(email_address):
     """Build a DD data structure from a given email address."""
     fields = dict([(field, func(str(email_address)))
                    for (field, func) in
-                   [('gpgfp', keyfinder.getFingerprintByEmail),
+                   [('openpgpfp', keyfinder.getFingerprintByEmail),
                     ('name', keyfinder.getRealnameByEmail),
                     ('username', keyfinder.getLoginByEmail)]])
     fields['email'] = email_address
-    if fields['username'] and fields['gpgfp'] and fields['name']:
+    if fields['username'] and fields['openpgpfp'] and fields['name']:
         fields['type'] = TYPE_DD
-    elif fields['name'] and fields['gpgfp']:
+    elif fields['name'] and fields['openpgpfp']:
         fields['type'] = TYPE_DM
     else:
         fields['type'] = TYPE_NO
diff --git a/debianmemberportfolio/model/keyfinder.py b/debianmemberportfolio/model/keyfinder.py
index 5129e54..c4b8a54 100644
--- a/debianmemberportfolio/model/keyfinder.py
+++ b/debianmemberportfolio/model/keyfinder.py
@@ -3,7 +3,7 @@
 #
 # Debian Member Portfolio Service key finder module
 #
-# Copyright © 2009-2015 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009-2022 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of the Debian Member Portfolio Service.
 #
@@ -21,7 +21,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 """
-This module provides tools for finding PGP key information from a
+This module provides tools for finding OpenPGP key information from a
 given keyring.
 """
 
diff --git a/debianmemberportfolio/model/portfolio.ini b/debianmemberportfolio/model/portfolio.ini
index 4d31b06..6baedad 100644
--- a/debianmemberportfolio/model/portfolio.ini
+++ b/debianmemberportfolio/model/portfolio.ini
@@ -1,7 +1,7 @@
 #
 # Configuration for Debian Member Portfolio Service
 #
-# Copyright © 2009-2020 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009-2022 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of the Debian Member Portfolio Service.
 #
@@ -96,7 +96,7 @@ search.pattern=https://search.debian.org/cgi-bin/omega?P=%%22%(name)s%%22
 gpgfinger.pattern=finger %(username)s/key@db.debian.org
 gpgfinger.type=finger
 gpgfinger.optional=true
-gpgweb.pattern=https://db.debian.org/fetchkey.cgi?fingerprint=%(gpgfp)s
+gpgweb.pattern=https://db.debian.org/fetchkey.cgi?fingerprint=%(openpgpfp)s
 gpgweb.optional=true
 nm.pattern=https://nm.debian.org/public/person/%(username)s
 contrib.pattern=https://contributors.debian.org/contributor/%(email)s
diff --git a/debianmemberportfolio/model/urlbuilder.py b/debianmemberportfolio/model/urlbuilder.py
index cb2f33f..d350021 100644
--- a/debianmemberportfolio/model/urlbuilder.py
+++ b/debianmemberportfolio/model/urlbuilder.py
@@ -3,7 +3,7 @@
 #
 # Debian Member Portfolio Service url builder
 #
-# Copyright © 2009-2020 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009-2022 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of the Debian Member Portfolio Service.
 #
@@ -42,7 +42,7 @@ my_config.read_file(UTF8StreamReader(
 _FIELDNAMES_MAP = {
     'email': N_('Email address'),
     'name': N_('Name'),
-    'gpgfp': N_('GPG fingerprint'),
+    'openpgpfp': N_('OpenPGP fingerprint'),
     'username': N_('Debian user name'),
     'nonddemail': N_('Non Debian email address'),
     'salsausername': N_('Salsa user name'),
@@ -75,10 +75,10 @@ def _build_quoted_fields(fields):
                 qfields[key] = value
             qfields[key] = str(qfields[key]).replace('%', '%%')
 
-    if 'gpgfp' not in qfields:
+    if 'openpgpfp' not in qfields:
         fpr = keyfinder.getFingerprintByEmail(fields['email'].encode('utf8'))
         if fpr:
-            qfields['gpgfp'] = fpr[0]
+            qfields['openpgpfp'] = fpr[0]
     qfields['firstchar'] = fields['email'][0].encode('utf8')
     qfields['emailnoq'] = fields['email'].encode('utf8')
     return qfields
diff --git a/debianmemberportfolio/templates/base.html b/debianmemberportfolio/templates/base.html
index 113e61f..84f1a34 100644
--- a/debianmemberportfolio/templates/base.html
+++ b/debianmemberportfolio/templates/base.html
@@ -2,7 +2,7 @@
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 {# vim: ft=jinja
 Base template for XHTML templates.
-Copyright © 2009-2021 Jan Dittberner <jan@dittberner.info>
+Copyright © 2009-2022 Jan Dittberner <jan@dittberner.info>
 
 This file is part of the Debian Member Portfolio service.
 
@@ -38,7 +38,7 @@ with this program.  If not, see <https://www.gnu.org/licenses/>.
     <div id="footer">
       <img alt="{{ _('AGPL - Free Software') }}" id="agpllogo" src="{{ url_for('static', filename='images/agplv3-88x31.png') }}" width="88" height="31" />
       <p>{% trans browseurl='https://git.dittberner.info/jan/debianmemberportfolio', cloneurl='https://git.dittberner.info/jan/debianmemberportfolio.git', weblateurl='https://hosted.weblate.org/projects/debian-member-portfolio-service/' %}The service is available under the terms of the <a href="https://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. You can <a href="{{ browseurl }}" title="Gitweb repository browser URL">browse the source code</a> or clone it from <a href="{{ cloneurl }}" title="git clone URL">{{ cloneurl }}</a> using <a href="https://git-scm.com/">git</a>. If you want to translate this service to your language you can contribute at <a href="{{ weblateurl }}" title="Debian Member Portfolio Service at Weblate">Weblate</a>.{% endtrans %}</p>
-      <p>{{ _('Copyright © 2009-2021 Jan Dittberner') }}</p>
+      <p>{{ _('Copyright © 2009-2022 Jan Dittberner') }}</p>
     </div>
     <script type="text/javascript">
         var flattr_url = '{{ request.scheme }}://portfolio.debian.net/';
diff --git a/debianmemberportfolio/templates/showform.html b/debianmemberportfolio/templates/showform.html
index a0d091a..6bc3191 100644
--- a/debianmemberportfolio/templates/showform.html
+++ b/debianmemberportfolio/templates/showform.html
@@ -2,7 +2,7 @@
 {#
 Template for the data input form.
 
-Copyright © 2009-2020 Jan Dittberner <jan@dittberner.info>
+Copyright © 2009-2022 Jan Dittberner <jan@dittberner.info>
 
 This file is part of the Debian Member Portfolio service.
 
@@ -46,12 +46,12 @@ with this program.  If not, see <https://www.gnu.org/licenses/>.
       </label><br />
       {{ form.name }}
     </div>
-    <div id="gpgfpfield"{% if form.gpgfp.errors %} class="witherrors"{% endif %}>
-      <label for="gpgfp">{{ _('GPG fingerprint:') }}{% if form.gpgfp.errors %}<br />
-        <span class="errormsg">{{ form.gpgfp.errors|join(', ') }}</span>
+    <div id="openpgpfpfield"{% if form.openpgpfp.errors %} class="witherrors"{% endif %}>
+      <label for="openpgpfp">{{ _('OpenPGP fingerprint:') }}{% if form.openpgpfp.errors %}<br />
+        <span class="errormsg">{{ form.openpgpfp.errors|join(', ') }}</span>
         {% endif %}
       </label><br />
-      {{ form.gpgfp }}
+      {{ form.openpgpfp }}
     </div>
     <div id="usernamefield"{% if form.username.errors %} class="witherrors"{% endif %}>
       <label for="username">{{ _('Debian user name:') }}{% if form.username.errors %}<br />
diff --git a/debianmemberportfolio/templates/showformscript.js b/debianmemberportfolio/templates/showformscript.js
index 842c272..32dde31 100644
--- a/debianmemberportfolio/templates/showformscript.js
+++ b/debianmemberportfolio/templates/showformscript.js
@@ -1,6 +1,6 @@
 {# vim: ft=jinja
 Helper JavaScript for the data input form.
-Copyright © 2009-2020, Jan Dittberner <jan@dittberner.info>
+Copyright © 2009-2022, Jan Dittberner <jan@dittberner.info>
 
 This file is part of the Debian Member Portfolio service.
 
@@ -18,19 +18,19 @@ You should have received a copy of the GNU Affero General Public License along
 with this program.  If not, see <https://www.gnu.org/licenses/>.
 #}
 var defaulthiddendivs = new Array(
-    '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
+    '#namefield', '#openpgpfpfield', '#usernamefield', '#nonddemailfield',
     '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
 var maskedfielddivs = new Array(
-    '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
+    '#namefield', '#openpgpfpfield', '#usernamefield', '#nonddemailfield',
     '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
 var allfielddivs = new Array(
-    '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
+    '#namefield', '#openpgpfpfield', '#usernamefield', '#nonddemailfield',
     '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
 
 function updateFields(data, textStatus) {
     if (data.type == 2) { // DD
         $('#name').prop('value', data.name).prop('readonly', 'readonly');
-        $('#gpgfp').prop('value', data.gpgfp);
+        $('#openpgpfp').prop('value', data.openpgpfp);
         $('#username').prop('value', data.username).prop(
             'readonly', 'readonly');
         $('#nonddemail').prop('value', data.email).focus();
@@ -38,7 +38,7 @@ function updateFields(data, textStatus) {
         $('#wikihomepage').prop('value', data.wikihomepage);
 
         $('#namefield').show();
-        $('#gpgfpfield').show();
+        $('#openpgpfpfield').show();
         $('#usernamefield').show();
         $('#nonddemailfield').show();
         $('#salsausernamefield').show();
@@ -48,13 +48,13 @@ function updateFields(data, textStatus) {
         $('#nonddemail').focus().select();
     } else if (data.type == 1) { // DM
         $('#name').prop('value', data.name).prop('readonly', 'readonly');
-        $('#gpgfp').prop('value', data.gpgfp);
+        $('#openpgpfp').prop('value', data.openpgpfp);
         $('#username').prop('value', '');
         $('#nonddemail').prop('value', data.email).focus();
         $('#wikihomepage').prop('value', data.wikihomepage);
 
         $('#namefield').show();
-        $('#gpgfpfield').show();
+        $('#openpgpfpfield').show();
         $('#usernamefield').hide();
         $('#nonddemailfield').hide();
         $('#salsausernamefield').show();
@@ -66,10 +66,10 @@ function updateFields(data, textStatus) {
         $('#nonddemail').prop('value', data.email);
         $('#name').removeAttr('readonly');
         $('#username').removeAttr('readonly').prop('value', '');
-        $('#gpgfp').prop('value', '');
+        $('#openpgpfp').prop('value', '');
 
         $('#usernamefield').hide();
-        $('#gpgfpfield').hide();
+        $('#openpgpfpfield').hide();
         $('#nonddemailfield').hide();
         $('#namefield').show();
         $('#salsausernamefield').show();
diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py
index 8c52153..1d3ad54 100644
--- a/debianmemberportfolio/views.py
+++ b/debianmemberportfolio/views.py
@@ -3,7 +3,7 @@
 #
 # Debian Member Portfolio Service views
 #
-# Copyright © 2015-2020 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2015-2022 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of the Debian Member Portfolio Service.
 #
@@ -95,8 +95,8 @@ bug=430986">#430986</a>)'''),
         'links': N_('links'),
         'website': N_('Debian website'),
         'search': N_('Debian search'),
-        'gpgfinger': N_('GPG public key via finger'),
-        'gpgweb': N_('GPG public key via HTTP'),
+        'gpgfinger': N_('OpenPGP public key via finger'),
+        'gpgweb': N_('OpenPGP public key via HTTP'),
         'nm': N_('NM, AM participation'),
         'contrib': N_('Contribution information'),
         'repology': N_('Repology information'),
@@ -112,7 +112,7 @@ bug=430986">#430986</a>)'''),
 
 #: list of field name tuples for Debian Maintainers
 DM_TUPLES = (('name', 'name'),
-             ('gpgfp', 'gpgfp'),
+             ('openpgpfp', 'openpgpfp'),
              ('nonddemail', 'email'))
 
 #: list of field name tuples for Debian Developers
diff --git a/docs/source/devdocs.rst b/docs/source/devdocs.rst
index 01b77ba..20cf194 100644
--- a/docs/source/devdocs.rst
+++ b/docs/source/devdocs.rst
@@ -68,7 +68,7 @@ Prepare for first startup
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The Debian Member Portfolio Service uses data from the Debian keyring to get
-information regarding PGP keys and names related to email addresses. Before you
+information regarding OpenPGP keys and names related to email addresses. Before you
 can run the service you need to fetch a copy of the keyring and prepare it for
 use by the code.
 
@@ -82,7 +82,7 @@ When you have both installed you can run::
 
   . ~/.virtualenvs/dmportfolio/bin/activate
   ./synckeyrings.sh
-  python debianmemberportfolio/model/keyringanalyzer.py
+  python3 debianmemberportfolio/model/keyringanalyzer.py
 
 The first synchronizes the keyrings in :file:`$HOME/debian/keyring.debian.org`
 with files on the `keyring.debian.org <http://keyring.debian.org>`_ host. And
@@ -137,7 +137,7 @@ Placeholder        Replacement
 %(emailnoq)s       email address
 %(firstchar)s      first character of the email address
 %(forumsid)s       forum user id
-%(gpgfp)s          GNUPG/PGP key fingerprint
+%(openpgpfp)s      OpenPGP key fingerprint
 %(name)s           full name (i.e. John Smith)
 %(username)s       Debian user name
 %(wikihomepage)s   full name in camel case (i.e. JohnSmith)
diff --git a/setup.py b/setup.py
index f284e43..bf5d722 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Debian Member Portfolio Service setup
-# Copyright © 2009-2020 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009-2022 Jan Dittberner <jan@dittberner.info>
 #
 # This file is part of the Debian Member Portfolio Service.
 #
@@ -29,7 +29,7 @@ except ImportError:
 
 setup(
     name='debianmemberportfolio',
-    version='0.7.2',
+    version='0.7.3',
     description='service to create Debian Member Portfolio URLs',
     long_description="""This is a service implementation that returns a set of
     personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It