From ce9416398b788cc0b984b4b5dc5b5912cdc4cc66 Mon Sep 17 00:00:00 2001
From: lukem <lukem@pkgsrc.org>
Date: Sun, 7 Mar 2010 08:52:27 +0000
Subject: Cast time_t to (long) before printing with %ld. Fixes random
 coredumps on NetBSD-current with 64bit time_t. Bump PKGREVISION to 3.

---
 net/rdist6/Makefile         |  4 ++--
 net/rdist6/distinfo         |  6 ++++--
 net/rdist6/patches/patch-ai | 28 ++++++++++++++++++++++++----
 net/rdist6/patches/patch-an | 33 +++++++++++++++++++++++++++++++++
 net/rdist6/patches/patch-ao | 13 +++++++++++++
 5 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100644 net/rdist6/patches/patch-an
 create mode 100644 net/rdist6/patches/patch-ao

(limited to 'net')

diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index c8dc9aeabab..32cf5b6f45b 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/08/15 23:32:49 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2010/03/07 08:52:27 lukem Exp $
 #
 
 DISTNAME=	freerdist-0.92
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.astron.com/pub/freerdist/
 
diff --git a/net/rdist6/distinfo b/net/rdist6/distinfo
index 6c1b5e5671d..ca4d36825aa 100644
--- a/net/rdist6/distinfo
+++ b/net/rdist6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2009/07/15 10:00:59 joerg Exp $
+$NetBSD: distinfo,v 1.13 2010/03/07 08:52:27 lukem Exp $
 
 SHA1 (freerdist-0.92.tar.gz) = 84db4efd8d223a7e10d62e386349aa9236f71ae3
 RMD160 (freerdist-0.92.tar.gz) = 2106cbf21fbe6fda2738d2e9e2d750625eb8c2da
@@ -11,8 +11,10 @@ SHA1 (patch-ae) = 2bcbce70c6228b34c13082e6a2b82f67f02389f8
 SHA1 (patch-af) = c91cfab8609a6b8fe0df051ac8a2d29154ff5aad
 SHA1 (patch-ag) = 0049876208f0466b6a725bb4bc04097ed603c89c
 SHA1 (patch-ah) = 35bda080c8b816b1e76f643548679dacbc10d2af
-SHA1 (patch-ai) = 3f96e7440fe4ac5d6180a4137806fe70e2033565
+SHA1 (patch-ai) = f03704bddc2e35000ba6597bb0310a98bf2c26d4
 SHA1 (patch-aj) = db6307ff40a8db7428fc23f7cfd40a3152c465dc
 SHA1 (patch-ak) = a65735786a4cbe19874e83cdc8ac2d6aadb8c14e
 SHA1 (patch-al) = f40942171206e5191051bf3e699d4c1977a4deb1
 SHA1 (patch-am) = 26655eccc7b2051f42dc57004161263777c80f8d
+SHA1 (patch-an) = 295a7a360a1a3765de37f8188ff1e358557e037c
+SHA1 (patch-ao) = 700af71348ac3236cd2a89f773e794905c97d1fa
diff --git a/net/rdist6/patches/patch-ai b/net/rdist6/patches/patch-ai
index 164e70b569a..5a88af14627 100644
--- a/net/rdist6/patches/patch-ai
+++ b/net/rdist6/patches/patch-ai
@@ -1,8 +1,28 @@
-$NetBSD: patch-ai,v 1.1 2003/09/06 03:36:04 kim Exp $
+$NetBSD: patch-ai,v 1.2 2010/03/07 08:52:27 lukem Exp $
 
