Merge branch 'f33' into f34

abcde-gnudb.patch

@@ -0,0 +1,31 @@
+--- ./abcde.conf~	2019-02-05 03:19:03.000000000 -0700
++++ ./abcde.conf	2021-01-15 18:07:27.125346596 -0700
+@@ -15,19 +15,24 @@
+ # If you wish to use a different CDDB server, edit this line.
+ # If you just wanted to use a proxy server, just set your http_proxy
+ # environment variable - wget will use it correctly.
+-#CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
++# In the past freedb.org was a popular choice but this service
++# was acquired and discontinued.  The following may serve as
++# a replacemet
++#CDDBURL="http://gnudb.gnudb.org/~cddb/cddb.cgi"
+ 
+ # The CDDB protocol level.
+ # Right now 5 is latin1 output and 6 is UTF8 encoding.
+ #CDDBPROTO=6
+ 
+ # The CDDB protocol requires hello information, including a valid username
+-# and hostname. If you feel paranoid about giving away such info, edit this
+-# line - the format is username@hostname.
++# and hostname. If you feel paranoid about giving away such info, edit
++# "HELLOINFO" line - the format is username@hostname.
++# Submissions to cddb actually require a valid email address which may, or may
++# not be like the following:
+ #HELLOINFO="`whoami`@`hostname`"
+ 
+ # This controls the email address CDDB changes are submitted to.
+-#CDDBSUBMIT=freedb-submit@freedb.org
++#CDDBSUBMIT=submit@gnudb.org
+ 
+ # The following options control whether or not fetched CDDB entries
+ # are cached locally in $CDDBLOCALDIR

abcde.spec

@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -12,6 +12,8 @@ Source1:        https://abcde.einval.com/download/%{name}-%{version}.tar.gz.sign
 # gpg2 --export --export-options export-minimal 0x587979573442684E > 587979573442684E.gpg
 Source2:        587979573442684E.gpg
 Patch0:         %{name}-normalize.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1916974
+Patch1:         https://bugzilla.redhat.com/attachment.cgi?id=1748056#/abcde-gnudb.patch
 
 BuildArch:      noarch
 BuildRequires:  %{_bindir}/gpgv2
@@ -78,6 +80,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Sat May 22 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.9.3-7
+- point to gnudb.org instead of the discontinued freedb.org (#1916974)
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild