Hi,

OK? (diffs below)

On Mon, 29 Jun 2020 23:59:45 +0200
Christian Weisgerber wrote:

> The freedb.org database of compact track listings has shut down.
> Any program functionality that tries to fetch from or submit data
> to freedb.org is broken now.
> 
> An alternative service is available at gnudb.org, see
> https://www.gnudb.org/
> 
> Below is a list of ports that still appear to use freedb.org in
> code and need to be fixed.  I've cc'ed any maintainers.
> 

> audio/aqualung                  jer...@openbsd.org
> audio/audacious/plugins         b...@openbsd.org
> audio/cantata                   ports@openbsd.org
> audio/cd-discid                 ports@openbsd.org
> audio/cmus                      ports@openbsd.org
> audio/deadbeef                  ports@openbsd.org
> audio/disc-cover                ports@openbsd.org
> audio/easytag                   ports@openbsd.org
> audio/grip                      ports@openbsd.org
> audio/libcdaudio                ports@openbsd.org
> audio/libcddb                   ports@openbsd.org
> audio/libcdio                   ports@openbsd.org
> audio/libdiscid                 ports@openbsd.org
> audio/libmp3splt                ports@openbsd.org
> audio/mp3cddb                   ports@openbsd.org
> audio/mp3splt                   ports@openbsd.org
> audio/puddletag                 ports@openbsd.org
> audio/py-cddb                   ports@openbsd.org
> audio/vlorb                     ports@openbsd.org
> devel/kf5/kio                   rsadow...@openbsd.org
> misc/cdrdao                     ports@openbsd.org
> misc/mc                         rob...@openbsd.org
> misc/xcdroast                   ports@openbsd.org
> multimedia/xine-lib             b...@comstyle.com
> net/mldonkey                    ports@openbsd.org
> print/texlive/texmf             e...@openbsd.org
> sysutils/cdrtools               ports@openbsd.org
> www/surfraw                     ben...@openbsd.org
> x11/gnome/vfs2                  jas...@openbsd.org,
> ajacou...@openbsd.org x11/gnustep/cdplayer
> sebas...@openbsd.org x11/kde/base3                   ports@openbsd.org
> x11/kde-applications/libkcddb   rsadow...@openbsd.org
> x11/mplayer                     b...@comstyle.com


>
> audio/abcde                     c...@openbsd.org
>
Musicbrainz is used by default, but some users having old config files
may still use cddb. Upstream is aware of the situation but no patches
yet.


Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/abcde/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile    12 Jul 2019 20:43:31 -0000      1.30
+++ Makefile    29 Jun 2020 22:39:59 -0000
@@ -3,6 +3,7 @@
 COMMENT=       command-line utility to rip and encode audio cds
 
 DISTNAME=      abcde-2.9.3
+REVISION=      0
 EPOCH=         0
 CATEGORIES=    audio
 
Index: patches/patch-abcde
===================================================================
RCS file: patches/patch-abcde
diff -N patches/patch-abcde
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-abcde 29 Jun 2020 22:39:59 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: abcde
+--- abcde.orig
++++ abcde
+@@ -3770,8 +3770,8 @@ post_encode ()
+ # CDDB
+ # Currently three supported options ("musicbrainz", "cddb" for freedb.org and 
"cdtext")
+ CDDBMETHOD=musicbrainz
+-CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi";
+-CDDBSUBMIT=freedb-sub...@freedb.org
++CDDBURL="https://gnudb.gnudb.org/~cddb/cddb.cgi";
++CDDBSUBMIT=sub...@gnudb.org
+ CDDBPROTO=6
+ HELLOINFO="$(whoami)@$(hostname)"
+ CDDBCOPYLOCAL="n"
Index: patches/patch-abcde_conf
===================================================================
RCS file: patches/patch-abcde_conf
diff -N patches/patch-abcde_conf
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-abcde_conf    29 Jun 2020 22:39:59 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: abcde.conf
+--- abcde.conf.orig
++++ abcde.conf
+@@ -15,7 +15,7 @@
+ # 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";
++#CDDBURL="https://gnudb.gnudb.org/~cddb/cddb.cgi";
+ 
+ # The CDDB protocol level.
+ # Right now 5 is latin1 output and 6 is UTF8 encoding.
+@@ -27,7 +27,7 @@
+ #HELLOINFO="`whoami`@`hostname`"
+ 
+ # This controls the email address CDDB changes are submitted to.
+-#CDDBSUBMIT=freedb-sub...@freedb.org
++#CDDBSUBMIT=sub...@gnudb.org
+ 
+ # The following options control whether or not fetched CDDB entries
+ # are cached locally in $CDDBLOCALDIR

>
> audio/p5-CDDB_get               ports@openbsd.org
>

Tested for real - the test suite is useless

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/p5-CDDB_get/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile    12 Jul 2019 20:43:38 -0000      1.16
+++ Makefile    29 Jun 2020 23:17:45 -0000
@@ -3,9 +3,10 @@
 COMMENT=               perl interface to query for cddb-information
 
 DISTNAME=              CDDB_get-2.28.1
+REVISION=              0
 CATEGORIES=            audio
 
-HOMEPAGE=              http://armin.emx.at/cddb/
+HOMEPAGE=              https://armin.emx.at/cddb/
 
 # perl
 PERMIT_PACKAGE=        Yes
