# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1247433483 -7200
# Node ID db6394fb176ffcac4984dfc2d8b8cbfd7b7d54fe
# Parent  91491c1bd7b6711e6641af5046d4e91c327c4d8f
Fix: ocsinventory-agent. Add Tazpkg.pm. Fix filesystem reports.

diff -r 91491c1bd7b6 -r db6394fb176f ocsinventory-agent/receipt
--- a/ocsinventory-agent/receipt	Sat Jul 11 17:13:21 2009 +0200
+++ b/ocsinventory-agent/receipt	Sun Jul 12 23:18:03 2009 +0200
@@ -8,7 +8,7 @@
 SOURCE="OCSNG_UNIX_AGENT"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 DEPENDS="perl perl-lwp-useragent perl-uri-url dmidecode"
-SUGGESTED="nmap perl-ssleay"
+SUGGESTED="nmap perl-net-ssleay"
 BUILD_DEPENDS="perl"
 WEB_SITE="http://www.ocsinventory-ng.org/"
 WGET_URL="http://downloads.sourceforge.net/sourceforge/ocsinventory/$TARBALL"
@@ -16,19 +16,24 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	  
 	src=$WOK/$PACKAGE/Ocsinventory-Agent-1.0.1
 
 	cp stuff/Slitaz.pm $src/lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB
+	cp stuff/Tazpkg.pm $src/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging
+	
 	cd $src
 	
 	# don't run postinstall script
 	rm -f run-postinst
-	patch -p1 -i ../stuff/manifest.u || exit
+	for p in ../stuff/*.u
+	do
+		[ -f done.$(basename $p) ] && continue
+		patch -p1 -i $p || exit
+		touch done.$(basename $p)
+	done
 	perl Makefile.PL 
 	rm -f run-postinst
-	 make && \
-	 make DESTDIR=$PWD/_pkg install
+	make && make DESTDIR=$PWD/_pkg install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -45,11 +50,17 @@
 }
 
 post_install(){
-	echo "postinstall commands"
+	echo "Processing post-install commands..."
 	cat > $1/etc/ocsinventory-agent/ocsinventory-agent.cfg <<EOT
 basevardir=/var/lib/ocsinventory-agent
 server=http://$(hostname)/ocsinventory
 EOT
+	# We need fix missing status for dpkg
+	# So we can Ocs agent can run Tazpkg.pm
+	if [ ! -d $1/var/lib/dpkg ]; then
+		install -o root -g root -m 0755 -d $1/var/lib/dpkg
+		touch $1/var/lib/dpkg/status
+	fi
 }	
 
 clean_wok()
diff -r 91491c1bd7b6 -r db6394fb176f ocsinventory-agent/stuff/Drives.pm.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ocsinventory-agent/stuff/Drives.pm.u	Sun Jul 12 23:18:03 2009 +0200
@@ -0,0 +1,47 @@
+--- Ocsinventory-Agent-1.0.1.ori/lib/Ocsinventory/Agent/Backend/OS/Linux/Drives.pm	Fri Mar  6 19:02:57 2009
++++ Ocsinventory-Agent-1.0.1/lib/Ocsinventory/Agent/Backend/OS/Linux/Drives.pm	Sun Jul 12 22:29:32 2009
+@@ -1,9 +1,11 @@
+ package Ocsinventory::Agent::Backend::OS::Linux::Drives;
++# Modified bye Erjo <erjo@slitaz.org>
++# Busybox df applet as no -T -P options.
+ 
+ use strict;
+ sub check {
+   return unless can_run ("df");
+-  my $df = `df -TP`;
++  my $df = `df -k`;
+   return 1 if $df =~ /\w+/;
+   0
+ }
+@@ -19,14 +21,14 @@
+   my $volumn;
+ 
+ 
+-  foreach(`df -TP`) { # TODO retrive error
+-    if(/^(\S+)\s+(\S+)\s+(\S+)\s+(?:\S+)\s+(\S+)\s+(?:\S+)\s+(\S+)\n/){
++  foreach(`df -k`) { # TODO retrive error
++    if(/^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\n/){
+       $free = sprintf("%i",($4/1024)); 
+-      $filesystem = $2;
+-      $total = sprintf("%i",($3/1024));
+-      $type = $1;
+-      $volumn = $5;
+-
++      $filesystem = $1;
++      $total = sprintf("%i",($2/1024));
++      $type = `grep ^$1 /etc/mtab | cut -d " " -f 3`;;
++      $volumn = $6;
++	  
+ # no virtual FS
+       next if ($type =~ /^(tmpfs|usbfs|proc|devpts|devshm|udev)$/);
+       next if ($filesystem =~ /^(tmpfs)$/);
+@@ -36,8 +38,7 @@
+ 	  FILESYSTEM => $filesystem,
+ 	  TOTAL => $total,
+ 	  TYPE => $type,
+-	  VOLUMN =>
+-	  $volumn
++	  VOLUMN => $volumn
+ 	})
+     }
+   }
diff -r 91491c1bd7b6 -r db6394fb176f ocsinventory-agent/stuff/Tazpkg.pm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ocsinventory-agent/stuff/Tazpkg.pm	Sun Jul 12 23:18:03 2009 +0200
@@ -0,0 +1,24 @@
+package Ocsinventory::Agent::Backend::OS::Generic::Packaging::Tazpkg;
+
+use strict;
+use warnings;
+
+sub check { can_run("tazpkg") }
+
+sub run {
+  my $params = shift;
+  my $inventory = $params->{inventory};
+
+# use dpkg-query -W -f='${Package}|||${Version}\n'
+  foreach (`tazpkg list `){
+    if (/^(\S+)\s+([0-9]+.*)\s+(.*)/) {
+      $inventory->addSoftwares({
+	  'NAME'          => $1,
+	  'VERSION'       => $2,
+	  });
+    }
+  }
+
+}
+
+1;
diff -r 91491c1bd7b6 -r db6394fb176f ocsinventory-agent/stuff/manifest.u
--- a/ocsinventory-agent/stuff/manifest.u	Sat Jul 11 17:13:21 2009 +0200
+++ b/ocsinventory-agent/stuff/manifest.u	Sun Jul 12 23:18:03 2009 +0200
@@ -1,10 +1,10 @@
 --- Ocsinventory-Agent-1.0.1.ori/MANIFEST	Sun Mar 22 20:19:28 2009
-+++ Ocsinventory-Agent-1.0.1/MANIFEST	Thu Jul  9 16:27:30 2009
-@@ -82,6 +82,7 @@
- lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/LSB.pm
- lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB.pm
- lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Debian.pm
-+lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Slitaz.pm
- lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Fedora.pm
- lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Gentoo.pm
- lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB/Knoppix.pm
++++ Ocsinventory-Agent-1.0.1/MANIFEST	Sun Jul 12 22:31:59 2009
+@@ -71,6 +71,7 @@
+ lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging.pm
+ lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/BSDpkg.pm
+ lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/Deb.pm
++lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/Tazpkg.pm
+ lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/Gentoo.pm
+ lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/RPM.pm
+ lib/Ocsinventory/Agent/Backend/OS/Generic/Screen.pm