1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
FreeBSD maintainer's guide to OpenSSH-portable
==============================================
These instructions assume you have a clone of the FreeBSD git repo
main branch in src/freebsd/main, and will store vendor trees under
src/freebsd/vendor/. In addition, this assumes there is a "freebsd"
origin pointing to git(repo).freebsd.org/src.git.
01) Make sure your mail spool has plenty of free space. It'll fill up
pretty fast once you're done with this checklist.
02) Download the latest OpenSSH-portable tarball and signature from
OpenBSD (https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/).
03) Verify the signature:
$ gpg --verify openssh-X.YpZ.tar.gz.asc
04) Unpack the tarball in a suitable directory:
$ tar xf openssh-X.YpZ.tar.gz
05) Copy to a vendor branch:
$ cd src/freebsd/main
$ git worktree add ../vendor/openssh freebsd/vendor/openssh
$ cd ../vendor/openssh
$ rsync --archive --delete --exclude=.git /path/to/openssh-X.YpZ/ ./
06) Take care of added / deleted files:
$ git add -A
07) Commit:
$ git commit -m "Vendor import of OpenSSH X.YpZ"
08) Tag:
$ git tag -a -m "Tag OpenSSH X.YpZ" vendor/openssh/X.YpZ
At this point the vendor branch can be pushed to the FreeBSD repo via:
$ git push freebsd vendor/openssh
$ git push freebsd vendor/openssh/X.YpZ
Note the second "git push" command is used to push the tag, which is
not pushed by default.
It is also possible to push the branch and tag together, but use
--dry-run first to ensure that no undesired tags will be pushed:
$ git push --dry-run --follow-tags freebsd vendor/openssh
$ git push --follow-tags freebsd vendor/openssh
The update and tag could instead be pushed later, along with the merge
to main, but pushing now allows others to collaborate.
09) Merge from the vendor branch:
$ git subtree merge -P crypto/openssh vendor/openssh
A number of files have been deleted from FreeBSD's copy of ssh,
including rendered man pages (which have a .0 extension). When
git prompts for these deleted files during the merge, choose 'd'
(leaving them deleted).
10) Resolve conflicts. Remember to bump the version addendum in
version.h, and update the default value in sshd_config and
sshd_config.5.
11) Diff against the vendor branch:
$ git diff --diff-filter=M vendor/openssh/X.YpZ HEAD:crypto/openssh
Review the diff for any unexpected changes.
12) Run the configure script:
$ sh freebsd-configure.sh
13) Review changes to config.h very carefully.
Note that libwrap should not be defined in config.h; as of
r311585 (233932cc2a60) it is conditional on MK_TCP_WRAPPERS.
14) If source files have been added or removed, update the appropriate
makefiles to reflect changes in the vendor's Makefile.in.
15) Update ssh_namespace.h:
$ sh freebsd-namespace.sh
16) Build and install world, reboot, test. Pay particular attention
to pam_ssh(8), which gropes inside libssh and will break if
something significant changes or if ssh_namespace.h is out of
whack.
17) Check for references to obsolete configuration options
(e.g., ChallengeResponseAuthentication in sshd_config) which
may exist in release/ scripts.
18) Commit, and hunker down for the inevitable storm of complaints.
An overview of FreeBSD changes to OpenSSH-portable
==================================================
1) Modified server-side defaults
We've modified some configuration defaults in sshd:
- UsePAM defaults to "yes".
- PermitRootLogin defaults to "no".
- PasswordAuthentication defaults to "no".
- VersionAddendum defaults to "FreeBSD-YYYYMMDD".
- UseDNS defaults to "yes".
2) Modified client-side defaults
We've modified some configuration defaults in ssh:
- CheckHostIP defaults to "no".
3) Canonic host names
We've added code to ssh.c to canonicize the target host name after
reading options but before trying to connect. This eliminates the
usual problem with duplicate known_hosts entries.
We added this support in 2002 (r99054 / bf2e2524a2ce). In 2014
upstream introduced CanonicalDomains and related options to serve a
similar purpose but they require environment-specific configuration.
4) setusercontext() environment
Our setusercontext(3) can set environment variables, which we must
take care to transfer to the child's environment.
5) TCP wrappers
Support for TCP wrappers was removed in upstream 6.7p1. We've
added it back by porting the 6.6p1 code forward.
TCP wrappers support in sshd will be disabled in HEAD and will
be removed from FreeBSD in the future.
6) Agent client reference counting
We've added code to ssh-agent.c to implement client reference
counting; the agent will automatically exit when the last client
disconnects.
7) Class-based login restrictions (27ceebbc2402)
We've added code to auth.c to enforce the host.allow, host.deny,
times.allow and times.deny login class capabilities, based on an
upstream submission from
https://github.com/openssh/openssh-portable/pull/262.
8) Blocklist integration
We include blocklist (https://github.com/zoulasc/blocklist) in FreeBSD,
and ssh is patched to report login failures to it.
9) Paths
A number of paths are changed to match FreeBSD's configuration (e.g.,
using /usr/local/ instead of /uxr/X11R6/).
10) Retired patches
We no longer have HPN patches (adaptive buffer size for increased
throughput on high-BxD links) or client-side VersionAddendum, but we
recognize and ignore the configuration options to avoid breaking
existing configurations.
This port was brought to you by (in no particular order) DARPA, NAI
Labs, ThinkSec, Nescafé, the Aberlour Glenlivet Distillery Co.,
Suzanne Vega, and a Sanford's #69 Deluxe Marker.
-- des@FreeBSD.org
|
