Attachment 163249 Details for Bug 204573 – patch file

[patch] patch file

patch-port-bitchx.txt (text/plain), 6.28 KB, created by Anonymous on 2015-11-17 14:30:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymous

Created: 2015-11-17 14:30:31 UTC

Size: 6.28 KB

patch

obsolete

>Index: freebsd-ports/irc/bitchx/Makefile
>===================================================================
>--- freebsd-ports/irc/bitchx/Makefile	(revision 401733)
>+++ freebsd-ports/irc/bitchx/Makefile	(working copy)
>@@ -3,11 +3,12 @@
> 
> PORTNAME=	bitchx
> PORTVERSION=	1.2.1
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES+=	irc
> MASTER_SITES=	SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION}
> 
>-MAINTAINER=	dan.mashal@gmail.com
>+MAINTAINER=	freebsd@bitchx.org
> COMMENT=	Feature-rich scriptable IRC client
> 
> LICENSE=	BSD3CLAUSE
>@@ -45,7 +46,7 @@
> 
> PLUGINS_CONFIGURE_WITH=		plugins="${PLUGIN_LIST:C/\$$/,/g}"
> 
>-PLUGIN_LIST=	abot acro aim arcfour autocycle blowfish cavlink cdrom encrypt \
>+PLUGIN_LIST=	abot acro arcfour autocycle blowfish cavlink cdrom encrypt \
> 		europa fserv hint nap nicklist pkga possum qbx qmail wavplay
> .include <bsd.port.options.mk>
> 
>Index: freebsd-ports/irc/bitchx/files/patch-include-dcc.h
>===================================================================
>--- freebsd-ports/irc/bitchx/files/patch-include-dcc.h	(nonexistent)
>+++ freebsd-ports/irc/bitchx/files/patch-include-dcc.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- include/dcc.h.old	2015-11-16 05:32:40.709191000 -0600
>++++ include/dcc.h	2015-11-16 05:33:08.161707000 -0600
>+@@ -97,6 +97,7 @@
>+ #define DCC_OFFER	0x00040000
>+ #define DCC_DELETE	0x00080000
>+ #define DCC_TWOCLIENTS	0x00100000
>++#define DCC_RESUME_REQ	0x00200000
>+ 
>+ #ifdef NON_BLOCKING_CONNECTS
>+ #define DCC_CNCT_PEND	0x00200000
>
>Property changes on: freebsd-ports/irc/bitchx/files/patch-include-dcc.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: freebsd-ports/irc/bitchx/files/patch-source-dcc.c
>===================================================================
>--- freebsd-ports/irc/bitchx/files/patch-source-dcc.c	(nonexistent)
>+++ freebsd-ports/irc/bitchx/files/patch-source-dcc.c	(working copy)
>@@ -0,0 +1,64 @@
>+diff source/dcc.c source/dcc.c
>+index d0706f8..b158189 100644
>+--- source/dcc.c
>++++ source/dcc.c
>+@@ -1415,6 +1415,7 @@ UserList *ul = NULL;
>+ 			if (autoresume && stat(fullname, &sb) != -1) {
>+ 				n->transfer_orders.byteoffset = sb.st_size;
>+ 				n->bytes_read = 0L;
>++				new_d->sock.flags |= DCC_RESUME_REQ;
>+ 				send_ctcp(CTCP_PRIVMSG, nick, CTCP_DCC, "RESUME %s %d %ld", n->filename, ntohs(n->remport), sb.st_size);
>+ 			} else {
>+ 				DCC_int *new = NULL;
>+@@ -3430,6 +3431,7 @@ void dcc_getfile_resume_start (char *nick, char *description, char *address, cha
>+ {
>+ SocketList *s;
>+ DCC_int *n;
>++const DCC_List *pending;
>+ char *tmp = NULL;
>+ char *fullname = NULL;
>+ struct stat sb;
>+@@ -3442,6 +3444,14 @@ struct stat sb;
>+ 		put_it("%s", convert_output_format("$G %RDCC%n warning in dcc_getfile_resume_start", NULL));
>+ 		return;
>+ 	}
>++	
>++	pending = find_dcc_pending(nick, description, NULL, DCC_FILEREAD, 0, -1);
>++	if (!pending || !(pending->sock.flags & DCC_RESUME_REQ))
>++	{
>++		put_it("%s", convert_output_format("$G %RDCC%n Ignoring unsolicited ACCEPT from $0", "%s", nick));
>++		return;
>++	}
>++
>+ 	if (!(n = dcc_create(nick, description, NULL, 0, port?atol(port):0, DCC_FILEREAD, DCC_TWOCLIENTS|DCC_OFFER, start_dcc_get)))
>+ 		return;
>+ 
>+@@ -3488,17 +3498,13 @@ int		blocksize = 0;
>+ 	user = get_dcc_args(&args, &passwd, &port, &blocksize);
>+ 	if (!user)
>+ 	{
>+-		put_it("%s", convert_output_format("$G %RDCC%n You must supply a nickname for DCC get", NULL, NULL));
>++		put_it("%s", convert_output_format("$G %RDCC%n You must supply a nickname for DCC RESUME", NULL));
>+ 		return;
>+ 	}
>++
>+ 	if (!blocksize || blocksize > MAX_DCC_BLOCK_SIZE)
>+ 		blocksize = get_int_var(DCC_BLOCK_SIZE_VAR);
>+ 
>+-	if (!user)
>+-	{
>+-		put_it("%s", convert_output_format("$G %RDCC%n You must supply a nickname for DCC RESUME", NULL));
>+-		return;
>+-	}
>+ 	if (args && *args)
>+ 		filename = args;
>+ 
>+@@ -3557,6 +3563,8 @@ int		blocksize = 0;
>+ 		n->blocksize = blocksize;
>+ 		n->transfer_orders.byteoffset = sb.st_size;
>+ 
>++		s->flags |= DCC_RESUME_REQ;
>++
>+ 		old_dp = doing_privmsg;	old_dn = doing_notice; old_dc = in_ctcp_flag;
>+ 		/* Just in case we have to fool the protocol enforcement. */
>+ 		doing_privmsg = doing_notice = in_ctcp_flag = 0;
>
>Property changes on: freebsd-ports/irc/bitchx/files/patch-source-dcc.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: freebsd-ports/irc/bitchx/pkg-descr
>===================================================================
>--- freebsd-ports/irc/bitchx/pkg-descr	(revision 401733)
>+++ freebsd-ports/irc/bitchx/pkg-descr	(working copy)
>@@ -1,14 +1,14 @@
> BitchX is an IRC (Internet Relay Chat) client by Colten Edwards aka
>-panasync@EFnet, it is based on its predecessors ircII and Epic.
>+panasync@EFnet, it's based on its predecessors ircII and Epic.
> 
> BitchX was originally started as a script by Trench and HappyCrappy for
>-the popular Unix IRC client ircII.  Around Christmas of 1994 the script
>+the popular Unix IRC client ircII. Around Christmas of 1994 the script
> was patched directly into the client by Colten Edwards.
> 
>-BitchX includes features which make it an eggdrop, a bouncer, and a
>-friendly IRC client at the same time.
>+BitchX includes features which make it a bot, bouncer, and a friendly 
>+IRC client at the same time.
> 
>-BitchX is one the most popular IRC clients among Unix systems.  It is
>+BitchX is one the most popular IRC clients among Unix systems. It's
> highly customizable and capable of running scripts, so it can be used
> as an IRC bot too.
> 
>Index: freebsd-ports/irc/bitchx/pkg-plist
>===================================================================
>--- freebsd-ports/irc/bitchx/pkg-plist	(revision 401733)
>+++ freebsd-ports/irc/bitchx/pkg-plist	(working copy)
>@@ -10,7 +10,6 @@
> @dir %%DATADIR%%/plugins
> %%PLUGINS%%%%DATADIR%%/plugins/BitchX.hints
> %%PLUGINS%%%%DATADIR%%/plugins/acro.so
>-%%PLUGINS%%%%DATADIR%%/plugins/aim.so
> %%PLUGINS%%%%DATADIR%%/plugins/autobot.so
> %%PLUGINS%%%%DATADIR%%/plugins/blowfish.so
> %%PLUGINS%%%%DATADIR%%/plugins/cavlink.so

Actions: View | Diff

Attachments on bug 204573: 163249 | 163250 | 163920