Index: patches/patch-CDDB_get_pm
===================================================================
RCS file: patches/patch-CDDB_get_pm
diff -N patches/patch-CDDB_get_pm
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-CDDB_get_pm   29 Jun 2020 23:17:45 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+freedb is dead
+
+Index: CDDB_get.pm
+--- CDDB_get.pm.orig
++++ CDDB_get.pm
+@@ -66,7 +66,7 @@ my $CDROM_MSF=0x02;
+ 
+ # default config
+ 
+-my $CDDB_HOST = "freedb.freedb.org";
++my $CDDB_HOST = "gnudb.gnudb.org";
+ my $CDDB_PORT = 8880;
+ my $CDDB_MODE = "cddb";
+ my $CD_DEVICE = "/dev/cdrom";
+@@ -608,7 +608,7 @@ CDDB - Read the CDDB entry for an audio CD in your dri
+ 
+  # following variables just need to be declared if different from defaults
+ 
+- $config{CDDB_HOST}="freedb.freedb.org";      # set cddb host
++ $config{CDDB_HOST}="gnudb.gnudb.org";                # set cddb host
+  $config{CDDB_PORT}=8880;                     # set cddb port
+  $config{CDDB_MODE}="cddb";                   # set cddb mode: cddb or http
+  $config{CD_DEVICE}="/dev/cdrom";             # set cd device

>
> audio/p5-cddb                   ports@openbsd.org
>

1 subtest failing

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/p5-cddb/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile    12 Jul 2019 20:43:39 -0000      1.30
+++ Makefile    29 Jun 2020 23:43:54 -0000
@@ -3,12 +3,17 @@
 COMMENT=       interface to CDDB and freedb servers
 
 DISTNAME=      CDDB-1.222
+REVISION=      0
 CATEGORIES=    audio
 
 # perl
 PERMIT_PACKAGE=        Yes
 
 MODULES=       cpan
+
+TEST_DEPENDS=  www/p5-HTTP-Message \
+               www/p5-libwww
+
 PKG_ARCH=      *
 
 .include <bsd.port.mk>
Index: patches/patch-lib_CDDB_pm
===================================================================
RCS file: patches/patch-lib_CDDB_pm
diff -N patches/patch-lib_CDDB_pm
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_CDDB_pm   29 Jun 2020 23:43:54 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+freedb is dead
+
+Index: lib/CDDB.pm
+--- lib/CDDB.pm.orig
++++ lib/CDDB.pm
+@@ -31,7 +31,7 @@ my $cddbp_host_selector = 0;
+ 
+ my @cddbp_hosts = (
+       [ 'localhost'         => 8880 ],
+-      [ 'freedb.freedb.org' => 8880 ],
++      [ 'gnudb.gnudb.org'   => 8880 ],
+       [ 'us.freedb.org',    => 8880 ],
+       [ 'ca.freedb.org',    => 8880 ],
+       [ 'ca2.freedb.org',   => 8880 ],

>
> audio/pacpl                     ports@openbsd.org
>

Tested for real as well.

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/pacpl/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile    12 Jul 2019 20:43:39 -0000      1.19
+++ Makefile    29 Jun 2020 23:27:53 -0000
@@ -5,7 +5,7 @@ PKG_ARCH=               *
 COMMENT=               PAC (Perl Audio Converter)
 
 DISTNAME=              pacpl-4.0.5
-REVISION=              0
+REVISION=              1
 CATEGORIES=            audio converters perl5
 
 HOMEPAGE=              http://pacpl.sourceforge.net/
Index: patches/patch-pacpl
===================================================================
RCS file: /cvs/ports/audio/pacpl/patches/patch-pacpl,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-pacpl
--- patches/patch-pacpl 27 Apr 2013 11:39:47 -0000      1.6
+++ patches/patch-pacpl 29 Jun 2020 23:27:53 -0000
@@ -1,6 +1,19 @@
 $OpenBSD: patch-pacpl,v 1.6 2013/04/27 11:39:47 sthen Exp $
---- pacpl.orig Fri Mar 20 02:19:03 2009
-+++ pacpl      Sat Apr 27 12:34:15 2013
+
+Hunk #1: freedb is dead
+
+Index: pacpl
+--- pacpl.orig
++++ pacpl
+@@ -117,7 +117,7 @@ my %config = (
+                BPSIZE       => 128,
+ 
+                USE_CDDB     => 1,
+-               CDDB_HOST    => 'freedb.freedb.org',
++               CDDB_HOST    => 'gnudb.gnudb.org',
+                CDDB_PORT    => 8880,
+                CDDB_MODE    => 'cddb',
+                CDDB_INPUT   => 1,
 @@ -130,8 +130,8 @@ my %config = (
               );
  
Index: patches/patch-pacpl_conf
===================================================================
RCS file: patches/patch-pacpl_conf
diff -N patches/patch-pacpl_conf
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-pacpl_conf    29 Jun 2020 23:27:53 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Hunk #1: freedb is dead
+
+Index: pacpl.conf
+--- pacpl.conf.orig
++++ pacpl.conf
+@@ -150,7 +150,7 @@ BPSIZE = 128
+ #
+ USE_CDDB = 1
+ 
+-CDDB_HOST = freedb.freedb.org
++CDDB_HOST = gnudb.gnudb.org
+ CDDB_PORT = 8880
+ 
+ # cddb or http
+@@ -185,4 +185,4 @@ KDE_OPTS = 1
+ # Use default encoder options 0/1 #
+ ###################################
+ #
+-DEFOPTS = 1
+\ No newline at end of file
++DEFOPTS = 1


Reply via email to