diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2020-06-26 19:51:15 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2020-06-26 19:51:15 +0000 |
| commit | cd85e55cc2c32fce751b374d8eeacd89687967ee (patch) | |
| tree | c1356e5cb81a64485557db08f4a3cbc5a73deef2 /usr.bin/cdio | |
| parent | 853ae0c98c05b3833e7944b51fa6e7cf9321b39b (diff) | |
Switch cdio's default CDDB database to gnudb.gnudb.org:8880.
The freedb.org CD track database has been discontinued.
Retire cddb/888 from /etc/services. Nothing uses this any longer.
gnudb.org uses the "cddbp-alt" port of 8880, but we don't need a
services(5) entry for a single site.
ok deraadt@
Diffstat (limited to 'usr.bin/cdio')
| -rw-r--r-- | usr.bin/cdio/cddb.c | 4 | ||||
| -rw-r--r-- | usr.bin/cdio/cdio.1 | 6 | ||||
| -rw-r--r-- | usr.bin/cdio/cdio.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/cdio/cddb.c b/usr.bin/cdio/cddb.c index 96bb9cc4736..babce4a0e30 100644 --- a/usr.bin/cdio/cddb.c +++ b/usr.bin/cdio/cddb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cddb.c,v 1.22 2017/12/07 02:08:44 krw Exp $ */ +/* $OpenBSD: cddb.c,v 1.23 2020/06/26 19:51:14 naddy Exp $ */ /* * Copyright (c) 2002 Marc Espie. * @@ -254,7 +254,7 @@ cddb(const char *host_port, int n, struct cd_toc_entry *e, char *arg) 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); diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1 index 93ee87ef937..05e9580067f 100644 --- a/usr.bin/cdio/cdio.1 +++ b/usr.bin/cdio/cdio.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cdio.1,v 1.65 2020/04/22 05:37:00 jmc Exp $ +.\" $OpenBSD: cdio.1,v 1.66 2020/06/26 19:51:14 naddy Exp $ .\" .\" Copyright (c) 1995 Serge V. Vakulenko .\" All rights reserved. @@ -29,7 +29,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 22 2020 $ +.Dd $Mdocdate: June 26 2020 $ .Dt CDIO 1 .Os .Sh NAME @@ -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 . diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c index af5a26c16a0..820327e86aa 100644 --- a/usr.bin/cdio/cdio.c +++ b/usr.bin/cdio/cdio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cdio.c,v 1.78 2019/07/03 03:24:02 deraadt Exp $ */ +/* $OpenBSD: cdio.c,v 1.79 2020/06/26 19:51:14 naddy Exp $ */ /* Copyright (c) 1995 Serge V. Vakulenko * All rights reserved. @@ -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) { |