The freedb.org CD track database is dead.  Its shutdown had already
been announced for March, and it finally disappeared.

gnudb.org, whoever they are, offers the last working alternative
that still supports the CDDB protocol.  Actually, the port was dead
yesterday, but they fixed it today.  I suggest we switch the default
of cdio(1)'s cddb command to gnudb.

I think we can also retire cddb/888 from /etc/services.  Literally
nothing uses this any longer.  gnudb uses the "cddbp-alt" port of
8880, but I don't think we need a services(5) entry for a single
site.  If anything in ports uses getservbyname("cddb", ...), it's
already broken anyway.

OK?

PS:
Clearly the NSA does not consider the unencrypted transmission of
compact disc identifiers a significant source of intelligence, or
they would sponsor a better server...

Index: etc/services
===================================================================
RCS file: /cvs/src/etc/services,v
retrieving revision 1.96
diff -u -p -r1.96 services
--- etc/services        27 Jan 2019 20:35:06 -0000      1.96
+++ etc/services        24 Jun 2020 22:27:44 -0000
@@ -182,7 +182,6 @@ kerberos-adm        749/udp                         # 
Kerberos 5 kad
 domain-s       853/tcp                         # DNS query-response protocol 
run over TLS/DTLS
 domain-s       853/udp                         # DNS query-response protocol 
run over TLS/DTLS
 rsync          873/tcp                         # rsync server
-cddb           888/tcp         cddbp           # Audio CD Database
 imaps          993/tcp                         # imap4 protocol over TLS/SSL
 imaps          993/udp                         # imap4 protocol over TLS/SSL
 pop3s          995/tcp         spop3           # pop3 protocol over TLS/SSL
Index: usr.bin/cdio/cddb.c
===================================================================
RCS file: /cvs/src/usr.bin/cdio/cddb.c,v
retrieving revision 1.22
diff -u -p -r1.22 cddb.c
--- usr.bin/cdio/cddb.c 7 Dec 2017 02:08:44 -0000       1.22
+++ usr.bin/cdio/cddb.c 24 Jun 2020 22:25:58 -0000
@@ -254,7 +254,7 @@ cddb(const char *host_port, int n, struc
        int i;
        const char *errstr;
 
-       s = parse_connect_to(host_port, "cddb");
+       s = parse_connect_to(host_port, "8880");
        if (s == -1)
                goto end;
        s2 = dup(s);
Index: usr.bin/cdio/cdio.1
===================================================================
RCS file: /cvs/src/usr.bin/cdio/cdio.1,v
retrieving revision 1.65
diff -u -p -r1.65 cdio.1
--- usr.bin/cdio/cdio.1 22 Apr 2020 05:37:00 -0000      1.65
+++ usr.bin/cdio/cdio.1 24 Jun 2020 22:22:34 -0000
@@ -58,7 +58,7 @@ The options are as follows:
 .Ar host : Ns Ar port
 .Xc
 Specifies a CDDB host
-.Bq default: freedb.freedb.org:cddb .
+.Bq default: gnudb.gnudb.org:8880 .
 .It Fl f Ar device
 Specifies the name of the CD device, such as
 .Pa /dev/rcd0c .
Index: usr.bin/cdio/cdio.c
===================================================================
RCS file: /cvs/src/usr.bin/cdio/cdio.c,v
retrieving revision 1.78
diff -u -p -r1.78 cdio.c
--- usr.bin/cdio/cdio.c 3 Jul 2019 03:24:02 -0000       1.78
+++ usr.bin/cdio/cdio.c 24 Jun 2020 22:25:19 -0000
@@ -239,7 +239,7 @@ main(int argc, char **argv)
 
        cddb_host = getenv("CDDB");
        if (!cddb_host)
-               cddb_host = "freedb.freedb.org";
+               cddb_host = "gnudb.gnudb.org";
 
        while ((ch = getopt(argc, argv, "svd:f:")) != -1)
                switch (ch) {
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to