summaryrefslogtreecommitdiff
path: root/contrib/redhat
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-10-30 22:03:51 +1100
committerDamien Miller <djm@mindrot.org>2001-10-30 22:03:51 +1100
commit1c613247288c06235b51d0f24f93eb99342f8c6a (patch)
tree53547f4d96dfca1978147823243e7bdd8df54f4a /contrib/redhat
parentb89e694b4c785076f9d4ad2d069cf678da29ec50 (diff)
- (djm) Redhat RPM spec: remove noreplace from config files, allow IPv6
by default (can force IPv4 using --define "noipv6 1")
Diffstat (limited to 'contrib/redhat')
-rw-r--r--contrib/redhat/openssh.spec20
1 files changed, 15 insertions, 5 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 38e9f372..bdc5fba0 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -19,6 +19,9 @@
# Use Redhat 7.0 pam control file
%define redhat7 0
+# Disable IPv6 (avoids DNS hangs on some glibc versions)
+%define noip6 0
+
# Reserve options to override askpass settings with:
# rpm -ba|--rebuild --define 'skip_xxx 1'
%{?skip_x11_askpass:%define no_x11_askpass 1}
@@ -36,6 +39,10 @@
# rpm -ba|--rebuild --define "smartcard 1"
%{?smartcard:%define scard 1}
+# Option to disable ipv6
+# rpm -ba|--rebuild --define "noipv6 1"
+%{?noipv6:%define noip6 1}
+
%define exact_openssl_version %(rpm -q openssl | cut -d - -f 2)
Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
@@ -150,12 +157,15 @@ EXTRA_OPTS=""
EXTRA_OPTS="$EXTRA_OPTS --with-smartcard"
%endif
+%if %{noip6}
+ EXTRA_OPTS="$EXTRA_OPTS --with-ipv4-default "
+%endif
+
%configure \
--libexecdir=%{_libexecdir}/openssh \
--datadir=%{_datadir}/openssh \
--with-pam \
--with-tcp-wrappers \
- --with-ipv4-default \
--with-rsh=/usr/bin/rsh \
--with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin \
$EXTRA_OPTS
@@ -235,7 +245,7 @@ fi
%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
%attr(0644,root,root) %{_mandir}/man1/scp.1*
%attr(0755,root,root) %dir %{_sysconfdir}
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli
+%attr(0600,root,root) %config %{_sysconfdir}/moduli
%attr(0755,root,root) %dir %{_libexecdir}/openssh
%if %{scard}
%attr(0755,root,root) %dir %{_datadir}/openssh
@@ -254,7 +264,7 @@ fi
%attr(0644,root,root) %{_mandir}/man1/ssh-add.1*
%attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1*
%attr(0644,root,root) %{_mandir}/man1/sftp.1*
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh_config
+%attr(0644,root,root) %config %{_sysconfdir}/ssh_config
%attr(-,root,root) %{_bindir}/slogin
%attr(-,root,root) %{_mandir}/man1/slogin.1*
@@ -264,9 +274,9 @@ fi
%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
%attr(0644,root,root) %{_mandir}/man8/sshd.8*
%attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
-#%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config
+#%attr(0600,root,root) %config %{_sysconfdir}/sshd_config
%attr(0600,root,root) %config %{_sysconfdir}/sshd_config
-%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
+%attr(0600,root,root) %config /etc/pam.d/sshd
%attr(0755,root,root) %config /etc/rc.d/init.d/sshd
%if ! %{no_x11_askpass}