Fix wbemcli doesn't accept dot (.) as password character on command line, Fix bogus date in the %%changelog

This commit is contained in:
Vitezslav Crhonek 2014-01-30 11:57:49 +01:00
parent 8c13a66150
commit 0f7d0ee85f
2 changed files with 23 additions and 2 deletions

View File

@ -0,0 +1,14 @@
diff -up sblim-wbemcli-1.6.2/CimXml.cpp.dot-in-username-password sblim-wbemcli-1.6.2/CimXml.cpp
--- sblim-wbemcli-1.6.2/CimXml.cpp.dot-in-username-password 2011-06-22 07:58:39.000000000 +0200
+++ sblim-wbemcli-1.6.2/CimXml.cpp 2014-01-30 11:55:56.917316346 +0100
@@ -2985,6 +2985,10 @@ URL::URL(const char *U)
phelp=strchr(u,'@'); // potential auth token delimiter
p=strchr(u,'.'); // potential key/host delimiter (doesn't matter)
b=strchr(u,'['); // likely an IPv6 host
+ if (phelp)
+ while (p != NULL && p < phelp)
+ // '.' is in username/password, find next
+ p=strchr(p+1,'.');
if (phelp && ( p==NULL || p > phelp)) {
// contains auth token[s] -- process them
p=strchr(u,':');

View File

@ -1,6 +1,6 @@
Name: sblim-wbemcli
Version: 1.6.2
Release: 8%{?dist}
Release: 9%{?dist}
Summary: SBLIM WBEM Command Line Interface
Group: Applications/System
@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz
Patch0: sblim-wbemcli-1.5.1-gcc43.patch
Patch1: sblim-wbemcli-1.6.2-gcc47.patch
Patch2: sblim-wbemcli-1.6.2-https-segfaults.patch
Patch3: sblim-wbemcli-1.6.2-dot-in-username-password.patch
BuildRequires: curl-devel >= 7.9.3
BuildRequires: binutils-devel >= 2.17.50.0.3-4
@ -25,6 +26,7 @@ scripts.
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .gcc47
%patch2 -p1 -b .https-segfaults
%patch3 -p1 -b .dot-in-username-password
%build
%configure CACERT=/etc/Pegasus/client.pem
@ -40,6 +42,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
* Thu Jan 30 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.6.2-9
- Fix wbemcli doesn't accept dot (.) as password character on command line
Resolves: #959885
- Fix bogus date in the %%changelog
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@ -104,7 +111,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
- Upgrade to version 1.5.1 (SSL V3 enforced, default CACERT).
- Created Fedora/RH specific spec file.
* Thu Oct 28 2005 Viktor Mihajlovski <mihajlov@de.ibm.com> - 1.5.0-1
* Fri Oct 28 2005 Viktor Mihajlovski <mihajlov@de.ibm.com> - 1.5.0-1
- Minor enhancements for Fedora compatibility, still not daring to
nuke the build root though