From owner-freebsd-current@FreeBSD.ORG Thu May 31 11:20:23 2007 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ECB8816A421 for ; Thu, 31 May 2007 11:20:22 +0000 (UTC) (envelope-from bdheeman@hotmail.com) Received: from bay0-omc1-s2.bay0.hotmail.com (bay0-omc1-s2.bay0.hotmail.com [65.54.246.74]) by mx1.freebsd.org (Postfix) with ESMTP id D767313C489 for ; Thu, 31 May 2007 11:20:22 +0000 (UTC) (envelope-from bdheeman@hotmail.com) Received: from hotmail.com ([65.55.133.104]) by bay0-omc1-s2.bay0.hotmail.com with Microsoft SMTPSVC(6.0.3790.2668); Thu, 31 May 2007 04:20:22 -0700 Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Thu, 31 May 2007 04:20:22 -0700 Message-ID: Received: from 65.55.133.123 by by128fd.bay128.hotmail.msn.com with HTTP; Thu, 31 May 2007 11:20:19 GMT X-Originating-IP: [122.162.11.175] X-Originating-Email: [bdheeman@hotmail.com] X-Sender: bdheeman@hotmail.com From: "Balwinder S Dheeman" To: freebsd-current@freebsd.org Date: Thu, 31 May 2007 16:50:19 +0530 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_2ef6_61fe_75e8" X-OriginalArrivalTime: 31 May 2007 11:20:22.0776 (UTC) FILETIME=[ADEBC780:01C7A375] Subject: [PATCH] The current csup sources X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 May 2007 11:20:23 -0000 This is a multi-part message in MIME format. ------=_NextPart_000_2ef6_61fe_75e8 Content-Type: text/plain; format=flowed Hi, I think, the manpage /usr/src/contrib/csup/csup.1 is dated and, or have not been updated per current csup sources. Plz find enclosed herewith 2 tiny patches for the same and apply, if appropriate. I'm sorry, I shall not send any PR to the Gnats/FreeBSD PR system, because it is insecure and, or does not obfuscates mail addresses of the users and hence encourages spammers. Thanks, Regards, -- Dr Balwinder S "bsd" Dheeman Registered Linux User: #229709 Anu'z Linux@HOME Machines: #168573, 170593, 259192 Chandigarh, UT, 160062, India Gentoo, Fedora, Debian/FreeBSD/XP Home: http://cto.homelinux.net/~bsd/ Visit: http://counter.li.org/ _________________________________________________________________ PC Magazine’s 2007 editors’ choice for best Web mail—award-winning Windows Live Hotmail. http://imagine-windowslive.com/hotmail/?locale=en-us&ocid=TXT_TAGHM_migration_HM_mini_pcmag_0507 ------=_NextPart_000_2ef6_61fe_75e8 Content-Type: text/x-patch; name="config.c.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="config.c.patch" --- config.c.orig Tue Mar 14 03:51:13 2006 +++ config.c Fri May 25 06:14:40 2007 @@ -105,11 +105,11 @@ /* Fixup the list of collections. */ STAILQ_FOREACH(coll, &config->colls, co_next) { if (coll->co_base == NULL) - coll->co_base = xstrdup("/usr/local/etc/cvsup"); + coll->co_base = xstrdup("/var/db"); if (coll->co_colldir == NULL) - coll->co_colldir = "sup"; + coll->co_colldir = "csup"; if (coll->co_prefix == NULL) { - coll->co_prefix = xstrdup(coll->co_base); + coll->co_prefix = xstrdup("/usr"); /* * If prefix is not an absolute pathname, it is * interpreted relative to base. ------=_NextPart_000_2ef6_61fe_75e8 Content-Type: text/x-patch; name="csup.1.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="csup.1.patch" --- csup.1.orig Tue Mar 14 03:51:13 2006 +++ csup.1 Fri May 25 06:35:15 2007 @@ -118,12 +118,16 @@ .Cm base specifications in the .Ar supfile . +The default +.Pa base +directory is +.Pa /var/db . .It Fl c Ar collDir Specifies the subdirectory of .Ar base where the information about the collections is maintained. The default is -.Pa sup . +.Pa csup . .It Fl d Ar delLimit Specifies the maximum number of files that may be deleted in a single update run. @@ -305,7 +309,7 @@ The default .Ar base directory is -.Pa /usr/local/etc/csup . +.Pa /var/db . .It Cm prefix= Ns Ar prefix This is the directory under which updated files will be placed. By default, it is the same as @@ -701,11 +705,11 @@ .Pp .Nm has a built-in default value of -.Ar /usr/local/etc/cvsup +.Ar /var/db for .Ar base and -.Ar sup +.Ar csup for .Ar collDir but it is possible to override both of these. The value of @@ -743,11 +747,11 @@ .Pp .Bl -item -compact -offset indent .It -.Pa /usr/local/etc/cvsup/sup/refuse +.Pa /var/db/csup/refuse .It -.Pa /usr/local/etc/cvsup/sup/src-all/refuse +.Pa /var/db/csup/src-all/refuse .It -.Pa /usr/local/etc/cvsup/sup/src-all/refuse.cvs:RELENG_3 +.Pa /var/db/csup/src-all/refuse.cvs:RELENG_3 .El .Pp If the @@ -758,11 +762,11 @@ .Pp .Bl -item -compact -offset indent .It -.Pa /foo/sup/refuse +.Pa /foo/csup/refuse .It -.Pa /foo/sup/src-all/refuse +.Pa /foo/csup/src-all/refuse .It -.Pa /foo/sup/src-all/refuse.cvs:RELENG_3 +.Pa /foo/csup/src-all/refuse.cvs:RELENG_3 .El .Pp If @@ -775,11 +779,11 @@ .Pp .Bl -item -compact -offset indent .It -.Pa /bar/sup/refuse +.Pa /bar/csup/refuse .It -.Pa /bar/sup/src-all/refuse +.Pa /bar/csup/src-all/refuse .It -.Pa /bar/sup/src-all/refuse.cvs:RELENG_3 +.Pa /bar/csup/src-all/refuse.cvs:RELENG_3 .El .Pp and with @@ -850,12 +854,12 @@ on the command line. .El .Sh FILES -.Bl -tag -width base/sup/collection/checkouts*xx -compact -.It Pa /usr/local/etc/cvsup +.Bl -tag -width base/csup/collection/checkouts*xx -compact +.It Pa /var/db Default .Ar base directory. -.It Pa sup +.It Pa csup Default .Ar collDir subdirectory. ------=_NextPart_000_2ef6_61fe_75e8--