From 5d9f56f1bcd9ec165e00d60ba4870e5c255516e5 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft>
Date: Sat, 4 Jul 1998 09:56:26 +0000
Subject: Update to 2.0.18.

---
 net/rsync/Makefile         |  8 +++++---
 net/rsync/files/md5        |  2 +-
 net/rsync/patches/patch-aa | 45 ++++++++++++++++++++-------------------------
 net/rsync/pkg/PLIST        |  3 ++-
 4 files changed, 28 insertions(+), 30 deletions(-)

(limited to 'net/rsync')

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 72168207348..f137f94c86c 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.7 1998/06/22 12:58:34 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/07/04 09:56:26 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/01/03 10:14:21 obrien Exp
 #
 
-DISTNAME=	rsync-1.6.9
+DISTNAME=	rsync-2.0.18
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/rsync/  \
 		ftp://sunsite.auc.dk/pub/unix/rsync/  \
 		ftp://ftp.sunet.se/pub/unix/admin/rsync/  \
 		ftp://ftp.fu-berlin.de/pub/unix/network/rsync/
 
-MAINTAINER=     packages@netbsd.org
+MAINTAINER=     mycroft@netbsd.org
+
+CONFLICTS=	rsync-1.6.9
 
 GNU_CONFIGURE=	yes
 
diff --git a/net/rsync/files/md5 b/net/rsync/files/md5
index 0e63f6c0f51..3dd657c5b4b 100644
--- a/net/rsync/files/md5
+++ b/net/rsync/files/md5
@@ -1 +1 @@
-MD5 (rsync-1.6.9.tar.gz) = 86b4ce12ef9a0fd9b8e1c76fe489be2c
+MD5 (rsync-2.0.18.tar.gz) = ffdbb121d522521d12e770e9b02bc728
diff --git a/net/rsync/patches/patch-aa b/net/rsync/patches/patch-aa
index adea6c5987b..bf51b25447e 100644
--- a/net/rsync/patches/patch-aa
+++ b/net/rsync/patches/patch-aa
@@ -1,25 +1,20 @@
---- rsync.c	1998/01/22 13:23:54	1.1
-+++ rsync.c	1998/01/22 13:28:29
-@@ -756,17 +756,11 @@
-       } else {
- 	      sprintf(fnametmp,"%s.XXXXXX",fname);
-       }
--      if (NULL == mktemp(fnametmp)) {
--	fprintf(FERROR,"mktemp %s failed\n",fnametmp);
--	receive_data(f_in,buf,-1,NULL);
--	if (buf) unmap_file(buf);
--	close(fd1);
--	continue;
--      }
--      fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
--      if (fd2 == -1 && relative_paths && errno == ENOENT && 
--	  create_directory_path(fnametmp) == 0) {
--	      fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
-+      if ((fd2 = mkstemp(fnametmp)) < 0) {
-+        if (relative_paths && errno == ENOENT && 
-+	    create_directory_path(fnametmp) == 0) {
-+	        fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
-+        }
-       }
-       if (fd2 == -1) {
- 	fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
+--- rsync.c.orig	Thu Jun 18 09:27:56 1998
++++ rsync.c	Sat Jul  4 05:49:43 1998
+@@ -879,6 +879,9 @@
+ 			continue;
+ 		}
+ 
++#ifdef HAVE_MKSTEMP
++		fd2 = mkstemp(fnametmp);
++#else
+ 		if (NULL == do_mktemp(fnametmp)) {
+ 			rprintf(FERROR,"mktemp %s failed\n",fnametmp);
+ 			receive_data(f_in,buf,-1,NULL);
+@@ -894,6 +897,7 @@
+ 		   this out */
+ 		fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
+ 			      file->mode & ACCESSPERMS);
++#endif
+ 
+ 		if (fd2 == -1 && relative_paths && errno == ENOENT && 
+ 		    create_directory_path(fnametmp) == 0) {
diff --git a/net/rsync/pkg/PLIST b/net/rsync/pkg/PLIST
index 25db6903bbf..939154df6fa 100644
--- a/net/rsync/pkg/PLIST
+++ b/net/rsync/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 1998/02/28 20:27:13 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/07/04 09:56:27 mycroft Exp $
 bin/rsync
 man/man1/rsync.1.gz
+man/man5/rsyncd.conf.5.gz
 share/doc/rsync/tech_report.tex
 @dirrm share/doc/rsync
-- 
cgit v1.2.3