packages: openssh/openssh.spec - rel 2 - added openldap-schema-openssh-lpk ...

[baggins]

Author: baggins                      Date: Tue May 26 15:49:06 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- added openldap-schema-openssh-lpk package
- build with LDAP support by default
- updated blacklist patch
- updated openssh-lpk patch

---- Files affected:
packages/openssh:
   openssh.spec (1.314 -> 1.315) 

---- Diffs:

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.314 packages/openssh/openssh.spec:1.315
--- packages/openssh/openssh.spec:1.314	Mon May 18 16:59:54 2009
+++ packages/openssh/openssh.spec	Tue May 26 17:49:01 2009
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_with	gnome		# with gnome-askpass (GNOME 1.x) utility
 %bcond_without	gtk		# without GTK+ (2.x)
-%bcond_with	ldap		# with ldap support
+%bcond_without	ldap		# with ldap support
 %bcond_without	libedit		# without libedit (editline/history support in sftp client)
 %bcond_without	kerberos5	# without kerberos5 support
 %bcond_without	selinux		# build without SELinux support
@@ -23,7 +23,7 @@
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	5.2p1
-Release:	1
+Release:	2
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -36,11 +36,12 @@
 Source4:	%{name}.sysconfig
 Source5:	ssh-agent.sh
 Source6:	ssh-agent.conf
+Source7:	%{name}-lpk.schema
 Patch0:		%{name}-no_libnsl.patch
 Patch2:		%{name}-pam_misc.patch
 Patch3:		%{name}-sigpipe.patch
-# http://www.opendarwin.org/projects/openssh-lpk/
-Patch4:		%{name}-lpk-4.3p1-0.3.7.patch
+# http://code.google.com/p/openssh-lpk/
+Patch4:		%{name}-lpk.patch
 Patch5:		%{name}-config.patch
 Patch7:		%{name}-selinux.patch
 # High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
@@ -75,6 +76,7 @@
 %define		_sysconfdir	/etc/ssh
 %define		_libexecdir	%{_libdir}/%{name}
 %define		_privsepdir	/usr/share/empty
+%define		schemadir	/usr/share/openldap/schema
 
 %description
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -456,6 +458,20 @@
 Цей пакет містить діалог вводу ключової фрази для використання під
 GNOME.
 
+%package -n openldap-schema-openssh-lpk
+Summary:	OpenSSH LDAP Public Key schema
+Summary(pl.UTF-8):	Schemat klucza publicznego LDAP dla OpenSSH
+Group:		Networking/Daemons
+Requires(post,postun):	sed >= 4.0
+Requires:	openldap-servers
+
+%description -n openldap-schema-openssh-lpk
+This package contains OpenSSH LDAP Public Key schema for openldap.
+
+%description -n openldap-schema-openssh-lpk -l pl.UTF-8
+Ten pakiet zawiera schemat klucza publicznego LDAP dla OpenSSH
+dla openldap-a.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -511,7 +527,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,env.d}} \
-	$RPM_BUILD_ROOT%{_libexecdir}/ssh
+	$RPM_BUILD_ROOT{%{_libexecdir}/ssh,%{schemadir}}
 install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d}
 
 %{__make} install \
@@ -525,6 +541,7 @@
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/profile.d
 ln -sf	/etc/profile.d/ssh-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ssh-agent.sh
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}
+install %{SOURCE7} $RPM_BUILD_ROOT%{schemadir}
 
 %if %{with gnome}
 install contrib/gnome-ssh-askpass1 $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
@@ -667,12 +684,25 @@
 %attr(755,root,root) %{_libexecdir}/ssh-askpass
 %endif
 
+%if %{with ldap}
+%files -n openldap-schema-openssh-lpk
+%defattr(644,root,root,755)
+%{schemadir}/openssh-lpk.schema
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315  2009/05/26 15:49:01  baggins
+- rel 2
+- added openldap-schema-openssh-lpk package
+- build with LDAP support by default
+- updated blacklist patch
+- updated openssh-lpk patch
+
 Revision 1.314  2009/05/18 14:59:54  blues
 - use hash known_hosts
 - TODO in separate file
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.314&r2=1.315&f=u