[Bug 260] New: Expanded features in spec file.

[bugzilla-daemon at mindrot.org]

http://bugzilla.mindrot.org/show_bug.cgi?id=260

           Summary: Expanded features in spec file.
           Product: Portable OpenSSH
           Version: -current
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: Miscellaneous
        AssignedTo: openssh-unix-dev at mindrot.org
        ReportedBy: seba at iq.pl


This patch resolves compile failure when openssh is compiled against static 
libcrypto under redhat 6.2/7.2.
Also adds some configuration capabilities.

--- openssh.spec.orig   Mon May 20 03:03:15 2002
+++ openssh.spec        Mon May 20 03:03:51 2002
@@ -26,6 +26,12 @@
 # Disable IPv6 (avoids DNS hangs on some glibc versions)
 %define noip6 0

+# Do we want ssh suid root? (1=yes 0=no)
+%define suidssh 0
+
+# Do we want kerberos5 support (1=yes 0=no)
+%define kerberos5 0
+
 # Reserve options to override askpass settings with:
 # rpm -ba|--rebuild --define 'skip_xxx 1'
 %{?skip_x11_askpass:%define no_x11_askpass 1}
@@ -184,15 +190,22 @@
 %if %{noip6}
        --with-ipv4-default \
 %endif
+%if ! %{suidssh}
+       --disable-suid-ssh \
+%endif
 %if %{rescue}
        --without-pam --with-md5-passwords
 %else
+%if %{kerberos5}
        --with-pam --with-kerberos5=/usr/kerberos
+%else
+       --with-pam
+%endif
 %endif


 %if %{static_libcrypto}
-perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile
+perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a -ldl|g" Makefile
 %endif

 make
@@ -314,7 +327,11 @@

 %files clients
 %defattr(-,root,root)
+%if %{suidssh}
 %attr(4755,root,root) %{_bindir}/ssh
+%else
+%attr(0755,root,root) %{_bindir}/ssh
+%endif
 %attr(0644,root,root) %{_mandir}/man1/ssh.1*
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
 %attr(-,root,root) %{_bindir}/slogin



------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.