packages: openssh/openssh.spec, openssh/opensshd.init - disable ecdsa on ac...

[glen]

Author: glen                         Date: Wed Apr 27 20:49:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable ecdsa on ac (openssl lacks OPENSSL_HAS_ECC)

---- Files affected:
packages/openssh:
   openssh.spec (1.360 -> 1.361) , opensshd.init (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.360 packages/openssh/openssh.spec:1.361
--- packages/openssh/openssh.spec:1.360	Thu Apr 21 08:20:30 2011
+++ packages/openssh/openssh.spec	Wed Apr 27 22:49:22 2011
@@ -30,7 +30,7 @@
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	5.8p1
-Release:	5
+Release:	6
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -521,12 +521,16 @@
 %patch13 -p1
 
 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.pam
+
+# openssl on ac does not have OPENSSL_HAS_ECC
+%{__sed} -i -e '/ecdsa/d' sshd.init
 %endif
 
 %build
@@ -581,7 +585,7 @@
 
 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
@@ -767,6 +771,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.361  2011/04/27 20:49:22  glen
+- disable ecdsa on ac (openssl lacks OPENSSL_HAS_ECC)
+
 Revision 1.360  2011/04/21 06:20:30  glen
 - typos
 

================================================================
Index: packages/openssh/opensshd.init
diff -u packages/openssh/opensshd.init:1.47 packages/openssh/opensshd.init:1.48
--- packages/openssh/opensshd.init:1.47	Sun Feb 20 11:29:52 2011
+++ packages/openssh/opensshd.init	Wed Apr 27 22:49:22 2011
@@ -65,7 +65,7 @@
 		/usr/bin/ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' >&2
 		chmod 600 /etc/ssh/ssh_host_ecdsa_key
 		[ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_ecdsa_key
-	fi
+	fi # ecdsa
 }
 
 start() {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.360&r2=1.361&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/opensshd.init?r1=1.47&r2=1.48&f=u