Attachment 176679 Details for Bug 214262 – svn diff

[patch] svn diff

icbirc.diff (text/plain), 5.81 KB, created by Dmitrij D. Czarkoff on 2016-11-06 10:05:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitrij D. Czarkoff

Created: 2016-11-06 10:05:31 UTC

Size: 5.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 425473)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	icbirc
>-PORTVERSION=	1.8
>-PORTREVISION=	1
>+PORTVERSION=	2.1
> CATEGORIES=	irc
> MASTER_SITES=	http://www.benzedrine.cx/
> 
>@@ -15,9 +14,11 @@
> 
> USES=		uidfix
> MAKE_ENV=	BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man"
>-WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> PLIST_FILES=	bin/icbirc \
> 		man/man8/icbirc.8.gz
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e '/^static const char rcsid/d' ${WRKSRC}/*.c
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 425473)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (icbirc-1.8.tar.gz) = ebc4c2482ac531149874ee77c188f6adcf509862ca2b600e9fe5057f555ecd92
>-SIZE (icbirc-1.8.tar.gz) = 11061
>+TIMESTAMP = 1478423682
>+SHA256 (icbirc-2.1.tar.gz) = 6839344d93c004da97ec6bb5d805a1db7e0a79efc3870445788043627162bbb1
>+SIZE (icbirc-2.1.tar.gz) = 11257
>Index: files/patch-icb.c
>===================================================================
>--- files/patch-icb.c	(revision 425473)
>+++ files/patch-icb.c	(working copy)
>@@ -1,16 +1,14 @@
>---- icb.c.orig	2004-11-19 06:14:28.000000000 +0900
>-+++ icb.c	2014-05-17 02:34:25.000000000 +0900
>-@@ -30,7 +30,9 @@
>+--- icb.c.orig	2015-08-21 19:01:12 UTC
>++++ icb.c
>+@@ -30,7 +30,6 @@
>   *
>   */
>  
>-+#if 0
>- static const char rcsid[] = "$Id: icb.c,v 1.15 2004/11/18 21:14:28 dhartmei Exp $";
>-+#endif
>+-static const char rcsid[] = "$Id: icb.c,v 1.3 2015/08/21 19:01:12 dhartmei Exp $";
>  
>  #include <stdio.h>
>  #include <stdlib.h>
>-@@ -40,8 +42,8 @@
>+@@ -40,8 +39,8 @@ static const char rcsid[] = "$Id: icb.c,
>  
>  extern int	 sync_write(int, const char *, int);
>  
>@@ -21,7 +19,7 @@
>  static void		 icb_ico(int, const char *);
>  static void		 icb_iwl(int, const char *, const char *, long,
>  			    long, const char *, const char *);
>-@@ -108,7 +110,7 @@
>+@@ -109,7 +108,7 @@ static unsigned off;
>   */
>  
>  void
>@@ -30,7 +28,7 @@
>  {
>  	while (**s && strchr(skip, **s) != NULL)
>  		(*s)++;
>-@@ -149,7 +151,7 @@
>+@@ -164,7 +163,7 @@ icb_recv(const char *buf, unsigned len, 
>  }
>  
>  static unsigned char
>@@ -39,7 +37,7 @@
>  {
>  	unsigned char i = 0, j = 0, k = 0;
>  
>-@@ -175,10 +177,10 @@
>+@@ -190,10 +189,10 @@ icb_args(const char *data, unsigned char
>  }
>  
>  static void
>@@ -52,7 +50,7 @@
>  	unsigned char i, j;
>  	char s[8192];
>  
>-@@ -254,7 +256,7 @@
>+@@ -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), " ", " ");
>@@ -61,7 +59,7 @@
>  				return;
>  			a += 21;
>  			scan(&a, new_nick, sizeof(new_nick), " ", " ");
>-@@ -268,7 +270,7 @@
>+@@ -283,7 +282,7 @@ icb_cmd(const char *cmd, unsigned char l
>  			char nick[256], topic[256];
>  
>  			scan(&a, nick, sizeof(nick), " ", " ");
>@@ -70,7 +68,7 @@
>  				return;
>  			a += 23;
>  			scan(&a, topic, sizeof(topic), "", "\"");
>-@@ -279,13 +281,13 @@
>+@@ -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), " ", " ");
>@@ -86,7 +84,7 @@
>  				snprintf(s, sizeof(s),
>  				    ":%s MODE %s +o %s\r\n",
>  				    icb_hostid, irc_channel, old_mod);
>-@@ -297,7 +299,7 @@
>+@@ -312,7 +311,7 @@ icb_cmd(const char *cmd, unsigned char l
>  			char nick[256];
>  
>  			scan(&a, nick, sizeof(nick), " ", " ");
>@@ -95,7 +93,7 @@
>  				return;
>  			snprintf(s, sizeof(s), ":%s KICK %s %s :booted\r\n",
>  			    icb_moderator, irc_channel, nick);
>-@@ -508,7 +510,7 @@
>+@@ -523,7 +522,7 @@ icb_send_openmsg(int fd, const char *msg
>  		cmd[off++] = 0;
>  		cmd[0] = off - 1;
>  		/* cmd[0] <= MAX_MSG_SIZE */
>@@ -104,7 +102,7 @@
>  	}
>  }
>  
>-@@ -533,7 +535,7 @@
>+@@ -548,7 +547,7 @@ icb_send_privmsg(int fd, const char *nic
>  		cmd[off++] = 0;
>  		cmd[0] = off - 1;
>  		/* cmd[0] <= MAX_MSG_SIZE */
>Index: files/patch-icbirc.c
>===================================================================
>--- files/patch-icbirc.c	(revision 425473)
>+++ files/patch-icbirc.c	(nonexistent)
>@@ -1,23 +0,0 @@
>---- 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
>
>Property changes on: files/patch-icbirc.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-irc.c
>===================================================================
>--- files/patch-irc.c	(revision 425473)
>+++ files/patch-irc.c	(nonexistent)
>@@ -1,12 +0,0 @@
>---- irc.c.orig	2014-05-17 02:34:33.000000000 +0900
>-+++ irc.c	2014-05-17 02:34:43.000000000 +0900
>-@@ -30,7 +30,9 @@
>-  *
>-  */
>- 
>-+#if 0
>- static const char rcsid[] = "$Id: irc.c,v 1.13 2004/11/18 21:14:28 dhartmei Exp $";
>-+#endif
>- 
>- #include <stdarg.h>
>- #include <stdio.h>
>
>Property changes on: files/patch-irc.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 214262: 176679