---- src/server.c.orig	Wed Aug  4 11:57:33 1999
-+++ src/server.c	Sun Nov 24 18:44:10 2002
-@@ -1737,7 +1737,7 @@
+--- src/server.c.orig	1999-08-04 15:57:33.000000000 +0000
++++ src/server.c
+@@ -684,7 +684,7 @@ static void query(xname)
+ #endif
+ #endif
+ 		(void) sendcmd(QC_YES, "%ld %ld %o %s %s",
+-			       (long) stb.st_size, stb.st_mtime,
++			       (long) stb.st_size, (long)stb.st_mtime,
+ 			       stb.st_mode & 07777,
+ 			       getusername(stb.st_uid, target, options), 
+ 			       getgroupname(stb.st_gid, target, options));
+@@ -1534,8 +1534,8 @@ static void recvit(cmd, type)
+ 	file = fileb;
+ 
+ 	debugmsg(DM_MISC,
+-		 "recvit: opts = %04o mode = %04o size = %d mtime = %d",
+-		 opts, mode, size, mtime);
++		 "recvit: opts = %04o mode = %04o size = %ld mtime = %ld",
++		 opts, mode, (long)size, (long)mtime);
+ 	debugmsg(DM_MISC,
+        "recvit: owner = '%s' group = '%s' file = '%s' catname = %d isdir = %d",
+ 		 owner, group, file, catname, (type == S_IFDIR) ? 1 : 0);
+@@ -1737,7 +1737,7 @@ static void settarget(cmd, isdir)
  	/*
  	 * Handle target
  	 */
diff --git a/net/rdist6/patches/patch-an b/net/rdist6/patches/patch-an
new file mode 100644
index 00000000000..5812af74ba6
--- /dev/null
+++ b/net/rdist6/patches/patch-an
@@ -0,0 +1,33 @@
+$NetBSD: patch-an,v 1.1 2010/03/07 08:52:27 lukem Exp $
+
+--- src/client.c.orig	1999-11-01 00:22:14.000000000 +0000
++++ src/client.c
+@@ -435,7 +435,7 @@ static int sendfile(rname, opts, stb, us
+ 
+ 	(void) sendcmd(C_RECVREG, "%o %04o %ld %ld %ld %s %s %s", 
+ 		       opts, stb->st_mode & 07777, (long) stb->st_size, 
+-		       stb->st_mtime, stb->st_atime,
++		       (long)stb->st_mtime, (long)stb->st_atime,
+ 		       user, group, ername);
+ 	if (response() < 0) {
+ 		(void) close(f);
+@@ -734,7 +734,7 @@ static int sendlink(rname, opts, stb, us
+ 	ENCODE(ername, rname);
+ 	(void) sendcmd(C_RECVSYMLINK, "%o %04o %ld %ld %ld %s %s %s", 
+ 		       opts, stb->st_mode & 07777, (long) stb->st_size, 
+-		       stb->st_mtime, stb->st_atime,
++		       (long)stb->st_mtime, (long)stb->st_atime,
+ 		       user, group, ername);
+ 	if (response() < 0)
+ 		return(-1);
+@@ -973,8 +973,8 @@ static int update(rname, opts, statp)
+ 
+ 	debugmsg(DM_MISC, "update(%s,) local mode %04o remote mode %04o\n", 
+ 		 rname, lmode, rmode);
+-	debugmsg(DM_MISC, "update(%s,) size %ld mtime %d owner '%s' grp '%s'\n",
+-		 rname, (long) size, mtime, owner, group);
++	debugmsg(DM_MISC, "update(%s,) size %ld mtime %ld owner '%s' grp '%s'\n",
++		 rname, (long) size, (long)mtime, owner, group);
+ 
+ 	if (statp->st_mtime != mtime) {
+ 		if (statp->st_mtime < mtime && IS_ON(opts, DO_YOUNGER)) {
diff --git a/net/rdist6/patches/patch-ao b/net/rdist6/patches/patch-ao
new file mode 100644
index 00000000000..8f0c9321563
--- /dev/null
+++ b/net/rdist6/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2010/03/07 08:52:27 lukem Exp $
+
+--- src/docmd.c.orig	2001-03-12 18:42:23.000000000 +0000
++++ src/docmd.c
+@@ -786,7 +786,7 @@ static void dodcolon(cmd, filev)
+ 		return;
+ 	}
+ 
+-	debugmsg(DM_MISC, "%s: mtime %d\n", stamp, stb.st_mtime);
++	debugmsg(DM_MISC, "%s: mtime %ld\n", stamp, (long) stb.st_mtime);
+ 
+ 	env = NULL;
+ 	for (sc = sbcmds; sc != NULL; sc = sc->sc_next) {
-- 
cgit v1.2.3