On Fri, Aug 21, 2015 at 07:03:17PM +0200, Juan Francisco Cantero Hurtado wrote: > I don't use icbirc, so I can't test the update. > > However, I think that the patches included in the port should go > upstream. I update the update to new release 2.0, with integrate the patches in ports.
The following patch do: - update to icbirc-2.0 - remove patches/ (integrated upstream) - take the maintainer-ship (proposed to me by Daniel) Comments ? OK ? -- Sebastien Marie Index: Makefile =================================================================== RCS file: /cvs/ports/net/icbirc/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile 22 Jan 2015 21:17:47 -0000 1.15 +++ Makefile 22 Aug 2015 04:39:36 -0000 @@ -2,16 +2,13 @@ COMMENT= proxy IRC client with ICB server -DISTNAME= icbirc-1.8 -REVISION= 1 +DISTNAME= icbirc-2.0 CATEGORIES= net MASTER_SITES= http://www.benzedrine.ch/ HOMEPAGE= http://www.benzedrine.ch/icbirc.html -MAINTAINER= Daniel Hartmeier <[email protected]> - -WRKDIST= ${WRKDIR}/icbirc +MAINTAINER= Sebastien Marie <[email protected]> # BSD PERMIT_PACKAGE_CDROM= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/net/icbirc/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 18 Jan 2015 03:14:40 -0000 1.10 +++ distinfo 22 Aug 2015 04:39:36 -0000 @@ -1,2 +1,2 @@ -SHA256 (icbirc-1.8.tar.gz) = 68TCSCrFMRSYdO53wYj2rc9QmGLKK2AOn+UFf1VezZI= -SIZE (icbirc-1.8.tar.gz) = 11061 +SHA256 (icbirc-2.0.tar.gz) = dgfH2A/Dk5zLkTyfzFemPTVSrzYVRU5Ab/Djc3wM5r0= +SIZE (icbirc-2.0.tar.gz) = 11174 Index: patches/patch-icb_c =================================================================== RCS file: patches/patch-icb_c diff -N patches/patch-icb_c --- patches/patch-icb_c 1 Jun 2009 07:06:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ -$OpenBSD: patch-icb_c,v 1.1 2009/06/01 07:06:12 ray Exp $ ---- icb.c.orig Thu Nov 18 13:14:06 2004 -+++ icb.c Sat May 30 20:29:23 2009 -@@ -60,6 +60,7 @@ static char icurgroup[256]; - static char igroup[256]; - static char inick[256]; - static char ihostmask[256]; -+static unsigned off; - - /* - * A single ICB packet consists of a length byte, a command byte and -@@ -124,10 +125,24 @@ scan(const char **s, char *d, size_t siz, const char * - } - - void -+icb_init(void) -+{ -+ memset(icb_protolevel, 0, sizeof(icb_protolevel)); -+ memset(icb_hostid, 0, sizeof(icb_hostid)); -+ memset(icb_serverid, 0, sizeof(icb_serverid)); -+ memset(icb_moderator, 0, sizeof(icb_moderator)); -+ imode = imode_none; -+ memset(icurgroup, 0, sizeof(icurgroup)); -+ memset(igroup, 0, sizeof(igroup)); -+ memset(inick, 0, sizeof(inick)); -+ memset(ihostmask, 0, sizeof(ihostmask)); -+ off = 0; -+} -+ -+void - icb_recv(const char *buf, unsigned len, int fd, int server_fd) - { - static unsigned char cmd[256]; -- static unsigned off = 0; - - while (len > 0) { - if (off == 0) { Index: patches/patch-icb_h =================================================================== RCS file: patches/patch-icb_h diff -N patches/patch-icb_h --- patches/patch-icb_h 1 Jun 2009 07:06:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-icb_h,v 1.1 2009/06/01 07:06:12 ray Exp $ ---- icb.h.orig Thu Nov 18 13:14:06 2004 -+++ icb.h Sat May 30 20:29:23 2009 -@@ -3,6 +3,7 @@ - #ifndef _ICB_H_ - #define _ICB_H_ - -+void icb_init(void); - void icb_recv(const char *, unsigned, int, int); - void icb_send_login(int, const char *, const char *, const char *); - void icb_send_openmsg(int, const char *); Index: patches/patch-icbirc_c =================================================================== RCS file: patches/patch-icbirc_c diff -N patches/patch-icbirc_c --- patches/patch-icbirc_c 1 Jun 2009 07:06:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-icbirc_c,v 1.1 2009/06/01 07:06:12 ray Exp $ ---- icbirc.c.orig Thu Nov 18 13:14:06 2004 -+++ icbirc.c Sat May 30 20:29:23 2009 -@@ -258,6 +258,7 @@ handle_client(int client_fd) - - irc_send_notice(client_fd, "Connected"); - terminate_client = 0; -+ icb_init(); - while (!terminate_client) { - fd_set readfds; - struct timeval tv;
