FREEBSD-upgrade (27067774dce3388702a4cf744d7096c6fb71b688) FREEBSD-upgrade (b23ddc58558b7f3ea00139d9cbbf02452d29c233)
1 FreeBSD maintainer's guide to OpenSSH-portable
2 ==============================================
3
400) Make sure your mail spool has plenty of free space. It'll fill up
5 pretty fast once you're done with this checklist.
6
701) Download the latest OpenSSH-portable tarball and signature from
8 OpenBSD (ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/).
9
1002) Verify the signature:
11
12 $ gpg --verify openssh-X.YpZ.tar.gz.asc
13
1403) Unpack the tarball in a suitable directory:
15
16 $ tar xf openssh-X.YpZ.tar.gz
17
1804) Copy to the vendor directory:
19
1 FreeBSD maintainer's guide to OpenSSH-portable
2 ==============================================
3
400) Make sure your mail spool has plenty of free space. It'll fill up
5 pretty fast once you're done with this checklist.
6
701) Download the latest OpenSSH-portable tarball and signature from
8 OpenBSD (ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/).
9
1002) Verify the signature:
11
12 $ gpg --verify openssh-X.YpZ.tar.gz.asc
13
1403) Unpack the tarball in a suitable directory:
15
16 $ tar xf openssh-X.YpZ.tar.gz
17
1804) Copy to the vendor directory:
19
20 $ svn co svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/dist
20 $ svn co svn+ssh://repo.freebsd.org/base/vendor-crypto/openssh/dist
21 $ rsync --archive --delete openssh-X.YpZ/ dist/
22
2305) Take care of added / deleted files:
24
25 $ svn rm $(svn stat dist | awk '$1 == "!" { print $2 }')
26 $ svn add --no-auto-props $(svn stat dist | awk '$1 == "?" { print $2 }')
27
2806) Commit:
29
30 $ svn commit -m "Vendor import of OpenSSH X.YpZ." dist
31
3207) Tag:
33
34 $ svn copy -m "Tag OpenSSH X.YpZ." \
21 $ rsync --archive --delete openssh-X.YpZ/ dist/
22
2305) Take care of added / deleted files:
24
25 $ svn rm $(svn stat dist | awk '$1 == "!" { print $2 }')
26 $ svn add --no-auto-props $(svn stat dist | awk '$1 == "?" { print $2 }')
27
2806) Commit:
29
30 $ svn commit -m "Vendor import of OpenSSH X.YpZ." dist
31
3207) Tag:
33
34 $ svn copy -m "Tag OpenSSH X.YpZ." \
35 svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/dist \
36 svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/X.YpZ
35 svn+ssh://repo.freebsd.org/base/vendor-crypto/openssh/dist \
36 svn+ssh://repo.freebsd.org/base/vendor-crypto/openssh/X.YpZ
37
3808) Check out head and run the pre-merge script, which strips our RCS
39 tags from files that have them:
40
37
3808) Check out head and run the pre-merge script, which strips our RCS
39 tags from files that have them:
40
41 $ svn co svn+ssh://svn.freebsd.org/base/head
41 $ svn co svn+ssh://repo.freebsd.org/base/head
42 $ cd head/crypto/openssh
43 $ sh freebsd-pre-merge.sh
44
4509) Merge from the vendor branch:
46
47 $ svn merge -cNNNNNN \^/vendor-crypto/openssh/dist .
48
490A) Resolve conflicts. Remember to bump the version addendum in

--- 129 unchanged lines hidden --- 		42 $ cd head/crypto/openssh
43 $ sh freebsd-pre-merge.sh
44
4509) Merge from the vendor branch:
46
47 $ svn merge -cNNNNNN \^/vendor-crypto/openssh/dist .
48
490A) Resolve conflicts. Remember to bump the version addendum in

--- 129 unchanged lines hidden ---