summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-07-27 11:53:09 +0200
committerRemi Collet <fedora@famillecollet.com>2016-07-27 11:53:09 +0200
commit9ae8d28620601acfb9af0cb56de216dfd1b46558 (patch)
treeff90e2ad7f681e82217e546042774ca2ef4a09c3
parent7a28706a1a1e3f9acddd8a67ef860ebf03814483 (diff)
glpi: 0.90.5
-rw-r--r--glpi-0.90-upstream2.patch59
-rw-r--r--glpi.spec10
2 files changed, 6 insertions, 63 deletions
diff --git a/glpi-0.90-upstream2.patch b/glpi-0.90-upstream2.patch
deleted file mode 100644
index 148d2f8..0000000
--- a/glpi-0.90-upstream2.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4a857c3bfd2354196b7035e1ab6356b724813df7 Mon Sep 17 00:00:00 2001
-From: Johan Cwiklinski <jcwiklinski@teclib.com>
-Date: Tue, 19 Jul 2016 16:17:38 +0200
-Subject: [PATCH] Only check for param name, we do not have any CommonDBTM
- subclass here
-
----
- ajax/dropdownRubDocument.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ajax/dropdownRubDocument.php b/ajax/dropdownRubDocument.php
-index f057b6c..15f321d 100644
---- a/ajax/dropdownRubDocument.php
-+++ b/ajax/dropdownRubDocument.php
-@@ -67,7 +67,7 @@
- }
- }
-
-- if (!is_subclass_of($_POST['myname'], 'CommonDBTM')) {
-+ if (preg_match('/[^a-z_\-0-9]/i', $_POST['myname'])) {
- throw new \RuntimeException('Invalid name provided!');
- }
-
-From fae0968a43947354598e073ab311970b5eb546e5 Mon Sep 17 00:00:00 2001
-From: Johan Cwiklinski <jcwiklinski@teclib.com>
-Date: Tue, 19 Jul 2016 16:36:09 +0200
-Subject: [PATCH] Fix overrided variable
-
----
- ajax/dropdownRubDocument.php | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/ajax/dropdownRubDocument.php b/ajax/dropdownRubDocument.php
-index 15f321d..9a1cab3 100644
---- a/ajax/dropdownRubDocument.php
-+++ b/ajax/dropdownRubDocument.php
-@@ -50,16 +50,16 @@
-
- // Clean used array
- if (isset($_POST['used']) && is_array($_POST['used']) && (count($_POST['used']) > 0)) {
-- $used = '';
-- foreach ($_POST['used'] as $used) {
-- if ($used !== '') {
-- $used .= ', ';
-+ $used_qry = '';
-+ foreach ($_POST['used'] as $current_used) {
-+ if ($used_qry !== '') {
-+ $used_qry .= ', ';
- }
-- $used .= (int)$used;
-+ $used_qry .= (int)$current_used;
- }
- $query = "SELECT `id`
- FROM `glpi_documents`
-- WHERE `id` IN (".$used.")
-+ WHERE `id` IN (".$used_qry.")
- AND `documentcategories_id` = '".(int)$_POST["rubdoc"]."'";
-
- foreach ($DB->request($query) AS $data) {
diff --git a/glpi.spec b/glpi.spec
index 23f2c76..dad05af 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -27,8 +27,8 @@
%endif
Name: glpi
-Version: 0.90.4
-Release: 2%{?dist}
+Version: 0.90.5
+Release: 1%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -49,7 +49,6 @@ Patch0: glpi-0.90-cron.patch
Patch1: glpi-0.90-autoload.patch
# Upstream patches
Patch2: glpi-0.90-upstream.patch
-Patch3: glpi-0.90-upstream2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -135,7 +134,6 @@ grep %{version} config/define.php
%patch0 -p0
%patch1 -p0
%patch2 -p1
-%patch3 -p1
find . -name \*.orig -exec rm {} \; -print
@@ -333,6 +331,10 @@ fi
%changelog
+* Wed Jul 27 2016 Remi Collet <remi@fedoraproject.org> - 0.90.5-1
+- update to 0.90.5
+ https://github.com/glpi-project/glpi/issues?q=milestone:0.90.5
+
* Sat Jul 23 2016 Remi Collet <remi@fedoraproject.org> - 0.90.4-2
- fix regression in document form, adding upstream patch