From c9d4adfcf47f34572f31fc534176da6522924051 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 19 Nov 2004 13:03:30 +0000 Subject: Update to 1.8. Only one change: incorporate pkgsrc changes into main source. Take over as MAINTAINER (requested by tron@). --- chat/icbirc/Makefile | 22 ++++++------- chat/icbirc/distinfo | 11 ++----- chat/icbirc/patches/patch-aa | 24 -------------- chat/icbirc/patches/patch-ab | 76 -------------------------------------------- chat/icbirc/patches/patch-ac | 13 -------- chat/icbirc/patches/patch-ad | 29 ----------------- chat/icbirc/patches/patch-ae | 11 ------- 7 files changed, 14 insertions(+), 172 deletions(-) delete mode 100644 chat/icbirc/patches/patch-aa delete mode 100644 chat/icbirc/patches/patch-ab delete mode 100644 chat/icbirc/patches/patch-ac delete mode 100644 chat/icbirc/patches/patch-ad delete mode 100644 chat/icbirc/patches/patch-ae (limited to 'chat/icbirc') diff --git a/chat/icbirc/Makefile b/chat/icbirc/Makefile index 1cc09cebcf1..c32f6f1b64d 100644 --- a/chat/icbirc/Makefile +++ b/chat/icbirc/Makefile @@ -1,28 +1,28 @@ -# $NetBSD: Makefile,v 1.5 2004/06/26 22:17:36 adrianp Exp $ +# $NetBSD: Makefile,v 1.6 2004/11/19 13:03:30 tv Exp $ -DISTNAME= icbirc-1.7 +DISTNAME= icbirc-1.8 CATEGORIES= chat MASTER_SITES= http://www.benzedrine.cx/ -MAINTAINER= tron@NetBSD.org +MAINTAINER= tv@duh.org HOMEPAGE= http://www.benzedrine.cx/icbirc.html COMMENT= Proxy IRC client and ICB server +WRKSRC= ${WRKDIR}/${PKGBASE} MAKE_ENV+= BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man" SRCS= icb.c irc.c icbirc.c -LIBS.SunOS+= -lsocket -lnsl +LDFLAGS.SunOS+= -lsocket -lnsl do-build: - cd ${WRKSRC}; \ - for SRC in ${SRCS}; do \ - ${CC} $$SRC ${CFLAGS} -c; \ - done; \ - ${CC} ${SRCS:S/.c/.o/} ${CFLAGS} ${LDFLAGS} -o icbirc ${LIBS} +.for f in ${SRCS} + cd ${WRKSRC} && ${COMPILE.c} $f +.endfor + cd ${WRKSRC} && ${LINK.c} -o icbirc ${SRCS:.c=.o} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/icbirc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/icbirc.8 ${PREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/icbirc ${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/icbirc.8 ${PREFIX}/man/man8/ .include "../../mk/bsd.pkg.mk" diff --git a/chat/icbirc/distinfo b/chat/icbirc/distinfo index 8132264252e..c5e113dbaba 100644 --- a/chat/icbirc/distinfo +++ b/chat/icbirc/distinfo @@ -1,9 +1,4 @@ -$NetBSD: distinfo,v 1.3 2004/06/26 22:17:36 adrianp Exp $ +$NetBSD: distinfo,v 1.4 2004/11/19 13:03:30 tv Exp $ -SHA1 (icbirc-1.7.tar.gz) = abeaf7c2143733b8e869fbae0838096d4f30e239 -Size (icbirc-1.7.tar.gz) = 10980 bytes -SHA1 (patch-aa) = a660db6b48e3af9ccf566128e7f31177dcda3e1b -SHA1 (patch-ab) = 067cca58c86971f1f0f2f426622be1e906a95508 -SHA1 (patch-ac) = 513482d11aeb0efa5dd6cee620deab7b6f756c96 -SHA1 (patch-ad) = a66bf9e00f964b904074a934d6fa6282913ff414 -SHA1 (patch-ae) = 74133ff7125740943cef136a59fbc7641261212b +SHA1 (icbirc-1.8.tar.gz) = 99ff8674b189fdf8a86b6acd2bc19418b888c38b +Size (icbirc-1.8.tar.gz) = 11061 bytes diff --git a/chat/icbirc/patches/patch-aa b/chat/icbirc/patches/patch-aa deleted file mode 100644 index 6396abeff6c..00000000000 --- a/chat/icbirc/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2004/04/01 16:00:42 tv Exp $ - ---- icbirc.c.orig Wed Aug 20 17:55:59 2003 -+++ icbirc.c -@@ -294,7 +294,7 @@ handle_client(int client_fd) - "Connection closed by server"); - break; - } -- icb_recv(buf, len, client_fd); -+ icb_recv(buf, len, client_fd, server_fd); - bytes_in += len; - } - if (FD_ISSET(client_fd, &readfds)) { -@@ -318,8 +318,8 @@ handle_client(int client_fd) - done: - if (server_fd >= 0) - close(server_fd); -- printf("(%u seconds, %lu:%lu bytes)\n", -- time(NULL) - t, bytes_out, bytes_in); -+ printf("(%lu seconds, %lu:%lu bytes)\n", -+ (unsigned long)(time(NULL) - t), bytes_out, bytes_in); - if (terminate_client) - irc_send_notice(client_fd, "Closing connection " - "(%u seconds, %lu:%lu bytes)", diff --git a/chat/icbirc/patches/patch-ab b/chat/icbirc/patches/patch-ab deleted file mode 100644 index 133fad297be..00000000000 --- a/chat/icbirc/patches/patch-ab +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/04/01 16:00:42 tv Exp $ - ---- icb.c.orig Sat Jan 3 19:08:07 2004 -+++ icb.c -@@ -41,7 +41,7 @@ static const char rcsid[] = "$Id: icb.c, - extern int sync_write(int, const char *, int); - - static unsigned char icb_args(const char *, unsigned char, char [255][255]); --static void icb_cmd(const char *, unsigned char, int); -+static void icb_cmd(const char *, unsigned char, int, int); - static void icb_ico(int, const char *); - static void icb_iwl(int, const char *, const char *, long, - long, const char *, const char *); -@@ -124,7 +124,7 @@ scan(const char **s, char *d, size_t siz - } - - void --icb_recv(const char *buf, unsigned len, int fd) -+icb_recv(const char *buf, unsigned len, int fd, int server_fd) - { - static unsigned char cmd[256]; - static unsigned off = 0; -@@ -142,7 +142,7 @@ icb_recv(const char *buf, unsigned len, - } - /* len == 0 || (off - 1) == cmd[0] */ - if ((off - 1) == cmd[0]) { -- icb_cmd(cmd + 1, off - 1 /* <= 255 */, fd); -+ icb_cmd(cmd + 1, off - 1 /* <= 255 */, fd, server_fd); - off = 0; - } - } -@@ -175,7 +175,7 @@ icb_args(const char *data, unsigned char - } - - static void --icb_cmd(const char *cmd, unsigned char len, int fd) -+icb_cmd(const char *cmd, unsigned char len, int fd, int server_fd) - { - char args[255][255]; - const char *a = args[1]; -@@ -195,9 +195,18 @@ icb_cmd(const char *cmd, unsigned char l - irc_send_code(fd, icb_hostid, irc_nick, "002", - "Your host is %s running %s protocol %s", - icb_hostid, icb_serverid, icb_protolevel); -+ /* some clients really want to see a MOTD */ -+ irc_send_code(fd, icb_hostid, irc_nick, "375", -+ "ICB server: %s", icb_serverid); -+ irc_send_code(fd, icb_hostid, irc_nick, "376", -+ "End of MOTD"); - icb_logged_in = 1; - break; - case 'b': /* Open Message */ -+ if (!in_irc_channel) { -+ irc_send_join(fd, irc_nick, irc_channel); -+ icb_send_names(server_fd, irc_channel); -+ } - irc_send_msg(fd, args[0], irc_channel, args[1]); - break; - case 'c': /* Personal Message */ -@@ -213,6 +222,7 @@ icb_cmd(const char *cmd, unsigned char l - scan(&a, irc_channel + 1, sizeof(irc_channel) - 1, - " ", " "); - irc_send_join(fd, irc_nick, irc_channel); -+ icb_send_names(server_fd, irc_channel); - } else if (!strcmp(args[0], "Arrive") || - !strcmp(args[0], "Sign-on")) { - char nick[256], host[256]; -@@ -372,7 +382,7 @@ icb_iwl(int fd, const char *flags, const - icb_hostid, irc_nick, nick); - sync_write(fd, s, strlen(s)); - } else if (imode == imode_names && !strcmp(icurgroup, igroup)) { -- snprintf(s, sizeof(s), ":%s 353 %s @ %s :%s%s\r\n", -+ snprintf(s, sizeof(s), ":%s 353 %s @ %s :%s%s \r\n", - icb_hostid, irc_nick, icurgroup, chanop ? "@" : "", nick); - sync_write(fd, s, strlen(s)); - snprintf(s, sizeof(s), ":%s 352 %s %s %s %s %s %s H :5 %s\r\n", diff --git a/chat/icbirc/patches/patch-ac b/chat/icbirc/patches/patch-ac deleted file mode 100644 index 2a897e68aa9..00000000000 --- a/chat/icbirc/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/04/01 16:00:42 tv Exp $ - ---- icb.h.orig Thu Apr 1 10:31:31 2004 -+++ icb.h -@@ -3,7 +3,7 @@ - #ifndef _ICB_H_ - #define _ICB_H_ - --void icb_recv(const char *, unsigned, int); -+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 *); - void icb_send_privmsg(int, const char *, const char *); diff --git a/chat/icbirc/patches/patch-ad b/chat/icbirc/patches/patch-ad deleted file mode 100644 index 42ccd3d961f..00000000000 --- a/chat/icbirc/patches/patch-ad +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2004/06/26 22:17:36 adrianp Exp $ - ---- irc.c.orig Sat May 29 14:41:29 2004 -+++ irc.c Sat May 29 14:54:37 2004 -@@ -52,6 +52,7 @@ - char irc_ident[256]; - char irc_nick[256]; - char irc_channel[256]; -+int in_irc_channel; - - /* - * irc_recv() receives read(2) chunks and assembles complete lines, which are -@@ -119,6 +120,8 @@ - cmd++; - scan(&cmd, group, sizeof(group), " ", " "); - icb_send_group(server_fd, group); -+ } else if (!strncasecmp(cmd, "PART ", 5)) { -+ in_irc_channel = 0; - } else if (!strncasecmp(cmd, "PRIVMSG ", 8) || - !strncasecmp(cmd, "NOTICE ", 7)) { - char dst[128]; -@@ -249,6 +252,7 @@ - - snprintf(cmd, sizeof(cmd), ":%s JOIN :%s\r\n", src, dst); - sync_write(fd, cmd, strlen(cmd)); -+ in_irc_channel = 1; - } - - void diff --git a/chat/icbirc/patches/patch-ae b/chat/icbirc/patches/patch-ae deleted file mode 100644 index 7ddb0de8f88..00000000000 --- a/chat/icbirc/patches/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/04/01 16:00:42 tv Exp $ - ---- irc.h.orig Thu Apr 1 10:52:37 2004 -+++ irc.h -@@ -15,5 +15,6 @@ extern char irc_pass[256]; - extern char irc_ident[256]; - extern char irc_nick[256]; - extern char irc_channel[256]; -+extern int in_irc_channel; - - #endif -- cgit v1.2.3