diff options
author | markd <markd@pkgsrc.org> | 2012-12-15 21:40:33 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2012-12-15 21:40:33 +0000 |
commit | fe81b5f967923cee97e922ce314d7277982d7913 (patch) | |
tree | 2d83f14686ebcb7cf1228235d648e477ee8b024a | |
parent | f3576c9aab4895f1c9f109479a0805d7cf8c3b1d (diff) | |
download | pkgsrc-fe81b5f967923cee97e922ce314d7277982d7913.tar.gz |
Fix for 64bit time_t on 32bit systems. Bump PKGREVISION
-rw-r--r-- | net/rdist6/Makefile | 4 | ||||
-rw-r--r-- | net/rdist6/distinfo | 3 | ||||
-rw-r--r-- | net/rdist6/patches/patch-src_client.c | 30 |
3 files changed, 34 insertions, 3 deletions
diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile index 36fb7776e9b..50168fd5159 100644 --- a/net/rdist6/Makefile +++ b/net/rdist6/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2012/10/23 17:19:05 asau Exp $ +# $NetBSD: Makefile,v 1.25 2012/12/15 21:40:33 markd Exp $ # DISTNAME= freerdist-0.94 -#PKGREVISION= 4 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.astron.com/pub/freerdist/ diff --git a/net/rdist6/distinfo b/net/rdist6/distinfo index 20620a81beb..7ade8a1e3c5 100644 --- a/net/rdist6/distinfo +++ b/net/rdist6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2012/11/17 22:48:50 markd Exp $ +$NetBSD: distinfo,v 1.18 2012/12/15 21:40:33 markd Exp $ SHA1 (freerdist-0.94.tar.gz) = 12141ceb7932727362c560b2589a06a8fa2dbb20 RMD160 (freerdist-0.94.tar.gz) = d253d6e9fd930b9fc6ee49496bee2f55086da5cf @@ -9,4 +9,5 @@ SHA1 (patch-ac) = 78df932333c8742139368abb5d12b910d34e222c SHA1 (patch-ad) = 89500d25dc2fb34c0295836f7ab18433218c85ea SHA1 (patch-ah) = 35bda080c8b816b1e76f643548679dacbc10d2af SHA1 (patch-am) = 26655eccc7b2051f42dc57004161263777c80f8d +SHA1 (patch-src_client.c) = e6f35b4cee32d1abcb3c3cae8905f1dc49db673b SHA1 (patch-src_setargs.c) = 8074c9277e43b144beb73f7bb8235d3f462be4af diff --git a/net/rdist6/patches/patch-src_client.c b/net/rdist6/patches/patch-src_client.c new file mode 100644 index 00000000000..a0d768cda93 --- /dev/null +++ b/net/rdist6/patches/patch-src_client.c @@ -0,0 +1,30 @@ +$NetBSD: patch-src_client.c,v 1.1 2012/12/15 21:40:33 markd Exp $ + +Fix for 64bit time_t + +--- src/client.c.orig 2012-09-26 15:26:32.000000000 +0000 ++++ src/client.c +@@ -417,9 +417,9 @@ sendfile(char *rname, opt_t opts, struct + debugmsg(DM_MISC, "Turning off compression"); + } + +- (void) sendcmd(C_RECVREG, "%lo %04o %ld %ld %ld %s %s %s", ++ (void) sendcmd(C_RECVREG, "%lo %04o %ld %jd %jd %s %s %s", + (long)opts, stb->st_mode & 07777, (long) stb->st_size, +- stb->st_mtime, stb->st_atime, ++ (intmax_t)stb->st_mtime, (intmax_t)stb->st_atime, + user, group, ername); + if (response() < 0) { + (void) close(f); +@@ -716,9 +716,9 @@ sendlink(char *rname, opt_t opts, struct + * Gather and send basic link info + */ + ENCODE(ername, rname); +- (void) sendcmd(C_RECVSYMLINK, "%lo %04o %ld %ld %ld %s %s %s", ++ (void) sendcmd(C_RECVSYMLINK, "%lo %04o %ld %jd %jd %s %s %s", + (long)opts, stb->st_mode & 07777, (long) stb->st_size, +- stb->st_mtime, stb->st_atime, ++ (intmax_t)stb->st_mtime, (intmax_t)stb->st_atime, + user, group, ername); + if (response() < 0) + return -1; |