Fri Oct 11 09:08:35 2019 UTC ()
cvs: Disable custom getcwd() implementation on Darwin.

It completely breaks on Catalina for some reason, so just use the native
version which works fine.  This commit brought to you by a patched binary
running on Catalina.  Bump PKGREVISION.


(jperkin)
diff -r1.18 -r1.19 pkgsrc/devel/scmcvs/Makefile
diff -r1.21 -r1.22 pkgsrc/devel/scmcvs/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/scmcvs/patches/patch-bb
cvs diff -r1.18 -r1.19 pkgsrc/devel/scmcvs/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/scmcvs/Makefile 2017/08/21 22:57:45 1.18
+++ pkgsrc/devel/scmcvs/Makefile 2019/10/11 09:08:35 1.19
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.18 2017/08/21 22:57:45 tez Exp $ 1# $NetBSD: Makefile,v 1.19 2019/10/11 09:08:35 jperkin Exp $
2 2
3DISTNAME= cvs-1.12.13 3DISTNAME= cvs-1.12.13
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= devel scm 5CATEGORIES= devel scm
6MASTER_SITES= http://ftp.gnu.org/non-gnu/cvs/source/feature/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://ftp.gnu.org/non-gnu/cvs/source/feature/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://cvs.nongnu.org/ 10HOMEPAGE= http://cvs.nongnu.org/
11COMMENT= Concurrent Versions System 11COMMENT= Concurrent Versions System
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= makeinfo autoconf 14USE_TOOLS+= makeinfo autoconf
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --with-external-zlib 16CONFIGURE_ARGS+= --with-external-zlib
17CONFIGURE_ARGS+= --with-rsh=ssh 17CONFIGURE_ARGS+= --with-rsh=ssh
18CONFIGURE_ENV+= PERL=${TOOLS_PERL5} gl_cv_func_getcwd_null=yes 18CONFIGURE_ENV+= PERL=${TOOLS_PERL5}
 19CONFIGURE_ENV+= gl_cv_func_getcwd_null=yes
19 20
20CHECK_INTERPRETER_SKIP= share/cvs/contrib/* 21CHECK_INTERPRETER_SKIP= share/cvs/contrib/*
21INFO_FILES= yes 22INFO_FILES= yes
22TEXINFO_REQD+= 4.0 23TEXINFO_REQD+= 4.0
23 24
24CONFIGURE_ARGS.Darwin+= --enable-case-sensitivity 25CONFIGURE_ARGS.Darwin+= --enable-case-sensitivity
25 26
26.include "options.mk" 27.include "options.mk"
27 28
28AUTOCONF_REQD= 2.50 29AUTOCONF_REQD= 2.50
29pre-configure: 30pre-configure:
30 cd ${WRKSRC} && autoconf 31 cd ${WRKSRC} && autoconf
31 32
cvs diff -r1.21 -r1.22 pkgsrc/devel/scmcvs/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/scmcvs/distinfo 2017/12/18 08:51:48 1.21
+++ pkgsrc/devel/scmcvs/distinfo 2019/10/11 09:08:35 1.22
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: distinfo,v 1.21 2017/12/18 08:51:48 adam Exp $ 1$NetBSD: distinfo,v 1.22 2019/10/11 09:08:35 jperkin Exp $
2 2
3SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9 3SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9
4RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487 4RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487
5SHA512 (cvs-1.12.13.tar.bz2) = 7d10f808de62190b18d4f706d2d03ab218a508bfb52047ff3e830e293ec40c5e8bf6cc743ef72a5c24be5aa867c9e4892d7d475a026a98b296a3764b4bd0f4d8 5SHA512 (cvs-1.12.13.tar.bz2) = 7d10f808de62190b18d4f706d2d03ab218a508bfb52047ff3e830e293ec40c5e8bf6cc743ef72a5c24be5aa867c9e4892d7d475a026a98b296a3764b4bd0f4d8
6Size (cvs-1.12.13.tar.bz2) = 3911104 bytes 6Size (cvs-1.12.13.tar.bz2) = 3911104 bytes
7SHA1 (patch-ab) = bc26fcb899d6316298c97779016aab4edb5cd124 7SHA1 (patch-ab) = bc26fcb899d6316298c97779016aab4edb5cd124
8SHA1 (patch-ad) = 12847d39cece34b310e4bc88c47fa8769233dff5 8SHA1 (patch-ad) = 12847d39cece34b310e4bc88c47fa8769233dff5
9SHA1 (patch-ae) = be535ece7dc9b62c940f500e67c454bf1a86feed 9SHA1 (patch-ae) = be535ece7dc9b62c940f500e67c454bf1a86feed
10SHA1 (patch-af) = 4299a901206aef3accb428579deb8774411992c7 10SHA1 (patch-af) = 4299a901206aef3accb428579deb8774411992c7
11SHA1 (patch-ag) = 53d072ba6bdbe0f988829616a232bb154cab2be3 11SHA1 (patch-ag) = 53d072ba6bdbe0f988829616a232bb154cab2be3
12SHA1 (patch-ah) = b03e6675ab1f6f62fc885d990b5a6bf64c309e9f 12SHA1 (patch-ah) = b03e6675ab1f6f62fc885d990b5a6bf64c309e9f
13SHA1 (patch-ai) = d265a2967566cf2679ad6fff1dffd5c6d6cbd120 13SHA1 (patch-ai) = d265a2967566cf2679ad6fff1dffd5c6d6cbd120
14SHA1 (patch-ak) = 3582de771a424cd7c906574bf4a76fc57f977e6b 14SHA1 (patch-ak) = 3582de771a424cd7c906574bf4a76fc57f977e6b
15SHA1 (patch-al) = 5c4909942ccfa7d7000c2856705ca9a28dbf005d 15SHA1 (patch-al) = 5c4909942ccfa7d7000c2856705ca9a28dbf005d
16SHA1 (patch-am) = cb0cc7cdfaf1d2455c519eda5cf239ea623c4f7b 16SHA1 (patch-am) = cb0cc7cdfaf1d2455c519eda5cf239ea623c4f7b
17SHA1 (patch-an) = 2eac4f7d0be8aa73de2ef3b021c134d0d9e40125 17SHA1 (patch-an) = 2eac4f7d0be8aa73de2ef3b021c134d0d9e40125
18SHA1 (patch-ao) = ccc7a159a6eb1ebc07c9187e3bcd0db61b8b4086 18SHA1 (patch-ao) = ccc7a159a6eb1ebc07c9187e3bcd0db61b8b4086
19SHA1 (patch-ap) = 8c8aafece339da841d3d3629449f1197339f3b22 19SHA1 (patch-ap) = 8c8aafece339da841d3d3629449f1197339f3b22
20SHA1 (patch-aq) = b7cabaf9b713aac2a199a98a91432f1abf406c82 20SHA1 (patch-aq) = b7cabaf9b713aac2a199a98a91432f1abf406c82
21SHA1 (patch-ar) = 3cb7fce566606a3757f51d5ca562a8117ebfec92 21SHA1 (patch-ar) = 3cb7fce566606a3757f51d5ca562a8117ebfec92
22SHA1 (patch-at) = 618673945aa10053f9fed5bee71b51605f39f4b4 22SHA1 (patch-at) = 618673945aa10053f9fed5bee71b51605f39f4b4
23SHA1 (patch-au) = 2f906a2940c496c4ecfcbb6efaf79fe43726a12c 23SHA1 (patch-au) = 2f906a2940c496c4ecfcbb6efaf79fe43726a12c
24SHA1 (patch-av) = 4bcfb17e86cd772dd9e182384f048c593462f5a8 24SHA1 (patch-av) = 4bcfb17e86cd772dd9e182384f048c593462f5a8
25SHA1 (patch-ay) = 6ce1c3c21dbc478248068f8b8850c21b0cb48c42 25SHA1 (patch-ay) = 6ce1c3c21dbc478248068f8b8850c21b0cb48c42
26SHA1 (patch-az) = 9dfd460ae6617f1492e0e6861387ff80080a7d5d 26SHA1 (patch-az) = 9dfd460ae6617f1492e0e6861387ff80080a7d5d
27SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07 27SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07
28SHA1 (patch-bb) = 09a607426b672f44c1882b82812e6ca81efdcf8e 28SHA1 (patch-bb) = 54cb5ebb1f4ec9e3f8f514914958d8a3cce59dab
29SHA1 (patch-lib_mktime.c) = 526a0e24c6399d527ae6a463ea91e993f9f7e920 29SHA1 (patch-lib_mktime.c) = 526a0e24c6399d527ae6a463ea91e993f9f7e920
30SHA1 (patch-lib_vasnprintf.c) = fbba4d923d3c61ebcf79e82779919dc1f8a570c0 30SHA1 (patch-lib_vasnprintf.c) = fbba4d923d3c61ebcf79e82779919dc1f8a570c0
31SHA1 (patch-m4_fpending.m4) = 6b7c96d8f092e179d2cfdf036bcbfd3855292e0f 31SHA1 (patch-m4_fpending.m4) = 6b7c96d8f092e179d2cfdf036bcbfd3855292e0f
32SHA1 (patch-rsh-client.c) = 448811f5df402501c7070677fc8c2d1873764306 32SHA1 (patch-rsh-client.c) = 448811f5df402501c7070677fc8c2d1873764306
33SHA1 (patch-src_error.c) = 60aba581be95aebbb6fb16c888fd384d855fe56e 33SHA1 (patch-src_error.c) = 60aba581be95aebbb6fb16c888fd384d855fe56e
34SHA1 (patch-src_ignore.c) = 90ac25311c83bb5713b83b9cfb6b2c03790ee787 34SHA1 (patch-src_ignore.c) = 90ac25311c83bb5713b83b9cfb6b2c03790ee787
35SHA1 (patch-src_zlib.c) = fee3becf1cc2e45d1241a302ed65c5f11b477a0a 35SHA1 (patch-src_zlib.c) = fee3becf1cc2e45d1241a302ed65c5f11b477a0a
cvs diff -r1.1 -r1.2 pkgsrc/devel/scmcvs/patches/patch-bb (expand / switch to unified diff)

--- pkgsrc/devel/scmcvs/patches/patch-bb 2014/08/13 18:30:03 1.1
+++ pkgsrc/devel/scmcvs/patches/patch-bb 2019/10/11 09:08:35 1.2
@@ -1,24 +1,30 @@ @@ -1,24 +1,30 @@
1$NetBSD: patch-bb,v 1.1 2014/08/13 18:30:03 cheusov Exp $ 1$NetBSD: patch-bb,v 1.2 2019/10/11 09:08:35 jperkin Exp $
2 2
3Do use non-standard getcwd(NULL, 0); This unbreaks cvs on Interix. 3Do use non-standard getcwd(NULL, 0); This unbreaks cvs on Interix.
4--- lib/xgetcwd.c.orig Mon Sep 19 21:12:25 2005 4Disable broken custom getcwd() on Apple, it breaks on Catalina.
5+++ lib/xgetcwd.c Wed Aug 13 17:58:42 2014 5
6@@ -25,6 +25,7 @@ 6--- lib/xgetcwd.c.orig 2005-09-19 21:12:25.000000000 +0000
 7+++ lib/xgetcwd.c
 8@@ -25,8 +25,11 @@
7 #include "xgetcwd.h" 9 #include "xgetcwd.h"
8  10
9 #include <errno.h> 11 #include <errno.h>
10+#include <limits.h> 12+#include <limits.h>
11  13
 14+#ifndef __APPLE__
12 #include "getcwd.h" 15 #include "getcwd.h"
 16+#endif
13 #include "xalloc.h" 17 #include "xalloc.h"
14@@ -36,8 +37,8 @@ 18
 19 /* Return the current directory, newly allocated.
 20@@ -36,8 +39,8 @@
15 char * 21 char *
16 xgetcwd (void) 22 xgetcwd (void)
17 { 23 {
18- char *cwd = getcwd (NULL, 0); 24- char *cwd = getcwd (NULL, 0);
19+ char *cwd = xmalloc (PATH_MAX); 25+ char *cwd = xmalloc (PATH_MAX);
20 if (! cwd && errno == ENOMEM) 26 if (! cwd && errno == ENOMEM)
21 xalloc_die (); 27 xalloc_die ();
22- return cwd; 28- return cwd;
23+ return getcwd (cwd, PATH_MAX); 29+ return getcwd (cwd, PATH_MAX);
24 } 30 }