packages: openssh/openssh.spec - LPK -> LDAP patch trigger, nfy

[glen]

Author: glen                         Date: Wed Sep 28 21:26:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- LPK -> LDAP patch trigger, nfy

---- Files affected:
packages/openssh:
   openssh.spec (1.368 -> 1.369) 

---- Diffs:

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.368 packages/openssh/openssh.spec:1.369
--- packages/openssh/openssh.spec:1.368	Fri Sep 16 19:24:39 2011
+++ packages/openssh/openssh.spec	Wed Sep 28 23:26:40 2011
@@ -652,6 +652,21 @@
 	%userremove sshd
 fi
 
+%triggerpostun server -- %{name}-server < 5.9p1-1
+# lpk.patch to ldap.patch
+if grep -qE '^(UseLPK|Lpk)' %{_sysconfdir}/sshd_config; then
+	echo >&2 "Migrating LPK patch to LDAP patch"
+	cp -f %{_sysconfdir}/sshd_config{,.rpmorig}
+	%{__sed} -i -e '
+		# disable old configs
+		# just UseLPK/LkpLdapConf supported for now
+		s/^UseLPK/## Obsolete &/
+		s/^LPK/## Obsolete &/
+		# Enable new ones, assumes /etc/ldap.conf defaults, see HOWTO.ldap-keys
+		/UseLPK/iAuthorizedKeysCommand "%{_libexecdir}/ssh-ldap-wrapper"
+	' %{_sysconfdir}/sshd_config
+fi
+
 %post server-upstart
 %upstart_post sshd
 
@@ -717,6 +732,7 @@
 
 %files server
 %defattr(644,root,root,755)
+%doc HOWTO.ldap-keys
 %attr(755,root,root) %{_sbindir}/sshd
 %attr(755,root,root) %{_libexecdir}/sftp-server
 %attr(755,root,root) %{_libexecdir}/ssh-keysign
@@ -766,6 +782,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.369  2011/09/28 21:26:40  glen
+- LPK -> LDAP patch trigger, nfy
+
 Revision 1.368  2011/09/16 17:24:39  arekm
 - release 2
 
================================================================

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