diff -uNr ircservices-5.0.58/Changes ircservices-5.0.59/Changes --- ircservices-5.0.58/Changes 2006-06-22 01:20:27 +0900 +++ ircservices-5.0.59/Changes 2006-10-01 16:00:09 +0900 @@ -1,5 +1,8 @@ Version 5.0 ----------- +2006/10/01 .59 Added support to convert-db for versions of PTlink Services + through 2.26-eol.1 +2006/08/16 Update documentation to reflect new domain name. 2006/06/22 .58 Added workaround to support the broken MD5 encryption used in Epona/Anope (through at least version 1.7.14), enabled by the EnableAnopeWorkaround option for the diff -uNr ircservices-5.0.58/docs/1.html ircservices-5.0.59/docs/1.html --- ircservices-5.0.58/docs/1.html 2004-11-22 21:34:15 +0900 +++ ircservices-5.0.59/docs/1.html 2006-08-16 11:14:16 +0900 @@ -280,13 +280,13 @@

1-3. IRC Services home page and download URL

The official IRC Services home page is located at -http://www.ircservices.esper.net/. +http://www.ircservices.za.net/. This page contains up-to-date information on Services (including much of the information in this section), as well as links to download Services and a copy of this manual.

The primary download site is located at -http://www.ircservices.esper.net/download/ +http://www.ircservices.za.net/download/ (located in Japan). Mirrors of the download site are available at:

