Tue Jan 27 19:40:24 2015 UTC ()
Note when the patch was sent upstream.


(gdt)
diff -r1.11 -r1.12 pkgsrc/net/coda/distinfo
diff -r1.1 -r1.2 pkgsrc/net/coda/patches/patch-coda-src_venus_worker.cc

cvs diff -r1.11 -r1.12 pkgsrc/net/coda/distinfo (expand / switch to unified diff)

--- pkgsrc/net/coda/distinfo 2015/01/27 15:21:52 1.11
+++ pkgsrc/net/coda/distinfo 2015/01/27 19:40:24 1.12
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.11 2015/01/27 15:21:52 hauke Exp $ 1$NetBSD: distinfo,v 1.12 2015/01/27 19:40:24 gdt Exp $
2 2
3SHA1 (coda-6.9.5.tar.gz) = 248af27c506f5c3be4c4e53f821c9c904580fe60 3SHA1 (coda-6.9.5.tar.gz) = 248af27c506f5c3be4c4e53f821c9c904580fe60
4RMD160 (coda-6.9.5.tar.gz) = 9ef0643aacc7d1352ef253af00d4c7e6ad9e1f78 4RMD160 (coda-6.9.5.tar.gz) = 9ef0643aacc7d1352ef253af00d4c7e6ad9e1f78
5Size (coda-6.9.5.tar.gz) = 1723098 bytes 5Size (coda-6.9.5.tar.gz) = 1723098 bytes
6SHA1 (patch-ad) = adfee7c5d7de913ee3b898a13bf7acfeac52b765 6SHA1 (patch-ad) = adfee7c5d7de913ee3b898a13bf7acfeac52b765
7SHA1 (patch-coda-src_dir_dirbody.c) = 3e3524a4a03ce359956ae00d9b24d1aa3292c752 7SHA1 (patch-coda-src_dir_dirbody.c) = 3e3524a4a03ce359956ae00d9b24d1aa3292c752
8SHA1 (patch-coda-src_kerndep_coda.h) = 14af6b7554ce36c55f426ab62630df629c2df6db 8SHA1 (patch-coda-src_kerndep_coda.h) = 14af6b7554ce36c55f426ab62630df629c2df6db
9SHA1 (patch-coda-src_kerndep_pioctl.h) = 1eae6d05b461f6e235d8f290ef41c10877f59650 9SHA1 (patch-coda-src_kerndep_pioctl.h) = 1eae6d05b461f6e235d8f290ef41c10877f59650
10SHA1 (patch-coda-src_librepair_repio.cc) = 3a79f16fb51bdeb76ccceb095f1409bec4bf098f 10SHA1 (patch-coda-src_librepair_repio.cc) = 3a79f16fb51bdeb76ccceb095f1409bec4bf098f
11SHA1 (patch-coda-src_resolution_rescoord.cc) = a885ced4a7bcfe38b14a0891d0ce84cc9c53ef19 11SHA1 (patch-coda-src_resolution_rescoord.cc) = a885ced4a7bcfe38b14a0891d0ce84cc9c53ef19
12SHA1 (patch-coda-src_venus_Makefile.in) = ecfb5d2d8bf806dddaf360f2b36d12b871e9f0e2 12SHA1 (patch-coda-src_venus_Makefile.in) = ecfb5d2d8bf806dddaf360f2b36d12b871e9f0e2
13SHA1 (patch-coda-src_venus_fso_dir.cc) = 3e02f3bdb02639a82db1be9c138267431d36697c 13SHA1 (patch-coda-src_venus_fso_dir.cc) = 3e02f3bdb02639a82db1be9c138267431d36697c
14SHA1 (patch-coda-src_venus_venus.cc) = 93c115fb8a8b22df3fdb166162410c67820dcb4c 14SHA1 (patch-coda-src_venus_venus.cc) = 93c115fb8a8b22df3fdb166162410c67820dcb4c
15SHA1 (patch-coda-src_venus_venusrecov.cc) = 089b6c5db50a78b7df9ca5c504628dacb3c550f9 15SHA1 (patch-coda-src_venus_venusrecov.cc) = 089b6c5db50a78b7df9ca5c504628dacb3c550f9
16SHA1 (patch-coda-src_venus_vproc_vfscalls.cc) = da71de1648e09aefdd442c4ab3cb2463aad6d397 16SHA1 (patch-coda-src_venus_vproc_vfscalls.cc) = da71de1648e09aefdd442c4ab3cb2463aad6d397
17SHA1 (patch-coda-src_venus_worker.cc) = d8308eea23d0583528e2e4b11b5ad6076e986410 17SHA1 (patch-coda-src_venus_worker.cc) = 5ba012ae1ef61657c1d9057a7d8198953f677c8b
18SHA1 (patch-coda-src_vice_Makefile.in) = 07744dcc45c269ecfe1f4c4feba37e7b7047c00b 18SHA1 (patch-coda-src_vice_Makefile.in) = 07744dcc45c269ecfe1f4c4feba37e7b7047c00b
19SHA1 (patch-coda-src_vice_codaproc2.cc) = 81dfacf9a0cda4bd8f891fbf0dacf0001a46bd02 19SHA1 (patch-coda-src_vice_codaproc2.cc) = 81dfacf9a0cda4bd8f891fbf0dacf0001a46bd02
20SHA1 (patch-coda-src_volutil_vol-ancient.cc) = e69f3e492aa78cbf5c4dbd34c15424ee7ebd150c 20SHA1 (patch-coda-src_volutil_vol-ancient.cc) = e69f3e492aa78cbf5c4dbd34c15424ee7ebd150c
21SHA1 (patch-coda-src_volutil_vol-dump.cc) = 6405a0be3edeb1f1cdb74d705c0fcccae1a8cefc 21SHA1 (patch-coda-src_volutil_vol-dump.cc) = 6405a0be3edeb1f1cdb74d705c0fcccae1a8cefc

