- up to 5.9p1 (lpk patch needs update; builds --without ldap only for now)

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 8aed9ee4aede1db11437ea6fd7a02bf78ac4e868..580eaba02e4243ecd0e52b5434d52f65621666fb 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -28,13 +28,13 @@ Summary(pt_BR.UTF-8):       Implementação livre do SSH
 Summary(ru.UTF-8):     OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
-Version:       5.8p1
-Release:       5
+Version:       5.9p1
+Release:       0.1
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 86f5e1c23b4c4845f23b9b7b493fb53d
+# Source0-md5: b50a499fa02616a47984b1920848b565
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 66943d481cc422512b537bcc2c7400d1
 Source2:       %{name}d.init
@@ -94,26 +94,6 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _privsepdir     /usr/share/empty
 %define                schemadir       /usr/share/openldap/schema
 
-## to be moved to rpm-build-macros
-## TODO: handle RPM_SKIP_AUTO_RESTART
-
-# migrate from init script to upstart job
-%define        upstart_post() \
-       if [ -f /var/lock/subsys/"%1" ] ; then \
-               /sbin/service --no-upstart "%1" stop \
-               /sbin/service "%1" start \
-       else \
-               /sbin/service "%1" try-restart \
-       fi
-
-# restart the job after upgrade or migrate to init script on removal
-%define        upstart_postun() \
-       if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep -q 'running' ; then \
-               /sbin/initctl stop "%1" 2>/dev/null \
-               [ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] && /sbin/service "%1" start \
-       fi
-
-
 %description
 Ssh (Secure Shell) a program for logging into a remote machine and for
 executing commands in a remote machine. It is intended to replace
@@ -424,6 +404,7 @@ Summary(pl.UTF-8):  Opis zadania Upstart dla serwera OpenSSH
 Group:         Daemons
 Requires:      %{name}-server = %{epoch}:%{version}-%{release}
 Requires:      upstart >= 0.6
+Conflicts:     syslog-ng < 3.2.4-1
 
 %description server-upstart
 Upstart job description for OpenSSH.
@@ -519,15 +500,22 @@ openldap-a.
 %patch12 -p1
 %patch13 -p1
 
-cp -p %{SOURCE3} sshd.pamd
+cp -p %{SOURCE3} sshd.pam
+install -p %{SOURCE2} sshd.init
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
 %{__sed} -i -e '/pkg-config/s/ x11//' contrib/Makefile
 # not present in ac, no point searching it
-%{__sed} -i -e '/pam_keyinit.so/d' sshd.pamd
+%{__sed} -i -e '/pam_keyinit.so/d' sshd.pam
+
+# openssl on ac does not have OPENSSL_HAS_ECC
+%{__sed} -i -e '/ecdsa/d' sshd.init
 %endif
 
+# hack since arc4random from openbsd-compat needs symbols from libssh and vice versa
+sed -i -e 's#-lssh -lopenbsd-compat#-lssh -lopenbsd-compat -lssh#g' Makefile*
+
 %build
 cp /usr/share/automake/config.sub .
 %{__aclocal}
@@ -580,7 +568,7 @@ install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d}
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
+install -p sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
 cp -p sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/sshd
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/profile.d
@@ -675,7 +663,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.RNG TODO README OVERVIEW CREDITS Change*
+%doc TODO README OVERVIEW CREDITS Change*
 %attr(755,root,root) %{_bindir}/ssh-key*
 %attr(755,root,root) %{_bindir}/ssh-vulnkey*
 %{_mandir}/man1/ssh-key*.1*