Request 2282 (accepted)

This request supersedes: request 2281 (Show diff)

Overview

Request 2282 (accepted)

Update to 1.0.7

Created by vanmeeuwen over 6 years ago
In state accepted
Supersedes 2281
Open review for Admin
Open review for vanmeeuwen

Submit php-kolab-net-ldap3

Submit package Kolab:Winterfell / php-kolab-net-ldap3 to package Kolab:16 / php-kolab-net-ldap3

php-kolab-net-ldap3.spec Changed

@@ -24,8 +24,8 @@
 %else
 Name:               php-kolab-net-ldap3
 %endif
-Version:            1.0.6
-Release:            2%{?dist}
+Version:            1.0.7
+Release:            1%{?dist}
 Summary:            Object oriented interface for searching and manipulating LDAP-entries
 Group:              Development/Libraries
 License:            GPLv3+
@@ -33,10 +33,6 @@
 
 Source0:            pear-Net-LDAP3-%{version}.tar.gz
 
-Patch0001:          0001-Improve-setup-of-the-schema-cache-location.patch
-Patch0002:          0002-Fix-regression-in-setting-LDAP-cache-file-path.patch
-Patch0003:          0003-Fix-bug-where-ldapsearch-command-was-failing-when-co.patch
-
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:          noarch
 
@@ -53,10 +49,6 @@
 %prep
 %setup -q -n pear-Net-LDAP3-%{version}
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-
 %build
 
 %install
@@ -79,6 +71,9 @@
 %{_datadir}/%{php}/Net/LDAP3/Result.php
 
 %changelog
+* Wed Jun 20 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.0.7-1
+- Release of version 1.0.7
+
 * Thu May 03 2018 Christoph Erhardt <kolab@sicherha.de> - 1.0.6-2
 - Fix upgrade path

0001-Improve-setup-of-the-schema-cache-location.patch Deleted

@@ -1,30 +0,0 @@
-From d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837 Mon Sep 17 00:00:00 2001
-Message-Id: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Fri, 24 Nov 2017 11:59:50 +0100
-Subject: [PATCH 1/3] Improve setup of the schema cache location
-
-1. Prevent from errors when the host is configured e.g. with ldap:// prefix
-2. Use sys_get_temp_dir() to get the system tmp directory
----
- lib/Net/LDAP3.php | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
-index 8872e47..b5dcae3 100644
---- a/lib/Net/LDAP3.php
-+++ b/lib/Net/LDAP3.php
-@@ -2149,8 +2149,9 @@ class Net_LDAP3
-             );
- 
-             $_ldap_schema_cache_cfg = array(
--                'path' => "/tmp/" . $host . ":" . ($port ? $port : '389') . "-Net_LDAP2_Schema.cache",
-                 'max_age' => 86400,
-+                'path' => sprintf('%s/%s:%d-Net_LDAP2_Schema.cache',
-+                    (sys_get_temp_dir() ?: '/tmp'), str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
-             );
- 
-             $_ldap = Net_LDAP2::connect($_ldap_cfg);
--- 
-2.14.1
-

0002-Fix-regression-in-setting-LDAP-cache-file-path.patch Deleted

@@ -1,30 +0,0 @@
-From 858fd6076366626b6ff45e8bdf57dedeb210ce34 Mon Sep 17 00:00:00 2001
-Message-Id: <858fd6076366626b6ff45e8bdf57dedeb210ce34.1525290244.git.christoph@terra.fritz.box>
-In-Reply-To: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
-References: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Tue, 26 Dec 2017 08:10:41 +0000
-Subject: [PATCH 2/3] Fix regression in setting LDAP cache file path
-
----
- lib/Net/LDAP3.php | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
-index b5dcae3..937c785 100644
---- a/lib/Net/LDAP3.php
-+++ b/lib/Net/LDAP3.php
-@@ -2150,8 +2150,8 @@ class Net_LDAP3
- 
-             $_ldap_schema_cache_cfg = array(
-                 'max_age' => 86400,
--                'path' => sprintf('%s/%s:%d-Net_LDAP2_Schema.cache',
--                    (sys_get_temp_dir() ?: '/tmp'), str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
-+                'path' => sprintf('%s/%s-Net_LDAP2_Schema.cache',
-+                    sys_get_temp_dir() ?: '/tmp', str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
-             );
- 
-             $_ldap = Net_LDAP2::connect($_ldap_cfg);
--- 
-2.14.1
-

0003-Fix-bug-where-ldapsearch-command-was-failing-when-co.patch Deleted

@@ -1,29 +0,0 @@
-From 56210fdaec70bc1f8f7455a75a6cd34e3a2f7e6d Mon Sep 17 00:00:00 2001
-Message-Id: <56210fdaec70bc1f8f7455a75a6cd34e3a2f7e6d.1525290244.git.christoph@terra.fritz.box>
-In-Reply-To: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
-References: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Tue, 26 Dec 2017 08:13:24 +0000
-Subject: [PATCH 3/3] Fix bug where ldapsearch command was failing when
- configured host contained protocol schema prefix
-
----
- lib/Net/LDAP3.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
-index 937c785..b12185f 100644
---- a/lib/Net/LDAP3.php
-+++ b/lib/Net/LDAP3.php
-@@ -738,7 +738,7 @@ class Net_LDAP3
-                 $moz_ldapsearch,
-                 '-x',
-                 '-h',
--                $this->_current_host,
-+                preg_replace('|^[a-z]+://|i', '', $this->_current_host),
-                 '-p',
-                 $this->config_get('port', 389),
-                 '-b',
--- 
-2.14.1
-

debian.changelog Changed

debian.series Changed

pear-Net-LDAP3-1.0.6.tar.gz/lib/Net/LDAP3.php -> pear-Net-LDAP3-1.0.7.tar.gz/lib/Net/LDAP3.php Changed

php-net-ldap3.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2282 0

Request History

vanmeeuwen created request over 6 years ago

Update to 1.0.7

sicherha accepted request over 6 years ago