=================================================================== RCS file: /cvsrepo/anoncvs/cvs/www/anoncvs.html,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- www/anoncvs.html 2004/11/24 20:29:47 1.225 +++ www/anoncvs.html 2004/12/03 03:24:17 1.226 @@ -11,7 +11,7 @@ - + [OpenBSD]

@@ -43,7 +43,6 @@ tree up to date with respect to changes made to current OpenBSD sources. In addition to following the bleeding edge of development, it is also possible to track the patches for errata of a release. -

The major advantage of Anonymous CVS over other source code update @@ -52,20 +51,19 @@ commands available to control merging and updating your changes with other source changes and for performing diffs, change histories and other queries against the central repository. -

The OpenBSD Project currently has five main source repositories: -

@@ -75,21 +73,32 @@ "best efforts" to update your entire source tree, rather than leaving you a list of arcane problems that have to be resolved before continuing. -

What is CVS?

- -CVS is the source code control system used to manage the OpenBSD source tree. +CVS is the source code control +system used to manage the OpenBSD source +tree. It implements a central repository for all officially released source code and changes, while permitting developers to maintain local copies of the -source code with their working changes. Developers with "write access" -can commit changes directly to the OpenBSD source tree, while "Anonymous -CVS" users have "read access" and can keep their local copies of the -source up to date and issue queries against the central repository. -

+source code with their working changes. +There are two levels of source tree access: + +

The major strength of CVS is that it has the ability to perform intelligent merges of changes to the central repository with changes that you make to @@ -97,14 +106,12 @@ perform an update, your changes are not "blown away", rather CVS makes best efforts to merge the changes made to the central sources with changes you've made to your local copy. -

In the event that the changes can't be completely merged, CVS provides a -"soft fallback", in terms of providing you with annotated changes to your +"soft fallback", providing you with annotated changes to your local copy, preserving an unmodified copy of your version and continuing to update any other source modules you requested. -

Getting Started Using Anonymous CVS

@@ -122,6 +129,8 @@ mounted on /mnt): 
     # cd /usr/src; tar xzf /mnt/src.tar.gz
+    # cd /usr; tar xzf /mnt/XF4.tar.tz
+    # tar xzf /mnt/ports.tar.gz
The source files for download from the FTP servers are separated into two @@ -137,14 +146,21 @@ # cd /usr/src # tar xzf ../sys.tar.gz # tar xzf ../src.tar.gz + # cd /usr + # tar xzf XF4.tar.gz + # tar xzf ports.tar.gz

+Not all people will wish to unpack all the file sets, but as the system +must be kept in sync, you will generally need to set up all trees. + +

You can also just use cvs(1) to "checkout" the source repository for you. This is discussed in the next section.

-After this, /usr/src will be a nice checkout area where all +After this, /usr/src will be a nice checkout area where all cvs(1) commands will work properly. @@ -152,54 +168,26 @@ source tree

-CVS was designed to be a simple way to retrieve and update your sources, -therefore there isn't much involved at all in doing so. You must first -decide whether you want to track current or a patch branch. +CVS was designed to be a simple way to retrieve and update your sources. +You must first decide whether you want to track -current or a +patch branch. The current tree has all of the up to the minute changes, whereas a patch branch contains a formal release plus the patches -from the errata already applied. For a definition -of current, see the Upgrade -Mini-FAQ. +from the errata and lesser issues already applied. +For more information on these "flavors" of OpenBSD, see +here.

Once you have decided which tree to follow, you must choose which Anonymous CVS server you are going to use. A list of these servers is -below. Do, however, notice that there are three ways -to access these servers. -

+below. -
-
ssh
Secure Shell can be used to access the anonymous CVS servers. -This is the recommended way of doing so, as it is encrypted. As of -2.6, OpenBSD has included OpenSSH in its standard distribution. -
rsh
Remote Shell can be used on some of the servers for users -who don't have access to ssh. -
pserver
pserver is primarily useful for users who are behind -firewalls that block the other two connections. -
-

-NOTE: For users wishing to use rsh, you must first set the -CVS_RSH variable to rsh. - -

- -

Once you have chosen which Anonymous CVS Server you will -use, and which method you will use, you can start using cvs. For those of you +use, you can start using cvs. For those of you who have CDs you can start with the CVS checkout that is on the CD by using the method above to get the sources onto your system. If you don't have a CD handy, use the method below to checkout the sources. This method puts the OpenBSD source tree into /usr/src. -

 	# cd /usr; cvs checkout -P src
