diff options
Diffstat (limited to 'contrib/redhat/openssh.spec')
-rw-r--r-- | contrib/redhat/openssh.spec | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 38e9f372b..bdc5fba07 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -19,6 +19,9 @@ | |||
19 | # Use Redhat 7.0 pam control file | 19 | # Use Redhat 7.0 pam control file |
20 | %define redhat7 0 | 20 | %define redhat7 0 |
21 | 21 | ||
22 | # Disable IPv6 (avoids DNS hangs on some glibc versions) | ||
23 | %define noip6 0 | ||
24 | |||
22 | # Reserve options to override askpass settings with: | 25 | # Reserve options to override askpass settings with: |
23 | # rpm -ba|--rebuild --define 'skip_xxx 1' | 26 | # rpm -ba|--rebuild --define 'skip_xxx 1' |
24 | %{?skip_x11_askpass:%define no_x11_askpass 1} | 27 | %{?skip_x11_askpass:%define no_x11_askpass 1} |
@@ -36,6 +39,10 @@ | |||
36 | # rpm -ba|--rebuild --define "smartcard 1" | 39 | # rpm -ba|--rebuild --define "smartcard 1" |
37 | %{?smartcard:%define scard 1} | 40 | %{?smartcard:%define scard 1} |
38 | 41 | ||
42 | # Option to disable ipv6 | ||
43 | # rpm -ba|--rebuild --define "noipv6 1" | ||
44 | %{?noipv6:%define noip6 1} | ||
45 | |||
39 | %define exact_openssl_version %(rpm -q openssl | cut -d - -f 2) | 46 | %define exact_openssl_version %(rpm -q openssl | cut -d - -f 2) |
40 | 47 | ||
41 | Summary: The OpenSSH implementation of SSH protocol versions 1 and 2 | 48 | Summary: The OpenSSH implementation of SSH protocol versions 1 and 2 |
@@ -150,12 +157,15 @@ EXTRA_OPTS="" | |||
150 | EXTRA_OPTS="$EXTRA_OPTS --with-smartcard" | 157 | EXTRA_OPTS="$EXTRA_OPTS --with-smartcard" |
151 | %endif | 158 | %endif |
152 | 159 | ||
160 | %if %{noip6} | ||
161 | EXTRA_OPTS="$EXTRA_OPTS --with-ipv4-default " | ||
162 | %endif | ||
163 | |||
153 | %configure \ | 164 | %configure \ |
154 | --libexecdir=%{_libexecdir}/openssh \ | 165 | --libexecdir=%{_libexecdir}/openssh \ |
155 | --datadir=%{_datadir}/openssh \ | 166 | --datadir=%{_datadir}/openssh \ |
156 | --with-pam \ | 167 | --with-pam \ |
157 | --with-tcp-wrappers \ | 168 | --with-tcp-wrappers \ |
158 | --with-ipv4-default \ | ||
159 | --with-rsh=/usr/bin/rsh \ | 169 | --with-rsh=/usr/bin/rsh \ |
160 | --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin \ | 170 | --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin \ |
161 | $EXTRA_OPTS | 171 | $EXTRA_OPTS |
@@ -235,7 +245,7 @@ fi | |||
235 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* | 245 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* |
236 | %attr(0644,root,root) %{_mandir}/man1/scp.1* | 246 | %attr(0644,root,root) %{_mandir}/man1/scp.1* |
237 | %attr(0755,root,root) %dir %{_sysconfdir} | 247 | %attr(0755,root,root) %dir %{_sysconfdir} |
238 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli | 248 | %attr(0600,root,root) %config %{_sysconfdir}/moduli |
239 | %attr(0755,root,root) %dir %{_libexecdir}/openssh | 249 | %attr(0755,root,root) %dir %{_libexecdir}/openssh |
240 | %if %{scard} | 250 | %if %{scard} |
241 | %attr(0755,root,root) %dir %{_datadir}/openssh | 251 | %attr(0755,root,root) %dir %{_datadir}/openssh |
@@ -254,7 +264,7 @@ fi | |||
254 | %attr(0644,root,root) %{_mandir}/man1/ssh-add.1* | 264 | %attr(0644,root,root) %{_mandir}/man1/ssh-add.1* |
255 | %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1* | 265 | %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1* |
256 | %attr(0644,root,root) %{_mandir}/man1/sftp.1* | 266 | %attr(0644,root,root) %{_mandir}/man1/sftp.1* |
257 | %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh_config | 267 | %attr(0644,root,root) %config %{_sysconfdir}/ssh_config |
258 | %attr(-,root,root) %{_bindir}/slogin | 268 | %attr(-,root,root) %{_bindir}/slogin |
259 | %attr(-,root,root) %{_mandir}/man1/slogin.1* | 269 | %attr(-,root,root) %{_mandir}/man1/slogin.1* |
260 | 270 | ||
@@ -264,9 +274,9 @@ fi | |||
264 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server | 274 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server |
265 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* | 275 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* |
266 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* | 276 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* |
267 | #%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config | 277 | #%attr(0600,root,root) %config %{_sysconfdir}/sshd_config |
268 | %attr(0600,root,root) %config %{_sysconfdir}/sshd_config | 278 | %attr(0600,root,root) %config %{_sysconfdir}/sshd_config |
269 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd | 279 | %attr(0600,root,root) %config /etc/pam.d/sshd |
270 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd | 280 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd |
271 | 281 | ||
272 | %if ! %{no_x11_askpass} | 282 | %if ! %{no_x11_askpass} |