diff --git a/.gitignore b/.gitignore index 8a600f5..99b5ede 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ sblim-wbemcli-1.5.1.tar.bz2 sblim-wbemcli-1.6.0.tar.bz2 /sblim-wbemcli-1.6.1.tar.bz2 /sblim-wbemcli-1.6.2.tar.bz2 +/sblim-wbemcli-1.6.3.tar.bz2 diff --git a/sblim-wbemcli-1.6.2-dot-in-username-password.patch b/sblim-wbemcli-1.6.2-dot-in-username-password.patch deleted file mode 100644 index d65fe74..0000000 --- a/sblim-wbemcli-1.6.2-dot-in-username-password.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -a -u -p -r1.75 CimXml.cpp ---- CimXml.cpp 19 Sep 2013 14:34:26 -0000 1.75 -+++ CimXml.cpp 22 Feb 2014 17:47:27 -0000 -@@ -2986,9 +2986,9 @@ URL::URL(const char *U) - u += 7; - } - phelp=strchr(u,'@'); // potential auth token delimiter -- p=strchr(u,'.'); // potential key/host delimiter (doesn't matter) -+ p=NULL; - b=strchr(u,'['); // likely an IPv6 host -- if (phelp && ( p==NULL || p > phelp)) { -+ if (phelp) { - // contains auth token[s] -- process them - p=strchr(u,':'); - if (b != NULL && p != NULL && (p < b)) { diff --git a/sblim-wbemcli-1.6.2-gcc47.patch b/sblim-wbemcli-1.6.2-gcc47.patch deleted file mode 100644 index 8e6b5b6..0000000 --- a/sblim-wbemcli-1.6.2-gcc47.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up sblim-wbemcli-1.6.2/CimCurl.h.orig sblim-wbemcli-1.6.2/CimCurl.h ---- sblim-wbemcli-1.6.2/CimCurl.h.orig 2012-01-05 13:55:30.901154659 +0100 -+++ sblim-wbemcli-1.6.2/CimCurl.h 2012-01-05 13:55:44.723271863 +0100 -@@ -24,6 +24,7 @@ - #include "CimXml.h" - #include - #include -+#include - - - class CimomCurl : public Cimom { -diff -up sblim-wbemcli-1.6.2/CimXml.h.orig sblim-wbemcli-1.6.2/CimXml.h ---- sblim-wbemcli-1.6.2/CimXml.h.orig 2012-01-05 13:54:52.445828446 +0100 -+++ sblim-wbemcli-1.6.2/CimXml.h 2012-01-05 13:54:52.449828480 +0100 -@@ -129,9 +129,9 @@ template class ArrayXml : publi - public: - ArrayXml() {} - ArrayXml * clone() const { return new ArrayXml(*this);} -- void add(const T& t) { push_back(t); } -+ void add(const T& t) { this->push_back(t); } - #if !defined(GCC_VERSION) || GCC_VERSION >= 3000 -- T& operator[] (size_type n) {return at(n);} -+ T& operator[] (size_type n) {return this->at(n);} - const T& operator[] (size_type n) const {return at(n);} - #endif - T *get(int n) { return &(*this)[n]; } diff --git a/sblim-wbemcli.spec b/sblim-wbemcli.spec index dc4af31..1f3099f 100644 --- a/sblim-wbemcli.spec +++ b/sblim-wbemcli.spec @@ -1,6 +1,6 @@ Name: sblim-wbemcli -Version: 1.6.2 -Release: 13%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Summary: SBLIM WBEM Command Line Interface Group: Applications/System @@ -8,11 +8,7 @@ License: EPL URL: http://sblim.wiki.sourceforge.net/ Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 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: Fixes wbemcli doesn't accept dot (.) as password character on command line -# Backported from upstream -Patch3: sblim-wbemcli-1.6.2-dot-in-username-password.patch +Patch1: sblim-wbemcli-1.6.2-https-segfaults.patch BuildRequires: curl-devel >= 7.9.3 BuildRequires: binutils-devel >= 2.17.50.0.3-4 @@ -28,9 +24,7 @@ scripts. %setup -q autoreconf --install --force %patch0 -p1 -b .gcc43 -%patch1 -p1 -b .gcc47 -%patch2 -p1 -b .https-segfaults -%patch3 -p0 -b .dot-in-username-password +%patch1 -p1 -b .https-segfaults %build %configure CACERT=/etc/Pegasus/client.pem @@ -46,6 +40,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} %{_datadir}/%{name} %changelog +* Wed Oct 15 2014 Vitezslav Crhonek - 1.6.3-1 +- Update to sblim-wbemcli-1.6.3 + * Mon Aug 18 2014 Fedora Release Engineering - 1.6.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 1b7aae5..c82a1bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02867b420089a84b05e49951643a5e31 sblim-wbemcli-1.6.2.tar.bz2 +521e64351e663e12f6a19ed1a2fa8e79 sblim-wbemcli-1.6.3.tar.bz2