fusioninventory-agent: revert fix for #636 which breaks compatibility

2 files changed, 51 insertions, 5 deletions

diff --git a/fusioninventory-agent-revert.patch b/fusioninventory-agent-revert.patch
new file mode 100644
index 0000000..4ce41b5
--- /dev/null
+++ b/fusioninventory-agent-revert.patch
@@ -0,0 +1,38 @@
+diff -up FusionInventory-Agent-2.1.8/Changes.orig FusionInventory-Agent-2.1.8/Changes
+--- FusionInventory-Agent-2.1.8/Changes.orig	2011-03-31 05:48:38.000000000 +0200
++++ FusionInventory-Agent-2.1.8/Changes	2011-03-31 05:48:59.000000000 +0200
+@@ -10,8 +10,6 @@ Revision history for FusionInventory::Ag
+        * Win32/AntiVirus: avoid pointless OLE error
+        * Add BNQ screen manufacturer support
+          https://bugs.launchpad.net/bugs/736095
+-       * scan-homedirs and rpc-trust-localhost don't works in command line
+-         http://forge.fusioninventory.org/issues/636
+        * Update the Inventory XML documentation
+        * HPUX: use NAME instead of TYPE to set the CPU name (Yanick Durant)
+          http://forum.fusioninventory.org/viewtopic.php?id=278
+diff -up FusionInventory-Agent-2.1.8/lib/FusionInventory/Agent/Config.pm.orig FusionInventory-Agent-2.1.8/lib/FusionInventory/Agent/Config.pm
+--- FusionInventory-Agent-2.1.8/lib/FusionInventory/Agent/Config.pm.orig	2011-03-31 05:49:17.000000000 +0200
++++ FusionInventory-Agent-2.1.8/lib/FusionInventory/Agent/Config.pm	2011-03-31 05:50:17.000000000 +0200
+@@ -243,9 +243,9 @@ sub loadUserParams {
+         'realm|r=s',
+         'rpc-ip=s',
+         'rpc-port=s',
+-        'rpc-trust-localhost=s',
++        'rpc-trust-localhost',
+         'remotedir|R=s',
+-        'scan-homedirs=s',
++        'scan-homedirs',
+         'share-dir=s',
+         'server|s=s',
+         'stdout',
+@@ -331,8 +331,8 @@ Extra options:
+     --logger                    Logger you want to use, can be Stderr,File or Syslog ($config->{logger})
+     --rpc-ip=IP                 ip of the interface to use for peer to peer exchange ($config->{'rpc-ip'})
+     --rpc-port=PORT     port use for RPC
+-    --rpc-trust-localhost=X     allow local users to force an inventory from http://127.0.0.1:62354/now (0/1) ($config->{'rpc-trust-localhost'})
+-    --scan-homedirs=X           permit to scan home user directories (0/1) ($config->{'scan-homedirs'})
++    --rpc-trust-localhost       allow local users to force an inventory from http://127.0.0.1:62354/now  ($config->{'rpc-trust-localhost'})
++    --scan-homedirs             permit to scan home user directories ($config->{'scan-homedirs'})
+     --share-dir=DIR             path to the directory where the shared files are stored ($config->{'share-dir'})
+     --stdout                    do not write or post the inventory but print it on STDOUT
+     -t --tag=TAG                use TAG as tag ($config->{tag}) Will be ignored by server if a value already exists.
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index e64f69e..72bde3c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -4,24 +4,27 @@
 Name:        fusioninventory-agent
 Summary:     FusionInventory agent
 Summary(fr): Agent FusionInventory
+Group:       Applications/System
+License:     GPLv2+
+URL:         http://fusioninventory.org/
 
-Version:   2.1.8
+Version:     2.1.8
 
 %if 0%{?gitver:1}
 Release:   2.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1-48-ga7532c0.tar.gz
 %else
-Release:   1
+Release:   2
 Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 %endif
 
 Source1:   %{name}.cron
 Source2:   %{name}.init
 
-Group:     Applications/System
-License:   GPLv2+
-URL:       http://fusioninventory.org/
+# See http://forge.fusioninventory.org/issues/636
+# revert this change which break compatibility with previous version
+Patch0:    %{name}-revert.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -128,6 +131,8 @@ Le service doit être actif et lancé avec l'option --rpc-trust-localhost.
 %setup -q -n FusionInventory-Agent-%{version}%{?prever}
 %endif
 
+%patch0 -p1 -b .revert
+
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
 #!/bin/sh
@@ -268,6 +273,9 @@ exit 0
 
 
 %changelog
+* Thu Mar 31 2011 Remi Collet <Fedora@famillecollet.com> 2.1.8-2
+- revert change for issue 656 which breaks compatibility
+
 * Wed Mar 30 2011 Remi Collet <Fedora@famillecollet.com> 2.1.8-1
 - update to 2.1.8
   http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.8/Changes