[ocsinventory/f13/master] update to 1.3.3 (bugfix)
Remi Collet
remi at fedoraproject.org
Wed Nov 24 18:04:42 UTC 2010
commit c702d7711f87dfc2416e1a292b21a54db7594ec8
Author: remi <fedora at famillecollet.com>
Date: Wed Nov 24 19:04:45 2010 +0100
update to 1.3.3 (bugfix)
.gitignore | 3 +-
ocsinventory-upstream.patch | 155 ++-----------------------------------------
ocsinventory.spec | 23 +++----
sources | 2 +-
4 files changed, 19 insertions(+), 164 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38271b0..4ca0276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-OCSNG_UNIX_SERVER-1.3.tar.gz
+OCSNG_UNIX_SERVER-1.3.2.tar.gz
+/OCSNG_UNIX_SERVER-1.3.3.tar.gz
diff --git a/ocsinventory-upstream.patch b/ocsinventory-upstream.patch
index 129bc23..c29c00b 100644
--- a/ocsinventory-upstream.patch
+++ b/ocsinventory-upstream.patch
@@ -1,159 +1,14 @@
-force install.php for first install, tx to Remi
- http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/57
-
-When opening the Date Time Picker in the administrative data for an inventoried computer,
-the year comes up as 2005. I tracked down the problem to the file
-/usr/share/ocsinventory-reports/ocsreports/js/datetimepicker.js on line 108 the date is
-being reset to 2005. I fixed this problem in my own installation by adding a line 109
-that reads "Cal.Year = dtToday.getFullYear();", however it would be nice if it were
-fixed in subsequent versions. Thanks, tx to Natrinicle
- https://bugs.launchpad.net/bugs/585077
- http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/58
-
-Fix bug with old cookies when you update OCSREPORT, tx to Remi!!!
- http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/59
- http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/59
+http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/66
=== modified file 'dbconfig.inc.php'
---- dbconfig.inc.php 2009-11-03 19:45:02 +0000
-+++ dbconfig.inc.php 2010-05-19 18:36:54 +0000
+--- ocsreports/dbconfig.inc.php 2010-11-23 08:28:16 +0000
++++ ocsreports/dbconfig.inc.php 2010-11-24 17:11:46 +0000
@@ -1,5 +1,5 @@
<?php
--$_SESSION["SERVEUR_SQL"]="";
-+//$_SESSION["SERVEUR_SQL"]="";
+-$_SESSION["SERVEUR_SQL"]="localhost";
++//$_SESSION["SERVEUR_SQL"]="localhost";
$_SESSION["COMPTE_BASE"]="ocs";
$_SESSION["PSWD_BASE"]="ocs";
?>
\ No newline at end of file
-=== modified file 'js/datetimepicker.js'
---- js/datetimepicker.js 2009-06-29 11:51:53 +0000
-+++ js/datetimepicker.js 2010-05-26 06:36:17 +0000
-@@ -105,7 +105,7 @@
- if (YearPattern.test(strYear))
- Cal.Year=parseInt(strYear,10);
-
-- if( Cal.Year == 0 ) Cal.Year = 2005;
-+ if( Cal.Year == 0 ) Cal.Year = dtToday.getFullYear();
- //end parse year
- //parse time
- if (Cal.ShowTime==true)
-
-=== modified file 'preferences.php'
---- preferences.php 2010-05-03 15:15:39 +0000
-+++ preferences.php 2010-06-17 10:03:38 +0000
-@@ -57,6 +57,19 @@
- $_SESSION["queryString"] .= "&".$key."=".$val;
- }
-
-+
-+//Delete all cookies if GUI_VER change
-+if ($_COOKIE["VERS"] != GUI_VER){
-+ if( isset( $_COOKIE["col"] ) ) {
-+ foreach( $_COOKIE["col"] as $key=>$val ) {
-+ setcookie( "col[$key][value]", FALSE, time() - 3600 ); // deleting corresponding cookie
-+ setcookie( "col[$key][rang]", FALSE, time() - 3600 ); // deleting corresponding cookie
-+ }
-+ unset( $_COOKIE["col"] );
-+ setcookie( "VERS", GUI_VER, time() + 3600 * 24 * 365 ); //expires in 365 days
-+ }
-+}
-+
- if( isset($_GET["uid"]) ) {
- setcookie( "DefNetwork", $_GET["uid"], time() + 3600 * 24 * 15 );
- }
-@@ -369,7 +382,7 @@
- $_POST[$var]=0+$_POST[$var];// si un nombre est attendu, on transforme en nombre
-
- $req->where=str_replace("option$ind",$_POST[$var],$req->where);
-- // on remplace les strings "optionX" de la requete par leurs valeurs présentes dans les variables en POST
-+ // on remplace les strings "optionX" de la requete par leurs valeurs pr�sentes dans les variables en POST
- $ind++;
- $var="option".$ind;
- }
-@@ -575,7 +588,7 @@
- if( $req->countId == "h.id" ) //computer in devices
- echo "<td width='15px'> </td>";*/
-
-- while($colname=mysql_fetch_field($result)) // On récupère le nom de toutes les colonnes
-+ while($colname=mysql_fetch_field($result)) // On r�cup�re le nom de toutes les colonnes
- {
- if($colname->name!="h.id"&&$colname->name!="deviceid")
- {
-@@ -691,7 +704,7 @@
- $listIdGroup .= $valIdGroup['ID'].",";
- }
- $listIdGroup=substr($listIdGroup,0,-1);
-- while($item = mysql_fetch_array($result)) // Parcour de toutes les lignes résultat
-+ while($item = mysql_fetch_array($result)) // Parcour de toutes les lignes r�sultat
- {
- flush();
- echo "<TR height=20px ". ($x == 1 ? "bgcolor='#FFFFFF'" : "bgcolor='#F2F2F2'") .">"; // on alterne les couleurs de ligne
-@@ -734,7 +747,7 @@
- echo "<td> </td>";
- }*/
-
-- foreach($tabChamps as $chmp) {// Affichage de toutes les valeurs résultats
-+ foreach($tabChamps as $chmp) {// Affichage de toutes les valeurs r�sultats
- echo "<td align='center'>";
- $isLink = FALSE;
- if($chmp==TAG_LBL)
-@@ -795,14 +808,14 @@
- //affichage des statistiques pour l'activation de paquet
- if( $teledeploy ) {
- $statResult="";
-- //recherche tous les ID dans download_enable qui correspondent à ce timestamp
-+ //recherche tous les ID dans download_enable qui correspondent � ce timestamp
- $sqlStat="SELECT ID
- FROM download_enable
- WHERE fileid='".$item["Timestamp"]."'";
- $resStat = mysql_query( $sqlStat, $_SESSION["readServer"] );
- $listIdstat="";
- while( $valStat = mysql_fetch_array( $resStat ) ) {
-- //création de la list pour effectuer un "in"
-+ //cr�ation de la list pour effectuer un "in"
- $listIdstat .= $valStat["ID"].",";
- }
- $listIdstat=substr($listIdstat,0,-1);
-@@ -1402,7 +1415,7 @@
- echo "<p align='center'>";
- if( $numPages > 1 ) {
- if( $_SESSION["pageCur"] == 1) {
-- echo " ";//voir grisé
-+ echo " ";//voir gris�
- echo " 1 ..";
- } else {
- echo " {$prefG}-1><img src='image/prec24.png'></a>";
-@@ -1415,7 +1428,7 @@
-
- if( $_SESSION["pageCur"] >= $numPages) {
- echo ".. $numPages ";
-- //echo "<img src='image/proch24.png'> "; voir grisé
-+ //echo "<img src='image/proch24.png'> "; voir gris�
- } else {
- echo ".. {$prefG}$numPages>$numPages</a> ";
- echo "{$prefG}-2><img src='image/proch24.png'></a> ";
-
-=== modified file 'preferences.php'
---- preferences.php 2010-06-17 10:03:38 +0000
-+++ preferences.php 2010-06-17 10:08:54 +0000
-@@ -59,15 +59,15 @@
-
-
- //Delete all cookies if GUI_VER change
--if ($_COOKIE["VERS"] != GUI_VER){
-+if (!isset($_COOKIE["VERS"]) or $_COOKIE["VERS"] != GUI_VER){
- if( isset( $_COOKIE["col"] ) ) {
- foreach( $_COOKIE["col"] as $key=>$val ) {
- setcookie( "col[$key][value]", FALSE, time() - 3600 ); // deleting corresponding cookie
- setcookie( "col[$key][rang]", FALSE, time() - 3600 ); // deleting corresponding cookie
- }
-- unset( $_COOKIE["col"] );
-- setcookie( "VERS", GUI_VER, time() + 3600 * 24 * 365 ); //expires in 365 days
-+ unset( $_COOKIE["col"] );
- }
-+ setcookie( "VERS", GUI_VER, time() + 3600 * 24 * 365 ); //expires in 365 days
- }
-
- if( isset($_GET["uid"]) ) {
-
diff --git a/ocsinventory.spec b/ocsinventory.spec
index 8030299..5e5f6b5 100644
--- a/ocsinventory.spec
+++ b/ocsinventory.spec
@@ -11,8 +11,8 @@
Name: ocsinventory
Summary: Open Computer and Software Inventory Next Generation
-Version: 1.3.2
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2
@@ -22,7 +22,6 @@ URL: http://www.ocsinventory-ng.org/
Source0: http://launchpad.net/ocsinventory-server/stable-1.3/%{version}/+download/%{tarname}-%{version}.tar.gz
Source1: ocsinventory-reports.conf
-Patch0: %{name}-shorttag.patch
# Upstream patch from Bzr
Patch1: %{name}-upstream.patch
@@ -106,16 +105,13 @@ Group: Applications/Internet
Summary: OCS Inventory NG - Communication server
# From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib
Requires: php
-Requires: php-mysql php-zip php-gd
-%if 0%{?rhel} == 4
-Requires: php-domxml
-%else
-Requires: php-xml
-%endif
+Requires: php-mysql php-zip php-gd php-domxml
# Required by the original setup script, but not detected automatically :
Requires: perl(DBD::mysql)
# Required by ipdiscover-util.pl (nmap and nmblookup)
-Requires: nmap samba-client
+Requires: nmap
+# nmblookup is provided by samba or samba3x (EL-5)
+Requires: %{_bindir}/nmblookup
%if %{useselinux}
Requires: policycoreutils
%endif
@@ -133,8 +129,6 @@ navigateur favori.
%prep
%setup -q -n %{tarname}-%{version}
-%patch0 -p1
-cd ocsreports
%patch1 -p0
@@ -284,6 +278,11 @@ fi
%changelog
+* Wed Nov 24 2010 Remi Collet <Fedora at famillecollet.com> - 1.3.3-1
+- update to 1.3.3 (bugfix)
+- clean applied patches
+- requires nbmlookup instead of samba-client, fix #654252
+
* Sat Jun 19 2010 Remi Collet <Fedora at famillecollet.com> - 1.3.2-3
- upstream patches
diff --git a/sources b/sources
index cc2de24..5334fdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aa933f6d9f2bc6071dc3f9f0e669ab33 OCSNG_UNIX_SERVER-1.3.2.tar.gz
+b3f0cc15c6c7ac602bcbfc67a596c98d OCSNG_UNIX_SERVER-1.3.3.tar.gz
More information about the scm-commits
mailing list