rpms/openldap/devel openldap-2.4.15-file-option.patch, NONE, 1.1 openldap.spec, 1.139, 1.140
Jan Zeleny
jzeleny at fedoraproject.org
Thu Mar 26 09:43:53 UTC 2009
Author: jzeleny
Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5647
Modified Files:
openldap.spec
Added Files:
openldap-2.4.15-file-option.patch
Log Message:
Removed -f option from help of client applications which didn't support it.
openldap-2.4.15-file-option.patch:
--- NEW FILE openldap-2.4.15-file-option.patch ---
--- openldap-2.4.15/clients/tools/common.c 2009-03-25 12:22:05.000000000 +0100
+++ openldap-2.4.15/clients/tools/common.c.option 2009-03-25 12:22:10.000000000 +0100
@@ -274,7 +274,6 @@ N_(" [!]sessiontracking\n")
N_(" abandon, cancel, ignore (SIGINT sends abandon/cancel,\n"
" or ignores response; if critical, doesn't wait for SIGINT.\n"
" not really controls)\n")
-N_(" -f file read operations from `file'\n"),
N_(" -h host LDAP server\n"),
N_(" -H URI LDAP Uniform Resource Identifier(s)\n"),
N_(" -I use SASL Interactive mode\n"),
--- openldap-2.4.15/clients/tools/ldapdelete.c 2009-03-25 12:07:29.000000000 +0100
+++ openldap-2.4.15/clients/tools/ldapdelete.c.option 2009-03-25 12:13:04.000000000 +0100
@@ -71,6 +71,7 @@ usage( void )
fprintf( stderr, _(" dn: list of DNs to delete. If not given, it will be readed from stdin\n"));
fprintf( stderr, _(" or from the file specified with \"-f file\".\n"));
fprintf( stderr, _("Delete Options:\n"));
+ fprintf( stderr, _(" -f file read operations from `file'\n"));
fprintf( stderr, _(" -r delete recursively\n"));
tool_common_usage();
exit( EXIT_FAILURE );
--- openldap-2.4.15/clients/tools/ldapmodify.c 2009-03-25 12:07:50.000000000 +0100
+++ openldap-2.4.15/clients/tools/ldapmodify.c.option 2009-03-25 12:12:52.000000000 +0100
@@ -143,6 +143,7 @@ usage( void )
fprintf( stderr,
_(" [!]txn=<commit|abort> (transaction)\n"));
#endif
+ fprintf( stderr, _(" -f file read operations from `file'\n"));
fprintf( stderr, _(" -S file write skipped modifications to `file'\n"));
tool_common_usage();
--- openldap-2.4.15/clients/tools/ldapmodrdn.c 2009-03-25 12:08:12.000000000 +0100
+++ openldap-2.4.15/clients/tools/ldapmodrdn.c.option 2009-03-25 12:13:19.000000000 +0100
@@ -83,6 +83,7 @@ usage( void )
fprintf( stderr, _(" If not given, the list of modifications is read from stdin or\n"));
fprintf( stderr, _(" from the file specified by \"-f file\" (see man page).\n"));
fprintf( stderr, _("Rename options:\n"));
+ fprintf( stderr, _(" -f file read operations from `file'\n"));
fprintf( stderr, _(" -r remove old RDN\n"));
fprintf( stderr, _(" -s newsup new superior entry\n"));
tool_common_usage();
--- openldap-2.4.15/clients/tools/ldapsearch.c 2009-01-22 01:00:43.000000000 +0100
+++ openldap-2.4.15/clients/tools/ldapsearch.c.option 2009-03-25 14:57:56.000000000 +0100
@@ -137,6 +137,7 @@ usage( void )
fprintf( stderr, _(" [!]deref=derefAttr:attr[,...][;derefAttr:attr[,...][;...]]\n"));
#endif
fprintf( stderr, _(" [!]<oid>=:<value> (generic control; no response handling)\n"));
+ fprintf( stderr, _(" -f file read operations from `file'\n"));
fprintf( stderr, _(" -F prefix URL prefix for files (default: %s)\n"), def_urlpre);
fprintf( stderr, _(" -l limit time limit (in seconds, or \"none\" or \"max\") for search\n"));
fprintf( stderr, _(" -L print responses in LDIFv1 format\n"));
Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- openldap.spec 25 Feb 2009 08:08:13 -0000 1.139
+++ openldap.spec 26 Mar 2009 09:43:23 -0000 1.140
@@ -11,7 +11,7 @@
Summary: LDAP support libraries
Name: openldap
Version: %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: OpenLDAP
Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -34,6 +34,7 @@
Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
Patch9: openldap-2.3.37-smbk5pwd.patch
Patch10: openldap-2.4.6-multilib.patch
+Patch11: openldap-2.4.15-file-option.patch
# Patches for the evolution library
Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -139,6 +140,7 @@
%patch6 -p1 -b .gethostbyname_r
%patch9 -p1 -b .smbk5pwd
%patch10 -p1 -b .multilib
+%patch11 -p1 -b .file_option
cp %{_datadir}/libtool/config/config.{sub,guess} build/
popd
@@ -602,6 +604,9 @@
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog
+* Thu Mar 26 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-2
+- removed -f option from some client tools (#481310)
+
* Wed Feb 25 2009 Jan Safranek <jsafranek at redhat.com> 2.4.15-1
- new upstream release
More information about the fedora-extras-commits
mailing list