packages: openssh/openssh.spec, openssh/ldap.conf.patch (NEW) - use /etc/ld...

[glen]

Author: glen                         Date: Wed Sep 28 22:04:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use /etc/ldap.conf, not another copy of ldap.conf

---- Files affected:
packages/openssh:
   openssh.spec (1.372 -> 1.373) , ldap.conf.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.372 packages/openssh/openssh.spec:1.373
--- packages/openssh/openssh.spec:1.372	Wed Sep 28 23:45:52 2011
+++ packages/openssh/openssh.spec	Thu Sep 29 00:04:27 2011
@@ -53,6 +53,7 @@
 # http://pkgs.fedoraproject.org/gitweb/?p=openssh.git;a=tree
 Patch4:		%{name}-5.9p1-ldap.patch
 Patch5:		%{name}-5.9p1-ldap-fixes.patch
+Patch8:		ldap.conf.patch
 Patch6:		%{name}-config.patch
 # https://bugzilla.mindrot.org/show_bug.cgi?id=1663
 Patch7:		authorized-keys-command.patch
@@ -500,6 +501,7 @@
 %patch3 -p1
 %{?with_ldap:%patch4 -p1}
 %{?with_ldap:%patch5 -p1}
+%{?with_ldap:%patch8 -p1}
 %patch6 -p1
 %patch7 -p1
 %{?with_hpn:%patch9 -p1}
@@ -618,6 +620,7 @@
 EOF
 
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.openssh-non-english-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -736,7 +739,7 @@
 
 %files server
 %defattr(644,root,root,755)
-%doc HOWTO.ldap-keys
+%doc HOWTO.ldap-keys ldap.conf
 %attr(755,root,root) %{_sbindir}/sshd
 %attr(755,root,root) %{_libexecdir}/sftp-server
 %attr(755,root,root) %{_libexecdir}/ssh-keysign
@@ -752,7 +755,6 @@
 %{_mandir}/man5/ssh-ldap.conf.5*
 %{_mandir}/man5/moduli.5*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sshd_config
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ldap.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sshd
 %attr(640,root,root) %{_sysconfdir}/moduli
 %attr(754,root,root) /etc/rc.d/init.d/sshd
@@ -786,6 +788,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.373  2011/09/28 22:04:27  glen
+- use /etc/ldap.conf, not another copy of ldap.conf
+
 Revision 1.372  2011/09/28 21:45:52  glen
 - fixing lpk trigger caps
 

================================================================
Index: packages/openssh/ldap.conf.patch
diff -u /dev/null packages/openssh/ldap.conf.patch:1.1
--- /dev/null	Thu Sep 29 00:04:33 2011
+++ packages/openssh/ldap.conf.patch	Thu Sep 29 00:04:27 2011
@@ -0,0 +1,56 @@
+--- openssh-5.9p1/./ldap-helper.c~	2011-09-29 00:38:28.000000000 +0300
++++ openssh-5.9p1/./ldap-helper.c	2011-09-29 00:54:04.004223268 +0300
+@@ -34,7 +34,7 @@
+ 
+ static int config_debug = 0;
+ int config_exclusive_config_file = 0;
+-static char *config_file_name = "/etc/ssh/ldap.conf";
++static char *config_file_name = "/etc/ldap.conf";
+ static char *config_single_user = NULL;
+ static int config_verbose = SYSLOG_LEVEL_VERBOSE;
+ int config_warning_config_file = 0;
+@@ -48,7 +48,7 @@
+ 	fprintf(stderr, "Options:\n");
+ 	fprintf(stderr, "  -d          Output the log messages to stderr.\n");
+ 	fprintf(stderr, "  -e          Check the config file for unknown commands.\n");
+-	fprintf(stderr, "  -f file     Use alternate config file (default is /etc/ssh/ldap.conf).\n");
++	fprintf(stderr, "  -f file     Use alternate config file (default is /etc/ldap.conf).\n");
+ 	fprintf(stderr, "  -s user     Do not demonize, send the user's key to stdout.\n");
+ 	fprintf(stderr, "  -v          Increase verbosity of the debug output (implies -d).\n");
+ 	fprintf(stderr, "  -w          Warn on unknown commands in the config file.\n");
+--- openssh-5.9p1/./ssh-ldap-helper.8~	2011-09-29 00:38:28.000000000 +0300
++++ openssh-5.9p1/./ssh-ldap-helper.8	2011-09-29 00:54:14.308032118 +0300
+@@ -56,7 +56,7 @@
+ halts if it encounters an unknown item in the ldap.conf file.
+ .It Fl f
+ .Nm
+-uses this file as the ldap configuration file instead of /etc/ssh/ldap.conf (default).
++uses this file as the ldap configuration file instead of /etc/ldap.conf (default).
+ .It Fl s
+ .Nm
+ prints out the user's keys to stdout and exits.
+--- openssh-5.9p1/./ssh-ldap.conf.5~	2011-09-29 00:38:28.000000000 +0300
++++ openssh-5.9p1/./ssh-ldap.conf.5	2011-09-29 00:54:40.285897653 +0300
+@@ -21,11 +21,11 @@
+ .Nm ssh-ldap.conf
+ .Nd configuration file for ssh-ldap-helper
+ .Sh SYNOPSIS
+-.Nm /etc/ssh/ldap.conf
++.Nm /etc/ldap.conf
+ .Sh DESCRIPTION
+ .Xr ssh-ldap-helper 8
+ reads configuration data from
+-.Pa /etc/ssh/ldap.conf
++.Pa /etc/ldap.conf
+ (or the file specified with
+ .Fl f
+ on the command line).
+@@ -361,7 +361,7 @@
+ .El
+ .Sh FILES
+ .Bl -tag -width Ds
+-.It Pa  /etc/ssh/ldap.conf
++.It Pa  /etc/ldap.conf
+ Ldap configuration file for
+ .Xr ssh-ldap-helper 8 .
+ .El
================================================================

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