--- ocsinventory-server-1.02.2.orig/debian/compat +++ ocsinventory-server-1.02.2/debian/compat @@ -0,0 +1 @@ +5 --- ocsinventory-server-1.02.2.orig/debian/changelog +++ ocsinventory-server-1.02.2/debian/changelog @@ -0,0 +1,160 @@ +ocsinventory-server (1.02.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix pending l10n issues. Debconf translations: + - Spanish (Camaleón). Closes: #583773 + - Danish (Joe Hansen). Closes: #599831 + - Italian (Vincenzo Campanella). Closes: #600441 + - Bokmål, Norwegian (Bjørn Steensrud). Closes: #600517 + + -- Christian Perrier Tue, 19 Oct 2010 07:29:19 +0200 + +ocsinventory-server (1.02.2-1) unstable; urgency=low + + * New upstream security release + * Bump Standards Version to 3.8.3 + * Add --debconf-ok to dbconfig calls (Closes: #531438) + * Add Japanese po-debconf template translation (Closes: #554087) + * Create /var/lib/ocsinventory-reports/download folder (Closes: #557782) + + -- Pierre Chifflier Sun, 31 Jan 2010 21:12:11 +0100 + +ocsinventory-server (1.02.1-2) unstable; urgency=high + + * Security update: fix potential SQL injection in ocsreports/machine.php + - no CVE yet (see http://seclists.org/fulldisclosure/2009/Aug/0143.html) + - urgency high + - Closes: #541995 + * Bump Standards Version to 3.8.2 (no changes) + + -- Pierre Chifflier Tue, 18 Aug 2009 14:40:20 +0200 + +ocsinventory-server (1.02.1-1) unstable; urgency=low + + * New Upstream Version (Closes: #529409): + - Some security fixes + - Use the same error for wrong user or wrong password (Closes: #529344) + * Fix name of upstream tgz in watch file (Closes: #529608) + * Upload to unstable: + - The SQL table is fully created by dbconfig-common (Closes: #512660) + + -- Pierre Chifflier Mon, 01 Jun 2009 10:39:03 +0200 + +ocsinventory-server (1.02-3) experimental; urgency=low + + * Apply patches from Daniel Dehennin: + * Use dbconfig-common to fully create the database (Closes: #529595) + Running install.php after installation is not required anymore if + dbconfig-common is used. + * Try to load required apache modules during install (Closes: #530716) + + -- Pierre Chifflier Thu, 28 May 2009 16:07:55 +0200 + +ocsinventory-server (1.02-2) experimental; urgency=low + + * Fix extra comma in dbconfig.patch (Closes: #529437) + * Re-introduce hardcoded-dbauth.patch to fix DB login during install + (Closes: #529447) + + -- Pierre Chifflier Tue, 19 May 2009 21:32:32 +0200 + +ocsinventory-server (1.02-1) experimental; urgency=low + + * New Upstream Version (Closes: #526829, #513124) + * Refreshed patches + * Symlink is created during ocsinventory-reports.postinst (Closes: #518318) + * Add Swedish debconf translation (Closes: #504331) + * Bump standards version to 3.8.1 + * Handle upgrade from previous versions by moving the old (incompatible) + config file out of the way (Closes: #499820). + See README.Debian for details + * Add local scripts to ocsinventory-server package (Closes: #527354) + + -- Pierre Chifflier Mon, 18 May 2009 22:28:05 +0200 + +ocsinventory-server (1.02~rc2-1) experimental; urgency=low + + * New upstream release candidate + * Drop patches for ipdiscover, the script was removed upstream + * Re-enable download feature + * Note: the documentation guide was removed upstream (Closes: #440656) + * Re-write configuration file + * Prefer PHP5 over PHP4 + + -- Pierre Chifflier Mon, 08 Sep 2008 16:43:49 +0200 + +ocsinventory-server (1.01-6) unstable; urgency=low + + * Fix configuration file if not using dbconfig (Closes: #492047) + * This also allows to install without a MySQL server (Closes: #489461) + * Bump standards version to 3.8.0 + * Replace Apache license in copyright file by a link to local file. + + -- Pierre Chifflier Tue, 29 Jul 2008 17:42:03 +0200 + +ocsinventory-server (1.01-5) unstable; urgency=low + + * Debconf translations: + - Basque (Closes: #483897) + - Brazilian Portuguese (Closes: #473351) + - Czech (Closes: #483298) + - Dutch (Closes: #450985) + - Finnish (Closes: #456962) + - Galician (Closes: #483732) + - Russian (Closes: #484320) + - Turkish (Closes: #484720) + + -- Pierre Chifflier Sun, 08 Jun 2008 13:01:14 +0200 + +ocsinventory-server (1.01-4) unstable; urgency=low + + * Acknowledge NMU (Closes: #468194) + Thanks to Mark Hymers + * Bump Standards version (no changes) + * Move homepage to pseudo-header + + -- Pierre Chifflier Mon, 14 Apr 2008 10:47:37 +0200 + +ocsinventory-server (1.01-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with Perl 5.10. Closes: #468194. + + -- Mark Hymers Sat, 05 Apr 2008 13:49:26 +0100 + +ocsinventory-server (1.01-3) unstable; urgency=low + + [ Pierre Chifflier ] + * Update my email address + * Debconf templates: + + French (Closes: #434080) + + (updated) Portuguese (Closes: #437287) + * Add installation notes (Closes: #439372, #433037) + + -- Pierre Chifflier Sun, 21 Oct 2007 18:07:55 +0200 + +ocsinventory-server (1.01-2) unstable; urgency=low + + * Fix spelling errors in debconf template (Closes: #432870) + * Debconf templates: + + German (Closes: #432868) + + Portuguese (Closes: #433186) + + -- Pierre Chifflier Tue, 17 Jul 2007 13:50:41 +0200 + +ocsinventory-server (1.01-1) unstable; urgency=low + + [ Pierre Chifflier ] + * Initial release (Closes: #419226) + * Should detect mod_perl version (1 or 2) in apache config + + [ Eric DECORNOD ] + * split in two packages : Comm. Server and Adm. Console (-server and -reports) + * ocsreports: - Changed the location of dbconfig, download and ipd + - moved guide.pdf to documentation + - replaced hardcoded user/pass in install.php + - protected install.php w/ /etc/ocsinventory/htpasswd.setup + * ipdiscover-util.pl: - Replaced hardcoded config to dbconfig.inc.php + + -- Pierre Chifflier Thu, 24 May 2007 16:17:06 +0200 + --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.prerm +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.prerm @@ -0,0 +1,18 @@ +#!/bin/sh +# prerm script for ocsinventory-server +# +# see: dh_installdeb(1) + +set -e + +# source debconf stuff +. /usr/share/debconf/confmodule +# source dbconfig-common stuff +. /usr/share/dbconfig-common/dpkg/prerm.mysql +dbc_go ocsinventory-server $@ + +#DEBHELPER# + +exit 0 + + --- ocsinventory-server-1.02.2.orig/debian/watch +++ ocsinventory-server-1.02.2/debian/watch @@ -0,0 +1,4 @@ +# See uscan(1) for format +# (debscripts >= 2.9) +version=3 +http://sf.net/ocsinventory/OCSNG_UNIX_SERVER_([0-9].*)\.tar\.gz --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.links +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.links @@ -0,0 +1,3 @@ +etc/ocsinventory/dbconfig.inc.php usr/share/ocsinventory-server/ocsreports/dbconfig.inc.php +etc/ocsinventory/dbconfig.inc.php var/lib/ocsinventory-server/config/dbconfig.inc.php +var/lib/ocsinventory-server/ipd usr/share/ocsinventory-server/ocsreports/ipd --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.postrm +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.postrm @@ -0,0 +1,63 @@ +#!/bin/sh +# postrm script for ocsinventory-server +# +# see: dh_installdeb(1) + +set -e + +varpath="/var/lib/ocsinventory-server" +confpath="/etc/ocsinventory" +conffile="ocsinventory.conf" + +. /usr/share/debconf/confmodule +db_version 2.0 || [ $? -lt 30 ] + +if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then + . /usr/share/dbconfig-common/dpkg/postrm.mysql + dbc_go ocsinventory-server $@ +fi + +if [ "$1" = "purge" ]; then + + for FILE in $confpath/$conffile; do + # Taken from the ucf example postrm + for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist .ucf-old; do + rm -f $FILE$ext + done + rm -f $FILE + if which ucf >/dev/null 2>&1; then + ucf --debconf-ok --purge $FILE + fi + done + + rmdir --ignore-fail-on-non-empty /etc/ocsinventory || true +fi + +if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then + + webservers="apache2" + for webserver in $webservers; do + webserver=${webserver%,} + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/$conffile ]; then + rm -f /etc/$webserver/conf.d/$conffile + fi + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload || true + else + /etc/init.d/$webserver reload || true + fi + done + +fi + +if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi + + +#DEBHELPER# + +exit 0 + + --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.config +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.config @@ -0,0 +1,31 @@ +#!/bin/bash + +set -e + +action=$1 +version=$2 + +# Source debconf library. +. /usr/share/debconf/confmodule +db_version 2.0 || [ 0 -lt 30 ] + +#db_input medium ocsinventory-server/webserver || true +#db_go + +if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then + . /usr/share/dbconfig-common/dpkg/config.mysql + + # hints for dbconfig + dbc_dbname="ocsweb" + dbc_dbuser="ocs" + + # hints from ocsinventory-reports if installed + if [ -f /etc/dbconfig-common/ocsinventory-reports.conf ]; then + . /etc/dbconfig-common/ocsinventory-reports.conf + fi + + dbc_go ocsinventory-server $@ +fi + +db_go + --- ocsinventory-server-1.02.2.orig/debian/control +++ ocsinventory-server-1.02.2/debian/control @@ -0,0 +1,58 @@ +Source: ocsinventory-server +Section: web +Priority: extra +Maintainer: Pierre Chifflier +Uploaders: Eric Décornod +Build-Depends: debhelper (>= 5), quilt (>= 0.40), po-debconf +Standards-Version: 3.8.3 +Homepage: http://www.ocsinventory-ng.org/ + +Package: ocsinventory-server +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, + apache2, + libapache2-mod-perl2, + libdbi-perl, + libapache-dbi-perl, + libdbd-mysql-perl, + libcompress-zlib-perl, + libxml-simple-perl, + libnet-ip-perl, + ucf (>= 0.28), + dbconfig-common +Recommends: ocsinventory-reports +Suggests: mysql-server, libsoap-lite-perl, ocsinventory-agent +Description: Hardware and software inventory tool (Communication Server) + Open Computer and Software Inventory Next Generation is an application + designed to help a network or system administrator keep track of the + computers configuration and software that are installed on the network. + . + Information about Hardware and Operating System are collected. + OCS Inventory is also able to detect all active devices on your network, + such as switch, router, network printer and unattended devices. + It also allows deploying softwares, commands or files on client computers. + . + This package contains the 'Communication Server' part. + Note that this is the XML-RPC/SOAP server, not the web interface (which is + provided in the ocsinventory-reports package). + +Package: ocsinventory-reports +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, + apache2, + php5 | php5-cgi | libapache2-mod-php5 | php4 | php4-cgi | libapache2-mod-php4, + php5-mysql | php4-mysql, + ucf, + dbconfig-common +Recommends: ocsinventory-server, php5-gd | php4-gd, libdbi-perl, libdbd-mysql-perl, libnet-ip-perl, libxml-simple-perl, nmap, samba-common +Description: Hardware and software inventory tool (Administration Console) + Open Computer and Software Inventory Next Generation is an application + designed to help a network or system administrator keep track of the + computers configuration and software that are installed on the network. + . + Information about Hardware and Operating System are collected. + OCS Inventory is also able to detect all active devices on your network, + such as switch, router, network printer and unattended devices. + It also allows deploying softwares, commands or files on client computers. + . + This package contains the 'Administration Console' part. --- ocsinventory-server-1.02.2.orig/debian/TODO +++ ocsinventory-server-1.02.2/debian/TODO @@ -0,0 +1,11 @@ +- allow apache1 web server +- tune up the 'purge' part of postrm scripts +- add a manpage for Ocsinventory_local.pl + and eventually link ip-discover-util.pl in /usr/bin + and add a manpage +- tune up ocsreports php configuration +- move files/oui.txt to /var/lib as it's a table + and even all 'files' subdir. +- add a notice about agent.exe in README.Debian +- add a notice about install.php creating an ocs + account in the database in README.Debian --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.logrotate +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.logrotate @@ -0,0 +1,21 @@ +################################################################################ +# +# OCS Inventory NG Communication Server +# +# Copyleft 2006 Didier LIROULET +# Web: http://ocsinventory.sourceforge.net +# +# This code is open source and may be copied and modified as long as the source +# code is always made freely available. +# Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt +################################################################################ +# +# Rotate OCS Inventory NG Communication server logs weekly, only if not empty +# Save 7 days old logs under compressed mode +/var/log/ocsinventory-server/*.log { + daily + rotate 7 + compress + notifempty + missingok +} --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.install +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.install @@ -0,0 +1,4 @@ +ocsreports usr/share/ocsinventory-server +#ipdiscover-util/ipdiscover-util.pl usr/share/ocsinventory-server/ocsreports +debian/conf/ocsreports.conf etc/ocsinventory +debian/conf/dbconfig.inc.php usr/share/ocsinventory-server/files --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.config +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.config @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +action=$1 +version=$2 + +# Source debconf library. +. /usr/share/debconf/confmodule +db_version 2.0 || [ 0 -lt 30 ] + +if [ -f /usr/share/dbconfig-common/dpkg/frontend.config.mysql ]; then + . /usr/share/dbconfig-common/dpkg/frontend.config.mysql + + # hints for dbconfig + dbc_dbname="ocsweb" + dbc_dbuser="ocs" + + # hints from ocsinventory-server if installed + if [ -f /etc/dbconfig-common/ocsinventory-server.conf ]; then + . /etc/dbconfig-common/ocsinventory-server.conf + fi + + dbc_go ocsinventory-reports $@ +fi + +db_go + --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.install +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.install @@ -0,0 +1,3 @@ +debian/conf/ocsinventory.conf usr/share/ocsinventory-server/files +debian/db/mysql usr/share/dbconfig-common/data/ocsinventory-server/install +debian/db/1.02 usr/share/dbconfig-common/data/ocsinventory-server/upgrade/mysql --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.docs +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.docs @@ -0,0 +1,2 @@ +README +debian/mysql.conf --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.examples +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.examples @@ -0,0 +1 @@ +Apache/etc/ocsinventory/ocsinventory-server.conf --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.templates +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.templates @@ -0,0 +1,23 @@ +Template: ocsinventory-reports/setup-username +Type: string +Default: admin +_Description: User name for web-based setup system: + OCS Reports comes with a web-based setup/upgrade script. + The script is located at http://localhost/ocsreports/install.php. + For security reasons it requires authorization. + . + Leave empty if you want to use the default user name 'admin'. + +Template: ocsinventory-reports/setup-password +Type: password +Default: +_Description: Password for web-based setup system: + OCS Reports comes with a web-based setup/upgrade script. + The script is located at http://localhost/ocsreports/install.php. + For security reasons it requires authorization. + . + You can manage the usernames and passwords with the `htpasswd' command. + They are stored in /etc/ocsinventory/htpasswd.setup file. + . + Leave empty if you want to disable access to the web-based setup. + --- ocsinventory-server-1.02.2.orig/debian/copyright +++ ocsinventory-server-1.02.2/debian/copyright @@ -0,0 +1,48 @@ +This package was debianized by Pierre Chifflier on +Fri, 23 Feb 2007 15:06:24 +0100. + +It was downloaded from http://www.ocsinventory-ng.org + +Upstream Author: Pascal DANEK + +Copyright: 2005-2007 - OCS Inventory Development Team: + Pascal DANEK, Goneri Le Bouder, + Pierre LEMMET, Didier LIROULET + +License: + +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. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + + + +For the files slider.js, range.js, timer.js and winclassic.css : + Copyright (c) 2002, 2003, 2006 Erik Arvidsson + Licensed under the Apache License, Version 2.0 + +On Debian GNU/Linux systems, the complete text of the Apache +License 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'. + + +For the file DateTimePicker.js : + Copyright (c) 2003 TengYong Ng + Permission given to use this script in + ANY kind of applications if header lines + are left unchanged + Homepage: http://www.rainforestnet.com + + +The Debian packaging is (C) 2007, Pierre Chifflier and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.dirs +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.dirs @@ -0,0 +1,8 @@ +etc/ocsinventory +usr/share/ocsinventory-server +usr/share/ocsinventory-server/files +var/lib/ocsinventory-reports/download +var/lib/ocsinventory-server/config +var/lib/ocsinventory-server/ipd +var/lib/ocsinventory-server/download +var/log/ocsinventory-server --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.docs +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.docs @@ -0,0 +1,2 @@ +README +#ocsreports/files/guide.pdf --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.examples +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.examples @@ -0,0 +1 @@ +Apache/etc/ocsinventory/ocsinventory-server.conf --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.dirs +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.dirs @@ -0,0 +1,4 @@ +etc/ocsinventory +usr/share/ocsinventory-server/files +usr/share/doc/ocsinventory-server +var/log/ocsinventory-server --- ocsinventory-server-1.02.2.orig/debian/mysql.conf +++ ocsinventory-server-1.02.2/debian/mysql.conf @@ -0,0 +1,8 @@ + --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.postinst +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.postinst @@ -0,0 +1,78 @@ +#!/bin/sh +# postinst script for ocsinventory-server +# +# see: dh_installdeb(1) + +set -e + +. /usr/share/debconf/confmodule +db_version 2.0 || [ $? -lt 30 ] + +if [ "$1" = "configure" ]; then + + # Enable perl module + a2enmod perl + + # only on a new install + if [ "$2" = "" ] || [ ! -f /etc/ocsinventory/ocsinventory.conf ]; then + pkgpath="/usr/share/ocsinventory-server" + confpath="/etc/ocsinventory" + conffile="ocsinventory.conf" + + # Allow mod_perl to write there + for dirname in /var/log/ocsinventory-server; do + chown www-data:www-data $dirname + chmod g+w $dirname + done + + # use dbconfig to setup vars in apache config file + . /usr/share/dbconfig-common/dpkg/postinst.mysql + dbc_generate_include=template:$confpath/$conffile + dbc_generate_include_args="-U -o template_infile='$pkgpath/files/$conffile'" + dbc_generate_include_owner="root:www-data" + dbc_generate_include_perms="0640" + + dbc_go ocsinventory-server $@ + + # if not using dbconfig, set default values to have a valid config file + db_get ocsinventory-server/dbconfig-install + use_dbconfig=${RET:-false} + if [ "x$use_dbconfig" != "xtrue" ]; then + sed -i -e 's/^\(\s*\)PerlSetEnv OCS_DB_NAME\s\+$/\1PerlSetEnv OCS_DB_NAME ocsweb/' \ + -e 's/^\(\s*\)PerlSetEnv OCS_DB_LOCAL\s\+$/\1PerlSetEnv OCS_DB_LOCAL ocsweb/' \ + -e 's/^\(\s*\)PerlSetEnv OCS_DB_USER\s\+$/\1PerlSetEnv OCS_DB_USER ocs/' \ + -e 's/^\(\s*\)PerlSetVar OCS_DB_PWD\s\+$/\1PerlSetVar OCS_DB_PWD ocs/' \ + $confpath/$conffile + fi + + db_stop + + # fix dbconfig empty variables + if [ -z "$dbc_dbhost" ]; then + sed -i -e 's/^\(\s*\)PerlSetEnv OCS_DB_HOST\s\+$/\1PerlSetEnv OCS_DB_HOST localhost/' \ + -e 's/^\(\s*\)PerlSetEnv OCS_DB_PORT\s\+$/\1PerlSetEnv OCS_DB_PORT 3306/' \ + $confpath/$conffile + fi + + # link apache config files in apache's conf.d dir + webservers="apache2" + for webserver in $webservers; do + webserver=${webserver%,} + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/$conffile ]; then + ln -s $confpath/$conffile /etc/$webserver/conf.d/$conffile + fi + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload || true + else + /etc/init.d/$webserver reload || true + fi + done + fi +fi + + +#DEBHELPER# + +exit 0 + + --- ocsinventory-server-1.02.2.orig/debian/rules +++ ocsinventory-server-1.02.2/debian/rules @@ -0,0 +1,125 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DESTDIR=$(CURDIR)/debian/ocsinventory-server +GDIR=$(DESTDIR)/usr/share/ocsinventory-server +GCONFDIR=$(DESTDIR)/etc/ocsinventory +GVARDIR=$(DESTDIR)/var/lib/ocsinventory-server + + +# If set to a true value then MakeMaker's prompt function will +# always return the default without waiting for user input. +export PERL_MM_USE_DEFAULT=1 + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +ifndef PERL + PERL = /usr/bin/perl +endif + +configure: configure-stamp +configure-stamp: patch + dh_testdir + # Add here commands to configure the package. + cd Apache && perl Makefile.PL INSTALLDIRS=vendor + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) -C Apache OPTIMIZE="$(CFLAGS)" + + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Apache/Makefile ] || $(MAKE) -C Apache realclean + rm -f Apache/Makefile.old + + -debconf-updatepo + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/ocsinventory-server. + $(MAKE) -C Apache DESTDIR=$(CURDIR)/debian/ocsinventory-server install PREFIX=/usr + cp -r Apache/binutils $(CURDIR)/debian/ocsinventory-server/usr/share/ocsinventory-server/ + find $(CURDIR)/debian/ocsinventory-server/usr/share/ocsinventory-server/ -name '*.pl' -exec chmod +x {} \; + chmod -x $(CURDIR)/debian/ocsinventory-server/usr/share/ocsinventory-server/binutils/ocs-errors + + # MakeMaker creates the dirs, we delete them from the deb: + [ ! -d $(CURDIR)/debian/ocsinventory-server/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents $(CURDIR)/debian/ocsinventory-server/usr/lib/perl5 + + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install + + # remove guide.pdf as it shouldn't reside in /usr/share/ocs... + rm -f $(CURDIR)/debian/ocsinventory-reports/usr/share/ocsinventory-server/ocsreports/files/guide.pdf + + # add execute to ipdiscover-util.pl + #chmod a+x $(CURDIR)/debian/ocsinventory-reports/usr/share/ocsinventory-server/ocsreports/ipdiscover-util.pl + + # fix permissions for scripts and images + find $(CURDIR)/debian/ocsinventory-reports/usr/share/ocsinventory-server/ocsreports -type f -exec chmod a-x {} \; + +# dh_installmenu + dh_installdebconf + dh_installlogrotate +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +include /usr/share/quilt/quilt.make + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.postinst +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.postinst @@ -0,0 +1,80 @@ +#!/bin/sh +# postinst script for ocsinventory-reports +# +# see: dh_installdeb(1) + +set -e + +. /usr/share/debconf/confmodule +db_version 2.0 || [ $? -lt 30 ] + +if [ "$1" = "configure" ]; then + + # enable required apache modules + a2enmod php5 + a2enmod rewrite + + # only on a new install + if [ "$2" = "" ]; then + pkgpath="/usr/share/ocsinventory-server" + varpath="/var/lib/ocsinventory-server" + confpath="/etc/ocsinventory" + conffile="ocsreports.conf" + dbconffile="dbconfig.inc.php" + + # Allow php to write there + for dirname in ipd download; do + chown www-data:www-data $varpath/$dirname + chmod g+w $varpath/$dirname + done + + varpath="/var/lib/ocsinventory-reports" + for dirname in download; do + chown www-data:www-data $varpath/$dirname + chmod g+w $varpath/$dirname + done + + + # use dbconfig to setup vars for php + . /usr/share/dbconfig-common/dpkg/frontend.postinst.mysql + dbc_generate_include=template:$confpath/$dbconffile + dbc_generate_include_args="-U -o template_infile='$pkgpath/files/$dbconffile'" + dbc_generate_include_owner="root:www-data" + dbc_generate_include_perms="0640" + + dbc_go ocsinventory-reports $@ + + # if not using dbconfig, set default values to have a valid config file + db_get ocsinventory-reports/dbconfig-install + use_dbconfig=${RET:-false} + if [ "x$use_dbconfig" != "xtrue" ]; then + sed -i -e 's/^\([^]]*\["SERVEUR_SQL"\]="\).*/\1localhost";/' \ + -e 's/^\([^]]*\["COMPTE_BASE"\]="\).*/\1ocs";/' \ + -e 's/^\([^]]*\["PSWD_BASE"\]="\).*/\1ocs";/' \ + $confpath/$conffile + fi + + db_stop + + # link apache config files in apache's conf.d dir + webservers="apache2" + for webserver in $webservers; do + webserver=${webserver%,} + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/$conffile ]; then + ln -s $confpath/$conffile /etc/$webserver/conf.d/$conffile + fi + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload || true + else + /etc/init.d/$webserver reload || true + fi + done + fi +fi + + +#DEBHELPER# + +exit 0 + + --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-server.preinst +++ ocsinventory-server-1.02.2/debian/ocsinventory-server.preinst @@ -0,0 +1,43 @@ +#!/bin/sh +# preinst script for ocsinventory-reports +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install) + ;; + + upgrade) + if dpkg --compare-versions "$2" lt-nl "1.02-1"; then + # move old file out of the way + mv /etc/ocsinventory/ocsinventory.conf /etc/ocsinventory/ocsinventory.conf-$2 + ucf --debconf-ok --purge /etc/ocsinventory/ocsinventory.conf + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- ocsinventory-server-1.02.2.orig/debian/ocsinventory-reports.postrm +++ ocsinventory-server-1.02.2/debian/ocsinventory-reports.postrm @@ -0,0 +1,64 @@ +#!/bin/sh +# postrm script for ocsinventory-reports +# +# see: dh_installdeb(1) + +set -e + +varpath="/var/lib/ocsinventory-server" +confpath="/etc/ocsinventory" +conffile="ocsreports.conf" +dbconffile="dbconfig.inc.php" + +. /usr/share/debconf/confmodule +db_version 2.0 || [ $? -lt 30 ] + +if [ -f /usr/share/dbconfig-common/dpkg/frontend.postrm.mysql ]; then + . /usr/share/dbconfig-common/dpkg/frontend.postrm.mysql + dbc_go ocsinventory-reports $@ +fi + +if [ "$1" = "purge" ]; then + + for FILE in $confpath/$conffile $confpath/$dbconffile; do + # Taken from the ucf example postrm + for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist .ucf-old; do + rm -f $FILE$ext + done + rm -f $FILE + if which ucf >/dev/null 2>&1; then + ucf --debconf-ok --purge $FILE + fi + done + + rmdir --ignore-fail-on-non-empty /etc/ocsinventory || true +fi + +if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then + + webservers="apache2" + for webserver in $webservers; do + webserver=${webserver%,} + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/$conffile ]; then + rm -f /etc/$webserver/conf.d/$conffile + fi + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload || true + else + /etc/init.d/$webserver reload || true + fi + done + +fi + +if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi + + +#DEBHELPER# + +exit 0 + + --- ocsinventory-server-1.02.2.orig/debian/README.Debian +++ ocsinventory-server-1.02.2/debian/README.Debian @@ -0,0 +1,62 @@ +ocsinventory-server for Debian +============================== + +Database +-------- + +The Debian package uses dbconfig to automatically create the database user and +the database. The schema and data are also created, so running the install.php +script is not required anymore (starting from version 1.02-3). +(see later for instructions). +If you choose not to use dbconfig, you will have to create them manually, +and configure files /etc/ocsinventory/dbconfig.inc.php and +/etc/ocsinventory/ocsinventory.conf + +Important: even if the debian package allows to change the database name, +using a different name from the default (ocsweb) will probably cause problems, +as the name is hardcoded in many files. This is being fixed. + +Post-installation notes +----------------------- + +Please note that after first installation, or after an upgrade, it's recommended +to call http://localhost/ocsreports/install.php ; please also note that this +particular page is restricted to localhost in /etc/ocsinventory/ocsreports.conf. + +For security reasons, this script is protected by an apache authentication, using +/etc/ocsinventory/htpasswd.setup + +You must change this password, for example using:: + + htpasswd /etc/ocsinventory/htpasswd.setup admin + New password: + Re-type new password: + +Upgrading from previous (1.01) versions +--------------------------------------- + +Configuration file /etc/ocsinventory/ocsinventory.conf has been changed upstream in +a way which makes clean upgrades impossible (keeping changes). +If you upgrade from a 1.01 version to 1.02, your configuration file will be renamed +to /etc/ocsinventory/ocsinventory.conf-, and a new one will be installed. +You will have to merge local changes manually. + +Debian changes +-------------- + +Configuration file dbconfig.inc.php has been moved to /var/lib/ocsinventory-server/config +and is created/modified/deleted by http://localhost/ocsreports/install.php + +ipd and download directories are also in /var/lib/ocsinventory-server. + +It's possible to install ocsinventory-server and ocsinventory-reports +on different web-servers, but please take in account that +ocsinventory-reports's install.php script builds and update the database. + + +Security +-------- + +Important: access to the reports server should be restricted + + -- Pierre Chifflier Mon, 18 May 2009 22:35:07 +0200 --- ocsinventory-server-1.02.2.orig/debian/db/1.02 +++ ocsinventory-server-1.02.2/debian/db/1.02 @@ -0,0 +1,271 @@ +-- -*- sql -*- +USE ocsweb; + +-- +-- Create new schema +-- +CREATE TABLE `blacklist_macaddresses` ( + `ID` INTEGER auto_increment, + `MACADDRESS` VARCHAR(255), + PRIMARY KEY (`MACADDRESS`), + KEY `ID` (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `blacklist_serials` ( + `ID` INTEGER auto_increment, + `SERIAL` VARCHAR(255), + PRIMARY KEY (`SERIAL`), + KEY `ID` (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `download_affect_rules` ( + `ID` INTEGER NOT NULL auto_increment, + `RULE` INTEGER NOT NULL, + `PRIORITY` INTEGER NOT NULL, + `CFIELD` VARCHAR(20) collate latin1_general_ci NOT NULL, + `OP` VARCHAR(20) collate latin1_general_ci NOT NULL, + `COMPTO` VARCHAR(20) collate latin1_general_ci NOT NULL, + `SERV_VALUE` VARCHAR(20) collate latin1_general_ci default NULL, + `RULE_NAME` VARCHAR(200) collate latin1_general_ci NOT NULL, + PRIMARY KEY (`ID`) +) ENGINE=MyISAM; + +CREATE TABLE `download_servers` ( + `HARDWARE_ID` INTEGER NOT NULL, + `URL` VARCHAR(250) collate latin1_general_ci NOT NULL, + `ADD_PORT` INTEGER NOT NULL, + `ADD_REP` VARCHAR(250) collate latin1_general_ci NOT NULL, + `GROUP_ID` INTEGER NOT NULL, + PRIMARY KEY (`HARDWARE_ID`) +) ENGINE=MyISAM; + +CREATE TABLE `engine_mutex` ( + `NAME` VARCHAR(255) NOT NULL default '', + `PID` INTEGER default NULL, + `TAG` VARCHAR(255) NOT NULL default '', + PRIMARY KEY (`NAME`, `TAG`) +) ENGINE=MEMORY DEFAULT CHARSET=latin1; + +CREATE TABLE `engine_persistent` ( + `ID` INTEGER NOT NULL auto_increment, + `NAME` VARCHAR(255) NOT NULL default '', + `IVALUE` INTEGER default NULL, + `TVALUE` VARCHAR(255) default NULL, + UNIQUE KEY `NAME` (`NAME`), + KEY `ID` (`ID`) +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; + +CREATE TABLE `groups` ( + `HARDWARE_ID` INTEGER default NULL, + `REQUEST` longtext, + `CREATE_TIME` INTEGER default 0, + `REVALIDATE_FROM` INTEGER default 0, + PRIMARY KEY (`HARDWARE_ID`) +) ENGINE=MYISAM; + +CREATE TABLE `groups_cache` ( + `HARDWARE_ID` INTEGER NOT NULL default 0, + `GROUP_ID` INTEGER NOT NULL default 0, + `STATIC` INTEGER default 0, + PRIMARY KEY (`HARDWARE_ID`, `GROUP_ID`) +) ENGINE=MYISAM; + +CREATE TABLE `hardware_osname_cache` ( + `ID` INTEGER auto_increment, + `OSNAME` VARCHAR(255) UNIQUE, + PRIMARY KEY (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `prolog_conntrack` ( + `ID` INTEGER NOT NULL auto_increment, + `DEVICEID` VARCHAR(255) default NULL, + `TIMESTAMP` INTEGER default NULL, + `PID` INTEGER default NULL, + KEY `ID` (`ID`), + KEY `DEVICEID` (`DEVICEID`) +) ENGINE=MEMORY; + +CREATE TABLE `softwares_name_cache` ( + `ID` INTEGER auto_increment, + `NAME` VARCHAR(255) UNIQUE, + PRIMARY KEY (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `tags` ( + `Tag` VARCHAR(255) NOT NULL default '', + `Login` VARCHAR(255) NOT NULL default '', + PRIMARY KEY (`Tag`, `Login`), + KEY `Tag` (`Tag`), + KEY `Login` (`Login`) +) ENGINE=MyISAM; + +CREATE TABLE `registry_name_cache` ( + `ID` INTEGER auto_increment, + `NAME` VARCHAR(255) UNIQUE, + PRIMARY KEY (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `registry_regvalue_cache` ( + `ID` INTEGER auto_increment, + `REGVALUE` VARCHAR(255) UNIQUE, + PRIMARY KEY (`ID`) +) ENGINE = MYISAM; + + +-- +-- Update existing schemas +-- + +-- accesslog +ALTER TABLE `accesslog` ADD KEY `USERID` (`USERID`); + +-- devices +ALTER TABLE `devices` ADD KEY `IVALUE` (`IVALUE`); +ALTER TABLE `devices` ADD KEY `NAME` (`NAME`); + +-- download_enable +ALTER TABLE `download_enable` ADD COLUMN `SERVER_ID` INTEGER; +ALTER TABLE `download_enable` ADD COLUMN `GROUP_ID` INTEGER; +ALTER TABLE `download_enable` ADD KEY `FILEID` (`FILEID`); + +-- hardware +ALTER TABLE `hardware` ADD COLUMN `SSTATE` INTEGER default 0; +ALTER TABLE `hardware` CHANGE `QUALITY` `QUALITY` DECIMAL(7,4) default NULL; -- NULL or 0 ? +ALTER TABLE `hardware` ADD KEY `USERID` (`USERID`); +ALTER TABLE `hardware` ADD KEY `WORKGROUP` (`WORKGROUP`); +ALTER TABLE `hardware` ADD KEY `OSNAME` (`OSNAME`); +ALTER TABLE `hardware` ADD KEY `MEMORY` (`MEMORY`); + +-- memories +ALTER TABLE `memories` ADD COLUMN `SERIALNUMBER` VARCHAR(255) default NULL AFTER `NUMSLOTS`; + +-- networks +-- IPSUBNET is 15/255 ? +ALTER TABLE `networks` ADD KEY `IPADDRESS` (`IPADDRESS`); +ALTER TABLE `networks` ADD KEY `IPGATEWAY` (`IPGATEWAY`); + +-- softwares +ALTER TABLE `softwares` ADD KEY `VERSION`(`VERSION`); + +-- storages +ALTER TABLE `storages` ADD COLUMN `SERIALNUMBER` VARCHAR(255) default NULL AFTER `DISKSIZE`; +ALTER TABLE `storages` ADD COLUMN `FIRMWARE` VARCHAR(255) default NULL AFTER `SERIALNUMBER`; + +-- subnet +ALTER TABLE `subnet` ADD KEY `ID` (`ID`); + +-- +-- Insert new values +-- + +-- blacklist_macaddresses +INSERT INTO `blacklist_macaddresses` (`MACADDRESS`) VALUES + ('00:00:00:00:00:00'), + ('FF:FF:FF:FF:FF:FF'), + ('44:45:53:54:00:00'), + ('44:45:53:54:00:01'), + ('00:01:02:7D:9B:1C'), + ('00:08:A1:46:06:35'), + ('00:08:A1:66:E2:1A'), + ('00:09:DD:10:37:68'), + ('00:0F:EA:9A:E2:F0'), + ('00:10:5A:72:71:F3'), + ('00:11:11:85:08:8B'), + ('10:11:11:11:11:11'), + ('44:45:53:54:61:6F'), + (''); + +-- blacklist_serials +INSERT INTO `blacklist_serials` (`SERIAL`) VALUES + ('N/A'), + ('(null string)'), + ('INVALID'), + ('SYS-1234567890'), + ('SYS-9876543210'), + ('SN-12345'), + ('SN-1234567890'), + ('1111111111'), + ('1111111'), + ('1'), + ('0123456789'), + ('12345'), + ('123456'), + ('1234567'), + ('12345678'), + ('123456789'), + ('1234567890'), + ('123456789000'), + ('12345678901234567'), + ('0000000000'), + ('000000000'), + ('00000000'), + ('0000000'), + ('000000'), + ('NNNNNNN'), + ('xxxxxxxxxxx'), + ('EVAL'), + ('IATPASS'), + ('none'), + ('To Be Filled By O.E.M.'), + ('Tulip Computers'), + ('Serial Number xxxxxx'), + ('SN-123456fvgv3i0b8o5n6n7k'), + (''); + +-- config +-- Update GUI_VERSION +UPDATE `config` + SET `TVALUE`='5003', `COMMENTS`='Version of the installed GUI and database' + WHERE NAME='GUI_VERSION'; + +DELETE FROM `config` WHERE NAME='IP_MIN_QUALITY'; + +-- Default new configuration +INSERT INTO `config` (`NAME`, `IVALUE`, `TVALUE`, `COMMENTS`) VALUES + ('DOWNLOAD_GROUPS_TRACE_EVENTS', 1, '', 'Specify if you want to track packages affected to a group on computer''s level'), + ('DOWNLOAD_PACK_DIR', 0, '/var/lib/ocsinventory-reports', 'Directory for download files'), + ('DOWNLOAD_SERVER_URI', 0, '$IP$/local', 'Server url used for group of server'), + ('DOWNLOAD_SERVER_DOCROOT', 0, 'd:\\\\tele_ocs', 'Server directory used for group of server'), + ('ENABLE_GROUPS', 1, '', 'Enable the computer''s groups feature'), + ('GENERATE_OCS_FILES', 0, '', 'Use with ocsinventory-injector, enable the multi entities feature'), + ('GUI_REPORT_AGIN_MACH', 30, '', 'Filter on lastdate for console page'), + ('GUI_REPORT_DD_MAX', 4000, '', 'Filter on Hard Drive for console page'), + ('GUI_REPORT_DD_MINI', 500, '', 'Filter on PROCESSOR for console page'), + ('GUI_REPORT_LAST_DIFF', 1, '', 'Difference between LASTDATE and LASTCOME'), + ('GUI_REPORT_NOT_VIEW', 3, '', 'Filter on DAY for console page'), + ('GUI_REPORT_PROC_MAX', 3000, '', 'Filter on PROCESSOR for console page'), + ('GUI_REPORT_PROC_MINI', 1000, '', 'Filter on Hard Drive for console page'), + ('GUI_REPORT_RAM_MAX', 512, '', 'Filter on RAM for console page'), + ('GUI_REPORT_RAM_MINI', 128, '', 'Filter on RAM for console page'), + ('GROUPS_CACHE_OFFSET', 43200, '', 'Random number computed in the defined range. Designed to avoid computing many groups in the same process'), + ('GROUPS_CACHE_REVALIDATE', 43200, '', 'Specify the validity of computer''s groups (default: compute it once a day - see offset)'), + ('IPDISCOVER_BETTER_THRESHOLD', 1, '', 'Specify the minimal difference to replace an ipdiscover agent'), + ('IPDISCOVER_IPD_DIR', 0, '/var/lib/ocsinventory-reports', 'Directory for Ipdiscover files'), + ('IPDISCOVER_NO_POSTPONE', 0, '', 'Disable the time before a first election (not recommended)'), + ('IPDISCOVER_USE_GROUPS', 1, '', 'Enable groups for ipdiscover (for example, you might want to prevent some groups'), + ('INVENTORY_CACHE_ENABLED', 1, '', 'Enable some stuff to improve DB queries, especially for GUI multicriteria searching system'), + ('INVENTORY_FILTER_ENABLED', 0, '', 'Enable core filter system to modify some things "on the fly"'), + ('INVENTORY_FILTER_FLOOD_IP', 0, '', 'Enable inventory flooding filter. A dedicated ipaddress ia allowed to send a new computer only once in this period'), + ('INVENTORY_FILTER_FLOOD_IP_CACHE_TIME', 300, '', 'Period definition for INVENTORY_FILTER_FLOOD_IP'), + ('INVENTORY_FILTER_ON', 0, '', 'Enable inventory filter stack'), + ('INVENTORY_WRITE_DIFF', 0, '', 'Configure engine to make a differential update of inventory sections (row level). Lower DB backend load, higher frontend load'), + ('LOCK_REUSE_TIME', 600, '', 'Validity of a computer''s lock'), + ('OCS_FILES_FORMAT', 0, 'OCS', 'Generate either compressed file or clear XML text'), + ('OCS_FILES_OVERWRITE', 0, '', 'Specify if you want to keep trace of all inventory between to synchronisation with the higher level server'), + ('OCS_FILES_PATH', 0, '/tmp', 'Path to ocs files directory (must be writeable)'), + ('PROLOG_FILTER_ON', 0, '', 'Enable prolog filter stack'), + ('SESSION_VALIDITY_TIME', 1, '', 'Validity of a session'); + + +-- Fill the caches +INSERT INTO `registry_name_cache` (`NAME`) SELECT DISTINCT `NAME` FROM `registry`; +INSERT INTO `registry_regvalue_cache` (`REGVALUE`) SELECT DISTINCT `REGVALUE` FROM `registry`; +INSERT INTO `hardware_osname_cache` (`OSNAME`) SELECT DISTINCT `OSNAME` FROM `hardware`; +INSERT INTO `softwares_name_cache` (`NAME`) SELECT DISTINCT `NAME` FROM `softwares`; + +-- +-- Drop useless +-- + +DROP TABLE IF EXISTS `dico_cat`; +DROP TABLE IF EXISTS `tag`; --- ocsinventory-server-1.02.2.orig/debian/db/mysql +++ ocsinventory-server-1.02.2/debian/db/mysql @@ -0,0 +1,655 @@ +-- -*- sql -*- +USE ocsweb; + +-- +-- Create Schema +-- +CREATE TABLE `accesslog` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `USERID` VARCHAR(255) default NULL, + `LOGDATE` DATETIME default NULL, + `PROCESSES` TEXT, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`), + KEY `USERID` (`USERID`) +) ENGINE=INNODB ; + +CREATE TABLE `accountinfo` ( + `HARDWARE_ID` INTEGER NOT NULL, + `TAG` VARCHAR(255) default 'NA', + PRIMARY KEY (`HARDWARE_ID`), + KEY `TAG` (`TAG`) +) ENGINE=INNODB ; + +CREATE TABLE `bios` ( + `HARDWARE_ID` INTEGER NOT NULL, + `SMANUFACTURER` VARCHAR(255) default NULL, + `SMODEL` VARCHAR(255) default NULL, + `SSN` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + `BMANUFACTURER` VARCHAR(255) default NULL, + `BVERSION` VARCHAR(255) default NULL, + `BDATE` VARCHAR(255) default NULL, + PRIMARY KEY (`HARDWARE_ID`), + KEY `SSN` (`SSN`) +) ENGINE=INNODB ; + +CREATE TABLE `blacklist_macaddresses` ( + `ID` INTEGER auto_increment, + `MACADDRESS` VARCHAR(255), + PRIMARY KEY (`MACADDRESS`), + KEY `ID` (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `blacklist_serials` ( + `ID` INTEGER auto_increment, + `SERIAL` VARCHAR(255), + PRIMARY KEY (`SERIAL`), + KEY `ID` (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `config` ( + `NAME` VARCHAR(50) NOT NULL, + `IVALUE` INTEGER default NULL, + `TVALUE` VARCHAR(255) default NULL, + `COMMENTS` TEXT, + PRIMARY KEY (`NAME`) +) ENGINE=MYISAM ; + +CREATE TABLE `conntrack` ( + `IP` VARCHAR(255), + `TIMESTAMP` TIMESTAMP default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + PRIMARY KEY (`IP`) +) ENGINE = HEAP; + +CREATE TABLE `controllers` ( + `HARDWARE_ID` INTEGER NOT NULL, + `ID` INTEGER NOT NULL auto_increment, + `MANUFACTURER` VARCHAR(255) default NULL, + `NAME` VARCHAR(255) default NULL, + `CAPTION` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `VERSION` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `deleted_equiv` ( + `DATE` TIMESTAMP default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `DELETED` VARCHAR(255) NOT NULL, + `EQUIVALENT` VARCHAR(255) default NULL +) ENGINE=MYISAM ; + +CREATE TABLE `deploy` ( + `NAME` VARCHAR(255) NOT NULL, + `CONTENT` LONGBLOB NOT NULL, + PRIMARY KEY (`NAME`) +) ENGINE=MYISAM ; + +CREATE TABLE `devices` ( + `HARDWARE_ID` INTEGER NOT NULL, + `NAME` VARCHAR(50) NOT NULL, + `IVALUE` INTEGER default NULL, + `TVALUE` VARCHAR(255) default NULL, + `COMMENTS` TEXT, + KEY `HARDWARE_ID` (`HARDWARE_ID`), + KEY `TVALUE` (`TVALUE`), + KEY `IVALUE` (`IVALUE`), + KEY `NAME` (`NAME`) +) ENGINE=INNODB ; + +CREATE TABLE `devicetype` ( + `ID` INTEGER NOT NULL auto_increment, + `NAME` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`) +) ENGINE=MYISAM ; + +CREATE TABLE `dico_ignored` ( + `EXTRACTED` VARCHAR(255) NOT NULL, + PRIMARY KEY (`EXTRACTED`) +) ENGINE=MYISAM ; + +CREATE TABLE `dico_soft` ( + `EXTRACTED` VARCHAR(255) NOT NULL, + `FORMATTED` VARCHAR(255) NOT NULL, + PRIMARY KEY (`EXTRACTED`) +) ENGINE=MYISAM ; + +CREATE TABLE `download_affect_rules` ( + `ID` INTEGER NOT NULL auto_increment, + `RULE` INTEGER NOT NULL, + `PRIORITY` INTEGER NOT NULL, + `CFIELD` VARCHAR(20) collate latin1_general_ci NOT NULL, + `OP` VARCHAR(20) collate latin1_general_ci NOT NULL, + `COMPTO` VARCHAR(20) collate latin1_general_ci NOT NULL, + `SERV_VALUE` VARCHAR(20) collate latin1_general_ci default NULL, + `RULE_NAME` VARCHAR(200) collate latin1_general_ci NOT NULL, + PRIMARY KEY (`ID`) +) ENGINE=MyISAM; + +CREATE TABLE `download_available` ( + `FILEID` VARCHAR(255) NOT NULL, + `NAME` VARCHAR(255) NOT NULL, + `PRIORITY` INTEGER NOT NULL, + `FRAGMENTS` INTEGER NOT NULL, + `SIZE` INTEGER NOT NULL, + `OSNAME` VARCHAR(255) NOT NULL, + `COMMENT` TEXT, + PRIMARY KEY (`FILEID`) +) ENGINE = INNODB; + +CREATE TABLE `download_enable` ( + `ID` INTEGER NOT NULL auto_increment, + `FILEID` VARCHAR(255) NOT NULL, + `INFO_LOC` VARCHAR(255) NOT NULL, + `PACK_LOC` VARCHAR(255) NOT NULL, + `CERT_PATH` VARCHAR(255), + `CERT_FILE` VARCHAR(255), + `SERVER_ID` INTEGER, + `GROUP_ID` INTEGER, + PRIMARY KEY (`ID`), + KEY `FILEID` (`FILEID`) +) ENGINE = INNODB; + +CREATE TABLE `download_history` ( + `HARDWARE_ID` INTEGER NOT NULL, + `PKG_ID` INTEGER default NULL, + `PKG_NAME` VARCHAR(255), + PRIMARY KEY (`HARDWARE_ID`, `PKG_ID`) +) ENGINE = INNODB; + +CREATE TABLE `download_servers` ( + `HARDWARE_ID` INTEGER NOT NULL, + `URL` VARCHAR(250) collate latin1_general_ci NOT NULL, + `ADD_PORT` INTEGER NOT NULL, + `ADD_REP` VARCHAR(250) collate latin1_general_ci NOT NULL, + `GROUP_ID` INTEGER NOT NULL, + PRIMARY KEY (`HARDWARE_ID`) +) ENGINE=MyISAM; + +CREATE TABLE `drives` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `LETTER` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + `FILESYSTEM` VARCHAR(255) default NULL, + `TOTAL` INTEGER default NULL, + `FREE` INTEGER default NULL, + `NUMFILES` INTEGER default NULL, + `VOLUMN` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `engine_mutex` ( + `NAME` VARCHAR(255) NOT NULL default '', + `PID` INTEGER default NULL, + `TAG` VARCHAR(255) NOT NULL default '', + PRIMARY KEY (`NAME`, `TAG`) +) ENGINE=MEMORY DEFAULT CHARSET=latin1; + +CREATE TABLE `engine_persistent` ( + `ID` INTEGER NOT NULL auto_increment, + `NAME` VARCHAR(255) NOT NULL default '', + `IVALUE` INTEGER default NULL, + `TVALUE` VARCHAR(255) default NULL, + UNIQUE KEY `NAME` (`NAME`), + KEY `ID` (`ID`) +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; + +CREATE TABLE `files` ( + `NAME` VARCHAR(255) NOT NULL, + `VERSION` VARCHAR(255) NOT NULL, + `OS` VARCHAR(255) NOT NULL, + `CONTENT` LONGBLOB NOT NULL, + PRIMARY KEY (`NAME`, `OS`, `VERSION`) +) ENGINE=MYISAM ; + +CREATE TABLE `groups` ( + `HARDWARE_ID` INTEGER default NULL, + `REQUEST` LONGTEXT, + `CREATE_TIME` INTEGER default 0, + `REVALIDATE_FROM` INTEGER default 0, + PRIMARY KEY (`HARDWARE_ID`) +) ENGINE=MYISAM; + +CREATE TABLE `groups_cache` ( + `HARDWARE_ID` INTEGER NOT NULL default 0, + `GROUP_ID` INTEGER NOT NULL default 0, + `STATIC` INTEGER default 0, + PRIMARY KEY (`HARDWARE_ID`, `GROUP_ID`) +) ENGINE=MYISAM; + +CREATE TABLE `hardware` ( + `ID` INTEGER NOT NULL auto_increment, + `DEVICEID` VARCHAR(255) NOT NULL, + `NAME` VARCHAR(255) default NULL, + `WORKGROUP` VARCHAR(255) default NULL, + `USERDOMAIN` VARCHAR(255) default NULL, + `OSNAME` VARCHAR(255) default NULL, + `OSVERSION` VARCHAR(255) default NULL, + `OSCOMMENTS` VARCHAR(255) default NULL, + `PROCESSORT` VARCHAR(255) default NULL, + `PROCESSORS` INTEGER default 0, + `PROCESSORN` SMALLINT default NULL, + `MEMORY` INTEGER default NULL, + `SWAP` INTEGER default NULL, + `IPADDR` VARCHAR(255) default NULL, + `ETIME` DATETIME default NULL, + `LASTDATE` DATETIME default NULL, + `LASTCOME` DATETIME default NULL, + `QUALITY` DECIMAL(7,4) default 0, + `FIDELITY` BIGINT default 1, + `USERID` VARCHAR(255) default NULL, + `TYPE` INTEGER default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `WINCOMPANY` VARCHAR(255) default NULL, + `WINOWNER` VARCHAR(255) default NULL, + `WINPRODID` VARCHAR(255) default NULL, + `WINPRODKEY` VARCHAR(255) default NULL, + `USERAGENT` VARCHAR(50) default NULL, + `CHECKSUM` INTEGER default 131071, + `SSTATE` INTEGER default 0, + PRIMARY KEY (`DEVICEID`, `ID`), + KEY `ID` (`ID`), + KEY `DEVICEID` (`DEVICEID`), + KEY `NAME` (`NAME`), + KEY `CHECKSUM` (`CHECKSUM`), + KEY `USERID` (`USERID`), + KEY `WORKGROUP` (`WORKGROUP`), + KEY `OSNAME` (`OSNAME`), + KEY `MEMORY` (`MEMORY`) +) ENGINE=INNODB ; + +CREATE TABLE `hardware_osname_cache` ( + `ID` INTEGER auto_increment, + `OSNAME` VARCHAR(255) UNIQUE, + PRIMARY KEY (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `inputs` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `TYPE` VARCHAR(255) default NULL, + `MANUFACTURER` VARCHAR(255) default NULL, + `CAPTION` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `INTERFACE` VARCHAR(255) default NULL, + `POINTTYPE` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `locks` ( + `HARDWARE_ID` INTEGER NOT NULL, + `ID` INTEGER DEFAULT NULL, + `SINCE` TIMESTAMP default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + PRIMARY KEY (`HARDWARE_ID`), + KEY `SINCE` (`SINCE`) +) ENGINE=HEAP ; + +CREATE TABLE `memories` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `CAPTION` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `CAPACITY` VARCHAR(255) default NULL, + `PURPOSE` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + `SPEED` VARCHAR(255) default NULL, + `NUMSLOTS` SMALLINT default NULL, + `SERIALNUMBER` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `modems` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `NAME` VARCHAR(255) default NULL, + `MODEL` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `monitors` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `MANUFACTURER` VARCHAR(255) default NULL, + `CAPTION` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + `SERIAL` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `netmap` ( + `IP` VARCHAR(15) NOT NULL, + `MAC` VARCHAR(17) NOT NULL, + `MASK` VARCHAR(15) NOT NULL, + `NETID` VARCHAR(15) NOT NULL, + `DATE` TIMESTAMP NOT NULL default CURRENT_TIMESTAMP, + `NAME` VARCHAR(255) default NULL, + PRIMARY KEY (`MAC`), + KEY `IP` (`IP`), + KEY `NETID` (`NETID`) +) ENGINE=INNODB ; + +CREATE TABLE `networks` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + `TYPEMIB` VARCHAR(255) default NULL, + `SPEED` VARCHAR(255) default NULL, + `MACADDR` VARCHAR(255) default NULL, + `STATUS` VARCHAR(255) default NULL, + `IPADDRESS` VARCHAR(255) default NULL, + `IPMASK` VARCHAR(255) default NULL, + `IPGATEWAY` VARCHAR(255) default NULL, + `IPSUBNET` VARCHAR(255) default NULL, + `IPDHCP` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`), + KEY `MACADDR` (`MACADDR`), + KEY `IPADDRESS` (`IPADDRESS`), + KEY `IPGATEWAY` (`IPGATEWAY`), + KEY `IPSUBNET` (`IPSUBNET`) +) ENGINE=INNODB ; + +CREATE TABLE `network_devices` ( + `ID` INTEGER NOT NULL auto_increment, + `DESCRIPTION` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + `MACADDR` VARCHAR(255) default NULL, + `USER` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`), + KEY `MACADDR` (`MACADDR`) +) ENGINE=MYISAM ; + +CREATE TABLE `operators` ( + `ID` VARCHAR(255) NOT NULL default '', + `FIRSTNAME` VARCHAR(255) default NULL, + `LASTNAME` VARCHAR(255) default NULL, + `PASSWD` VARCHAR(50) default NULL, + `ACCESSLVL` INTEGER default NULL, + `COMMENTS` TEXT, + PRIMARY KEY (`ID`) +) ENGINE=MYISAM ; + +CREATE TABLE `ports` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `TYPE` VARCHAR(255) default NULL, + `NAME` VARCHAR(255) default NULL, + `CAPTION` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `printers` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `NAME` VARCHAR(255) default NULL, + `DRIVER` VARCHAR(255) default NULL, + `PORT` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `prolog_conntrack` ( + `ID` INTEGER NOT NULL auto_increment, + `DEVICEID` VARCHAR(255) default NULL, + `TIMESTAMP` INTEGER default NULL, + `PID` INTEGER default NULL, + KEY `ID` (`ID`), + KEY `DEVICEID` (`DEVICEID`) +) ENGINE=MEMORY; + +CREATE TABLE `regconfig` ( + `ID` INTEGER NOT NULL auto_increment, + `NAME` VARCHAR(255) default NULL, + `REGTREE` INTEGER default NULL, + `REGKEY` TEXT, + `REGVALUE` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`), + KEY `NAME` (`NAME`) +) ENGINE=MYISAM ; + +CREATE TABLE `registry` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `NAME` VARCHAR(255) default NULL, + `REGVALUE` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`), + KEY `NAME` (`NAME`) +) ENGINE=INNODB ; + +CREATE TABLE `registry_name_cache` ( + `ID` INTEGER auto_increment, + `NAME` VARCHAR(255) UNIQUE, + PRIMARY KEY (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `registry_regvalue_cache` ( + `ID` INTEGER auto_increment, + `REGVALUE` VARCHAR(255) UNIQUE, + PRIMARY KEY (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `slots` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `NAME` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `DESIGNATION` VARCHAR(255) default NULL, + `PURPOSE` VARCHAR(255) default NULL, + `STATUS` VARCHAR(255) default NULL, + `PSHARE` TINYINT(4) default NULL, + PRIMARY KEY (`HARDWARE_ID`, `ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `softwares` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `PUBLISHER` VARCHAR(255) default NULL, + `NAME` VARCHAR(255) default NULL, + `VERSION` VARCHAR(255) default NULL, + `FOLDER` TEXT, + `COMMENTS` TEXT, + `FILENAME` VARCHAR(255) default NULL, + `FILESIZE` INTEGER default '0', + `SOURCE` INTEGER default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`), + KEY `NAME` (`NAME`), + KEY `VERSION` (`VERSION`) +) ENGINE=INNODB ; + +CREATE TABLE `softwares_name_cache` ( + `ID` INTEGER auto_increment, + `NAME` VARCHAR(255) UNIQUE, + PRIMARY KEY (`ID`) +) ENGINE = MYISAM; + +CREATE TABLE `sounds` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `MANUFACTURER` VARCHAR(255) default NULL, + `NAME` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `storages` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `MANUFACTURER` VARCHAR(255) default NULL, + `NAME` VARCHAR(255) default NULL, + `MODEL` VARCHAR(255) default NULL, + `DESCRIPTION` VARCHAR(255) default NULL, + `TYPE` VARCHAR(255) default NULL, + `DISKSIZE` INTEGER default NULL, + `SERIALNUMBER` VARCHAR(255) default NULL, + `FIRMWARE` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + +CREATE TABLE `subnet` ( + `NETID` VARCHAR(15) NOT NULL, + `NAME` VARCHAR(255), + `ID` INTEGER, + `MASK` VARCHAR(255), + PRIMARY KEY (`NETID`), + KEY `ID` (`ID`) +) ENGINE=MYISAM ; + +CREATE TABLE `tags` ( + `Tag` VARCHAR(255) NOT NULL default '', + `Login` VARCHAR(255) NOT NULL default '', + PRIMARY KEY (`Tag`, `Login`), + KEY `Tag` (`Tag`), + KEY `Login` (`Login`) +) ENGINE=MyISAM; + +CREATE TABLE `videos` ( + `ID` INTEGER NOT NULL auto_increment, + `HARDWARE_ID` INTEGER NOT NULL, + `NAME` VARCHAR(255) default NULL, + `CHIPSET` VARCHAR(255) default NULL, + `MEMORY` VARCHAR(255) default NULL, + `RESOLUTION` VARCHAR(255) default NULL, + PRIMARY KEY (`ID`, `HARDWARE_ID`), + KEY `ID` (`ID`) +) ENGINE=INNODB ; + + +-- +-- Insert default values +-- + +-- administrator +INSERT INTO `operators` (`ID`, `FIRSTNAME`, `LASTNAME`, `PASSWD`, `ACCESSLVL`, `COMMENTS`) VALUES + ('admin', 'admin', 'admin', 'admin', 1, 'Default administrator account'); + +-- configuration +INSERT INTO `config` (`NAME`, `IVALUE`, `TVALUE`, `COMMENTS`) VALUES + ('AUTO_DUPLICATE_LVL', 7, '', 'Duplicates bitmap'), + ('DEPLOY', 1, '', 'Activates or not the automatic deployment option'), + ('DOWNLOAD', 0, '', 'Activate softwares auto deployment feature'), + ('DOWNLOAD_CYCLE_LATENCY', 60, '', 'Time between two cycles (seconds)'), + ('DOWNLOAD_PERIOD_LENGTH', 10, '', 'Number of cycles in a period'), + ('DOWNLOAD_FRAG_LATENCY', 10, '', 'Time between two downloads (seconds)'), + ('DOWNLOAD_GROUPS_TRACE_EVENTS', 1, '', 'Specify if you want to track packages affected to a group on computer''s level'), + ('DOWNLOAD_PACK_DIR', 0, '/var/lib/ocsinventory-reports', 'Directory for download files'), + ('DOWNLOAD_PERIOD_LATENCY', 0, '', 'Time between two periods (seconds)'), + ('DOWNLOAD_SERVER_URI', 0, '$IP$/local', 'Server url used for group of server'), + ('DOWNLOAD_SERVER_DOCROOT', 0, 'd:\\\\tele_ocs', 'Server directory used for group of server'), + ('DOWNLOAD_TIMEOUT', 30, '', 'Validity of a package (in days)'), + ('ENABLE_GROUPS', 1, '', 'Enable the computer''s groups feature'), + ('FREQUENCY', 0, '', 'Specify the frequency (days) of inventories. (0: inventory at each login. -1: no inventory)'), + ('GENERATE_OCS_FILES', 0, '', 'Use with ocsinventory-injector, enable the multi entities feature'), + ('GUI_REPORT_AGIN_MACH', 30, '', 'Filter on lastdate for console page'), + ('GUI_REPORT_DD_MAX', 4000, '', 'Filter on Hard Drive for console page'), + ('GUI_REPORT_DD_MINI', 500, '', 'Filter on PROCESSOR for console page'), + ('GUI_REPORT_LAST_DIFF', 1, '', 'Difference between LASTDATE and LASTCOME'), + ('GUI_REPORT_NOT_VIEW', 3, '', 'Filter on DAY for console page'), + ('GUI_REPORT_PROC_MAX', 3000, '', 'Filter on PROCESSOR for console page'), + ('GUI_REPORT_PROC_MINI', 1000, '', 'Filter on Hard Drive for console page'), + ('GUI_REPORT_RAM_MAX', 512, '', 'Filter on RAM for console page'), + ('GUI_REPORT_RAM_MINI', 128, '', 'Filter on RAM for console page'), + ('GUI_VERSION', 0, '5003', 'Version of the installed GUI and database'), + ('GROUPS_CACHE_OFFSET', 43200, '', 'Random number computed in the defined range. Designed to avoid computing many groups in the same process'), + ('GROUPS_CACHE_REVALIDATE', 43200, '', 'Specify the validity of computer''s groups (default: compute it once a day - see offset)'), + ('IPDISCOVER', 2, '', 'Max number of computers per gateway retrieving IP on the network'), + ('IPDISCOVER_BETTER_THRESHOLD', 1, '', 'Specify the minimal difference to replace an ipdiscover agent'), + ('IPDISCOVER_IPD_DIR', 0, '/var/lib/ocsinventory-reports', 'Directory for Ipdiscover files'), + ('IPDISCOVER_LATENCY', 100, '', 'Default latency between two arp requests'), + ('IPDISCOVER_MAX_ALIVE', 7, '', 'Max number of days before an Ip Discover computer is replaced'), + ('IPDISCOVER_NO_POSTPONE', 0, '', 'Disable the time before a first election (not recommended)'), + ('IPDISCOVER_USE_GROUPS', 1, '', 'Enable groups for ipdiscover (for example, you might want to prevent some groups'), + ('INVENTORY_CACHE_ENABLED', 1, '', 'Enable some stuff to improve DB queries, especially for GUI multicriteria searching system'), + ('INVENTORY_DIFF', 1, '', 'Activate/Deactivate inventory incremental writing'), + ('INVENTORY_FILTER_ENABLED', 0, '', 'Enable core filter system to modify some things "on the fly"'), + ('INVENTORY_FILTER_FLOOD_IP', 0, '', 'Enable inventory flooding filter. A dedicated ipaddress ia allowed to send a new computer only once in this period'), + ('INVENTORY_FILTER_FLOOD_IP_CACHE_TIME', 300, '', 'Period definition for INVENTORY_FILTER_FLOOD_IP'), + ('INVENTORY_FILTER_ON', 0, '', 'Enable inventory filter stack'), + ('INVENTORY_TRANSACTION', 1, '', 'Enable/disable db commit at each inventory section'), + ('INVENTORY_WRITE_DIFF', 0, '', 'Configure engine to make a differential update of inventory sections (row level). Lower DB backend load, higher frontend load'), + ('LOCAL_SERVER', 0, 'localhost', 'Server address used for local import'), + ('LOCAL_PORT', 80, '', 'Server port used for local import'), + ('LOCK_REUSE_TIME', 600, '', 'Validity of a computer''s lock'), + ('LOGLEVEL', 0, '', 'ocs engine loglevel'), + ('OCS_FILES_FORMAT', 0, 'OCS', 'Generate either compressed file or clear XML text'), + ('OCS_FILES_OVERWRITE', 0, '', 'Specify if you want to keep trace of all inventory between to synchronisation with the higher level server'), + ('OCS_FILES_PATH', 0, '/tmp', 'Path to ocs files directory (must be writeable)'), + ('PROLOG_FILTER_ON', 0, '', 'Enable prolog filter stack'), + ('PROLOG_FREQ', 24, '', 'Specify the frequency (hours) of prolog, on agents'), + ('REGISTRY', 0, '', 'Activates or not the registry query function'), + ('SESSION_VALIDITY_TIME', 1, '', 'Validity of a session'), + ('TRACE_DELETED', 0, '', 'Trace deleted/duplicated computers (Activated by GLPI)'), + ('UPDATE', 0, '', 'Activates or not the update feature'); + +-- blacklisted macaddresses +INSERT INTO `blacklist_macaddresses` (`MACADDRESS`) VALUES + ('00:00:00:00:00:00'), + ('FF:FF:FF:FF:FF:FF'), + ('44:45:53:54:00:00'), + ('44:45:53:54:00:01'), + ('00:01:02:7D:9B:1C'), + ('00:08:A1:46:06:35'), + ('00:08:A1:66:E2:1A'), + ('00:09:DD:10:37:68'), + ('00:0F:EA:9A:E2:F0'), + ('00:10:5A:72:71:F3'), + ('00:11:11:85:08:8B'), + ('10:11:11:11:11:11'), + ('44:45:53:54:61:6F'), + (''); + +-- blacklisted serials +INSERT INTO `blacklist_serials` (`SERIAL`) VALUES + ('N/A'), + ('(null string)'), + ('INVALID'), + ('SYS-1234567890'), + ('SYS-9876543210'), + ('SN-12345'), + ('SN-1234567890'), + ('1111111111'), + ('1111111'), + ('1'), + ('0123456789'), + ('12345'), + ('123456'), + ('1234567'), + ('12345678'), + ('123456789'), + ('1234567890'), + ('123456789000'), + ('12345678901234567'), + ('0000000000'), + ('000000000'), + ('00000000'), + ('0000000'), + ('000000'), + ('NNNNNNN'), + ('xxxxxxxxxxx'), + ('EVAL'), + ('IATPASS'), + ('none'), + ('To Be Filled By O.E.M.'), + ('Tulip Computers'), + ('Serial Number xxxxxx'), + ('SN-123456fvgv3i0b8o5n6n7k'), + (''); --- ocsinventory-server-1.02.2.orig/debian/conf/ocsinventory.conf +++ ocsinventory-server-1.02.2/debian/conf/ocsinventory.conf @@ -0,0 +1,278 @@ +################################################################################ +# +# OCS Inventory NG Communication Server Perl Module Setup +# +# Copyleft 2006 Pascal DANEK +# Web: http://www.ocsinventory-ng.org +# +# This code is open source and may be copied and modified as long as the source +# code is always made freely available. +# Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt +################################################################################ + + + # Which version of mod_perl we are using + # For mod_perl <= 1.999_21, replace VERSION_MP by 1 + # For mod_perl > 1.999_21, replace VERSION_MP by 2 + + PerlSetEnv OCS_MODPERL_VERSION 2 + + + PerlSetEnv OCS_MODPERL_VERSION 1 + + + # Master Database settings + # Replace DATABASE_SERVER by hostname or ip of MySQL server for WRITE + PerlSetEnv OCS_DB_HOST _DBC_DBSERVER_ + # Replace DATABASE_PORT by port where running MySQL server, generally 3306 + PerlSetEnv OCS_DB_PORT _DBC_DBPORT_ + # Name of database + PerlSetEnv OCS_DB_NAME _DBC_DBNAME_ + PerlSetEnv OCS_DB_LOCAL _DBC_DBNAME_ + # User allowed to connect to database + PerlSetEnv OCS_DB_USER _DBC_DBUSER_ + # Password for user + PerlSetVar OCS_DB_PWD _DBC_DBPASS_ + + # Slave Database settings + # Replace DATABASE_SERVER by hostname or ip of MySQL server for READ + # Useful if you handle mysql slave databases + # PerlSetEnv OCS_DB_SL_HOST DATABASE_SERVER + # Replace DATABASE_PORT by port where running MySQL server, generally 3306 + # PerlSetEnv OCS_DB_SL_PORT_SLAVE DATABASE_PORT + # User allowed to connect to database + # PerlSetEnv OCS_DB_SL_USER ocs + # Name of the database + # PerlSetEnv OCS_DB_SL_NAME ocsweb + # Password for user + # PerlSetVar OCS_DB_SL_PWD ocs + + # Path to log directory (must be writeable) + PerlSetEnv OCS_OPT_LOGPATH "/var/log/ocsinventory-server" + + # If you need to specify a mysql socket that the client's built-in + #PerlSetVar OCS_OPT_DBI_MYSQL_SOCKET "path/to/mysql/unix/socket" + # DBI verbosity + PerlSetEnv OCS_OPT_DBI_PRINT_ERROR 0 + + # If you are using a multi server architecture, + # Put the ip addresses of the slaves on the master + # (This is read as perl regular expressions) + PerlAddVar OCS_OPT_TRUSTED_IP 127.0.0.1 + #PerlAddVar OCS_OPT_TRUSTED_IP XXX.XXX.XXX.XXX + +# ===== WEB SERVICE (SOAP) SETTINGS ===== + + PerlSetEnv OCS_OPT_WEB_SERVICE_ENABLED 0 + PerlSetEnv OCS_OPT_WEB_SERVICE_RESULTS_LIMIT 100 + # PerlSetEnv OCS_OPT_WEB_SERVICE_PRIV_MODS_CONF "WEBSERV_PRIV_MOD_CONF_FILE" + +# Be careful: you must restart apache to make settings taking effects + + # Configure engine to use the settings from this file + PerlSetEnv OCS_OPT_OPTIONS_NOT_OVERLOADED 0 + + # Try to use other compress algorythm than raw zlib + # GUNZIP and clear XML are supported + PerlSetEnv OCS_OPT_COMPRESS_TRY_OTHERS 1 + +############################################################## +# ===== OPTIONS BELOW ARE OVERLOADED IF YOU USE OCS GUI =====# +############################################################## + +# NOTE: IF YOU WANT TO USE THIS CONFIG FILE INSTEAD, set OCS_OPT_OPTIONS_NOT_OVERLOADED to '1' + +# ===== MAIN SETTINGS ===== + + # Enable engine logs (see LOGPATH setting) + PerlSetEnv OCS_OPT_LOGLEVEL 0 + # Specify agent's prolog frequency + PerlSetEnv OCS_OPT_PROLOG_FREQ 12 + # Configure the duplicates detection system + PerlSetEnv OCS_OPT_AUTO_DUPLICATE_LVL 15 + # Futur security improvements + PerlSetEnv OCS_OPT_SECURITY_LEVEL 0 + # Validity of a computer's lock + PerlSetEnv OCS_OPT_LOCK_REUSE_TIME 600 + # Enable the history tracking system (useful for external data synchronisation + PerlSetEnv OCS_OPT_TRACE_DELETED 0 + +# ===== INVENTORY SETTINGS ===== + + # Specify the validity of inventory data + PerlSetEnv OCS_OPT_FREQUENCY 0 + # Configure engine to update inventory regarding to CHECKSUM agent value (lower DB backend load) + PerlSetEnv OCS_OPT_INVENTORY_DIFF 1 + PerlSetEnv OCS_OPT_INVENTORY_TRANSACTION 1 + # Configure engine to make a differential update of inventory sections (row level). Lower DB backend load, higher frontend load + PerlSetEnv OCS_OPT_INVENTORY_WRITE_DIFF 1 + # Enable some stuff to improve DB queries, especially for GUI multicriteria searching system + PerlSetEnv OCS_OPT_INVENTORY_CACHE_ENABLED 1 + # Specify when the engine will clean the inventory cache structures + PerlSetEnv OCS_OPT_INVENTORY_CACHE_REVALIDATE 7 + # Enable you to keep trace of every elements encountered in db life + PerlSetEnv OCS_OPT_INVENTORY_CACHE_KEEP 1 + +# ===== SOFTWARES DEPLOYMENT SETTINGS ===== + + # Enable this feature + PerlSetEnv OCS_OPT_DOWNLOAD 0 + # Package wich have a priority superior than this value will not be downloaded + PerlSetEnv OCS_OPT_DOWNLOAD_PERIOD_LENGTH 10 + # Time between two download cycles (bandwidth control) + PerlSetEnv OCS_OPT_DOWNLOAD_CYCLE_LATENCY 60 + # Time between two fragment downloads (bandwidth control) + PerlSetEnv OCS_OPT_DOWNLOAD_FRAG_LATENCY 60 + # Specify if you want to track packages affected to a group on computer's level + PerlSetEnv OCS_OPT_DOWNLOAD_GROUPS_TRACE_EVENTS 1 + # Time between two download periods (bandwidth control) + PerlSetEnv OCS_OPT_DOWNLOAD_PERIOD_LATENCY 60 + # Agents will send ERR_TIMEOUT event and clean the package it is older than this setting + PerlSetEnv OCS_OPT_DOWNLOAD_TIMEOUT 7 + # Number of cycle within a period + + # Enable ocs engine to deliver agent's files (deprecated) + PerlSetEnv OCS_OPT_DEPLOY 0 + # Enable the softwares deployment capacity (bandwidth control) + +# ===== GROUPS SETTINGS ===== + + # Enable the computer\s groups feature + PerlSetEnv OCS_OPT_ENABLE_GROUPS 1 + # Random number computed in the defined range. Designed to avoid computing many groups in the same process + PerlSetEnv OCS_OPT_GROUPS_CACHE_OFFSET 43200 + # Specify the validity of computer's groups (default: compute it once a day - see offset) + PerlSetEnv OCS_OPT_GROUPS_CACHE_REVALIDATE 43200 + +# ===== IPDISCOVER SETTINGS ===== + + # Specify how much agent per LAN will discovered connected peripherals (0 to disable) + PerlSetEnv OCS_OPT_IPDISCOVER 2 + # Specify the minimal difference to replace an ipdiscover agent + PerlSetEnv OCS_OPT_IPDISCOVER_BETTER_THRESHOLD 1 + # Time between 2 arp requests (mini: 10 ms) + PerlSetEnv OCS_OPT_IPDISCOVER_LATENCY 100 + # Specify when to remove a computer when it has not come until this period + PerlSetEnv OCS_OPT_IPDISCOVER_MAX_ALIVE 14 + # Disable the time before a first election (not recommended) + PerlSetEnv OCS_OPT_IPDISCOVER_NO_POSTPONE 0 + # Enable groups for ipdiscover (for example, you might want to prevent some groups to be ipdiscover agents) + PerlSetEnv OCS_OPT_IPDISCOVER_USE_GROUPS 1 + +# ===== INVENTORY FILES MAPPING SETTINGS ===== + + # Use with ocsinventory-local, enable the multi entities feature + PerlSetEnv OCS_OPT_GENERATE_OCS_FILES 0 + # Generate either compressed file or clear XML text + PerlSetEnv OCS_OPT_OCS_FILES_FORMAT OCS + # Specify if you want to keep trace of all inventory between to synchronisation with the higher level server + PerlSetEnv OCS_OPT_OCS_FILES_OVERWRITE 0 + # Path to ocs files directory (must be writeable) + PerlSetEnv OCS_OPT_OCS_FILES_PATH /tmp + +# ===== FILTER SETTINGS ===== + + # Enable prolog filter stack + PerlSetEnv OCS_OPT_PROLOG_FILTER_ON 0 + # Enable core filter system to modify some things "on the fly" + PerlSetEnv OCS_OPT_INVENTORY_FILTER_ENABLED 0 + # Enable inventory flooding filter. A dedicated ipaddress ia allowed to send a new computer only once in this period + PerlSetEnv OCS_OPT_INVENTORY_FILTER_FLOOD_IP 0 + # Period definition for INVENTORY_FILTER_FLOOD_IP + PerlSetEnv OCS_OPT_INVENTORY_FILTER_FLOOD_IP_CACHE_TIME 300 + # Enable inventory filter stack + PerlSetEnv OCS_OPT_INVENTORY_FILTER_ON 0 + +# ===== REGISTRY SETTINGS ===== + + # Enable the registry capacity + PerlSetEnv OCS_OPT_REGISTRY 1 + +# ===== SESSION SETTINGS ===== +# Not yet in GUI + + # Validity of a session (prolog=>postinventory) + PerlSetEnv OCS_OPT_SESSION_VALIDITY_TIME 600 + # Consider a session obsolete if it is older thant this value + PerlSetEnv OCS_OPT_SESSION_CLEAN_TIME 86400 + # Accept an inventory only if required by server + #( Refuse "forced" inventory) + PerlSetEnv OCS_OPT_INVENTORY_SESSION_ONLY 0 + +# ===== DEPRECATED ===== + + # Set the proxy cache validity in http headers when sending a file + PerlSetEnv OCS_OPT_PROXY_REVALIDATE_DELAY 3600 + # Deprecated + PerlSetEnv OCS_OPT_UPDATE 0 + +############ DO NOT MODIFY BELOW ! ####################### + + # External modules + PerlModule Apache::DBI + PerlModule Compress::Zlib + PerlModule XML::Simple + + # Ocs + PerlModule Apache::Ocsinventory + PerlModule Apache::Ocsinventory::Server::Constants + PerlModule Apache::Ocsinventory::Server::System + PerlModule Apache::Ocsinventory::Server::Communication + PerlModule Apache::Ocsinventory::Server::Inventory + PerlModule Apache::Ocsinventory::Server::Duplicate + + # Capacities + PerlModule Apache::Ocsinventory::Server::Capacities::Registry + PerlModule Apache::Ocsinventory::Server::Capacities::Update + PerlModule Apache::Ocsinventory::Server::Capacities::Ipdiscover + PerlModule Apache::Ocsinventory::Server::Capacities::Download + PerlModule Apache::Ocsinventory::Server::Capacities::Notify + # This module guides you through the module creation + # PerlModule Apache::Ocsinventory::Server::Capacities::Example + # This module adds some rules to filter some request sent to ocs server in the prolog and inventory stages + # PerlModule Apache::Ocsinventory::Server::Capacities::Filter + + # PerlTaintCheck On + + # SSL apache settings + #SSLEngine "SSL_ENABLE" + #SSLCertificateFile "SSL_CERTIFICATE_FILE" + #SSLCertificateKeyFile "SSL_CERTIFICATE_KEY_FILE" + #SSLCACertificateFile "SSL_CERTIFICATE_FILE" + #SSLCACertificatePath "SSL_CERTIFICATE_PATH" + #SSLVerifyClient "SSL_VALIDATE_CLIENT" + + # Engine apache settings + # "Virtual" directory for handling OCS Inventory NG agents communications + # Be careful, do not create such directory into your web server root document ! + + order deny,allow + allow from all + Satisfy Any + # If you protect this area you have to deal with http_auth_* agent's parameters + # AuthType Basic + # AuthName "OCS Inventory agent area" + # AuthUserFile "APACHE_AUTH_USER_FILE" + # require valid-user + SetHandler perl-script + PerlHandler Apache::Ocsinventory + + + # Web service apache settings + PerlModule Apache::Ocsinventory::SOAP + + + SetHandler perl-script + PerlHandler "Apache::Ocsinventory::SOAP" + + # By default, you can query web service from everywhere with a valid user + Order deny,allow + Allow from all + AuthType Basic + AuthName "OCS Inventory SOAP Area" + # Use htpasswd to create/update soap-user (or another granted user) + AuthUserFile "APACHE_AUTH_USER_FILE" + require "SOAP_USER" + + + --- ocsinventory-server-1.02.2.orig/debian/conf/ocsreports.conf +++ ocsinventory-server-1.02.2/debian/conf/ocsreports.conf @@ -0,0 +1,34 @@ +#################################################################### +# +# OCS Inventory NG Administration Console Module Setup +# +#################################################################### + +Alias /ocsreports /usr/share/ocsinventory-server/ocsreports +Alias /download /var/lib/ocsinventory-server/download + + + Options Indexes FollowSymLinks + DirectoryIndex index.php + + # Disable manual setup + + Order deny,allow + Deny from all + + + + AddType application/x-httpd-php .php + + php_value post_max_size 8m + php_value upload_max_filesize 8m + + + AddType application/x-httpd-php .php + + php_value post_max_size 8m + php_value upload_max_filesize 8m + + + +# vim: ft=apache : --- ocsinventory-server-1.02.2.orig/debian/conf/dbconfig.inc.php +++ ocsinventory-server-1.02.2/debian/conf/dbconfig.inc.php @@ -0,0 +1,5 @@ + --- ocsinventory-server-1.02.2.orig/debian/po/fr.po +++ ocsinventory-server-1.02.2/debian/po/fr.po @@ -0,0 +1,78 @@ +# This file is distributed under the same license as the ocsinventory-server package +# David Kremer , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server_1.01-1_templates\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2007-07-13 19:44+0200\n" +"Last-Translator: David Kremer \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Identifiant pour le système web de configuration : " + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports est fourni avec un script web de configuration et mise à jour. " +"Le script est situé à l'adresse http://localhost/ocsreports/install.php. " +"Pour des raisons de sécurité, il nécessite une identification." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Veuillez laisser le champ vide si vous décidez d'utiliser le nom " +"d'utilisateur par défaut, « admin » ." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Mot de passe pour le système web de configuration :" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Vous pouvez gérer les identifiants et mots de passe avec la commande " +"htpasswd." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Veuillez laisser ce champ vide si vous décidez de désactiver l'accès à la " +"configuration web." + +#~ msgid "" +#~ "OCS Reports comes with a webb-ased setup/upgrade script. The script is " +#~ "located at http://localhost/ocsreports/install.php . For security reasons " +#~ "it requires authorization." +#~ msgstr "" +#~ "OCS Reports est fourni avec un script web de configuration et mise à " +#~ "jour. Le script est situé à l'adresse http://localhost/ocsreports/install." +#~ "php. Pour des raisons de sécurité, il nécessite une identification." --- ocsinventory-server-1.02.2.orig/debian/po/it.po +++ ocsinventory-server-1.02.2/debian/po/it.po @@ -0,0 +1,72 @@ +# ITALIAN TRANSLATION OF OCSINVENTORY-SERVER'S PO-DEBCONF FILE. +# COPYRIGHT (C) 2010 THE OCSINVENTORY-SERVER'S COPYRIGHT HOLDER +# This file is distributed under the same license as the ocsinventory-server package. +# +# Vincenzo Campanella , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2010-10-14 20:15+0200\n" +"Last-Translator: Vincenzo Campanella \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Nome utente per il sistema d'installazione basato sul web:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports viene fornito con uno script d'installazione o di aggiornamento " +"basato sul web, il quale si trova in http://localhost/ocsreports/install.php " +"e, per motivi di sicurezza, richiede un'autorizzazione." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Se si desidera utilizzare il nome utente predefinito, «admin», lasciare " +"vuoto." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Password per il sistema d'installazione basato sul web:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"È possibile gestire i nomi utenti e le password utilizzando il comando " +"«htpasswd». Essi vengono memorizzati nel file «/etc/ocsinventory/htpasswd." +"setup»." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Se si desidera disabilitare l'accesso all'installazione basata sul web, " +"lasciare vuoto." --- ocsinventory-server-1.02.2.orig/debian/po/pt_BR.po +++ ocsinventory-server-1.02.2/debian/po/pt_BR.po @@ -0,0 +1,70 @@ +# ocsinventory-server Brazilian Portuguese po-debconf Translation. +# Copyright (C) 2008 THE ocsinventory-server COPYRIGHT HOLDER +# This file is distributed under the same license as the ocsinventory-server package. +# Jefferson Alexandre dos Santos , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2008-03-18 23:12-0300\n" +"Last-Translator: Jefferson Alexandre dos Santos, \n" +"Language-Team: l10n Portuguese \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"pt_BR utf-8\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Usuário para configuração baseada na web:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"O OCS Reports vem com um script de configuração/atualização baseado na web. " +"Este script está localizado em http://localhost/ocsreports/install.php. Por " +"razões de segurança ele requer autorização." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Deixe em branco se você quiser utilizar o nome de usuário padrão 'admin'." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Senha para o sistema de configuração baseado na web:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Você pode gerenciar os usuários e senhas com o comando 'htpasswd'. Eles são " +"armazenados no arquivo /etc/ocsinventory/htpasswd.setup." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Deixe em branco se você quiser desabilitar o acesso a configuração baseada " +"na web." --- ocsinventory-server-1.02.2.orig/debian/po/templates.pot +++ ocsinventory-server-1.02.2/debian/po/templates.pot @@ -0,0 +1,61 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" --- ocsinventory-server-1.02.2.orig/debian/po/gl.po +++ ocsinventory-server-1.02.2/debian/po/gl.po @@ -0,0 +1,66 @@ +# Galician translation of ocsinventory-server's debconf templates +# This file is distributed under the same license as the ocsinventory-server package. +# Jacobo Tarrio , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2008-05-30 21:11+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Nome de usuario para o sistema de configuración en web:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports inclúe un script de configuración/actualización baseado en web. " +"O script reside en http://localhost/ocsreports/install.php . Por motivos de " +"seguridade, o script precisa de autorización." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Déixeo en branco se quere empregar o nome de usuario por defecto, \"admin\"." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Contrasinal para o sistema de configuración en web:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Pode xestionar os nomes de usuario e contrasinais coa orde \"htpasswd\". " +"Están armacenados no ficheiro /etc/ocsinventory/htpasswd.setup." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "Déixeo en branco se quere desactivar o acceso á configuración en web." --- ocsinventory-server-1.02.2.orig/debian/po/fi.po +++ ocsinventory-server-1.02.2/debian/po/fi.po @@ -0,0 +1,66 @@ +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server_1.01-3\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2007-12-18 20:22+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: Finland\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Verkkopohjaisen asetusjärjestelmän käyttäjätunnus:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reportsin mukana on verkkopohjainen asetus- ja ylläpitokomentosarja. " +"Komentosarjan sijainti on http://localhost/ocsreports/install.php. " +"Turvallisuussyistä se vaatii tunnistautumisen." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Jätä kenttä tyhjäksi, jos haluat käyttää oletuskäyttäjätunnusta ”admin”." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Verkkopohjaisen asetusjärjestelmän salasana:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Voit hallinnoida käyttäjätunnuksia ja salasanoja ”htpasswd”-komennon avulla. " +"Ne on tallennettu tiedostoon /etc/ocsinventory/htpasswd.setup." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Jätä kenttä tyhjäksi, jos haluat passivoida pääsyn verkkopohjaiseen " +"asetusjärjestelmään." --- ocsinventory-server-1.02.2.orig/debian/po/ru.po +++ ocsinventory-server-1.02.2/debian/po/ru.po @@ -0,0 +1,72 @@ +# translation of ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2008. +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server new\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2008-06-03 21:11+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Имя пользователя для системы настройки через веб:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports содержит сценарий установки/обновления, управляемый через веб. " +"Сценарий доступен по адресу http://localhost/ocsreports/install.php. В целях " +"безопасности он требует имя и пароль." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Оставьте поле пустым, если хотите использовать имя пользователя по умолчанию " +"('admin')." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Пароль для системы настройки через веб:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Вы можете управлять пользователями и паролями с помощью команды `htpasswd'. " +"Они хранятся в файле /etc/ocsinventory/htpasswd.setup." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Оставьте поле пустым, если хотите заблокировать доступ к настройке через веб." --- ocsinventory-server-1.02.2.orig/debian/po/ja.po +++ ocsinventory-server-1.02.2/debian/po/ja.po @@ -0,0 +1,68 @@ +# Copyright (C) 2009 Pierre Chifflier +# This file is distributed under the same license as ocsinventory-server package. +# Hideki Yamane , 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server 1.02.1-2\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2009-10-25 06:52+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "ウェブベースの設定システム用ユーザ名:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS のレポートはウェブベースの設定／アップグレードスクリプトで生成されます。" +"スクリプトは http://localhost/ocsreports/install.php に配置されます。セキュリ" +"ティのため、認証が必要です。" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"デフォルトユーザ名 'admin' を使いたい場合は、空のままにしておいてください。" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "ウェブベースの設定システム用パスワード:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"ユーザ名とパスワードは `htpasswd' コマンドで変更できます。これらは /etc/" +"ocsinventory/htpasswd.setup ファイル中に保存されます。" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"ウェブベースの設定へのアクセスを無効にしたい場合は、空のままにしておいてくだ" +"さい。" --- ocsinventory-server-1.02.2.orig/debian/po/nb.po +++ ocsinventory-server-1.02.2/debian/po/nb.po @@ -0,0 +1,68 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Bjørn Steensrud , 2010. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2010-10-17 20:45+0200\n" +"Last-Translator: Bjørn Steensrud \n" +"Language-Team: Norwegian Bokmål \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Brukernavn for vev-basert oppsettssystem:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports har med et vevbasert skript for oppsett/oppgradering. Skriptet " +"finnes på http://localhost/ocsreports/install.php. Av sikkerhetsgrunner " +"kreves autorisering. " + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "La det være tomt hvis du vil bruke standard brukernavn «admin»." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Passord for vevbasert oppsettssystem:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Du kan styre brukernavn og passord med kommandoen «htpasswd»-kommandoen. De " +"er lagret i fila /etc/ocsinventory/htpasswd.setup." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"La det være tomt hvis du vil slå av tilgang til det vevbaserte oppsettet." --- ocsinventory-server-1.02.2.orig/debian/po/sv.po +++ ocsinventory-server-1.02.2/debian/po/sv.po @@ -0,0 +1,70 @@ +# translation of ocsinventory-server.po to swedish +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Martin Bagge , 2008. +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2008-11-02 22:34+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: swedish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "" +"Användarnamn för det webbaserade systemet för hantering av inställningar:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports levereras med ett webbaserat installations-/uppgraderings-skript " +"som återfinns på http://localhost/ocsreports/install.php. Av säkerhetsskäl " +"så krävs inloggning till detta." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "Lämna fältet tomt om du vill använda standardnamnet 'admin'." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Lösenord för det webbaserade systemet för hantering av inställningar:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Användarnamnen och lösenorden kan administreras med hjälp av htpasswd-" +"kommandot. De sparas i /etc/ocsinventory/htpasswd." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Lämna fältet tomt om du vill avaktivera tillgången till det webbaserade " +"systemet för hantering av inställningar." --- ocsinventory-server-1.02.2.orig/debian/po/POTFILES.in +++ ocsinventory-server-1.02.2/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] ocsinventory-reports.templates --- ocsinventory-server-1.02.2.orig/debian/po/pt.po +++ ocsinventory-server-1.02.2/debian/po/pt.po @@ -0,0 +1,73 @@ +# translation of ocsinventory-server to Portuguese +# Copyright (C) 2007 Américo Monteiro +# This file is distributed under the same license as the ocsinventory-server package. +# +# Américo Monteiro , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server 1.01-2\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2007-07-15 02:57+0100\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "" +"Nome de utilizador para o sistema de configuração através de interface Web:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"Os relatórios OCS vêem com um script de configuração/actualização através " +"duma interface Web. O script está localizado em http://localhost/ocsreports/" +"install.php. Por razões de segurança, necessita de autorização." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Deixe o campo vazio, se pretender usar o nome de utilizador dado por omissão " +"'admin'." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Password do sistema de configuração por interface Web:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Você pode gerir os nomes de utilizadores e suas passwords com o comando " +"'htpasswd'. Elas estão guardadas no ficheiro /etc/ocsinventory/htpasswd." +"setup." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Deixe o campo vazio se pretender desactivar o acesso à configuração por " +"interface Web." --- ocsinventory-server-1.02.2.orig/debian/po/de.po +++ ocsinventory-server-1.02.2/debian/po/de.po @@ -0,0 +1,79 @@ +# Translation of ocsinventory-server debconf templates to German +# Copyright (C) Helge Kreutzmann , 2007. +# This file is distributed under the same license as the ocsinventory-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server 1.01-1\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2007-07-12 18:25+0200\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Benutzername fr das webbasierte Einrichtungssystem:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports enthlt ein webbasiertes Einrichtungs-/Upgrade-Skript. Das " +"Skript befindet sich unter http://localhost/ocsreports/install.php. Aus " +"Sicherheitsgrnden erfordert es eine Autorisierung." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Lassen Sie dies leer, falls Sie den vordefinierten Benutzernamen admin " +"verwenden mchten." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Passwort fr das webbasierte Einrichtungssystem:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Sie knnen die Benutzernamen und Passwrter mit dem htpasswd-Befehl " +"verwalten. Sie sind in der Datei /etc/ocsinventory/htpasswd.setup " +"gespeichert." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Lassen Sie dies leer, falls Sie den Zugriff auf die webbasierte Einrichtung " +"deaktivieren mchten." + +#~ msgid "" +#~ "OCS Reports comes with a webb-ased setup/upgrade script. The script is " +#~ "located at http://localhost/ocsreports/install.php . For security reasons " +#~ "it requires authorization." +#~ msgstr "" +#~ "OCS Reports enthlt ein webbasiertes Einrichtungs-/Upgrade-Skript. Das " +#~ "Skript befindet sich unter http://localhost/ocsreports/install.php. Aus " +#~ "Sicherheitsgrnden erfordert es eine Autorisierung." --- ocsinventory-server-1.02.2.orig/debian/po/eu.po +++ ocsinventory-server-1.02.2/debian/po/eu.po @@ -0,0 +1,69 @@ +# translation of ocsinventory-server.po to Basque (eu) +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# xabier bilbao , 2008. +# Piarres Beobide , 2008. +msgid "" +msgstr "" +"Project-Id-Version: xp-ocsinventory-server\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2008-06-01 00:07+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Web bidezko konfigurazio sistemaren erabiltzaile-izena:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports-ek web bidez konfiguratzeko/bertsio-berritzeko script-a dakar. " +"Script honen kokagunea http://localhost/ocsreports/install.php da. " +"Segurtasun arrazoiengatik, baimena edukitzea eskatzen du." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Bete gabe utzi lehenetsitako 'admin' erabiltzaile-izena erabili nahi baduzu." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Web bidezko konfigurazio sistemaren pasahitza:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Erabiltzaile-izenak eta pasahitzak 'htpasswd' komandoaren bitartez kudea " +"ditzakezu. /etc/ocsinventory/htpasswd.setup fitxategian daude gordeta." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "Bete gabe utzi web bidezko konfiguraziorako sarrera desgaitzeko." --- ocsinventory-server-1.02.2.orig/debian/po/tr.po +++ ocsinventory-server-1.02.2/debian/po/tr.po @@ -0,0 +1,72 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Mert Dirik , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2008-06-05 23:48+0200\n" +"Last-Translator: Mert Dirik \n" +"Language-Team: Debian L10n Turkish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Poedit-Language: Turkish\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Web tabanlı kurulum sistemi için kullanıcı adı:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Raporları web tabanlı bir kurulum/yükseltme betiğiyle gelir. Bu betik " +"http://localhost/ocsreports/install.php adresindedir ve güvenlik nedeniyle " +"kimlik doğrulama gerektirir." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Öntanımlı kullanıcı adı olan 'admin'i kullanmak istiyorsanız bu alanı boş " +"bırakın." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Web tabanlı kurulum sistemi için parola:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Kullanıcı adları ve parolaları 'htpasswd' komutuyla yönetebilirsiniz. " +"Kullanıcı adları ve parolalar /etc/ocsinventory/htpasswd.setup dosyasında " +"saklanır." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Web tabanlı kuruluma erişimi devre dışı bırakmak için bu alanı boş bırakın." --- ocsinventory-server-1.02.2.orig/debian/po/da.po +++ ocsinventory-server-1.02.2/debian/po/da.po @@ -0,0 +1,68 @@ +# Danish translation ocsinventory-server. +# Copyright (C) 2010 ocsinventory-server & nedenstående oversættere. +# This file is distributed under the same license as the ocsinventory-server package. +# Joe Hansen , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2010-10-11 13:26+0100\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Brugernavn for internetbaseret opsætningssystem:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS-rapporter kommer med et internetbaseret opsætnings-/opgraderingsskript. " +"Skriptet er placeret på http://localhost/ocsreports/install.php. Af " +"sikkerhedsmæssige årsager kræver den godkendelse." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "Efterlad tom hvis du ønsker at bruge standardbrugernavnet 'admin'." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Adgangskode for internetbaseret opsætningssystem:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Du kan håndtere brugernavnene og adgangskoderne med kommandoen »htpasswd«. " +"De er gemt i filen /etc/ocsinventory/htpasswd.setup." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Efterlad tom hvis du ønsker at deaktivere adgang til den internetbaserede " +"opsætning." --- ocsinventory-server-1.02.2.orig/debian/po/nl.po +++ ocsinventory-server-1.02.2/debian/po/nl.po @@ -0,0 +1,71 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER +# This file is distributed under the same license as the package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2007-10-26 20:08+0100\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Dutch\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Gebruikersnaam voor het webgebaseerde setupsysteem:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports voorziet een webgebaseerd setup-/opwaarderings-script. Dit " +"script bevindt zich op http://localhost/ocsreports/install.php. Om " +"beveiligingsredenen vereist autorisatie. " + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Laat dit leeg als u de standaard gebruikersnaam 'admin' wilt gebruiken." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Wachtwoord voor het webgebaseerde setupsysteem:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"U kunt de gebruikersnamen en wachtwoorden beheren via het commando " +"'htpasswd', ze worden opgeslagen in het bestand /etc/ocsinventory/htpasswd." +"setup ." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Laat dit leeg als u toegang tot het webgebaseerde setupsysteem wilt " +"deactiveren." --- ocsinventory-server-1.02.2.orig/debian/po/cs.po +++ ocsinventory-server-1.02.2/debian/po/cs.po @@ -0,0 +1,63 @@ +# Czech translation of ocsinventory-server debconf messages. +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server_1.01-4\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2008-05-27 18:05+0200\n" +"Last-Translator: Daniel Kavan \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Uživatelské jméno pro nastavování přes web:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports mají svůj webový nastavovací/upgradovací skript. Skript se " +"nalézá na http://localhost/ocsreports/install.php. Z bezpečnostních důvodů " +"požaduje autorizaci." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "Pokud chcete používat předvolené jméno „admin“, ponechte prázdné." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Heslo pro webový nastavovací systém:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Jména a hesla můžete spravovat pomocí příkazu „htpasswd“. Uložena jsou v " +"souboru /etc/ocsinventory/htpasswd.setup." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "Pokud chcete zakázat přístup k webovému nastavování, ponechte prázdné." --- ocsinventory-server-1.02.2.orig/debian/po/es.po +++ ocsinventory-server-1.02.2/debian/po/es.po @@ -0,0 +1,95 @@ +# ocsinventory-server po-debconf translation to Spanish +# Copyright (C) 2010 Software in the Public Interest +# This file is distributed under the same license as the ocsinventory-server package. +# +# Changes: +# - Initial translation +# Camaleón , 2010 +# +# - Updates +# +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: ocsinventory-server 1.02.2-1\n" +"Report-Msgid-Bugs-To: chifflier@inl.fr\n" +"POT-Creation-Date: 2007-07-17 13:47+0200\n" +"PO-Revision-Date: 2010-05-18 11:41+0100\n" +"Last-Translator: Camaleón \n" +"Language-Team: Debian Spanish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "User name for web-based setup system:" +msgstr "Nombre de usuario para el sistema de configuración vía web:" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:1001 +#: ../ocsinventory-reports.templates:2001 +msgid "" +"OCS Reports comes with a web-based setup/upgrade script. The script is " +"located at http://localhost/ocsreports/install.php. For security reasons it " +"requires authorization." +msgstr "" +"OCS Reports viene con un script de configuración/actualización vía web. El " +"script se encuentra disponible en «http://localhost/ocsreports/install.php». " +"Por motivos de seguridad, requiere autorización." + +#. Type: string +#. Description +#: ../ocsinventory-reports.templates:1001 +msgid "Leave empty if you want to use the default user name 'admin'." +msgstr "" +"Deje este campo en blanco si quiere utilizar el nombre de usuario " +"predeterminado («admin»)." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Password for web-based setup system:" +msgstr "Contraseña para el sistema de configuración vía web:" + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "" +"You can manage the usernames and passwords with the `htpasswd' command. They " +"are stored in /etc/ocsinventory/htpasswd.setup file." +msgstr "" +"Puede gestionar los nombres de usuario y las contraseñas utilizando la orden " +"«htpasswd». Se almacenan en el archivo «/etc/ocsinventory/htpasswd.setup»." + +#. Type: password +#. Description +#: ../ocsinventory-reports.templates:2001 +msgid "Leave empty if you want to disable access to the web-based setup." +msgstr "" +"Deje este campo en blanco si quiere impedir el acceso al sistema de " +"configuración vía web." --- ocsinventory-server-1.02.2.orig/debian/patches/guide-in-doc.patch +++ ocsinventory-server-1.02.2/debian/patches/guide-in-doc.patch @@ -0,0 +1,15 @@ +guide.pdf has been moved to package documentation, +so the link changed to reflect that. +Index: ocsinventory-server-1.01/ocsreports/index.php +=================================================================== +--- ocsinventory-server-1.01.orig/ocsreports/index.php 2007-05-03 15:05:12.000000000 +0200 ++++ ocsinventory-server-1.01/ocsreports/index.php 2007-05-03 15:05:31.000000000 +0200 +@@ -267,7 +267,7 @@ + case 13: $img = "local"; break; + case 12: $img = "label"; break; + case 28: $img = "aide"; +- $llink = "files/guide.pdf' target='_BLANK"; ++ $llink = "/doc/ocsinventory-reports/guide.pdf.gz' target='_BLANK"; + break; + default: if( $label==$l->g(15) ) + $img = "utilisateurs"; --- ocsinventory-server-1.02.2.orig/debian/patches/series +++ ocsinventory-server-1.02.2/debian/patches/series @@ -0,0 +1,6 @@ +dbconfig.patch +do-not-set-mysql-permissions.patch +dbconfig-get-default.patch +soap_http_v1.patch +hardcoded-dbauth.patch +sql_injection_machines.patch --- ocsinventory-server-1.02.2.orig/debian/patches/dbconfig.patch +++ ocsinventory-server-1.02.2/debian/patches/dbconfig.patch @@ -0,0 +1,87 @@ + +Move dbconfig.inc.php from ocsreports to /var/lib/ocsinventory/config +where it can be easily deleted/created/modified by install.php + +Index: ocsinventory-server/ocsreports/install.php +=================================================================== +--- ocsinventory-server.orig/ocsreports/install.php 2009-05-08 22:14:03.000000000 +0200 ++++ ocsinventory-server/ocsreports/install.php 2009-05-08 22:21:07.000000000 +0200 +@@ -12,6 +12,8 @@ + + @set_time_limit(0); + error_reporting(E_ALL & ~E_NOTICE); ++ ++define('DBCONFIG_INC', '/var/lib/ocsinventory-server/config/dbconfig.inc.php'); + ?> + + +@@ -94,9 +96,9 @@ + else + $instOk = true; + } +-if( $hnd = @fopen("dbconfig.inc.php", "r") ) { ++if( $hnd = @fopen(DBCONFIG_INC, "r") ) { + fclose($hnd); +- require("dbconfig.inc.php"); ++ require(DBCONFIG_INC); + $valNme = $_SESSION["COMPTE_BASE"]; + $valPass = $_SESSION["PSWD_BASE"]; + $valServ = $_SESSION["SERVEUR_SQL"]; +@@ -172,7 +174,7 @@ + echo "
ERROR: MySql authentication problem. (using host=".$_POST["host"]." login=ocs pass=ocs).
"; + + echo "
ERROR: The installer ended unsuccessfully, rerun install.php once problems are corrected
"; +- unlink("dbconfig.inc.php"); ++ unlink(DBCONFIG_INC); + } + else { + echo "
Installation finished you can log in index.php with login=admin and pass=admin

Click here to enter OCS-NG GUI
"; +@@ -181,7 +183,7 @@ + } + + +-if(!$ch = @fopen("dbconfig.inc.php","w")) { ++if(!$ch = @fopen(DBCONFIG_INC,"w")) { + echo "
ERROR: can't write in directory (on dbconfig.inc.php), please set the required rights in order to install ocsinventory (you should remove the write mode after the installation is successfull)
"; + die(); + } +@@ -314,7 +316,7 @@ + + if($nberr) { + echo "
ERROR: The installer ended unsuccessfully, rerun install.php once problems are corrected
"; +- unlink("dbconfig.inc.php"); ++ unlink(DBCONFIG_INC); + die(); + } + $nberr=0; +@@ -354,7 +356,7 @@ + if(mysql_errno()==2006) { + echo "
ERROR: $fil was not inserted. You need to set the max_allowed_packet mysql value to at least 2M
"; + echo "
ERROR: The installer ended unsuccessfully, rerun install.php once problems are corrected
"; +- unlink("dbconfig.inc.php"); ++ unlink(DBCONFIG_INC); + die(); + } + echo "
ERROR: $fil not inserted
"; +@@ -383,7 +385,7 @@ + + if($nberr) { + echo "
ERROR: The installer ended unsuccessfully, rerun install.php once problems are corrected
"; +- unlink("dbconfig.inc.php"); ++ unlink(DBCONFIG_INC); + die(); + } + +Index: ocsinventory-server/ocsreports/preferences.php +=================================================================== +--- ocsinventory-server.orig/ocsreports/preferences.php 2009-05-08 22:14:03.000000000 +0200 ++++ ocsinventory-server/ocsreports/preferences.php 2009-05-08 22:21:28.000000000 +0200 +@@ -12,7 +12,7 @@ + + error_reporting(E_ALL & ~E_NOTICE); + @session_start(); +-require('dbconfig.inc.php'); ++require('/var/lib/ocsinventory-server/config/dbconfig.inc.php'); + require ('fichierConf.class.php'); + + define("MAX_CACHED_SOFTS", 200 ); // Max number of softs that may be returned by optimizations queries --- ocsinventory-server-1.02.2.orig/debian/patches/no-download.patch +++ ocsinventory-server-1.02.2/debian/patches/no-download.patch @@ -0,0 +1,126 @@ +Move /download to /var/lib/ocsinventory/download, +instead of apache's document root. +Index: ocsinventory-server-1.01/ocsreports/install.php +=================================================================== +--- ocsinventory-server-1.01.orig/ocsreports/install.php 2007-05-03 15:05:11.000000000 +0200 ++++ ocsinventory-server-1.01/ocsreports/install.php 2007-05-03 15:15:07.000000000 +0200 +@@ -64,7 +64,9 @@ + echo "
WARNING: OpenSSL for PHP is not properly installed.
Some automatic deployment features won't be available
Try uncommenting \";extension=php_openssl.dll\" (windows) by removing the semicolon in file php.ini, or try installing the php4-openssl package (Linux).
"; + } + ++/* Disabled in Debian + @mkdir($_SERVER["DOCUMENT_ROOT"]."/download"); ++*/ + $pms = "post_max_size"; + $umf = "upload_max_filesize"; + +Index: ocsinventory-server-1.01/ocsreports/tele_package.php +=================================================================== +--- ocsinventory-server-1.01.orig/ocsreports/tele_package.php 2007-05-03 15:15:18.000000000 +0200 ++++ ocsinventory-server-1.01/ocsreports/tele_package.php 2007-05-03 15:19:37.000000000 +0200 +@@ -9,6 +9,7 @@ + // Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt + //==================================================================================== + //Modified on $Date: 2007/02/08 15:53:24 $$Author: plemmet $($Revision: 1.10 $) ++define('SERVER_DOCUMENT_ROOT','/var/lib/ocsinventory-server'); + ?> + "); + } +@@ -139,8 +140,8 @@ + } + else { + $id = time(); +- if( ! @mkdir( $_SERVER["DOCUMENT_ROOT"]."/download/".$id)) { +- echo "
ERROR: can't write in ".$_SERVER["DOCUMENT_ROOT"]."/download/ folder, please refresh when corrected
"; ++ if( ! @mkdir( SERVER_DOCUMENT_ROOT."/download/".$id)) { ++ echo "
ERROR: can't write in ".SERVER_DOCUMENT_ROOT."/download/ folder, please refresh when corrected
"; + die(""); + } + ?> +@@ -161,7 +162,7 @@ + else if( isset( $_POST["nbfrags"] ) ) { + + //fragmenter +- $fname = $_SERVER["DOCUMENT_ROOT"]."/download/".$_POST["id"]."/tmp"; ++ $fname = SERVER_DOCUMENT_ROOT."/download/".$_POST["id"]."/tmp"; + if( $size = @filesize( $fname )) { + $handle = fopen ( $fname, "rb"); + +@@ -169,7 +170,7 @@ + for( $i=1; $i<$_POST["nbfrags"]; $i++ ) { + $contents = fread ($handle, $size / $_POST["nbfrags"] ); + $read += strlen( $contents ); +- $handfrag = fopen( $_SERVER["DOCUMENT_ROOT"]."/download/".$_POST["id"]."/".$_POST["id"]."-".$i, "w+b" ); ++ $handfrag = fopen( SERVER_DOCUMENT_ROOT."/download/".$_POST["id"]."/".$_POST["id"]."-".$i, "w+b" ); + fwrite( $handfrag, $contents ); + fclose( $handfrag ); + //echo "FRAG ".$i." lu ".strlen( $contents ). " (en tout " .$read.")
"; +@@ -177,12 +178,12 @@ + + $contents = fread ($handle, $size - $read); + $read += strlen( $contents ); +- $handfrag = fopen( $_SERVER["DOCUMENT_ROOT"]."/download/".$_POST["id"]."/".$_POST["id"]."-".$i, "w+b" ); ++ $handfrag = fopen( SERVER_DOCUMENT_ROOT."/download/".$_POST["id"]."/".$_POST["id"]."-".$i, "w+b" ); + fwrite( $handfrag, $contents ); + fclose( $handfrag ); + fclose ($handle); + +- unlink( $_SERVER["DOCUMENT_ROOT"]."/download/".$_POST["id"]."/tmp" ); ++ unlink( SERVER_DOCUMENT_ROOT."/download/".$_POST["id"]."/tmp" ); + } + + //creation info +@@ -206,7 +207,7 @@ + "NEED_DONE_ACTION_TEXT=\"".clean($_SESSION["down_NEED_DONE_ACTION_TEXT"])."\" ". + "GARDEFOU=\"rien\" />\n"; + +- $handinfo = fopen( $_SERVER["DOCUMENT_ROOT"]."/download/".$_POST["id"]."/info", "w+" ); ++ $handinfo = fopen( SERVER_DOCUMENT_ROOT."/download/".$_POST["id"]."/info", "w+" ); + fwrite( $handinfo, $info ); + fclose( $handinfo ); + +@@ -217,7 +218,7 @@ + + mysql_query( $req, $_SESSION["writeServer"] ); + echo mysql_error(); +- echo "
".$l->g(437)." ".$_SERVER["DOCUMENT_ROOT"]."/download/".$_POST["id"]."

"; ++ echo "
".$l->g(437)." ".SERVER_DOCUMENT_ROOT."/download/".$_POST["id"]."

"; + + unset( $_POST["nbfrags"] ); + //vider session +Index: ocsinventory-server-1.01/ocsreports/tele_activate.php +=================================================================== +--- ocsinventory-server-1.01.orig/ocsreports/tele_activate.php 2007-05-03 15:21:55.000000000 +0200 ++++ ocsinventory-server-1.01/ocsreports/tele_activate.php 2007-05-03 15:22:47.000000000 +0200 +@@ -9,6 +9,7 @@ + // Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt + //==================================================================================== + //Modified on $Date: 2007/02/16 16:39:13 $$Author: plemmet $($Revision: 1.7 $) ++define('SERVER_DOCUMENT_ROOT','/var/lib/ocsinventory-server'); + + PrintEnTete($l->g(465)); + +@@ -117,8 +118,8 @@ + $reqDelAvailable = "DELETE FROM download_available WHERE FILEID='".$_GET["suppack"]."'"; + @mysql_query($reqDelAvailable, $_SESSION["writeServer"]) or die(mysql_error()); + +- if( ! @recursive_remove_directory( $_SERVER["DOCUMENT_ROOT"]."/download/".$_GET["suppack"] )) { +- echo "
".$l->g(472)." ".$_SERVER["DOCUMENT_ROOT"]."/download/".$_GET["suppack"]."
"; ++ if( ! @recursive_remove_directory( SERVER_DOCUMENT_ROOT."/download/".$_GET["suppack"] )) { ++ echo "
".$l->g(472)." ".SERVER_DOCUMENT_ROOT."/download/".$_GET["suppack"]."
"; + } + } + --- ocsinventory-server-1.02.2.orig/debian/patches/soap_http_v1.patch +++ ocsinventory-server-1.02.2/debian/patches/soap_http_v1.patch @@ -0,0 +1,15 @@ +Index: ocsinventory-server-1.02/Apache/Ocsinventory/SOAP.pm +=================================================================== +--- ocsinventory-server-1.02.orig/Apache/Ocsinventory/SOAP.pm 2008-09-08 16:50:34.000000000 +0200 ++++ ocsinventory-server-1.02/Apache/Ocsinventory/SOAP.pm 2008-09-08 16:50:53.000000000 +0200 +@@ -20,8 +20,8 @@ + elsif( $ENV{OCS_MODPERL_VERSION}==2 ){ + require Apache::Ocsinventory::Server::Modperl2; + Apache::Ocsinventory::Server::Modperl2->import(); +- require SOAP::Transport::HTTP2; +- our $server = SOAP::Transport::HTTP2::Apache->dispatch_to('Apache::Ocsinventory::Interface'); ++ require SOAP::Transport::HTTP; ++ our $server = SOAP::Transport::HTTP::Apache->dispatch_to('Apache::Ocsinventory::Interface'); + } + require Apache::Ocsinventory::Interface; + }; --- ocsinventory-server-1.02.2.orig/debian/patches/dbconfig-get-default.patch +++ ocsinventory-server-1.02.2/debian/patches/dbconfig-get-default.patch @@ -0,0 +1,22 @@ +install.php now checks for a file /etc/oscinventory/dbconfig.inc.php +before asking the user. +Index: ocsinventory-server/ocsreports/install.php +=================================================================== +--- ocsinventory-server.orig/ocsreports/install.php 2009-05-08 22:31:19.000000000 +0200 ++++ ocsinventory-server/ocsreports/install.php 2009-05-08 22:34:04.000000000 +0200 +@@ -103,6 +103,15 @@ + $valPass = $_SESSION["PSWD_BASE"]; + $valServ = $_SESSION["SERVEUR_SQL"]; + } ++# added for debian to get default values from dbconfig-common ++elseif( $hnd = @file_get_contents("/etc/ocsinventory/ocsinventory.conf") ) { ++ if (preg_match('/^\s*PerlSetEnv\s*OCS_DB_USER\s*(\S+)/im',$hnd,$matches)) ++ $valNme = $matches[1]; ++ if (preg_match('/^\s*PerlSetVar\s*OCS_DB_PWD\s*(\S+)/im',$hnd,$matches)) ++ $valPass = $matches[1]; ++ if (preg_match('/^\s*PerlSetEnv\s*OCS_DB_HOST\s*(\S+)/im',$hnd,$matches)) ++ $valServ = $matches[1]; ++} + + if( ! $instOk ) { + --- ocsinventory-server-1.02.2.orig/debian/patches/do-not-set-mysql-permissions.patch +++ ocsinventory-server-1.02.2/debian/patches/do-not-set-mysql-permissions.patch @@ -0,0 +1,21 @@ +Index: ocsinventory-server/ocsreports/files/ocsbase.sql +=================================================================== +--- ocsinventory-server.orig/ocsreports/files/ocsbase.sql 2009-05-08 22:14:03.000000000 +0200 ++++ ocsinventory-server/ocsreports/files/ocsbase.sql 2009-05-08 22:25:02.000000000 +0200 +@@ -1,6 +1,3 @@ +-CREATE DATABASE ocsweb; +-USE ocsweb; +- + CREATE TABLE hardware ( + ID INTEGER NOT NULL auto_increment, + DEVICEID VARCHAR(255) not NULL, +@@ -737,9 +734,6 @@ + + INSERT INTO operators VALUES ('admin','admin','admin','admin',1, 'Default administrator account'); + +-GRANT ALL PRIVILEGES ON ocsweb.* TO ocs IDENTIFIED BY 'ocs'; +-GRANT ALL PRIVILEGES ON ocsweb.* TO ocs@localhost IDENTIFIED BY 'ocs'; +- + INSERT INTO config VALUES ('GUI_VERSION', 0, '5003', 'Version of the installed GUI and database'); + + CREATE TABLE download_servers ( --- ocsinventory-server-1.02.2.orig/debian/patches/sql_injection_machines.patch +++ ocsinventory-server-1.02.2/debian/patches/sql_injection_machines.patch @@ -0,0 +1,185 @@ +Index: ocsinventory-server/ocsreports/machine.php +=================================================================== +--- ocsinventory-server.orig/ocsreports/machine.php 2009-08-18 14:33:14.000000000 +0200 ++++ ocsinventory-server/ocsreports/machine.php 2009-08-18 14:33:21.000000000 +0200 +@@ -25,7 +25,7 @@ + + if (isset($_GET['systemid'])) { + $systemid = $_GET['systemid']; +- if ($systemid == "") ++ if ($systemid == "" or !is_numeric($systemid)) + { + echo "Please Supply A System ID"; + die(); +@@ -33,7 +33,12 @@ + } + elseif (isset($_POST['systemid'])) { + $systemid = $_POST['systemid']; ++ if ($systemid == "" or !is_numeric($systemid)){ ++ echo "Please Supply A System ID"; ++ die(); ++ } + } ++ + //for update blacklist serial or mac + update_blacklist(); + +@@ -51,27 +56,27 @@ + } + else + $_SESSION["justAdded"] = false; +- //TODO: voir si on loggue les evenements de groupe +-if( isset( $_GET["actgrp"] )) { +- //v�rification si la valeur correspond � un groupe +- $reqGroups = "SELECT h.id id +- FROM hardware h +- WHERE h.deviceid='_SYSTEMGROUP_' "; +- //pour les autres qu'SADMIN, ajout que pour les groupes d�clar�s visibles +- if ($_SESSION["lvluser"]!=SADMIN) +- $reqGroups .= " and h.workgroup = 'GROUP_4_ALL'"; +- $resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] ); +- $valGroups = mysql_fetch_array( $resGroups ); +- if (isset($valGroups['id'])){ +- $reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"]; +- +- if( $_GET["actgrp"] == 0 ) +- $reqDelete .= " AND static<>0"; +- $reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")"; +- @mysql_query( $reqDelete, $_SESSION["writeServer"] ); +- if( $_GET["actgrp"] != 0 ) +- @mysql_query( $reqInsert, $_SESSION["writeServer"] ); +- } ++ //TODO: voir si on loggue les evenements de groupe ++if( isset( $_GET["actgrp"] )) { ++ //v�rification si la valeur correspond � un groupe ++ $reqGroups = "SELECT h.id id ++ FROM hardware h ++ WHERE h.deviceid='_SYSTEMGROUP_' "; ++ //pour les autres qu'SADMIN, ajout que pour les groupes d�clar�s visibles ++ if ($_SESSION["lvluser"]!=SADMIN) ++ $reqGroups .= " and h.workgroup = 'GROUP_4_ALL'"; ++ $resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] ); ++ $valGroups = mysql_fetch_array( $resGroups ); ++ if (isset($valGroups['id'])){ ++ $reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"]; ++ ++ if( $_GET["actgrp"] == 0 ) ++ $reqDelete .= " AND static<>0"; ++ $reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")"; ++ @mysql_query( $reqDelete, $_SESSION["writeServer"] ); ++ if( $_GET["actgrp"] != 0 ) ++ @mysql_query( $reqInsert, $_SESSION["writeServer"] ); ++ } + } + + $queryMachine = "SELECT * FROM hardware WHERE (ID=$systemid)"; +@@ -413,8 +418,8 @@ + //PROLOG_FREQ + optperso("PROLOG_FREQ",$l->g(724)." PROLOG_FREQ",$optPerso,0,$optdefault["PROLOG_FREQ"],$l->g(730)); + //GROUPS +- $sql_groups="SELECT static, name, group_id,workgroup FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id"; +- $resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); ++ $sql_groups="SELECT static, name, group_id,workgroup FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id"; ++ $resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); + + if( mysql_num_rows( $resGroups )>0 ) { + while( $valGroups = mysql_fetch_array( $resGroups ) ) { +@@ -422,7 +427,7 @@ + echo ""; + echo " "; + echo $td3.$l->g(607)." "; +- if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") ++ if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") + echo "".$valGroups["name"].""; + else + echo "".$valGroups["name"].""; +@@ -434,11 +439,11 @@ + case 2: echo "".$l->g(597).""; break; + } + +- if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") { ++ if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") { + $hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500))."&grp=".$valGroups["group_id"]; + switch( $valGroups["static"] ) { + case 0: echo $td3."".$l->g(598)."     ".$l->g(600).""; break; +- case 1: echo $td3."".$l->g(818).""; break; ++ case 1: echo $td3."".$l->g(818).""; break; + case 2: echo $td3."".$l->g(598)."     ".$l->g(599).""; break; + } + } +@@ -467,20 +472,20 @@ + echo ""; + } + } +- ++ + $hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500)); + + echo ""; +- if( $_SESSION["lvluser"]==SADMIN ) +- echo "".$l->g(501)."".$l->g(386); +- echo " ". ++ if( $_SESSION["lvluser"]==SADMIN ) ++ echo "".$l->g(501)."".$l->g(386); ++ echo " ". + $l->g(589).""; +- +- $reqGroups = "SELECT h.name,h.id,h.workgroup +- FROM hardware h +- WHERE h.deviceid='_SYSTEMGROUP_'"; +- if( $_SESSION["lvluser"]!=SADMIN ) +- $reqGroups .= " and workgroup = 'GROUP_4_ALL'"; ++ ++ $reqGroups = "SELECT h.name,h.id,h.workgroup ++ FROM hardware h ++ WHERE h.deviceid='_SYSTEMGROUP_'"; ++ if( $_SESSION["lvluser"]!=SADMIN ) ++ $reqGroups .= " and workgroup = 'GROUP_4_ALL'"; + $resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] ); + $first = true; + while( $valGroups = mysql_fetch_array( $resGroups ) ) { +@@ -495,7 +500,7 @@ + echo ""; + + echo ""; +- //} ++ //} + echo "
"; + + if ($_POST['modification_param']) +@@ -784,7 +789,7 @@ + $td3".textDecode($item->TYPE)." + $td3".textDecode($item->SPEED)." + $td3".textDecode($item->MACADDR).($const?"
($const)":""); +- blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"Rseau(x)"); ++ blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"Reseau(x)"); + echo ""; + echo "$td3".textDecode($item->STATUS)." + $td3".textDecode($item->IPADDRESS)." +@@ -1185,7 +1190,7 @@ + + ); ++close DBCONFIG; ++$dbhost = $1 ++ if $dbconfig_lines =~ /^\s*\$_SESSION\s*\[\s*['"]SERVEUR_SQL['"]\s*\]\s*=\s*['"](.*)['"]\s*;/m; ++$dbuser = $1 ++ if $dbconfig_lines =~ /^\s*\$_SESSION\s*\[\s*['"]COMPTE_BASE['"]\s*\]\s*=\s*['"](.*)['"]\s*;/m; ++$dbpwd = $1 ++ if $dbconfig_lines =~ /^\s*\$_SESSION\s*\[\s*['"]PSWD_BASE['"]\s*\]\s*=\s*['"](.*)['"]\s*;/m; + # + my %xml; + my $ipdiscover; --- ocsinventory-server-1.02.2.orig/debian/patches/ipdiscover-util-gnmap.patch +++ ocsinventory-server-1.02.2/debian/patches/ipdiscover-util-gnmap.patch @@ -0,0 +1,71 @@ +Moved .gnmap files from ocsreports to ipd +subdir, thus it can be moved to /var/lib... +Index: ocsinventory-server-1.01/ipdiscover-util/ipdiscover-util.pl +=================================================================== +--- ocsinventory-server-1.01.orig/ipdiscover-util/ipdiscover-util.pl 2007-05-04 10:01:46.000000000 +0200 ++++ ocsinventory-server-1.01/ipdiscover-util/ipdiscover-util.pl 2007-05-04 10:05:59.000000000 +0200 +@@ -542,7 +542,7 @@ + my @ips; + push @ips, $$_[1] for(@hosts); + #Check that there is no analyses of this network pending +- open NMAP, "+>$filter.gnmap"; ++ open NMAP, "+>ipd/$filter.gnmap"; + unless(flock(NMAP, LOCK_EX|LOCK_NB)){ + if($xml){ + print "345"; +@@ -552,13 +552,13 @@ + } + } + #Analyse +- system("nmap -R -v @ips -p 135,80,22,23 -oG $filter.gnmap -P0 > /dev/null"); ++ system("nmap -R -v @ips -p 135,80,22,23 -oG ipd/$filter.gnmap -P0 > /dev/null"); + # + my @gnmap; + if($net){ + @gnmap = ; + close NMAP; +- unlink "$filter.gnmap"; ++ unlink "ipd/$filter.gnmap"; + # + ########### + # +@@ -685,14 +685,14 @@ + # + sub _cleanup{ + my($name, @files); +- opendir DIR, "."; ++ opendir DIR, "ipd"; + while($name = readdir DIR){ + push @files, $name if $name=~/\.gnmap$/i; + } + closedir DIR; + for(@files){ +- open FILE, $_ or next; +- unlink $_ if(flock(FILE, LOCK_EX|LOCK_NB)); ++ open FILE, "ipd/$_" or next; ++ unlink "ipd/$_" if(flock(FILE, LOCK_EX|LOCK_NB)); + } + } + +Index: ocsinventory-server-1.01/ocsreports/ipdiscover.php +=================================================================== +--- ocsinventory-server-1.01.orig/ocsreports/ipdiscover.php 2007-05-04 10:07:32.000000000 +0200 ++++ ocsinventory-server-1.01/ocsreports/ipdiscover.php 2007-05-04 10:11:11.000000000 +0200 +@@ -18,7 +18,7 @@ + if( ! is_executable($fipdisc) ) { + $scriptPresent = false; + } +- else if( ! is_writable(".") ) { ++ else if( ! is_writable("ipd") ) { + $scriptPresent = false; + } + } +@@ -38,7 +38,7 @@ + if( ! is_executable($fipdisc) ) { + echo "
$fipdisc ".$l->g(341)."
"; + } +- else if( ! is_writable(".") ) { ++ else if( ! is_writable("ipd") ) { + echo "
".$l->g(342)." $fipdisc
"; + } + } --- ocsinventory-server-1.02.2.orig/debian/patches/hardcoded-dbauth.patch +++ ocsinventory-server-1.02.2/debian/patches/hardcoded-dbauth.patch @@ -0,0 +1,13 @@ +Index: ocsinventory-server/ocsreports/install.php +=================================================================== +--- ocsinventory-server.orig/ocsreports/install.php 2009-05-19 22:32:53.000000000 +0200 ++++ ocsinventory-server/ocsreports/install.php 2009-05-19 22:33:53.000000000 +0200 +@@ -252,7 +252,7 @@ + echo "
MySql config file successfully written (using ".$_POST["name"]." account)
"; + } else { + // Use account created during installation +- fwrite($ch,""); ++ fwrite($ch,""); + fclose($ch); + echo "
MySql config file successfully written (using new ocs account)
"; + }