Attachment #176679 for bug #214262

View | Details | Raw Unified | Return to bug 214262
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-3 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= icbirc	4	PORTNAME= icbirc
5	PORTVERSION= 1.8	5	PORTVERSION= 2.1
6	PORTREVISION= 1
7	CATEGORIES= irc	6	CATEGORIES= irc
8	MASTER_SITES= http://www.benzedrine.cx/	7	MASTER_SITES= http://www.benzedrine.cx/
9		8
Lines 15-23 Link Here
15		14
16	USES= uidfix	15	USES= uidfix
17	MAKE_ENV= BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man"	16	MAKE_ENV= BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man"
18	WRKSRC= ${WRKDIR}/${PORTNAME}
19		17
20	PLIST_FILES= bin/icbirc \	18	PLIST_FILES= bin/icbirc \
21	man/man8/icbirc.8.gz	19	man/man8/icbirc.8.gz
22		20
		21	post-patch:
		22	@${REINPLACE_CMD} -e '/^static const char rcsid/d' ${WRKSRC}/*.c
		23
23	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (icbirc-1.8.tar.gz) = ebc4c2482ac531149874ee77c188f6adcf509862ca2b600e9fe5057f555ecd92	1	TIMESTAMP = 1478423682
2	SIZE (icbirc-1.8.tar.gz) = 11061	2	SHA256 (icbirc-2.1.tar.gz) = 6839344d93c004da97ec6bb5d805a1db7e0a79efc3870445788043627162bbb1
		3	SIZE (icbirc-2.1.tar.gz) = 11257




--- icb.c.orig	2015-08-21 19:01:12 UTC
+++ icb.c
@@ -30,7 +30,6 @@
  *
  */
 
-static const char rcsid[] = "$Id: icb.c,v 1.3 2015/08/21 19:01:12 dhartmei Exp $";
 static const char rcsid[] = "$Id: icb.c,v 1.15 2004/11/18 21:14:28 dhartmei Exp $";
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,8 +39,8 @@ static const char rcsid[] = "$Id: icb.c,
 
 extern int	 sync_write(int, const char *, int);
 

 static void		 icb_ico(int, const char *);
 static void		 icb_iwl(int, const char *, const char *, long,
 			    long, const char *, const char *);
