Date: Mon, 14 Mar 2005 23:52:19 +0100 (CET) From: Danny Koenig <dako@bsdberlin.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Walter Venable <weaseal@hotmail.com> Subject: ports/78861: update port: irc/srvx 1.2.1 -> 1.3 Message-ID: <200503142252.j2EMqJOu009326@prod410.bsdberlin.org> Resent-Message-ID: <200503151200.j2FC0C3B015982@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78861 >Category: ports >Synopsis: update port: irc/srvx 1.2.1 -> 1.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 15 12:00:11 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Danny Koenig >Release: FreeBSD 4.10-RELEASE-p5 i386 >Organization: <none> >Environment: System: FreeBSD prod410.bsdberlin.org 4.10-RELEASE-p5 FreeBSD 4.10-RELEASE-p5 #0: Sun Mar 13 06:14:07 CET 2005 dako@prod410.bsdberlin.org:/usr/obj/usr/src/sys/PROD410 i386 >Description: Update port: irc/srvx from 1.2.1 to 1.3 Changes from 1.2.1 to 1.3: - Fix registered channel desync; fix HelpServ crash for old cfg files - Mention 'slab' in --with-malloc docs. Merge fakehosts when merging accounts - Fix memory corruption when removing certain bans from a channel - Rearrange slab allocation header; minor slab fixes - Even more slab allocator updates - and many more, see ChangeLog in Package for further detailed information Patches to add in irc/srvx/files: - patch-ac - patch-ad Walter Venable (maintainer) gets an CC of this PR. >How-To-Repeat: >Fix: --- srvx-1.3.patch begins here --- diff -ruN srvx.old/Makefile srvx/Makefile --- srvx.old/Makefile Tue Feb 17 09:37:49 2004 +++ srvx/Makefile Mon Mar 14 23:14:27 2005 @@ -6,8 +6,7 @@ # PORTNAME= srvx -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= irc net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= srvx @@ -26,17 +25,19 @@ CONFIGURE_ARGS+= --with-protocol=bahamut .endif -PLIST_FILES= bin/srvx etc/srvx.conf.example \ - etc/sockcheck.conf.example \ - share/doc/${PORTNAME}/chanserv.help \ - share/doc/${PORTNAME}/global.help \ - share/doc/${PORTNAME}/helpserv.help \ - share/doc/${PORTNAME}/modcmd.help \ - share/doc/${PORTNAME}/nickserv.help \ - share/doc/${PORTNAME}/opserv.help \ - share/doc/${PORTNAME}/saxdb.help \ - share/doc/${PORTNAME}/sendmail.help \ - share/doc/${PORTNAME}/sockcheck.help +PLIST_FILES= bin/srvx \ + etc/srvx.conf.example \ + etc/sockcheck.conf.example \ + share/doc/${PORTNAME}/chanserv.help \ + share/doc/${PORTNAME}/global.help \ + share/doc/${PORTNAME}/mod-helpserv.help \ + share/doc/${PORTNAME}/mod-memoserv.help \ + share/doc/${PORTNAME}/mod-sockcheck.help \ + share/doc/${PORTNAME}/modcmd.help \ + share/doc/${PORTNAME}/nickserv.help \ + share/doc/${PORTNAME}/opserv.help \ + share/doc/${PORTNAME}/saxdb.help \ + share/doc/${PORTNAME}/sendmail.help PLIST_DIRS= share/doc/${PORTNAME} pre-fetch: @@ -56,8 +57,7 @@ post-install: @ ${ECHO} "" @ ${ECHO} " When you 'make deinstall', any files generated by ${PORTNAME} (logs, etc)" - @ ${ECHO} " will remain in ${PREFIX}/etc/. These files must be removed" - @ ${ECHO} " manually." + @ ${ECHO} " will remain in ${PREFIX}/etc/. These files must be removed manually." @ ${ECHO} "" @ ${ECHO} " ${PORTNAME} .help files are located in ${DOCSDIR}." @ ${ECHO} "" diff -ruN srvx.old/distinfo srvx/distinfo --- srvx.old/distinfo Thu Mar 18 19:00:31 2004 +++ srvx/distinfo Mon Mar 14 21:55:58 2005 @@ -1,2 +1,2 @@ -MD5 (srvx-1.2.1.tar.gz) = 4c1c4982fbc23156dbeb6d5c33850c3b -SIZE (srvx-1.2.1.tar.gz) = 556892 +MD5 (srvx-1.3.tar.gz) = 856d4d452d32340224400dfdfeaf70bc +SIZE (srvx-1.3.tar.gz) = 572481 diff -ruN srvx.old/files/patch-ac srvx/files/patch-ac --- srvx.old/files/patch-ac Thu Jan 1 01:00:00 1970 +++ srvx/files/patch-ac Mon Mar 14 22:22:21 2005 @@ -0,0 +1,49 @@ +--- src/proto-p10.c.old Tue Feb 22 05:11:21 2005 ++++ src/proto-p10.c Mon Mar 14 22:21:12 2005 +@@ -367,10 +367,10 @@ + if (srv == self) { + /* The +s, ignored by Run's ircu, means "service" to Undernet's ircu */ + putsock(P10_SERVER " %s %d %li %li J10 %s%s +s :%s", +- srv->name, srv->hops+1, srv->boot, srv->link, srv->numeric, extranum, srv->description); ++ srv->name, srv->hops+1, (long)srv->boot, (long)srv->link, srv->numeric, extranum, srv->description); + } else { + putsock("%s " P10_SERVER " %s %d %li %li %c10 %s%s +s :%s", +- self->numeric, srv->name, srv->hops+1, srv->boot, srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description); ++ self->numeric, srv->name, srv->hops+1, (long)srv->boot, (long)srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description); + } + } + +@@ -408,10 +408,10 @@ + + /* we don't need to put the + in modes because it's in the format string. */ + putsock("%s " P10_NICK " %s %d %li %s %s +%s %s %s :%s", +- user->uplink->numeric, user->nick, user->uplink->hops+1, user->timestamp, user->ident, user->hostname, modes, b64ip, user->numeric, user->info); ++ user->uplink->numeric, user->nick, user->uplink->hops+1, (long)user->timestamp, user->ident, user->hostname, modes, b64ip, user->numeric, user->info); + } else { + putsock("%s " P10_NICK " %s %d %li %s %s %s %s :%s", +- user->uplink->numeric, user->nick, user->uplink->hops+1, user->timestamp, user->ident, user->hostname, b64ip, user->numeric, user->info); ++ user->uplink->numeric, user->nick, user->uplink->hops+1, (long)user->timestamp, user->ident, user->hostname, b64ip, user->numeric, user->info); + } + } + +@@ -545,7 +545,7 @@ + irc_gline(struct server *srv, struct gline *gline) + { + putsock("%s " P10_GLINE " %s +%s %ld :%s", +- self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires-now, gline->reason); ++ self->numeric, (srv ? srv->numeric : "*"), gline->target, (long)gline->expires-now, gline->reason); + } + + void +@@ -680,9 +680,9 @@ + { + if (what->members.used == 1) { + putsock("%s " P10_CREATE " %s %lu", +- who->numeric, what->name, what->timestamp); ++ who->numeric, what->name, (long)what->timestamp); + } else { +- putsock("%s " P10_JOIN " %s %lu", who->numeric, what->name, what->timestamp); ++ putsock("%s " P10_JOIN " %s %lu", who->numeric, what->name, (long)what->timestamp); + } + } + diff -ruN srvx.old/files/patch-ad srvx/files/patch-ad --- srvx.old/files/patch-ad Thu Jan 1 01:00:00 1970 +++ srvx/files/patch-ad Mon Mar 14 23:36:04 2005 @@ -0,0 +1,20 @@ +--- src/Makefile.am.old Mon Mar 14 23:35:03 2005 ++++ src/Makefile.am Mon Mar 14 23:35:13 2005 +@@ -11,7 +11,6 @@ + .PHONY: checkversion + arch-version.h: checkversion + checkversion: +- @tla logs -f >/dev/null || exit 0; \ + TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \ + echo "#define ARCH_VERSION \"`tla logs -f | tail -n 1`\"" >> $$TMPFILE ; \ + if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \ +--- src/Makefile.in.old Mon Mar 14 23:35:17 2005 ++++ src/Makefile.in Mon Mar 14 23:35:33 2005 +@@ -527,7 +527,6 @@ + .PHONY: checkversion + arch-version.h: checkversion + checkversion: +- @tla logs -f >/dev/null || exit 0; \ + TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \ + echo "#define ARCH_VERSION \"`tla logs -f | tail -n 1`\"" >> $$TMPFILE ; \ + if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \ diff -ruN srvx.old/pkg-descr srvx/pkg-descr --- srvx.old/pkg-descr Tue Feb 17 09:37:49 2004 +++ srvx/pkg-descr Mon Mar 14 23:19:12 2005 @@ -14,4 +14,3 @@ Author: "Entrope" <entrope@users.sourceforge.net> WWW: http://www.srvx.net - --- srvx-1.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503142252.j2EMqJOu009326>