From: Paweł Sikora <pluto@pld-linux.org>
Date: Sat, 8 May 2004 21:33:27 +0000 (+0000)
Subject: - skipping the IPV6 socket, ./configure needs fixes.
X-Git-Tag: deadbranch-1.7.2~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frsync.git;a=commitdiff_plain;h=300a26d9d28486ee53029b43754b5d0824443d4c

- skipping the IPV6 socket, ./configure needs fixes.

Changed files:
    rsync-ipv6_socket.patch -> 1.1
    rsync.spec -> 1.81
---

diff --git a/rsync-ipv6_socket.patch b/rsync-ipv6_socket.patch
new file mode 100644
index 0000000..87c24d4
--- /dev/null
+++ b/rsync-ipv6_socket.patch
@@ -0,0 +1,13 @@
+--- rsync-2.6.2/socket.c.orig	2004-05-08 23:25:11.979473336 +0200
++++ rsync-2.6.2/socket.c	2004-05-08 23:27:13.255036648 +0200
+@@ -379,8 +379,8 @@
+ 
+ #ifdef IPV6_V6ONLY
+ 		if (resp->ai_family == AF_INET6) {
+-			setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
+-				   (char *)&one, sizeof one);
++		    if(setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&one, sizeof one) < 0)
++			continue;
+ 		}
+ #endif
+ 
diff --git a/rsync.spec b/rsync.spec
index 9b9e818..a86b338 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -13,7 +13,7 @@ Summary(zh_CN):	[ͨѶ]
 Summary(zh_TW):	[³ñ°Ô]$(B6G?i¤õ(c(B
 Name:		rsync
 Version:	2.6.2
-Release:	3
+Release:	3.1
 License:	GPL
 Group:		Daemons
 Source0:	http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
@@ -25,6 +25,7 @@ Source4:	%{name}d.logrotate
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-man.patch
 Patch2:		%{name}-segv.patch
+Patch3:		%{name}-ipv6_socket.patch
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	popt-devel
 URL:		http://samba.anu.edu.au/rsync/
@@ -149,6 +150,7 @@ techniczna nowego algorytmu zosta
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .