From owner-freebsd-arch Tue Mar 18 14:56:56 2003 Delivered-To: freebsd-arch@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B0F4C37B404 for ; Tue, 18 Mar 2003 14:56:54 -0800 (PST) Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06D6C43FA3 for ; Tue, 18 Mar 2003 14:56:54 -0800 (PST) (envelope-from des@ofug.org) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 5F3F55308; Tue, 18 Mar 2003 23:56:51 +0100 (CET) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: arch@freebsd.org Subject: OpenBSD compatibility in cvs From: des@ofug.org (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=) Date: Tue, 18 Mar 2003 23:56:51 +0100 Message-ID: User-Agent: Gnus/5.090015 (Oort Gnus v0.15) Emacs/21.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable The attached patch implements the OpenBSD tag, umask and dlimit cvs configuration keywords so our cvs(1) can operate on an OpenBSD repo without warnings. The file it affects is on the vendor branch; should we submit this patch to the vendor or just take the file off the branch? DES --=20 Dag-Erling Sm=F8rgrav - des@ofug.org --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=cvs.diff Index: contrib/cvs/src/parseinfo.c =================================================================== RCS file: /home/ncvs/src/contrib/cvs/src/parseinfo.c,v retrieving revision 1.1.1.11 diff -u -r1.1.1.11 parseinfo.c --- contrib/cvs/src/parseinfo.c 21 Jan 2003 21:53:02 -0000 1.1.1.11 +++ contrib/cvs/src/parseinfo.c 18 Mar 2003 22:53:26 -0000 @@ -340,6 +340,25 @@ goto error_return; } } + else if (strcmp (line, "tag") == 0) { + RCS_setlocalid(p); + } + else if (strcmp (line, "umask") == 0) { + cvsumask = (mode_t)(strtol(p, NULL, 8) & 0777); + } + else if (strcmp (line, "dlimit") == 0) { +#ifdef BSD +#include + struct rlimit rl; + + if (getrlimit(RLIMIT_DATA, &rl) != -1) { + rl.rlim_cur = atoi(p); + rl.rlim_cur *= 1024; + + (void) setrlimit(RLIMIT_DATA, &rl); + } +#endif /* BSD */ + } else if (strcmp (line, "PreservePermissions") == 0) { if (strcmp (p, "no") == 0) --=-=-=-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message