[spindown] Fixed against iniparser-3.0-1

[Martin Cermak]

commit 10afecd3fee3af90a9177f780395531f5cd32abd
Author: Martin Cermak <mcermak at redhat.com>
Date:   Tue Jan 31 17:03:21 2012 +0100

    Fixed against iniparser-3.0-1

 spindown-0.4.0-iniparser-3.0-1.patch |   54 ++++++++++++++++++++++++++++++++++
 spindown.spec                        |    7 ++++-
 2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/spindown-0.4.0-iniparser-3.0-1.patch b/spindown-0.4.0-iniparser-3.0-1.patch
new file mode 100644
index 0000000..9bb6351
--- /dev/null
+++ b/spindown-0.4.0-iniparser-3.0-1.patch
@@ -0,0 +1,54 @@
+diff --git a/src/disk.cpp b/src/disk.cpp
+index 1d72a06..731d97d 100644
+--- a/src/disk.cpp
++++ b/src/disk.cpp
+@@ -46,12 +46,12 @@ extern "C" {
+ 
+ Disk* Disk::create( dictionary& ini, string const & section)
+ {
+-    string id      = iniparser_getstring (&ini, string(section+":id").data(),       (char*)"");
+-    string name    = iniparser_getstring (&ini, string(section+":name").data(),     (char*)"");
+-    bool sd        = iniparser_getboolean(&ini, string(section+":spindown").data(), 0);
+-    string command = iniparser_getstring (&ini, string(section+":command").data(),  (char*)"sg_start --stop");
+-    int sgTime     = iniparser_getint (&ini, string(section+":idle-time").data(), 0);
+-    bool repeat    = iniparser_getboolean(&ini, string(section+":repeat").data(), 0);
++    string id      = iniparser_getstring (&ini, (char*)string(section+":id").data(),       (char*)"");
++    string name    = iniparser_getstring (&ini, (char*)string(section+":name").data(),     (char*)"");
++    bool sd        = iniparser_getboolean(&ini, (char*)string(section+":spindown").data(), 0);
++    string command = iniparser_getstring (&ini, (char*)string(section+":command").data(),  (char*)"sg_start --stop");
++    int sgTime     = iniparser_getint (&ini, (char*)string(section+":idle-time").data(), 0);
++    bool repeat    = iniparser_getboolean(&ini, (char*)string(section+":repeat").data(), 0);
+ 
+     Disk* newDisk = new Disk(id, name, sd, command, sgTime, repeat);
+ 
+diff --git a/src/spindownd.cpp b/src/spindownd.cpp
+index 16cc6bc..c4c50c6 100644
+--- a/src/spindownd.cpp
++++ b/src/spindownd.cpp
+@@ -235,7 +235,7 @@ void Spindownd::readConfig(string const &path)
+     }
+ 
+     // Try to open the configuration file
+-    if( (ini=iniparser_load(path.data()))==NULL )
++    if( (ini=iniparser_load((char*)path.data()))==NULL )
+     {
+         std::cerr << "Can't open the configuration file: " << path << endl;
+         exit(1);
+@@ -250,14 +250,14 @@ void Spindownd::readConfig(string const &path)
+         // General section?
+         if( section=="general" )
+         {
+-            commonSpinDownTime = iniparser_getint(ini, string(section+":idle-time").data(), 7200);
++            commonSpinDownTime = iniparser_getint(ini, (char*)string(section+":idle-time").data(), 7200);
+ 
+             if( commonSpinDownTime <= 0 )
+                 commonSpinDownTime = 7200;
+ 
+-            cycleTime = iniparser_getint(ini, string(section+":cycle-time").data(), 60);
++            cycleTime = iniparser_getint(ini, (char*)string(section+":cycle-time").data(), 60);
+ 
+-            if( iniparser_getboolean(ini, string(section+":syslog").data(), 0) )
++            if( iniparser_getboolean(ini, (char*)string(section+":syslog").data(), 0) )
+                 Log::get()->open( (char*)"spindown", LOG_NDELAY, LOG_DAEMON );
+             else
+                 Log::get()->close();
diff --git a/spindown.spec b/spindown.spec
index 364d6dd..0285911 100644
--- a/spindown.spec
+++ b/spindown.spec
@@ -1,7 +1,7 @@
 Summary:    Daemon that can spin idle disks down
 Name:       spindown
 Version:    0.4.0
-Release:    5%{?dist}
+Release:    6%{?dist}
 License:    GPLv3+
 Group:      System Environment/Daemons
 Url:        http://code.google.com/p/spindown
@@ -10,6 +10,7 @@ Source1:    spindown.service
 
 Patch0: spindown-0.4.0-Makefile.patch
 Patch1: spindown-0.4.0-iniparser.patch
+Patch2: spindown-0.4.0-iniparser-3.0-1.patch
 
 Requires(preun): systemd-units
 
@@ -31,6 +32,7 @@ rm -rf src/ininiparser3.0b
 cp -pf %{SOURCE1} spindown.service
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS"
@@ -55,6 +57,9 @@ fi
 %config(noreplace) %{_sysconfdir}/spindown.conf
 
 %changelog
+* Tue Jan 31 2012 Martin Cermak <mcermak at redhat.com> 0.4.0-6
+- Fixed against iniparser-3.0-1
+
 * Thu Jan 26 2012 Martin Cermak <mcermak at redhat.com> 0.4.0-5
 - Replaced sysvinitscript with a systemd unit