@@ -109,7 +108,7 @@ static unsigned off;
  */
 
 void

 {
 	while (**s && strchr(skip, **s) != NULL)
 		(*s)++;
@@ -164,7 +163,7 @@ icb_recv(const char *buf, unsigned len, 
 }
 
 static unsigned char

 {
 	unsigned char i = 0, j = 0, k = 0;
 
@@ -190,10 +189,10 @@ icb_args(const char *data, unsigned char
 }
 
 static void

 	unsigned char i, j;
 	char s[8192];
 
@@ -269,7 +268,7 @@ icb_cmd(const char *cmd, unsigned char l
 			char old_nick[256], new_nick[256];
 
 			scan(&a, old_nick, sizeof(old_nick), " ", " ");

 				return;
 			a += 21;
 			scan(&a, new_nick, sizeof(new_nick), " ", " ");
@@ -283,7 +282,7 @@ icb_cmd(const char *cmd, unsigned char l
 			char nick[256], topic[256];
 
 			scan(&a, nick, sizeof(nick), " ", " ");

 				return;
 			a += 23;
 			scan(&a, topic, sizeof(topic), "", "\"");
@@ -294,13 +293,13 @@ icb_cmd(const char *cmd, unsigned char l
 			char old_mod[256], new_mod[256];
 
 			scan(&a, old_mod, sizeof(old_mod), " ", " ");

 				snprintf(s, sizeof(s),
 				    ":%s MODE %s +o %s\r\n",
 				    icb_hostid, irc_channel, old_mod);
@@ -312,7 +311,7 @@ icb_cmd(const char *cmd, unsigned char l
 			char nick[256];
 
 			scan(&a, nick, sizeof(nick), " ", " ");

 				return;
 			snprintf(s, sizeof(s), ":%s KICK %s %s :booted\r\n",
 			    icb_moderator, irc_channel, nick);
@@ -523,7 +522,7 @@ icb_send_openmsg(int fd, const char *msg
 		cmd[off++] = 0;
 		cmd[0] = off - 1;
 		/* cmd[0] <= MAX_MSG_SIZE */

 	}
 }
 
@@ -548,7 +547,7 @@ icb_send_privmsg(int fd, const char *nic
 		cmd[off++] = 0;
 		cmd[0] = off - 1;
 		/* cmd[0] <= MAX_MSG_SIZE */




--- icbirc.c.orig	2004-11-19 06:14:28.000000000 +0900
+++ icbirc.c	2014-05-17 02:17:15.000000000 +0900
@@ -30,7 +30,9 @@
  *
  */
 
+#if 0
 static const char rcsid[] = "$Id: icbirc.c,v 1.13 2004/11/18 21:14:28 dhartmei Exp $";
+#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -322,8 +324,8 @@
 	    (unsigned long)(time(NULL) - t), bytes_out, bytes_in);
 	if (terminate_client)
 		irc_send_notice(client_fd, "Closing connection "
-		    "(%u seconds, %lu:%lu bytes)",
-		    time(NULL) - t, bytes_out, bytes_in);
+		    "(%lu seconds, %lu:%lu bytes)",
+		     (unsigned long)(time(NULL) - t), bytes_out, bytes_in);
 }
 
 int

Lines 1-12 Link Here

(-)files/patch-irc.c (-12 lines)
1	--- irc.c.orig 2014-05-17 02:34:33.000000000 +0900
2	+++ irc.c 2014-05-17 02:34:43.000000000 +0900
3	@@ -30,7 +30,9 @@
4	*
5	*/
6
7	+#if 0
8	static const char rcsid[] = "$Id: irc.c,v 1.13 2004/11/18 21:14:28 dhartmei Exp $";
9	+#endif
10
11	#include <stdarg.h>
12	#include <stdio.h>

Return to bug 214262

Lines 1-16 Link Here

(-)files/patch-icb.c (-16 / +14 lines)
1	--- icb.c.orig 2004-11-19 06:14:28.000000000 +0900	1	--- icb.c.orig 2015-08-21 19:01:12 UTC
2	+++ icb.c 2014-05-17 02:34:25.000000000 +0900	2	+++ icb.c
3	@@ -30,7 +30,9 @@	3	@@ -30,7 +30,6 @@
4	*	4	*
5	*/	5	*/
6		6
7	+#if 0	7	-static const char rcsid[] = "$Id: icb.c,v 1.3 2015/08/21 19:01:12 dhartmei Exp $";
8	static const char rcsid[] = "$Id: icb.c,v 1.15 2004/11/18 21:14:28 dhartmei Exp $";
9	+#endif
10		8
11	#include <stdio.h>	9	#include <stdio.h>
12	#include <stdlib.h>	10	#include <stdlib.h>
13	@@ -40,8 +42,8 @@	11	@@ -40,8 +39,8 @@ static const char rcsid[] = "$Id: icb.c,
14		12
15	extern int sync_write(int, const char *, int);	13	extern int sync_write(int, const char *, int);
16		14
Lines 21-27 Link Here
21	static void icb_ico(int, const char *);	19	static void icb_ico(int, const char *);
22	static void icb_iwl(int, const char , const char , long,	20	static void icb_iwl(int, const char , const char , long,
23	long, const char , const char );	21	long, const char , const char );
24	@@ -108,7 +110,7 @@	22	@@ -109,7 +108,7 @@ static unsigned off;
25	*/	23	*/
26		24
27	void	25	void
Lines 30-36 Link Here
30	{	28	{
31	while (s && strchr(skip, s) != NULL)	29	while (s && strchr(skip, s) != NULL)
32	(*s)++;	30	(*s)++;
33	@@ -149,7 +151,7 @@	31	@@ -164,7 +163,7 @@ icb_recv(const char *buf, unsigned len,
34	}	32	}
35		33
36	static unsigned char	34	static unsigned char
Lines 39-45 Link Here
39	{	37	{
40	unsigned char i = 0, j = 0, k = 0;	38	unsigned char i = 0, j = 0, k = 0;
41		39
42	@@ -175,10 +177,10 @@	40	@@ -190,10 +189,10 @@ icb_args(const char *data, unsigned char
43	}	41	}
44		42
45	static void	43	static void
Lines 52-58 Link Here
52	unsigned char i, j;	50	unsigned char i, j;
53	char s[8192];	51	char s[8192];
54		52
55	@@ -254,7 +256,7 @@	53	@@ -269,7 +268,7 @@ icb_cmd(const char *cmd, unsigned char l
56	char old_nick[256], new_nick[256];	54	char old_nick[256], new_nick[256];
57		55
58	scan(&a, old_nick, sizeof(old_nick), " ", " ");	56	scan(&a, old_nick, sizeof(old_nick), " ", " ");
Lines 61-67 Link Here
61	return;	59	return;
62	a += 21;	60	a += 21;
63	scan(&a, new_nick, sizeof(new_nick), " ", " ");	61	scan(&a, new_nick, sizeof(new_nick), " ", " ");
64	@@ -268,7 +270,7 @@	62	@@ -283,7 +282,7 @@ icb_cmd(const char *cmd, unsigned char l
65	char nick[256], topic[256];	63	char nick[256], topic[256];
66		64
67	scan(&a, nick, sizeof(nick), " ", " ");	65	scan(&a, nick, sizeof(nick), " ", " ");
Lines 70-76 Link Here
70	return;	68	return;
71	a += 23;	69	a += 23;
72	scan(&a, topic, sizeof(topic), "", "\"");	70	scan(&a, topic, sizeof(topic), "", "\"");
73	@@ -279,13 +281,13 @@	71	@@ -294,13 +293,13 @@ icb_cmd(const char *cmd, unsigned char l
74	char old_mod[256], new_mod[256];	72	char old_mod[256], new_mod[256];
75		73
76	scan(&a, old_mod, sizeof(old_mod), " ", " ");	74	scan(&a, old_mod, sizeof(old_mod), " ", " ");
Lines 86-92 Link Here
86	snprintf(s, sizeof(s),	84	snprintf(s, sizeof(s),
87	":%s MODE %s +o %s\r\n",	85	":%s MODE %s +o %s\r\n",
88	icb_hostid, irc_channel, old_mod);	86	icb_hostid, irc_channel, old_mod);
89	@@ -297,7 +299,7 @@	87	@@ -312,7 +311,7 @@ icb_cmd(const char *cmd, unsigned char l
90	char nick[256];	88	char nick[256];
91		89
92	scan(&a, nick, sizeof(nick), " ", " ");	90	scan(&a, nick, sizeof(nick), " ", " ");
Lines 95-101 Link Here
95	return;	93	return;
96	snprintf(s, sizeof(s), ":%s KICK %s %s :booted\r\n",	94	snprintf(s, sizeof(s), ":%s KICK %s %s :booted\r\n",
97	icb_moderator, irc_channel, nick);	95	icb_moderator, irc_channel, nick);
98	@@ -508,7 +510,7 @@	96	@@ -523,7 +522,7 @@ icb_send_openmsg(int fd, const char *msg
99	cmd[off++] = 0;	97	cmd[off++] = 0;
100	cmd[0] = off - 1;	98	cmd[0] = off - 1;
101	/* cmd[0] <= MAX_MSG_SIZE */	99	/* cmd[0] <= MAX_MSG_SIZE */
Lines 104-110 Link Here
104	}	102	}
105	}	103	}
106		104
107	@@ -533,7 +535,7 @@	105	@@ -548,7 +547,7 @@ icb_send_privmsg(int fd, const char *nic
108	cmd[off++] = 0;	106	cmd[off++] = 0;
109	cmd[0] = off - 1;	107	cmd[0] = off - 1;
110	/* cmd[0] <= MAX_MSG_SIZE */	108	/* cmd[0] <= MAX_MSG_SIZE */

Lines 1-23 Link Here

(-)files/patch-icbirc.c (-23 lines)
1	--- icbirc.c.orig 2004-11-19 06:14:28.000000000 +0900
2	+++ icbirc.c 2014-05-17 02:17:15.000000000 +0900
3	@@ -30,7 +30,9 @@
4	*
5	*/
6
7	+#if 0
8	static const char rcsid[] = "$Id: icbirc.c,v 1.13 2004/11/18 21:14:28 dhartmei Exp $";
9	+#endif
10
11	#include <sys/types.h>
12	#include <sys/socket.h>
13	@@ -322,8 +324,8 @@
14	(unsigned long)(time(NULL) - t), bytes_out, bytes_in);
15	if (terminate_client)
16	irc_send_notice(client_fd, "Closing connection "
17	- "(%u seconds, %lu:%lu bytes)",
18	- time(NULL) - t, bytes_out, bytes_in);
19	+ "(%lu seconds, %lu:%lu bytes)",
20	+ (unsigned long)(time(NULL) - t), bytes_out, bytes_in);
21	}
22
23	int