From owner-p4-projects Fri Jan 24 17:38:43 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4742237B405; Fri, 24 Jan 2003 17:38:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF3AC37B401 for ; Fri, 24 Jan 2003 17:38:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 194D443F13 for ; Fri, 24 Jan 2003 17:38:17 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0P1cGbv066163 for ; Fri, 24 Jan 2003 17:38:16 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0P1cDO2066158 for perforce@freebsd.org; Fri, 24 Jan 2003 17:38:13 -0800 (PST) Date: Fri, 24 Jan 2003 17:38:13 -0800 (PST) Message-Id: <200301250138.h0P1cDO2066158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 24160 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=24160 Change 24160 by chris@chris_holly on 2003/01/24 17:37:16 Integ. Affected files ... .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#14 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sound/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#13 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#13 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/obraun.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#14 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#4 integrate .. //depot/projects/trustedbsd/doc/share/sgml/freebsd.ent#8 integrate .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#13 integrate .. //depot/projects/trustedbsd/doc/zh_TW.Big5/books/faq/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/zh_TW.Big5/books/faq/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/zh_TW.Big5/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trustedbsd/doc/zh_TW.Big5/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/doc/zh_TW.Big5/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/zh_TW.Big5/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trustedbsd/doc/zh_TW.Big5/share/sgml/mailing-lists.ent#1 branch Differences ... ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#6 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.10 2003/01/12 19:19:32 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.29 2003/01/12 19:04:31 mheinen Exp $ - basiert auf: 1.256 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.11 2003/01/14 23:38:41 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.30 2003/01/14 23:42:58 mheinen Exp $ + basiert auf: 1.257 --> @@ -4332,6 +4332,16 @@ + RELENG_5_0 + + + Der Zweig, auf dem sicherheitsrelevante oder kritische + Fehlerbehebungen für FreeBSD 5.0 durchgeführt + werden. + + + + RELENG_4 ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#3 (text+ko) ==== @@ -26,8 +26,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - $FreeBSD: doc/en_US.ISO8859-1/articles/checkpoint/article.sgml,v 1.4 2003/01/10 05:58:04 blackend Exp $ --> - Jon - Orbeton + Jon + Orbeton - -
jono@securityreports.com
- + +
jono@securityreports.com
+ - Matt - Hite + Matt + Hite - -
mhite@hotmail.com
- - + +
mhite@hotmail.com
+ + - $FreeBSD: doc/en_US.ISO8859-1/articles/checkpoint/article.sgml,v 1.4 2003/01/10 05:58:04 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/checkpoint/article.sgml,v 1.15 2003/01/22 17:40:24 keramida Exp $ 2001, 2002, 2003 @@ -68,22 +66,22 @@ &legalnotice; - + - This document explains how to configure a - VPN tunnel between FreeBSD and Checkpoint's - VPN-1/Firewall-1. Other documents provide similar information, - but do not contain instructions specific to VPN-1/Firewall-1 - and its integration with FreeBSD. These documents are - listed at the conclusion of this paper for further reference. + This document explains how to configure a VPN + tunnel between FreeBSD and Checkpoint's VPN-1/Firewall-1. Other + documents provide similar information, but do not contain instructions + specific to VPN-1/Firewall-1 and its integration with FreeBSD. These + documents are listed at the conclusion of this paper for further + reference. Prerequisites - The following is a diagram of the machines and networks - referenced in this document. + The following is a diagram of the machines and networks referenced + in this document. External Interface External Interface 208.229.100.6 216.218.197.2 @@ -96,34 +94,33 @@ The FreeBSD gateway GW serves as a firewall and NAT device for internal nets. - The FreeBSD kernel must be compiled to support IPSec. - Use the following kernel options: + The FreeBSD kernel must be compiled to support IPSec. Use the + following kernel options to enable IPSec support in your kernel: options IPSEC options IPSEC_ESP options IPSEC_DEBUG For instructions on building a custom kernel, refer to the - - FreeBSD handbook. Please note that IP - protocol 50 (ESP) and UDP - port 500 must be open between the Firewall-1 + FreeBSD + handbook. Please note that IP + protocol 50 (ESP) and UDP + port 500 must be open between the Firewall-1 host and the FreeBSD GW. - Also, racoon must be installed to - support key exchange. Racoon is part - of the FreeBSD ports collection in - security/racoon. The - racoon configuration file will be - covered later in this document. + Also, racoon must be installed to support + key exchange. Racoon is part of the FreeBSD + ports collection in security/racoon. + The racoon configuration file will be covered + later in this document. Firewall-1 Network Object Configuration - Begin by configuring the Firewall-1 Policy. Open the - Policy Editor on the Firewall-1 Management server and create - a new Workstation Network Object representing FreeBSD + Begin by configuring the Firewall-1 Policy. Open the Policy Editor + on the Firewall-1 Management server and create a new + Workstation Network Object representing FreeBSD GW. General Tab: @@ -143,11 +140,12 @@ Support Aggressive Mode: Checked Supports Subnets: Checked - - After setting the pre-shared secret in the Firewall-1 Network - Object definition, place this secret in - /usr/local/etc/racoon/psk.txt on FreeBSD - GW. The format for psk.txt is: + + After setting the pre-shared secret in the Firewall-1 Network Object + definition, place this secret in the + /usr/local/etc/racoon/psk.txt file on FreeBSD + GW. The format for psk.txt + is: 208.229.100.6 rUac0wtoo? @@ -156,8 +154,8 @@ Firewall-1 VPN Rule Configuration - Next, create a Firewall-1 rule enabling encryption between - the FreeBSD GW and the Firewall-1 protected network. + Next, create a Firewall-1 rule enabling encryption between the + FreeBSD GW and the Firewall-1 protected network. In this rule, the network services permitted through the VPN must be defined. @@ -168,16 +166,16 @@ VPN services are any services (i.e. telnet, SSH, - NTP, etc.) which remote hosts are permitted to - access through the VPN. Use caution when - permitting services; hosts connecting through a VPN - still represent a potential security risk. Encrypting the traffic - between the two networks offers little protection if a host on either - side of the tunnel has been compromised. + NTP, etc.) which remote hosts are permitted to access + through the VPN. Use caution when permitting + services; hosts connecting through a VPN still + represent a potential security risk. Encrypting the traffic between the + two networks offers little protection if a host on either side of the + tunnel has been compromised. Once the rule specifying data encryption between the FreeBSD - GW and the Firewall-1 protected network has - been configured, review the Action Encrypt settings. + GW and the Firewall-1 protected network has been + configured, review the Action Encrypt settings. Encryption Schemes Defined: IKE ---> Edit Transform: Encryption + Data Integrity (ESP) @@ -187,13 +185,14 @@ Use Perfect Forward Secrecy: Checked The use of Perfect Forward Secrecy (PFS) is - optional. Enabling PFS will add another layer of + optional. Enabling PFS will add another layer of encryption security, but does come at the cost of increased - CPU overhead. If PFS is not - used, uncheck the box above and comment out the pfs_group 1 - line from racoon.conf on FreeBSD - GW. An example racoon.conf - is provided later in this document. + CPU overhead. If PFS is not used, + uncheck the box above and comment out the + pfs_group 1 line in the + racoon.conf file on FreeBSD GW. + An example racoon.conf file is provided later in + this document. @@ -201,8 +200,8 @@ FreeBSD <acronym>VPN</acronym> Policy Configuration At this point, the VPN policy on FreeBSD - GW must be defined. The - /usr/sbin/setkey tool performs this function. + GW must be defined. The &man.setkey.8; tool performs + this function. Below is an example shell script which will flush &man.setkey.8; and add your VPN policy rules. @@ -244,12 +243,14 @@ FreeBSD <application>Racoon</application> Configuration To facilitate the negotiation of IPSec keys on the FreeBSD - GW, /usr/ports/security/racoon must - be installed and configured. + GW, the + security/racoon port must be + installed and configured. - The following is a racoon configuration file suitable for use with - the examples outlined in this document. Please make sure you fully - understand this file before using in a production environment. + The following is a racoon configuration + file suitable for use with the examples outlined in this document. + Please make sure you fully understand this file before using it in a + production environment. # racoon.conf for use with Checkpoint VPN-1/Firewall-1 # @@ -328,23 +329,24 @@ compression_algorithm deflate ; } - Ensure that /usr/local/etc/racoon/psk.txt - contains the pre-shared secret configured in the "Firewall-1 Network Object - Configuration" section of this document and has mode 600 - permissions. + Ensure that the /usr/local/etc/racoon/psk.txt + file contains the pre-shared secret configured in the Firewall-1 + Network Object Configuration section of this document and has + mode 600 permissions. &prompt.root; chmod 600 /usr/local/etc/racoon/psk.txt - + - - Starting the <acronym>VPN</acronym> + + Starting the <acronym>VPN</acronym> - You are now ready to launch racoon and test - the VPN tunnel. For debugging purposes, open the - Firewall-1 Log Viewer and define a log filter to isolate entries pertaining - to FreeBSD GW. You may also find it helpful to - &man.tail.1; the racoon log: + You are now ready to launch racoon and + test the VPN tunnel. For debugging purposes, open + the Firewall-1 Log Viewer and define a log filter to isolate entries + pertaining to FreeBSD GW. You may also find it + helpful to &man.tail.1; the racoon + log: &prompt.root; tail -f /var/log/racoon.log @@ -353,30 +355,32 @@ &prompt.root; /usr/local/sbin/racoon -f /usr/local/etc/racoon/racoon.conf - Once racoon has been launched, &man.telnet.1; - to a host on the Firewall-1 protected network. + Once racoon has been launched, + &man.telnet.1; to a host on the Firewall-1 protected network. &prompt.root; telnet -s 192.168.10.3 199.208.192.66 22 - This command attempts to connect to the &man.ssh.1; - port on 199.208.192.66, a machine in the Firewall-1 protected network. The - switch indicates the source interface of the outbound - connection. This is particularly important when running - NAT and IPFW on FreeBSD - GW. Using -s and specifying an - explicit source address prevents NAT from mangling the - packet prior to tunneling. + This command attempts to connect to the &man.ssh.1; port on 199.208.192.66, a machine in the Firewall-1 + protected network. The switch indicates the source + interface of the outbound connection. This is particularly important + when running NAT and IPFW on + FreeBSD GW. Using -s and + specifying an explicit source address prevents NAT + from mangling the packet prior to tunneling. A successful racoon key exchange will - output the following to racoon.log: + output the following to the racoon.log log + file: pfkey UPDATE succeeded: ESP/Tunnel 216.218.197.2->208.229.100.6 pk_recvupdate(): IPSec-SA established: ESP/Tunnel 216.218.197.2->208.229.100.6 get pfkey ADD message IPsec-SA established: ESP/Tunnel 208.229.100.6->216.218.197.2 - Once key exchange completes (which takes a few seconds), an &man.ssh.1; - banner will appear. If all went well, two "Key Install" messages will be logged - in the Firewall-1 Log Viewer. + Once key exchange completes (which takes a few seconds), an + &man.ssh.1; banner will appear. If all went well, two Key + Install messages will be logged in the Firewall-1 Log + Viewer. Action | Source | Dest. | Info. Key Install | 216.218.197.2 | 208.229.100.6 | IKE Log: Phase 1 (aggressive) completion. @@ -391,21 +395,20 @@ References - - - - The FreeBSD Handbook: IPSec - + + + + The FreeBSD Handbook: IPSec + - - KAME Project - + + KAME Project + - - - FreeBSD IPSec mini-HOWTO - - - + + + FreeBSD IPSec mini-HOWTO + + ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.148 2003/01/11 11:43:55 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.151 2003/01/21 23:08:04 bmah Exp $ 1999 @@ -54,26 +54,26 @@ Main Repository Host ncvs.FreeBSD.org - + Login Methods &man.ssh.1;, protocol 2 only - - + + Main CVSROOT ncvs.FreeBSD.org:/home/ncvs - + Main &a.cvs; &a.peter; and &a.markm;, as well as &a.joe; for ports/ - - + + Mailing Lists &a.developers;, &a.committers; (Both of these are private list; archives can be found @@ -83,7 +83,7 @@ cluster.) - + Core Team monthly reports @@ -92,14 +92,14 @@ - + Noteworthy CVS Tags RELENG_4 (4.X-STABLE), HEAD (-CURRENT) - + It is required that you use &man.ssh.1; or &man.telnet.1; with Kerberos 5 to connect to the project hosts and only &man.ssh.1;, protocol 2 is allowed connecting to the repository @@ -176,9 +176,9 @@ CVS Operations - It is assumed that you are already familiar with the basic operation + It is assumed that you are already familiar with the basic operation of CVS. - + The CVS repository is hosted on the repository machines. The &a.cvs; are the owners of the CVS repository and are responsible for direct modification of it for the purposes of @@ -244,9 +244,9 @@ CVS reference information, tutorials, and FAQs can also be found at: http://www.cvshome.org/docs/, + url="http://www.cvshome.org/docs/">http://www.cvshome.org/docs/, and the information in Karl Fogel's - chapters from Open Source Development with CVS are also very + chapters from Open Source Development with CVS are also very useful. &a.des; also supplied the following mini primer for @@ -254,520 +254,520 @@ - Check out a module with the co or + Check out a module with the co or checkout command. - &prompt.user; cvs checkout shazam + &prompt.user; cvs checkout shazam - This checks out a copy of the shazam module. If - there is no shazam module in the modules file, it looks for a - top-level directory named shazam instead. + This checks out a copy of the shazam module. If + there is no shazam module in the modules file, it looks for a + top-level directory named shazam instead. - +
Useful <command>cvs checkout</command> options - - - - - Do not create empty directories - + + + + + Do not create empty directories + - - - Check out a single level, no subdirectories - + + + Check out a single level, no subdirectories + - - - Check out revision, branch or tag - rev - + + + Check out revision, branch or tag + rev + - - - Check out the sources as they were on date - date - - - -
+ + + Check out the sources as they were on date + date + + + + - Practical FreeBSD examples: + Practical FreeBSD examples: - - - Check out the miscfs module, - which corresponds to src/sys/miscfs: + + + Check out the miscfs module, + which corresponds to src/sys/miscfs: - &prompt.user; cvs co miscfs + &prompt.user; cvs co miscfs - You now have a directory named miscfs - with subdirectories CVS, - deadfs, devfs, and so - on. One of these (linprocfs) is - empty. - + You now have a directory named miscfs + with subdirectories CVS, + deadfs, devfs, and so + on. One of these (linprocfs) is + empty. + - - Check out the same files, but with full path: + + Check out the same files, but with full path: - &prompt.user; cvs co src/sys/miscfs + &prompt.user; cvs co src/sys/miscfs - You now have a directory named src, - with subdirectories CVS and - sys. src/sys has - subdirectories CVS and - miscfs, etc. - + You now have a directory named src, + with subdirectories CVS and + sys. src/sys has + subdirectories CVS and + miscfs, etc. + - - Check out the same files, but prunes empty - directories: + + Check out the same files, but prunes empty + directories: - &prompt.user; cvs co -P miscfs + &prompt.user; cvs co -P miscfs - You now have a directory named - miscfs with subdirectories - CVS, deadfs, - devfs... but note that there is no - linprocfs subdirectory, because there - are no files in it. - + You now have a directory named + miscfs with subdirectories + CVS, deadfs, + devfs... but note that there is no + linprocfs subdirectory, because there + are no files in it. + - - Check out the directory miscfs, but - none of the subdirectories: + + Check out the directory miscfs, but + none of the subdirectories: - &prompt.user; cvs co -l miscfs + &prompt.user; cvs co -l miscfs - You now have a directory named miscfs - with just one subdirectory named - CVS. - + You now have a directory named miscfs + with just one subdirectory named + CVS. + - - Check out the miscfs module as - it is in the 4.X branch: + + Check out the miscfs module as + it is in the 4.X branch: - &prompt.user; cvs co -rRELENG_4 miscfs + &prompt.user; cvs co -rRELENG_4 miscfs - You can modify the sources and commit along this - branch. - + You can modify the sources and commit along this + branch. + - - Check out the miscfs module as - it was in 3.4-RELEASE. + + Check out the miscfs module as + it was in 3.4-RELEASE. - &prompt.user; cvs co -rRELENG_3_4_0_RELEASE miscfs + &prompt.user; cvs co -rRELENG_3_4_0_RELEASE miscfs - You will not be able to commit modifications, since - RELENG_3_4_0_RELEASE is a point in time, not a branch. - + You will not be able to commit modifications, since + RELENG_3_4_0_RELEASE is a point in time, not a branch. + - - Check out the miscfs module as it was - on Jan 15 2000. + + Check out the miscfs module as it was + on Jan 15 2000. - &prompt.user; cvs co -D'01/15/2000' miscfs + &prompt.user; cvs co -D'01/15/2000' miscfs - You will not be able to commit modifications. - + You will not be able to commit modifications. + - - Check out the miscfs module as it was - one week ago. + + Check out the miscfs module as it was + one week ago. - &prompt.user; cvs co -D'last week' miscfs + &prompt.user; cvs co -D'last week' miscfs - You will not be able to commit modifications. - - + You will not be able to commit modifications. + + - Note that cvs stores metadata in subdirectories named - CVS. + Note that cvs stores metadata in subdirectories named + CVS. - Arguments to and - are sticky, which means cvs will remember them later, e.g. - when you do a cvs update. + Arguments to and + are sticky, which means cvs will remember them later, e.g. + when you do a cvs update. - Check the status of checked-out files with the - status command. + Check the status of checked-out files with the + status command. - &prompt.user; cvs status shazam + &prompt.user; cvs status shazam - This displays the status of the - shazam file or of every file in the - shazam directory. For every file, the - status is given as one of: + This displays the status of the + shazam file or of every file in the + shazam directory. For every file, the + status is given as one of: - - - - - Up-to-date - File is up-to-date and unmodified. - + + + + + Up-to-date + File is up-to-date and unmodified. + - - Needs Patch - File is unmodified, but there is a newer revision in - the repository. - + + Needs Patch + File is unmodified, but there is a newer revision in + the repository. + - - Locally Modified - File is up-to-date, but modified. - + + Locally Modified + File is up-to-date, but modified. + - - Needs Merge - File is modified, and there is a newer revision in the - repository. - + + Needs Merge + File is modified, and there is a newer revision in the + repository. + - - File had conflicts on merge - There were conflicts the last time this file was - updated, and they have not been resolved yet. - - - - + + File had conflicts on merge + There were conflicts the last time this file was + updated, and they have not been resolved yet. + + + + - You will also see the local revision and date, - the revision number of the newest applicable version - (newest applicable because if you have a - sticky date, tag or branch, it may not be the actual newest - revision), and any sticky tags, dates or options. + You will also see the local revision and date, + the revision number of the newest applicable version + (newest applicable because if you have a + sticky date, tag or branch, it may not be the actual newest + revision), and any sticky tags, dates or options. - Once you have checked something out, update it with the - update command. + Once you have checked something out, update it with the + update command. - &prompt.user; cvs update shazam + &prompt.user; cvs update shazam - This updates the shazam file or the - contents of the shazam directory to the - latest version along the branch you checked out. If you - checked out a point in time, does nothing - unless the tags have moved in the repository or some other weird - stuff is going on. + This updates the shazam file or the + contents of the shazam directory to the + latest version along the branch you checked out. If you + checked out a point in time, does nothing + unless the tags have moved in the repository or some other weird + stuff is going on. - Useful options, in addition to those listed above for - checkout: + Useful options, in addition to those listed above for + checkout: - - - - - - Check out any additional missing directories. - + + + + + + Check out any additional missing directories. + - - - Update to head of main branch. - + + + Update to head of main branch. + - - - More magic (see below). - - - - + + + More magic (see below). + + + + - If you checked out a module with or - , running cvs update - with a different or - argument or with will select a new branch, - revision or date. The option clears all - sticky tags, dates or revisions whereas - and set new ones. + If you checked out a module with or + , running cvs update + with a different or + argument or with will select a new branch, + revision or date. The option clears all + sticky tags, dates or revisions whereas + and set new ones. - Theoretically, specifying HEAD as - argument to will give you the same result - as , but that is just theory. + Theoretically, specifying HEAD as + argument to will give you the same result + as , but that is just theory. - The option is useful if: + The option is useful if: - - - somebody has added subdirectories to the module - you have checked out after you checked it out. - + + + somebody has added subdirectories to the module + you have checked out after you checked it out. + - - you checked out with , and later - change your mind and want to check out the subdirectories - as well. - + + you checked out with , and later + change your mind and want to check out the subdirectories + as well. + - - you deleted some subdirectories and want to check - them all back out. - - + + you deleted some subdirectories and want to check + them all back out. + + - Watch the output of the cvs - update with care. The letter in front of - each filename indicates what was done with it: + Watch the output of the cvs + update with care. The letter in front of + each filename indicates what was done with it: - - - - - U - The file was updated without trouble. - + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message