diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/redhat/openssh.spec | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 623cfa6d6..656e692e8 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,5 +1,5 @@ | |||
1 | %define ver 3.6.1p2 | 1 | %define ver 3.6.1p2 |
2 | %define rel 2 | 2 | %define rel 3 |
3 | 3 | ||
4 | # OpenSSH privilege separation requires a user & group ID | 4 | # OpenSSH privilege separation requires a user & group ID |
5 | %define sshd_uid 74 | 5 | %define sshd_uid 74 |
@@ -26,9 +26,6 @@ | |||
26 | # Is this build for RHL 6.x? | 26 | # Is this build for RHL 6.x? |
27 | %define build6x 0 | 27 | %define build6x 0 |
28 | 28 | ||
29 | # Disable IPv6 (avoids DNS hangs on some glibc versions) | ||
30 | %define noip6 0 | ||
31 | |||
32 | # Do we want kerberos5 support (1=yes 0=no) | 29 | # Do we want kerberos5 support (1=yes 0=no) |
33 | %define kerberos5 1 | 30 | %define kerberos5 1 |
34 | 31 | ||
@@ -43,7 +40,6 @@ | |||
43 | # If this is RHL 6.x, the default configuration has sysconfdir in /usr/etc. | 40 | # If this is RHL 6.x, the default configuration has sysconfdir in /usr/etc. |
44 | %if %{build6x} | 41 | %if %{build6x} |
45 | %define _sysconfdir /etc | 42 | %define _sysconfdir /etc |
46 | %define noip6 1 | ||
47 | %endif | 43 | %endif |
48 | 44 | ||
49 | # Options for static OpenSSL link: | 45 | # Options for static OpenSSL link: |
@@ -54,10 +50,6 @@ | |||
54 | # rpm -ba|--rebuild --define "smartcard 1" | 50 | # rpm -ba|--rebuild --define "smartcard 1" |
55 | %{?smartcard:%define scard 1} | 51 | %{?smartcard:%define scard 1} |
56 | 52 | ||
57 | # Option to disable ipv6 | ||
58 | # rpm -ba|--rebuild --define "noipv6 1" | ||
59 | %{?noipv6:%define noip6 1} | ||
60 | |||
61 | # Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no) | 53 | # Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no) |
62 | %define rescue 0 | 54 | %define rescue 0 |
63 | %{?build_rescue:%define rescue 1} | 55 | %{?build_rescue:%define rescue 1} |
@@ -196,9 +188,6 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS | |||
196 | %if %{scard} | 188 | %if %{scard} |
197 | --with-smartcard \ | 189 | --with-smartcard \ |
198 | %endif | 190 | %endif |
199 | %if %{noip6} | ||
200 | --with-ipv4-default \ | ||
201 | %endif | ||
202 | %if %{rescue} | 191 | %if %{rescue} |
203 | --without-pam --with-md5-passwords \ | 192 | --without-pam --with-md5-passwords \ |
204 | %else | 193 | %else |
@@ -402,6 +391,10 @@ fi | |||
402 | %endif | 391 | %endif |
403 | 392 | ||
404 | %changelog | 393 | %changelog |
394 | * Mon Jun 2 2003 Damien Miller <djm@mindrot.org> | ||
395 | - Remove noip6 option. This may be controlled at run-time in client config | ||
396 | file using new AddressFamily directive | ||
397 | |||
405 | * Mon May 12 2003 Damien Miller <djm@mindrot.org> | 398 | * Mon May 12 2003 Damien Miller <djm@mindrot.org> |
406 | - Don't install profile.d scripts when not building with GNOME/GTK askpass | 399 | - Don't install profile.d scripts when not building with GNOME/GTK askpass |
407 | (patch from bet@rahul.net) | 400 | (patch from bet@rahul.net) |