ftp://ftp.esper.net/ircservices/ (Western USA) @@ -309,7 +309,7 @@ Anyone may subscribe to the mailing list and participate in the discussion, but you must subscribe before you will be allowed to send mail to the list. You can subscribe to the list by visiting -http://lists.ircservices.esper.net/mailman/listinfo/ircservices. +http://lists.ircservices.za.net/mailman/listinfo/ircservices. You will be sent a confirmation E-mail message; reply to that message and you will be subscribed to the list. If you later want to unsubscribe, visit the same page and select "Edit Options" after entering your E-mail @@ -317,9 +317,9 @@ delivery options from that page.
Once you have subscribed, the address for posting to the list is -ircservices@ircservices.esper.net. +ircservices@ircservices.za.net. Archives of past messages to the list are available at -http://lists.ircservices.esper.net/pipermail/ircservices/; +http://lists.ircservices.za.net/pipermail/ircservices/; please check the archives before asking a question to make sure your question has not been answered already. @@ -333,9 +333,9 @@ including the author of Services, cannot read them.
Users who intend to modify or extend Services may also wish to join the -ircservices-coding@ircservices.esper.net mailing list; information on +ircservices-coding@ircservices.za.net mailing list; information on this mailing list can be found at -http://lists.ircservices.esper.net/mailman/listinfo/ircservices-coding. +http://lists.ircservices.za.net/mailman/listinfo/ircservices-coding. Please note that discussions on this list are frequently very technical in nature, and questions about setting up or using Services will not be answered there. @@ -377,7 +377,7 @@ directory of the Services distribution, which detail all changes made in each version of Services. -
The Services home page +
The Services home page was designed by Andrew Kempe. Mirrors of the download site are provided by Ian Justman, diff -uNr ircservices-5.0.58/docs/5.html ircservices-5.0.59/docs/5.html --- ircservices-5.0.58/docs/5.html 2006-06-22 01:18:19 +0900 +++ ircservices-5.0.59/docs/5.html 2006-10-01 16:01:15 +0900 @@ -233,7 +233,7 @@ ptlink PTlink Services [sourceforge.net] - 2.13.0 and later + 2.13.0 through 2.26-eol.1 sirv SirvNET Services [www.sirv.net] diff -uNr ircservices-5.0.58/tools/convert-db.c ircservices-5.0.59/tools/convert-db.c --- ircservices-5.0.58/tools/convert-db.c 2006-06-22 01:22:40 +0900 +++ ircservices-5.0.59/tools/convert-db.c 2006-10-01 16:14:00 +0900 @@ -598,8 +598,8 @@ ) { fprintf(stderr, "Access entry %d for nickgroup %u %s," " deleting.\n", i, ngi->id, - !ngi->access ? "is empty" - : "isn't a valid user@host mask"); + !ngi->access[i] ? "is empty" + : "isn't a valid user@host mask"); ARRAY_REMOVE(ngi->access, i); i--; } diff -uNr ircservices-5.0.58/tools/convert-ptlink.c ircservices-5.0.59/tools/convert-ptlink.c --- ircservices-5.0.58/tools/convert-ptlink.c 2006-06-22 01:22:40 +0900 +++ ircservices-5.0.59/tools/convert-ptlink.c 2006-10-01 16:14:00 +0900 @@ -29,7 +29,7 @@ { char filename[PATH_MAX+1]; dbFILE *f; - int i, j, c; + int i, j, c, delete; int16 tmp16, ver; int32 tmp32, total, count; NickInfo *ni; @@ -42,7 +42,7 @@ return; SAFE(read_int8(&ch, f)); SAFE(read_int16(&ver, f)); - if (ch != -1 || ver < 6 || ver > 10) { + if (ch != -1 || ver < 6 || ver > 11) { fprintf(stderr, "Wrong version number on %s\n", filename); exit(1); } @@ -56,7 +56,7 @@ while (ver >= 10 || (c = getc_db(f)) == 1) { char nickbuf[32], passbuf[32], authbuf[16]; if (ver >= 9) { - int res = read_int32(&tmp32, f); /* suid */ + int res = read_int32(&tmp32, f); /* SUID (broken) / SNID */ if (res < 0) { if (ver >= 10) /* v10: no more int8 markers */ break; @@ -65,7 +65,16 @@ } } SAFE(read_buffer(nickbuf, f)); + /* The source (v2.26-eol.1) claims that duplicate nicknames can + * get stored in the database for unknown reasons, so watch for + * and delete them as needed */ + delete = (get_nickinfo(nickbuf) != NULL); ni = makenick(nickbuf, &ngi); + /* Use the SNID (file version 11) as a nickname group ID only + * if it's nonzero and unique. Never use the SUID (versions 9 + * and 10) as the source code claims that it's broken. */ + if (ver >= 11 && tmp32 && !get_nickgroupinfo(tmp32)) + ni->nickgroup = ngi->id = (uint32)tmp32; SAFE(read_buffer(passbuf, f)); memcpy(ngi->pass, passbuf, sizeof(passbuf)); if (ver >= 7) @@ -203,6 +212,10 @@ case 4: ngi->language = LANG_IT; break; } } + if (delete) { + del_nickgroupinfo(ngi); + del_nickinfo(ni); + } count++; } /* while (getc_db(f) == 1) */ if (ver < 10 && c != 0) { @@ -302,7 +315,7 @@ return; SAFE(read_int8(&ch, f)); SAFE(read_int16(&ver, f)); - if (ch != -1 || ver < 7 || ver > 9) { + if (ch != -1 || ver < 7 || ver > 10) { fprintf(stderr, "Wrong version number on %s\n", filename); exit(1); } @@ -317,6 +330,8 @@ while ((c = getc_db(f)) == 1) { char namebuf[64], passbuf[32], nickbuf[32]; + if (ver >= 10) + SAFE(read_int32(&tmp32, f)); /* SCID */ SAFE(read_buffer(namebuf, f)); ci = makechan(namebuf); SAFE(read_string(&s, f)); diff -uNr ircservices-5.0.58/version.sh ircservices-5.0.59/version.sh --- ircservices-5.0.58/version.sh 2006-06-22 01:20:38 +0900 +++ ircservices-5.0.59/version.sh 2006-10-01 16:11:47 +0900 @@ -6,7 +6,7 @@ # $PROGRAM is the string returned as the first part of a /VERSION reply, # and must not contain spaces. It is not used anywhere else. PROGRAM=ircservices -VERSION=5.0.58 +VERSION=5.0.59 # Increment Services build number if [ -f version.c ] ; then