--- fusioninventory-agent-2.3.4.orig/debian/README.source +++ fusioninventory-agent-2.3.4/debian/README.source @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- fusioninventory-agent-2.3.4.orig/debian/changelog +++ fusioninventory-agent-2.3.4/debian/changelog @@ -0,0 +1,340 @@ +fusioninventory-agent (1:2.3.4-1) unstable; urgency=low + + * new upstream release + * fusioninventory-task-network: add nmap as a suggested package + * backport 0001-test-fix-the-HTTPS-over-proxy-test.patch from upstream + to be able to build the package with a libwww-perl that really support + HTTPS over proxy (>= 6.05-2) + * Bump standard version from 3.9.4 to 3.9.5: no changes + + -- Gonéri Le Bouder Thu, 26 Dec 2013 00:51:12 +0100 + +fusioninventory-agent (1:2.3.2-2) unstable; urgency=low + + * Add a missing dependency on libsocket-getaddrinfo-perl, + thanks Raphaël Doursenaud + + -- Gonéri Le Bouder Mon, 14 Oct 2013 14:41:59 +0200 + +fusioninventory-agent (1:2.3.2-1) unstable; urgency=low + + * New upstream release + * drop patches merged upstream + - avoid-warning-with-fakeroot.patch, + - screen.t-requires-Parse-EDID-1.0.4.patch, + - increase-the-timeout-for-slow-machine.patch + * move /usr/share/doc/fusioninventory-agent/agent.cfg to + /usr/share/fusioninventory/etc/agent.cfg because of policy 12.3 + (Packages must not require the existence of any files in + `/usr/share/doc/' in order to function) (closes: #722620) + * clean up fusioninventory-agent.postrm + * Depends on libio-socket-ssl-perl instead of libnet-ssleay-perl + directly as advertised in 2.2.3-3 + + -- Gonéri Le Bouder Mon, 30 Sep 2013 14:29:12 +0200 + +fusioninventory-agent (1:2.3.0-2) unstable; urgency=low + + * Avoid a FTBFS on mips, cherry-pick commit + ab7a555bc05e2b3560d165b13931d3e2dd2b6a0e from upstream + * fix some spelling issues in debian/control + + -- Gonéri Le Bouder Sun, 08 Sep 2013 00:33:06 +0200 + +fusioninventory-agent (1:2.3.0-1) unstable; urgency=low + + * New upstream release (closes: #719868, #710415) + - add avoid-warning-with-fakeroot.patch patch + - screen.t-requires-Parse-EDID-1.0.4.patch + - upload to unstable since Wheezy is released + * Maintained in collab-maint svn repository now + - Vcs-{Svn,Browser} fields adjusted + * merged libfusioninventory-task-* in the main distribution to follow + decision + - use an epoch for the transition + * Indent the Build-Deps + * Refresh pciutils-pciids.diff + * libparse-edid-perl is a new dependency + * bump Standard-Version to 3.9.4 + * Architecture: rename the arch wildcard: + - amd64-any -> am64-i386 + - i386-any -> any-i386 + * drop the backport part from the debian/rules + * use my @debian.org address + + -- Gonéri Le Bouder Thu, 15 Aug 2013 01:25:16 +0200 + +fusioninventory-agent (2.2.7-1) experimental; urgency=low + + * New upstream release + * Add Kevin Roy to Uploaders + + -- Kevin Roy Wed, 19 Dec 2012 12:44:51 +0100 + +fusioninventory-agent (2.2.6-1) experimental; urgency=low + + * New upstream release + - drop ssl_cert_backport.diff + + -- Gonéri Le Bouder Thu, 27 Sep 2012 15:57:19 +0200 + +fusioninventory-agent (2.2.3-3) unstable; urgency=low + + * Add a post{inst,rm} scripts to prepeare and clean up + the config file, thanks Andreas Beckmann (closes: #679299) + * Depends on libio-socket-ssl-perl instead of libnet-ssleay-perl + directly + * Migrate debian/copyright to Machine-readable format + * Add a B-D on libio-socket-ssl-perl + * Backport SSL cert from upstream, the ones from the archive were expired, + thanks Gregor Herrmann and Lucas Nussbaum (closes: #684855) + + -- Gonéri Le Bouder Wed, 11 Jul 2012 12:11:55 -0300 + +fusioninventory-agent (2.2.3-2) unstable; urgency=low + + * Add a dependency on ucf (closes: #679299) + * Add a logrotate script (closes: #675254) + * Adjust the path to the GPL licence file (GPL-2) + * Clean up the dependency list + + -- Gonéri Le Bouder Sat, 30 Jun 2012 00:04:37 +0200 + +fusioninventory-agent (2.2.3-1) unstable; urgency=low + + * New upstream release + + -- Gonéri Le Bouder Tue, 26 Jun 2012 16:45:48 +0200 + +fusioninventory-agent (2.2.2-1) unstable; urgency=low + + * New upstream release + + -- Gonéri Le Bouder Wed, 30 May 2012 18:01:10 +0200 + +fusioninventory-agent (2.2.1-1) unstable; urgency=low + + * New upstream release + * Only depend on hdparm on linux-any + * Simplify dmidecode to i386-any, amd64-any ia64 + + -- Gonéri Le Bouder Sat, 26 May 2012 16:05:58 +0200 + +fusioninventory-agent (2.2.0-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version + * new build-dep: libtest-mockmodule-perl + * use pciutils pci.ids file + add pciutils-pciids.diff + * disable t/inventory/generic/lspci/controllers.t + http://forge.fusioninventory.org/issues/1548 + + -- Gonéri Le Bouder Sun, 08 Apr 2012 21:20:18 +0200 + +fusioninventory-agent (2.1.9904-1) experimental; urgency=low + + * New upstream beta release + - refresh the debian/rules to pass the location dir parameters + and so drop debian/patches/etc-location.diff + - just comment libcompress-zlib-perl dependency to be able to + turn it back for backport + + -- Gonéri Le Bouder Fri, 13 Jan 2012 10:48:28 +0100 + +fusioninventory-agent (2.1.9902-1) experimental; urgency=low + + * New upstream beta release + + -- Gonéri Le Bouder Fri, 21 Oct 2011 17:51:50 +0200 + +fusioninventory-agent (2.1.9901-2) experimental; urgency=low + + * Restore the B-D, sorry + + -- Gonéri Le Bouder Tue, 20 Sep 2011 12:15:44 +0200 + +fusioninventory-agent (2.1.9901-1) experimental; urgency=low + + * New upstream beta release + * Drop the 2.1.x patches + - add etc-location.diff + * Refresh dependency + - drop nmap suggest, not used anymore + * use a debian/control + + -- Gonéri Le Bouder Thu, 08 Sep 2011 17:30:04 +0200 + +fusioninventory-agent (2.1.10-1) unstable; urgency=low + + * New upstream release + * Install a copy of agent.cfg in doc + Closes: #638413 + + -- Gonéri Le Bouder Tue, 06 Sep 2011 11:31:38 +0200 + +fusioninventory-agent (2.1.9-3) unstable; urgency=low + + * Remplace cfg.diff with fix-sharedir + * Really remove inactive upload + + -- Gonéri Le Bouder Thu, 30 Jun 2011 10:57:32 +0200 + +fusioninventory-agent (2.1.9-2) unstable; urgency=low + + * Fix the test-suite: + -add 0001-Fix-ignore-REST-build-in-the-test-suite.patch + * Remove inactive maintainer from the uploader + + -- Gonéri Le Bouder Tue, 21 Jun 2011 10:09:59 +0200 + +fusioninventory-agent (2.1.9-1) unstable; urgency=low + + * New upstream release + * Standard-Version: 3.9.2 + + -- Gonéri Le Bouder Tue, 14 Jun 2011 21:35:30 +0200 + +fusioninventory-agent (2.1.8-2) unstable; urgency=low + + * Add the dependency on libproc-pid-file-perl + * Add a B-D on libhttp-daemon-perl and a recommends on this dependency + Closes: #620414 + + -- Gonéri Le Bouder Fri, 08 Apr 2011 12:31:03 +0200 + +fusioninventory-agent (2.1.8-1) unstable; urgency=low + + * New upstream release + * Remove Benoit Mortier from Uploaders + + -- Gonéri Le Bouder Sun, 27 Mar 2011 14:52:46 +0200 + +fusioninventory-agent (2.1.8~rc1-1) experimental; urgency=low + + * New upstream release + + -- Gonéri Le Bouder Sun, 20 Mar 2011 14:43:24 +0100 + +fusioninventory-agent (2.1.7stable-2) experimental; urgency=low + + * Recommends hdparm + + -- Gonéri Le Bouder Thu, 13 Jan 2011 14:09:59 +0100 + +fusioninventory-agent (2.1.7stable-1) experimental; urgency=low + + * New upstream release + + -- Gonéri Le Bouder Sun, 12 Dec 2010 20:37:27 +0100 + +fusioninventory-agent (2.1.7beta1-1) experimental; urgency=low + + * New upstream release + * Remove fix-pod.diff + * Add BD: libtest-compile-perl + + -- Gonéri Le Bouder Fri, 19 Nov 2010 15:30:41 +0100 + +fusioninventory-agent (2.1.6-1) experimental; urgency=low + + * New upstream release + * add fix-pod.diff to fix a syntax error in fusioninventory-agent + + -- Gonéri Le Bouder Sun, 10 Oct 2010 00:59:51 +0200 + +fusioninventory-agent (2.1.5-1) experimental; urgency=low + + * New upstream release + * refresh debian/patches/cfg.diff + + -- Gonéri Le Bouder Thu, 16 Sep 2010 00:06:56 +0200 + +fusioninventory-agent (2.1.3-1) experimental; urgency=low + + * New upstream release + + -- Gonéri Le Bouder Wed, 01 Sep 2010 22:08:08 +0200 + +fusioninventory-agent (2.1.2-1) experimental; urgency=low + + * New upstream release + * remove debian-changes-2.1.1-1 + * Install README.html as documentation + + -- Gonéri Le Bouder Tue, 31 Aug 2010 00:06:49 +0200 + +fusioninventory-agent (2.1.1-1) experimental; urgency=low + + * New upstream release + * Remove pod.diff, merged upstream + + -- Gonéri Le Bouder Wed, 18 Aug 2010 21:55:04 +0200 + +fusioninventory-agent (2.1-1) experimental; urgency=low + + * New upstream release + * Upload in experimental because of the Squeeze freeze. + * Add dependency on libuniversal-require-perl + * Standard version 3.9.1 + * fix various minor POD error + * Use upstream agent.cfg + * Add fix-share-dir-loc.diff to fix share-dir loc + * Disable daemon mode in agent.cfg + + -- Gonéri Le Bouder Sun, 15 Aug 2010 23:13:13 +0200 + +fusioninventory-agent (2.0.6-2) unstable; urgency=low + + * Fix the init.d script so it can stop the service, thanks + David Hannequin + * Standard version 3.9.0 + * remove the set -e from the init.d script + + -- Gonéri Le Bouder Mon, 12 Jul 2010 15:26:47 +0200 + +fusioninventory-agent (2.0.6-1) unstable; urgency=low + + * New upstream release + + -- Gonéri Le Bouder Fri, 28 May 2010 16:24:54 +0200 + +fusioninventory-agent (2.0.5-2) unstable; urgency=low + + * Add an optional daemon mode + + -- Gonéri Le Bouder Tue, 18 May 2010 00:28:22 +0200 + +fusioninventory-agent (2.0.5-1) unstable; urgency=low + + * New upstream release + * Drop debian/patches/debian-changes-2.0.3-2 + + -- Gonéri Le Bouder Fri, 14 May 2010 02:29:27 +0200 + +fusioninventory-agent (2.0.3-2) unstable; urgency=low + + * control: drop two duplicated spaces in description, thank you Rhonda. + * remove debian/patches/debian-changes-2.0-1 + * changes Architecture: from all to any since dmidecode conditional + dependency is eval during build process, thanks Kibi :) + * remove tools/build-perl-tree.sh MANIFEST.SKIP from the git repository + * Create /etc/fusioninventory, thanks Fabrice Flore-Thebault + (Closes: #578400) + * drop the debconf menu and template + * install a template agent.cfg in /etc/fusioninventory + + -- Gonéri Le Bouder Thu, 22 Apr 2010 10:31:15 +0200 + +fusioninventory-agent (2.0.3-1) unstable; urgency=low + + * New upstream release + * Fix the Vcs-Git URL and add a Vcs-Browser link + + -- Gonéri Le Bouder Sun, 11 Apr 2010 00:19:27 +0200 + +fusioninventory-agent (2.0-1) unstable; urgency=low + + * Initial release (Closes: #570768) + + -- Gonéri Le Bouder Sat, 20 Mar 2010 23:34:03 +0100 --- fusioninventory-agent-2.3.4.orig/debian/compat +++ fusioninventory-agent-2.3.4/debian/compat @@ -0,0 +1 @@ +7 --- fusioninventory-agent-2.3.4.orig/debian/control +++ fusioninventory-agent-2.3.4/debian/control @@ -0,0 +1,222 @@ +Source: fusioninventory-agent +Section: net +Priority: extra +Maintainer: Gonéri Le Bouder +Uploaders: Kevin Roy +Build-Depends: + debhelper (>= 8), + dmidecode [any-i386 any-amd64 ia64], + hdparm [linux-any], + libclone-perl, + libdigest-sha-perl, + libfile-copy-recursive-perl, + libfile-which-perl, + libhttp-cookies-perl, + libhttp-server-simple-authen-perl, + libhttp-daemon-perl, + libhttp-proxy-perl, + libio-capture-perl, + libipc-run-perl, + libjson-perl, + libmodule-install-perl, + libnet-ip-perl, + libnet-snmp-perl, + libio-socket-ssl-perl, + libparse-edid-perl, + libpoe-component-client-ping-perl, + libproc-daemon-perl, + libproc-pid-file-perl, + libtest-compile-perl, + libtest-deep-perl, + libtest-nowarnings-perl, + libtest-exception-perl, + libtest-http-server-simple-perl, + libtest-mockmodule-perl, + libtest-mockobject-perl, + libtext-template-perl, + libsocket-getaddrinfo-perl, + libuniversal-require-perl, + liburi-perl, + libwww-perl, + libxml-treepp-perl (>= 0.26), + libyaml-perl, + pciutils, + perl, + quilt, + ucf, +Standards-Version: 3.9.5 +Homepage: http://fusioninventory.org/ +Vcs-Svn: svn://anonscm.debian.org/collab-maint/deb-maint/fusioninventory-agent +Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/fusioninventory-agent + +Package: fusioninventory-agent +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${perl:Depends}, + ucf, + perl, + dmidecode [i386-any amd64-any ia64], + libnet-cups-perl, + libnet-ip-perl, + libwww-perl, + libparse-edid-perl, + libproc-daemon-perl, + libuniversal-require-perl, + libproc-pid-file-perl, + hdparm [linux-any], + libfile-which-perl, + libxml-treepp-perl (>= 0.26), + libyaml-perl, + libtext-template-perl, + libjson-perl, + pciutils, + libhttp-daemon-perl, + libsocket-getaddrinfo-perl +Suggests: smartmontools, read-edid +Recommends: libio-socket-ssl-perl +Breaks: + libfusioninventory-agent-task-esx-perl (<< 1:2.3.0-1), + libfusioninventory-agent-task-deploy-perl (<< 1:2.3.0-1), + libfusioninventory-agent-task-network-perl (<< 1:2.3.0-1), + libfusioninventory-agent-task-netinventory-perl (<< 1:2.3.0-1), + libfusioninventory-agent-task-netdiscovery-perl (<< 1:2.3.0-1), +Description: Hardware and software inventory tool (client) + FusionInventory Agent is an application designed to help a network + or system administrator to keep track of the hardware and software + configurations of devices. + This agent can collect information about from: + - the local machine (Inventory) + - the network using SNMP + - an VMware ESX or vCEnter server + The agent can be driven from different asset management software + including GLPI, Rudder, Uranos, OCSInventory. + . + The agent can also be used to install new software and configuration + changes. + +Package: fusioninventory-agent-task-esx +Architecture: all +Depends: + ${misc:Depends}, + ${perl:Depends}, + fusioninventory-agent (>= ${binary:Version}), + libhttp-cookies-perl, + libjson-perl, +Conflicts: + libfusioninventory-agent-task-esx-perl (<< 1:2.3.0-1), +Replaces: + libfusioninventory-agent-task-esx-perl (<< 1:2.3.0-1), +Description: ESX and ESXi inventory + Do remote inventory of your ESX, ESXi, vCenter server using the SOAP interface. + You can import the generated .ocs files in: + - GLPI with FusionInventory for GLPI + - ocsinventory + - Uranos + This module can also be controlled from GLPI using the FusionInventory for GLPI + plugin. + +Package: fusioninventory-agent-task-deploy +Architecture: all +Depends: + ${misc:Depends}, + ${perl:Depends}, + fusioninventory-agent (>= ${binary:Version}), + libjson-perl, + liburi-perl, + libfile-copy-recursive-perl, + libdigest-sha-perl, + libpoe-component-client-ping-perl, + perl +Conflicts: + libfusioninventory-agent-task-deploy-perl (<< 1:2.3.0-1), +Replaces: + libfusioninventory-agent-task-deploy-perl (<< 1:2.3.0-1), +Description: Software deployment support for FusionInventory + With this module, FusionInventory can accept software deployment + request from an GLPI server with the FusionInventory plugin. + This module uses SSL certificat to authentificat the server. + . + If the P2P option is turned on, the agent will looks for peer in its + network to reduce the bandwidth usage with the primary server. + +Package: fusioninventory-agent-task-network +Architecture: all +Depends: + ${misc:Depends}, + ${perl:Depends}, + fusioninventory-agent (>= ${binary:Version}), + libcrypt-des-perl, + libnet-ip-perl, + libnet-snmp-perl, + libnet-nbname-perl +Conflicts: + libfusioninventory-agent-task-netdiscovery-perl (<< 1:2.3.0-1), + libfusioninventory-agent-task-snmpquery-perl (<< 1:2.3.0-1), + libfusioninventory-agent-task-network-perl (<< 1:2.3.0-1), +Replaces: + libfusioninventory-agent-task-netdiscovery-perl (<< 1:2.3.0-1), + libfusioninventory-agent-task-snmpquery-perl (<< 1:2.3.0-1), + libfusioninventory-agent-task-network-perl (<< 1:2.3.0-1), +Suggests: nmap +Description: Network device discovery for FusionInventory Agent + This module scans your networks to quickly identifiy its hosts with SNMP, + Nmap and NetBIOS request: + - networking devices discovery within an IP range + - identify unknown MAC addresses + . + The plugin depends on FusionInventory for GLPI on server side. + +# Dummy packages +Package: libfusioninventory-agent-task-esx-perl +Architecture: all +Section: oldlibs +Priority: extra +Depends: + ${misc:Depends}, + fusioninventory-agent-task-esx +Description: transitional dummy package + This package is a dummy transitional package. It can be safely removed. + +Package: libfusioninventory-agent-task-deploy-perl +Architecture: all +Section: oldlibs +Priority: extra +Depends: + ${misc:Depends}, + fusioninventory-agent-task-deploy +Description: transitional dummy package + This package is a dummy transitional package. It can be safely removed. + +Package: libfusioninventory-agent-task-network-perl +Architecture: all +Section: oldlibs +Priority: extra +Depends: + ${misc:Depends}, + fusioninventory-agent-task-network +Description: transitional dummy package + This package is a dummy transitional package. It can be safely removed. + +Package: libfusioninventory-agent-task-netinventory-perl +Architecture: all +Section: oldlibs +Priority: extra +Depends: + ${misc:Depends}, + fusioninventory-agent-task-network +Description: transitional dummy package + This package is a dummy transitional package. It can be safely removed. + +Package: libfusioninventory-agent-task-snmpquery-perl +Architecture: all +Section: oldlibs +Priority: extra +Depends: + ${misc:Depends}, + fusioninventory-agent-task-network +Description: transitional dummy package + This package is a dummy transitional package. It can be safely removed. + + --- fusioninventory-agent-2.3.4.orig/debian/copyright +++ fusioninventory-agent-2.3.4/debian/copyright @@ -0,0 +1,57 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: FusionInventory Team +Source: http://search.cpan.org/dist/FusionInventory-Agent/ +Upstream-Name: FusionInventory-Agent + +Files: * +Copyright: 2006-2010 OCS Inventory contributors + 2010 FusionInventory Team + 2007 Gonéri Le Bouder + 2008 Jean Parpaillon + 2005-2010 Mandriva SA +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +Files: debian/* +Copyright: 2012, Gonéri Le Bouder +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + --- fusioninventory-agent-2.3.4.orig/debian/default/fusioninventory-agent +++ fusioninventory-agent-2.3.4/debian/default/fusioninventory-agent @@ -0,0 +1,6 @@ +# FusionInventory Agent Options +# +# MODE can be either "daemon" or "cron" +MODE=cron +# You need to set the server in +# /etc/fusioninventory/agent.cfg --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent-task-esx.manpages +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent-task-esx.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/fusioninventory-esx.1p --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent-task-network.manpages +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent-task-network.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/fusioninventory-netinventory.1p +debian/tmp/usr/share/man/man1/fusioninventory-netdiscovery.1p --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent.cron.daily +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent.cron.daily @@ -0,0 +1,18 @@ +#!/bin/sh + +PROG=/usr/bin/fusioninventory-agent + +if [ -f /etc/default/fusioninventory-agent ] ; then + . /etc/default/fusioninventory-agent +fi + +if [ ! -x "$PROG" ]; then + exit 0 +fi + +if [ ! "$MODE" = "cron" ]; then + exit 0 +fi + +$PROG > /dev/null 2>&1 + --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent.dirs +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent.dirs @@ -0,0 +1,2 @@ +var/lib/fusioninventory-agent +etc/fusioninventory --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent.docs +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent.docs @@ -0,0 +1 @@ +README --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent.logrotate +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent.logrotate @@ -0,0 +1,10 @@ +/var/log/fusioninventory.log { + weekly + rotate 52 + compress + delaycompress + notifempty + missingok +} + +# vim:set ai et sts=4 sw=4 tw=80: --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent.manpages +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent.manpages @@ -0,0 +1,5 @@ +debian/tmp/usr/share/man/man1/fusioninventory-inventory.1p +debian/tmp/usr/share/man/man1/fusioninventory-injector.1p +debian/tmp/usr/share/man/man1/fusioninventory-wakeonlan.1p +debian/tmp/usr/share/man/man1/fusioninventory-agent.1p + --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent.postinst +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent.postinst @@ -0,0 +1,13 @@ +#! /bin/sh +set -e + +#DEBHELPER# + +case "$1" in + configure) + [ -d "/etc/fusioninventory" ] || mkdir "/etc/fusioninventory" + ucf /usr/share/fusioninventory/etc/agent.cfg /etc/fusioninventory/agent.cfg + ucfr fusioninventory-agent /etc/fusioninventory/agent.cfg +esac + +exit 0 --- fusioninventory-agent-2.3.4.orig/debian/fusioninventory-agent.postrm +++ fusioninventory-agent-2.3.4/debian/fusioninventory-agent.postrm @@ -0,0 +1,29 @@ +#! /bin/sh +set -e + +#DEBHELPER# + +case "$1" in + purge) + for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do + rm -f /etc/fusioninventory/agent.cfg$ext + done + + # remove the configuration file itself + rm -f /etc/fusioninventory/agent.cfg + [ -d /etc/fusioninventory ] && rmdir --ignore-fail-on-non-empty /etc/fusioninventory + + # and finally clear it out from the ucf database + if which ucf >/dev/null; then + ucf --purge /etc/fusioninventory/agent.cfg + fi + if which ucfr >/dev/null; then + ucfr --purge fusioninventory-agent /etc/fusioninventory/agent.cfg + fi + + ;; + *) + exit 0;; +esac + +exit 0 --- fusioninventory-agent-2.3.4.orig/debian/init.d +++ fusioninventory-agent-2.3.4/debian/init.d @@ -0,0 +1,66 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: fusioninventory-agent +# Required-Start: $local_fs $remote_fs $network $syslog +# Required-Stop: $local_fs $remote_fs $network $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: starts FusionInventory Agent +# Description: starts FusionInventory Agent using start-stop-daemon +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/fusioninventory-agent +DAEMON_OPTS=-d +NAME=fusioninventory-agent +DESC=fusioninventory-agent + +test -x $DAEMON || exit 0 + +# Include fusioninventory-_agent defaults if available +if [ -f /etc/default/fusioninventory-agent ] ; then + . /etc/default/fusioninventory-agent +fi + +. /lib/lsb/init-functions + + +if [ ! "$MODE" = "daemon" ]; then + echo "Daemon mode disabled in /etc/default/fusioninventory-agent" + exit 0 +fi + + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS || true + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --exec /usr/bin/perl || true + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON || true + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS || true + echo "$NAME." + ;; + status) + status_of_proc -p /var/run/$NAME.pid "$DAEMON" fusioninventory-agent && exit 0 || exit $? + ;; + *) + echo "Usage: $NAME {start|stop|restart|status}" >&2 + exit 1 + ;; +esac + +exit 0 --- fusioninventory-agent-2.3.4.orig/debian/patches/0001-test-fix-the-HTTPS-over-proxy-test.patch +++ fusioninventory-agent-2.3.4/debian/patches/0001-test-fix-the-HTTPS-over-proxy-test.patch @@ -0,0 +1,62 @@ +From e7dec45eee5c9146c07833012f7962cf884ef403 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= +Date: Wed, 25 Dec 2013 18:03:11 +0100 +Subject: [PATCH] test: fix the HTTPS over proxy test + +This commit properly apply patch commit:fe68a18324809699ca144f7f . + +The test was failing when libwww-perl really support HTTPS over +proxy. +See: https://github.com/libwww-perl/libwww-perl/pull/52 +--- + t/agent/http/client/connection.t | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +diff --git a/t/agent/http/client/connection.t b/t/agent/http/client/connection.t +index 1d93617..fb2f9b1 100755 +--- a/t/agent/http/client/connection.t ++++ b/t/agent/http/client/connection.t +@@ -245,13 +245,8 @@ $server = FusionInventory::Test::Server->new( + password => 'test', + ); + $server->set_dispatch({ +- '/public' => sub { +- return $ok->(@_) if $ENV{HTTP_X_FORWARDED_FOR}; +- }, +- '/private' => sub { +- return $ok->(@_) if $ENV{HTTP_X_FORWARDED_FOR} && +- $server->authenticate(); +- } ++ '/public' => sub { return $ok->(@_) if $ENV{HTTP_X_FORWARDED_FOR}; }, ++ '/private' => sub { return $ok->(@_) if $ENV{HTTP_X_FORWARDED_FOR} && $server->authenticate(); } + }); + eval { + $server->background(); +@@ -323,8 +318,22 @@ $server = FusionInventory::Test::Server->new( + key => 'resources/ssl/key/good.pem', + ); + $server->set_dispatch({ +- '/public' => sub { return $ok->(@_) if $ENV{HTTP_X_FORWARDED_FOR}; }, +- '/private' => sub { return $ok->(@_) if $ENV{HTTP_X_FORWARDED_FOR} && $server->authenticate(); } ++ '/public' => sub { ++ if ($ENV{HTTP_X_FORWARDED_FOR}) { ++ diag("We are are supposed to do HTTPS over a proxy and ". ++ "HTTP_X_FORWARDED_FOR environment variables is defined. ". ++ "This should not append since the proxy cannot access the ". ++ "encrypted data. ". ++ "This means the local LWP library doesn't provide real ". ++ "SSL proxy support and try to contact the server using ". ++ "plaintext HTTP. HTTPS over proxy will not work properly. ". ++ "Please see: https://github.com/libwww-perl/libwww-perl/pull/52") ++ } ++ return $ok->(@_); ++ }, ++ '/private' => sub { ++ return $ok->(@_) if $server->authenticate(); ++ } + }); + eval { + $server->background(); +-- +1.8.5.2 + --- fusioninventory-agent-2.3.4.orig/debian/patches/pciutils-pciids.diff +++ fusioninventory-agent-2.3.4/debian/patches/pciutils-pciids.diff @@ -0,0 +1,11 @@ +--- a/lib/FusionInventory/Agent/Tools/Generic.pm ++++ b/lib/FusionInventory/Agent/Tools/Generic.pm +@@ -268,7 +268,7 @@ + my (%params) = @_; + + ($PCIVendors, $PCIClasses) = _loadDatabase( +- file => "$params{datadir}/pci.ids" ++ file => "/usr/share/misc/pci.ids" + ); + } + --- fusioninventory-agent-2.3.4.orig/debian/patches/series +++ fusioninventory-agent-2.3.4/debian/patches/series @@ -0,0 +1,2 @@ +pciutils-pciids.diff +0001-test-fix-the-HTTPS-over-proxy-test.patch --- fusioninventory-agent-2.3.4.orig/debian/refresh-install-files +++ fusioninventory-agent-2.3.4/debian/refresh-install-files @@ -0,0 +1,36 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use File::Find; + +open AGENT, ">debian/fusioninventory-agent.install"; +open AGENT_TASK_DEPLOY, ">debian/fusioninventory-agent-task-deploy.install"; +open AGENT_TASK_NETWORK, ">debian/fusioninventory-agent-task-network.install"; +open AGENT_TASK_ESX, ">debian/fusioninventory-agent-task-esx.install"; + +find({ wanted => \&wanted, no_chdir=>1}, 'blib'); +sub wanted { + my $t = $File::Find::name; + return unless -f $t; + $t =~ s/blib\//usr\/share\/fusioninventory\//; + $t =~ s,usr/share/fusioninventory/script/,usr/bin/,; + if (/\/man1\//) { + # dh_installmans + } elsif ($t =~ /fusioninventory-net/ || $t =~ /FusionInventory\/Agent\/SNMP/) { + print AGENT_TASK_NETWORK "$t\n"; + } elsif ($t =~ /fusioninventory-esx/) { + print AGENT_TASK_ESX "$t\n"; + } elsif ($t =~ /FusionInventory\/Agent\/Task\/Net/) { + print AGENT_TASK_NETWORK "$t\n"; + } elsif ($t =~ /FusionInventory\/Agent\/Task\/Deploy/) { + print AGENT_TASK_DEPLOY "$t\n"; + } elsif ($t !~ /\/pci\.ids$/ && $t !~ /\/\.exists$/) { # We use Debian pci.ids file + print AGENT "$t\n"; + } +}; + +print AGENT "etc/fusioninventory/agent.cfg /usr/share/fusioninventory/etc\n"; +print AGENT "usr/share/fusioninventory/*.ids\n"; +print AGENT "usr/share/fusioninventory/html\n"; --- fusioninventory-agent-2.3.4.orig/debian/rules +++ fusioninventory-agent-2.3.4/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +%: + dh $@ --with quilt + +override_dh_auto_configure: + perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc/fusioninventory LOCALSTATEDIR=/var/lib/fusioninventory-agent + +override_dh_auto_build: + dh_auto_build + perl debian/refresh-install-files + +override_dh_auto_clean: + [ ! -d var ] || rm -r var + [ ! -d blib ] || rm -r blib + [ ! -f Makefile ] || rm Makefile + [ ! -f MYMETA.yml ] || rm MYMETA.yml + [ ! -f MYMETA.json ] || rm MYMETA.json + [ ! -f t/inventory/generic/lspci/controllers.t ] || rm t/inventory/generic/lspci/controllers.t + [ ! -f t/changelog.t ] || rm t/changelog.t + dh_clean --- fusioninventory-agent-2.3.4.orig/debian/source/format +++ fusioninventory-agent-2.3.4/debian/source/format @@ -0,0 +1 @@ +1.0 --- fusioninventory-agent-2.3.4.orig/debian/tools/prepare-bpo.pl +++ fusioninventory-agent-2.3.4/debian/tools/prepare-bpo.pl @@ -0,0 +1,98 @@ +#!/usr/bin/perl +use strict; +use warnings; +use Data::Dumper; +use Dpkg::Control::Info; +use Dpkg::Changelog::Debian; + +$ENV{'DEBFULLNAME'} = 'Gonéri Le Bouder'; +$ENV{'EMAIL'} = 'goneri@rulezlan.org'; + +my %dropTest = ( + 'fusioninventory-agent' => [ + 't/components/client/ocs/response.t', 't/xml/response.t', + 't/components/logger.t', 't/components/client/ssl.t', + 't/components/client/connection.t', 't/01compile.t', + 't/apps/agent.t', + ], + 'libfusioninventory-agent-task-deploy-perl' => [ 't/server.t', ] + +); + +my %newDeps = ( + 'Depends' => { + 'libfusioninventory-agent-task-esx-perl' => [ 'libio-socket-ssl-perl' ], + }, + 'Build-Depends' => { + 'libfusioninventory-agent-task-esx-perl' => [ 'libio-socket-ssl-perl' ] + + } + +); + +open RULES, "; +close RULES; +open RULES, ">debian/rules"; +foreach (@origin_rules) { + s/BACKPORT = no/BACKPORT = yes/; + print RULES; +} +close RULES; + +sub bpDeps { + my ($pkg) = @_; + + my $name = $pkg->{Package} || $pkg->{Source}; + foreach my $section (qw/Build-Depends Build-Depends-Indep Depends/) { + next unless $pkg->{$section}; + $pkg->{$section} =~ s/\s*\n//g; + my @list = split( /,/, $pkg->{$section} ); + + my @listFinal; + foreach (@list) { + s/^\s*//; + next if $_ eq "libhttp-daemon-perl"; + next if $_ eq "libhttp-server-simple-authen-perl"; + next if $_ eq "libhttp-cookies-perl"; + push @listFinal, $_; + } + if ( $newDeps{$section}->{$name} ) { + push @listFinal, $_ foreach ( @{ $newDeps{$section}->{$name} } ); + } + $pkg->{$section} = join( ",\n", @listFinal ); + } + +} + +my $c = Dpkg::Control::Info->new("debian/control"); + +my $s = $c->get_source(); +bpDeps($s); +use Data::Dumper; + +my @pList = $c->get_packages(); +foreach my $p (@pList) { + bpDeps($p); +} + +open my $f, ">debian/control"; +$c->output($f); + +foreach ( @{ $dropTest{ $s->{Source} } } ) { + unlink($_); +} + +my $changelog = Dpkg::Changelog::Debian->new(); +$changelog->load('debian/changelog'); +use Data::Dumper; +if ( $changelog->[0]->get_distributions() ne 'squeeze-backports' ) { + system("dch --bpo"); +} + +my $lastVersion = $changelog->[ @$changelog - 1 ]->get_version(); +if ( `rmadison $s->{Source} -s squeeze-backports` =~ /^[^\|]*\|\s(\S+)~bpo6/ ) { + $lastVersion = "-v$1"; +} +print "lastVersion: $lastVersion\n"; +system( "dpkg-buildpackage", "-i", "-sa", "-v$lastVersion" ); --- fusioninventory-agent-2.3.4.orig/debian/watch +++ fusioninventory-agent-2.3.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://search.cpan.org/dist/FusionInventory-Agent/ .*/FusionInventory-Agent-([[:digit:]].*)\.tar\.gz