On Wed, May 01, 2013 at 06:27:13PM -0400, Nick Holland wrote: >So, if you want to hit this thing before I do...that's where I'd >recommend starting.
OK, here's a first try. I just skipped the example about overwriting existing config files, as rsync doesn't provide a default rsyncd.conf. I think the text is clear enough with the example, otherwise another package should be used in this example. Index: faq15.html =================================================================== RCS file: /cvs/www/faq/faq15.html,v retrieving revision 1.91 diff -u -r1.91 faq15.html --- faq15.html 1 May 2013 13:16:32 -0000 1.91 +++ faq15.html 2 May 2013 20:46:16 -0000 @@ -316,19 +316,16 @@ with the package name, as in the following basic example. <blockquote><pre> -$ <b>sudo pkg_add -v screen-4.0.3p1</b> -parsing screen-4.0.3p1 -installed /etc/screenrc from /usr/local/share/examples/screen/screenrc | 71% -screen-4.0.3p1: complete +$ <b>sudo pkg_add -v rsync-3.0.9p2</b> +rsync-3.0.9p2: ok </pre></blockquote> <p> In this example the <b>-v</b> flag was used to give a more verbose -output. -This option is not needed but it is helpful for debugging and was -used here to give a little more insight into what pkg_add(1) is actually +output. However, in this case there was no additional output. +This option is not needed but it is helpful for debugging and can be +used to give a little more insight into what pkg_add(1) is actually doing. -Notice the message mentioning <i>/etc/screenrc</i>. Specifying multiple <b>-v</b> flags will produce even more verbose output. @@ -342,14 +339,13 @@ you can try something like: <blockquote><pre> -$ <b>sudo pkg_add -i screen</b> -Ambiguous: screen could be screen-4.0.3p3 screen-4.0.3p3-shm -Choose one package - 0: <None> - 1: screen-4.0.3p3 - 2: screen-4.0.3p3-shm +$ <b>sudo pkg_add -i rsync</b> +Ambiguous: choose package for rsync + a 0: <None> + 1: rsync-3.0.9p2 + 2: rsync-3.0.9p2-iconv Your choice: 1 -screen-4.0.3p3: complete +rsync-3.0.9p2: ok </pre></blockquote> @@ -420,8 +416,8 @@ Let's consider installation via FTP in the next example: <blockquote><pre> -$ <b>sudo pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/5.3/packages/`machine -a`/screen-4.0.3p3.tgz</b> -screen-4.0.3p1: complete +$ <b>sudo pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/5.3/packages/`machine -a`/rsync-3.0.9p2.tgz</b> +rsync-3.0.9p2: ok </pre></blockquote> <p> @@ -443,15 +439,6 @@ Instead, it will inform you about this as follows (only when using the <b>-v</b> flag, however!): -<blockquote><pre> -$ <b>sudo pkg_add -v screen-4.0.3p1</b> -parsing screen-4.0.3p1 -The existing file /etc/screenrc has NOT been changed** | 71% -It does NOT match the sample file /usr/local/share/examples/screen/screenrc -You may wish to update it manually -screen-4.0.3p1: complete -</pre></blockquote> - Sometimes you may encounter an error like the one in the following example: @@ -522,7 +509,7 @@ mutt-1.4.2.2i tty-based e-mail client pcre-6.4p1 perl-compatible regular expression library png-1.2.14p0 library for manipulating PNG images -screen-4.0.3p1 multi-screen window manager +rsync-3.0.9p2 mirroring/synchronization over low bandwidth links tcsh-6.14.00p1 extended C-shell with many useful features tiff-3.8.2p0 tools and library routines for working with TIFF images tin-1.8.2p0 threaded NNTP and spool based UseNet newsreader @@ -579,16 +566,19 @@ above) and use <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pkg_delete&sektion=1&manpath=OpenBSD+5.3";>pkg_delete(1)</a> to remove the package. -In the example below, the screen package is being removed. +In the example below, the rsync package is being removed. Notice that on some occasions there are instructions of extra items that need to be removed that pkg_delete(1) did not remove for you. As with the pkg_add(1) utility, you can use the <b>-v</b> flag to get more verbose output. <blockquote><pre> -$ <b>sudo pkg_delete screen</b> -screen-4.0.3p1: complete -Clean shared items: complete +$ <b>sudo pkg_delete rsync</b> +rsync-3.0.9p2: ok +Read shared items: ok +--- -rsync-3.0.9p2 ------------------- +You should also run /usr/sbin/userdel _rsync +You should also run /usr/sbin/groupdel _rsync </pre></blockquote> <p> @@ -596,7 +586,7 @@ and flavors with the package name, since pkg_delete(1) will usually be able to find the full name by itself. You need to specify the complete package name (in the example, that is -screen-4.0.3p1) only if ambiguity is possible due to multiple installed +rsync-3.0.9p2) only if ambiguity is possible due to multiple installed packages with the specified name. In that case pkg_delete(1) cannot know which package to delete. @@ -606,11 +596,13 @@ Instead it will inform you about this as follows: <blockquote><pre> -$ <b>sudo pkg_delete screen</b> -screen-4.0.3p1: complete -Clean shared items: complete ---- screen-4.0.3p1 ------------------- -You should also remove /etc/screenrc (which was modified) +$ <b>sudo pkg_delete rsync</b> +rsync-3.0.9p2: ok +Read shared items: ok +--- -rsync-3.0.9p2 ------------------- +You should also remove /etc/rsyncd.conf +You should also run /usr/sbin/userdel _rsync +You should also run /usr/sbin/groupdel _rsync </pre></blockquote> <p>
