| 1 |
This source was retrieved from ftp.openbsd.org on |
| 2 |
Thu Jul 15 19:38:16 EDT 1999 |
| 3 |
|
| 4 |
---- |
| 5 |
|
| 6 |
To do a new import: |
| 7 |
|
| 8 |
1. go to ftp.openbsd.org and get sources from libexec/ftpd. The files |
| 9 |
are: |
| 10 |
|
| 11 |
Makefile ftpcmd.y ftpd.c logwtmp.c popen.c |
| 12 |
extern.h ftpd.8 logutmp.c pathnames.h |
| 13 |
|
| 14 |
If OpenBSD has added more files, be sure to get them and update this |
| 15 |
list. Put the files in a temp directory. |
| 16 |
|
| 17 |
2. Update this file as necessary (including particularly the date at |
| 18 |
the top) and copy it into the temp directory under the name README. |
| 19 |
|
| 20 |
3. Make sure CVSROOT is set correctly. |
| 21 |
|
| 22 |
4. Do the following: |
| 23 |
|
| 24 |
cvs import -m "Import from OpenBSD <desc>" linux-ftpd/ftpd \ |
| 25 |
openbsd openbsd-<version> |
| 26 |
|
| 27 |
where <version> should represent the OpenBSD version, either a release |
| 28 |
number or the date of a -current in the form 19990630, and <desc> |
| 29 |
should hold the same information in a human-readable format. |
| 30 |
|
| 31 |
Note that you can't use . in cvs tags; use _ instead. |
| 32 |
|
| 33 |
E.g.: |
| 34 |
|
| 35 |
cvs import -m "Import from OpenBSD 1.4" linux-ftpd/ftpd openbsd openbsd-1_4 |
| 36 |
|
| 37 |
or |
| 38 |
|
| 39 |
cvs import -m "Import from OpenBSD June 30, 1999" linux-ftpd/ftpd \ |
| 40 |
openbsd openbsd-19990630 |
| 41 |
|
| 42 |
|
| 43 |
5. If there are merge conflicts cvs will tell you to do a cvs checkout |
| 44 |
with some -j flags. Do that in a scratch tree, clean up the conflicts, |
| 45 |
and commit the results. Then update your main working tree, build, and |
| 46 |
test. |
| 47 |
|
| 48 |
You may want to manually check any OpenBSD changes to see if they have |
| 49 |
added anything that won't work in Linux. |
| 50 |
|