@@ -209,7 +197,6 @@
 The above will checkout the current source tree.  Many of you will
 only want the patch branch sources.  To checkout a patch branch, you must
 specify a tag along with your command. Example:
-

 
 
 	# cd /usr; cvs checkout -P -rOPENBSD_3_6 src
@@ -224,24 +211,6 @@
 
 
 

-There are two levels of source tree access:
-
-

-
Read-write access for developers:
-
Developers who need to commit changes to the source tree must have
-an account on the OpenBSD machines.  Getting this access will be a
-natural result of working on the sources with other OpenBSD developers.
-If someone does some good work and shows they can work with the team,
-they will get an account.
-

-
-

-
Read-only access for everyone:
-
Anyone can access the read-only CVS repositories. These copies
-of the read-write CVS repository are mirrored often. To use one,
-set your CVSROOT environment variable to one of
-the following values:
-

 Please see the note about ssh vs. rsh below!
 

 
    
@@ -406,7 +375,6 @@
 Note: If your server is listed on here with inaccurate or
 unknown information, please contact
 beck@openbsd.org
-
    
 
 
    
 You may want to use 
@@ -414,7 +382,6 @@
 to find out which server is nearest you.
 Problems with a server should be reported to the maintainer of the
 server in question.
-

 
 
Getting crypto sources through 
 cvs(1)

@@ -451,9 +418,6 @@
 
 Because of the USA ITAR munitions list,
 crypto software may only be exported to Canada from the USA.
-

-
  • The OpenBSD project is looking for more anoncvs servers -- read
-on to find out how you can help.
 
 
 
    Example usages for cvs(1)
@@ -515,7 +479,6 @@
 	# cd /usr
 	# cvs -q get -rOPENBSD_3_6 -P src
 
    • 
-
 
 
  •  Anytime afterwards, to `update' this tree:
 
     (If you are following current):
@@ -532,10 +495,7 @@
 
 Every time you ran this it would synchronize your /usr/src tree. It would
 not destroy any of your local changes, rather it would attempt to merge
-changes in. If you use obj directories (not obj symbolic links) you may
-wish to append "-I obj" to the cvs command line, this will keep cvs from
-spitting out a warning about all the obj directories it is going to
-encounter which are not in the repository.
+changes in.
 
 
    
 
  •  NOTE:
@@ -546,7 +506,6 @@
 	# cd /usr/src
 	# cvs -d $CVSROOT -q up -Pd
    • -

    @@ -575,7 +534,6 @@ # cd /usr/ports # cvs -q up -rOPENBSD_3_6 -Pd - In the above example, -q is optional, only intended to minimize @@ -596,36 +554,7 @@ (included with the CVS sources) has much more information about how CVS can be used. -

    X11 Source tree

    -

    -Anoncvs mirrors also carry the OpenBSD X11 (XFree86) source tree. You can adapt -the recipe above to update your XFree86 source tree from the third CD. -You can copy or download the XFree86 3 source tree with the X11 cvs module, -although the current module containing XFree86 4 is XF4. -There are two ways to get the XF4 sources to /usr/XF4: - -

    - -After this, /usr/XF4 will be ready to be used by cvs. You can for -example update it to -current source (assuming you've already set -the CVSROOT environment variable): - -
    -        # cd /usr/XF4
-        # cvs -q update -Pd
-
    - -

    Warning: When using cvs you should take care that your current directory is either the root of the tree you are referencing or in a separate place such as /tmp. @@ -643,8 +572,37 @@

    Use rsh(1) or ssh(1)?

    +CVS supports three access methods between the CVS server and the CVS +client: + + +

    -By default, the CVS client uses ssh ("secure shell": +NOTE: For users wishing to use rsh, you must first set the +CVS_RSH environment variable to point to the rsh(1) program: + +

    + +

    +By default, OpenBSD's CVS client uses ssh ("secure shell": OpenSSH) to talk to the CVS server.

    @@ -700,7 +658,7 @@

    which would mirror the cvs tree into /home/cvs with the sup data files ending up in /home/sup. The full OpenBSD cvs tree is currently -about 2.2GB in size. +about 2.5GB in size, and will, of course continue to grow.

    Setting up an anoncvs mirror

    @@ -735,7 +693,7 @@ OpenBSD www@openbsd.org -
    $OpenBSD: anoncvs.html,v 1.225 2004/11/24 20:29:47 nick Exp $ +
    $OpenBSD: anoncvs.html,v 1.226 2004/12/03 03:24:17 nick Exp $