Attachment 72793 Details for Bug 105731 – rsync-2.6.9.diff

[patch] rsync-2.6.9.diff

rsync-2.6.9.diff (text/plain), 4.13 KB, created by Antony Mawer on 2006-11-22 05:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antony Mawer

Created: 2006-11-22 05:10:14 UTC

Size: 4.13 KB

patch

obsolete

>diff -Nru rsync.old/Makefile rsync/Makefile
>--- rsync.old/Makefile	Wed Nov 22 10:25:14 2006
>+++ rsync/Makefile	Wed Nov 22 10:26:06 2006
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	rsync
>-PORTVERSION=	2.6.8
>-PORTREVISION=	2
>+PORTVERSION=	2.6.9
> CATEGORIES=	net ipv6
> MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
> 		ftp://ftp.samba.org/pub/%SUBDIR%/ \
>diff -Nru rsync.old/distinfo rsync/distinfo
>--- rsync.old/distinfo	Wed Nov 22 10:25:14 2006
>+++ rsync/distinfo	Wed Nov 22 12:26:07 2006
>@@ -1,3 +1,3 @@
>-MD5 (rsync-2.6.8.tar.gz) = 082a9dba1f741e6591e5cd748a1233de
>-SHA256 (rsync-2.6.8.tar.gz) = 784782de0efee0b4624bdd1d75d524ef95d16354cb13cbb5449d990b61e607a6
>-SIZE (rsync-2.6.8.tar.gz) = 772314
>+MD5 (rsync-2.6.9.tar.gz) = 996d8d8831dbca17910094e56dcb5942
>+SHA256 (rsync-2.6.9.tar.gz) = ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
>+SIZE (rsync-2.6.9.tar.gz) = 811841
>diff -Nru rsync.old/files/patch-2.6.8-unexpected_tag_3 rsync/files/patch-2.6.8-unexpected_tag_3
>--- rsync.old/files/patch-2.6.8-unexpected_tag_3	Wed Nov 22 10:25:14 2006
>+++ rsync/files/patch-2.6.8-unexpected_tag_3	Thu Jan  1 10:00:00 1970
>@@ -1,98 +0,0 @@
>-===================================================================
>-RCS file: /cvsroot/rsync/io.c,v
>-retrieving revision 1.195
>-retrieving revision 1.196
>-diff -u -r1.195 -r1.196
>---- io.c	2006/05/03 06:32:59	1.195
>-+++ io.c	2006/05/03 16:17:46	1.196
>-@@ -282,10 +282,7 @@
>- 			exit_cleanup(RERR_STREAMIO);
>- 		}
>- 		read_loop(fd, buf, len);
>--		if (defer_forwarding_messages)
>--			msg_list_add(&msg2sndr, MSG_DELETED, buf, len);
>--		else
>--			io_multiplex_write(MSG_DELETED, buf, len);
>-+		send_msg(MSG_DELETED, buf, len);
>- 		break;
>- 	case MSG_SUCCESS:
>- 		if (len != 4 || !am_generator) {
>-@@ -295,10 +292,7 @@
>- 		read_loop(fd, buf, len);
>- 		if (remove_sent_files) {
>- 			decrement_active_files(IVAL(buf,0));
>--			if (defer_forwarding_messages)
>--				msg_list_add(&msg2sndr, MSG_SUCCESS, buf, len);
>--			else
>--				io_multiplex_write(MSG_SUCCESS, buf, len);
>-+			send_msg(MSG_SUCCESS, buf, len);
>- 		}
>- 		if (preserve_hard_links)
>- 			flist_ndx_push(&hlink_list, IVAL(buf,0));
>-@@ -318,10 +312,7 @@
>- 			if (n >= sizeof buf)
>- 				n = sizeof buf - 1;
>- 			read_loop(fd, buf, n);
>--			if (am_generator && am_server && defer_forwarding_messages)
>--				msg_list_add(&msg2sndr, tag, buf, n);
>--			else
>--				rwrite((enum logcode)tag, buf, n);
>-+			rwrite(tag, buf, n);
>- 			len -= n;
>- 		}
>- 		break;
>-@@ -395,14 +386,19 @@
>- 	return 1;
>- }
>- 
>--void send_msg(enum msgcode code, char *buf, int len)
>-+int send_msg(enum msgcode code, char *buf, int len)
>- {
>- 	if (msg_fd_out < 0) {
>--		io_multiplex_write(code, buf, len);
>--		return;
>-+		if (!defer_forwarding_messages)
>-+			return io_multiplex_write(code, buf, len);
>-+		if (!io_multiplexing_out)
>-+			return 0;
>-+		msg_list_add(&msg2sndr, code, buf, len);
>-+		return 1;
>- 	}
>- 	msg_list_add(&msg2genr, code, buf, len);
>- 	msg2genr_flush(NORMAL_FLUSH);
>-+	return 1;
>- }
>- 
>- int get_redo_num(int itemizing, enum logcode code)
>-===================================================================
>-RCS file: /cvsroot/rsync/log.c,v
>-retrieving revision 1.147
>-retrieving revision 1.148
>-diff -u -r1.147 -r1.148
>---- log.c	2006/05/03 06:11:11	1.147
>-+++ log.c	2006/05/03 16:17:49	1.148
>-@@ -256,7 +256,7 @@
>- 
>- 	if (am_server) {
>- 		/* Pass the message to the non-server side. */
>--		if (io_multiplex_write((enum msgcode)code, buf, len))
>-+		if (send_msg(code, buf, len))
>- 			return;
>- 		if (am_daemon) {
>- 			/* TODO: can we send the error to the user somehow? */
>-===================================================================
>-RCS file: /cvsroot/rsync/proto.h,v
>-retrieving revision 1.303
>-retrieving revision 1.304
>-diff -u -r1.303 -r1.304
>---- proto.h	2006/05/03 00:48:17	1.303
>-+++ proto.h	2006/05/03 16:17:42	1.304
>-@@ -104,7 +104,7 @@
>- void set_msg_fd_out(int fd);
>- void increment_active_files(int ndx, int itemizing, enum logcode code);
>- void decrement_active_files(int ndx);
>--void send_msg(enum msgcode code, char *buf, int len);
>-+int send_msg(enum msgcode code, char *buf, int len);
>- int get_redo_num(int itemizing, enum logcode code);
>- int get_hlink_num(void);
>- void io_set_filesfrom_fds(int f_in, int f_out);

Actions: View | Diff

Attachments on bug 105731: 72793