cvs diff -r1.1 -r1.2 pkgsrc/net/coda/patches/patch-coda-src_venus_worker.cc (expand / switch to unified diff)

--- pkgsrc/net/coda/patches/patch-coda-src_venus_worker.cc 2015/01/27 15:21:52 1.1
+++ pkgsrc/net/coda/patches/patch-coda-src_venus_worker.cc 2015/01/27 19:40:24 1.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: patch-coda-src_venus_worker.cc,v 1.1 2015/01/27 15:21:52 hauke Exp $ 1$NetBSD: patch-coda-src_venus_worker.cc,v 1.2 2015/01/27 19:40:24 gdt Exp $
2 2
3Added experimental code to support mounting on NetBSD >= 4.99.24. The 3Added experimental code to support mounting on NetBSD >= 4.99.24. The
4magic value of 256 is taken from coda_vfsops in coda_vfsops.c. 4magic value of 256 is taken from coda_vfsops in coda_vfsops.c.
 5Sent upstream on 2011-03-11 and again on 2015-01-27.
5 6
6gcc 4.7 on SunOS insists on de-'const'ifying venusRoot. 7gcc 4.7 on SunOS insists on de-'const'ifying venusRoot.
7 8
8--- coda-src/venus/worker.cc.orig 2008-10-06 16:52:22.000000000 +0000 9--- coda-src/venus/worker.cc.orig 2008-10-06 16:52:22.000000000 +0000
9+++ coda-src/venus/worker.cc 10+++ coda-src/venus/worker.cc
10@@ -403,11 +403,19 @@ void VFSMount() 11@@ -403,11 +403,19 @@ void VFSMount()
11 error = nmount(md, 6, 0); 12 error = nmount(md, 6, 0);
12 } 13 }
13 #endif 14 #endif
14-  15-
15+ 16+
16+#if defined(__NetBSD__) && __NetBSD_Version__ >= 499002400 /* 4.99.24 */ 17+#if defined(__NetBSD__) && __NetBSD_Version__ >= 499002400 /* 4.99.24 */
17+ if (error < 0) 18+ if (error < 0)