Overview
Request 2436 (accepted)
Release version 1.3.1
- Created by vanmeeuwen about 6 years ago
- In state accepted
kolab-autoconf.spec
Changed
x
1
2
%global httpd_name apache23
%global httpd_user wwwrun4
%else5
+%if 0%{?plesk}6
+%global httpd_group roundcube_sysgroup7
+%global httpd_name httpd8
+%global httpd_user roundcube_sysuser9
+%else10
%global httpd_group apache11
%global httpd_name httpd12
%global httpd_user apache13
%endif14
+%endif15
16
%global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}17
18
Name: kolab-autoconf19
-Version: 1.320
-Release: 2%{?dist}21
+Version: 1.3.122
+Release: 1%{?dist}23
Summary: Autodiscovery for clients of Kolab Groupware24
25
Group: Applications/Internet26
License: GPLv3+27
URL: https://kolab.org28
+29
Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz30
31
+%if 0%{?plesk} < 132
Requires: php-kolab-net-ldap333
+%endif34
+35
Obsoletes: kolab-autodiscover < %{version}-%{release}36
Provides: kolab-autodiscover = %{version}-%{release}37
BuildArch: noarch38
39
ln -s ../../..%{_var}/log/%{name} logs40
popd41
42
+%if 0%{?plesk} < 143
%{__install} -pm 644 docs/%{name}.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf44
+%endif45
46
%files47
%defattr(-,root,root,-)48
%doc docs/*49
+%if 0%{?plesk} < 150
%dir %{_ap_sysconfdir}51
%dir %{_ap_sysconfdir}/conf.d52
%config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf53
+%endif54
%{_datadir}/%{name}55
%attr(0750,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}56
57
%changelog58
-* Sat Dec 1 2018 Timotheus Pokorra <tp@tbits.net> - 1.3-259
-- require php-kolab-net-ldap3 because it was upgraded in EPEL60
+* Mon Mar 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.1-161
+- Release 1.3.162
+63
+* Wed Jun 27 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3.0-164
+- Release version 1.3.065
66
* Mon Oct 9 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3-167
- Release version 1.368
debian.changelog
Changed
29
1
2
+kolab-autoconf (1.3.1-1) unstable; urgency=medium3
+4
+ * Release of version 1.3.1.5
+6
+ -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Mon, 18 Mar 2019 16:24:02 +01007
+8
+kolab-autoconf (1.3.0-3) unstable; urgency=medium9
+10
+ * Fix dependency - the Debian package is called php-net-ldap311
+12
+ -- Christoph Erhardt <kolab@sicherha.de> Mon, 24 Sep 2018 08:30:49 +020013
+14
+kolab-autoconf (1.3.0-2) unstable; urgency=medium15
+16
+ * Omit requiring php-kolab-net-ldap3 on systems that do not use LDAP17
+18
+ -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Wed, 4 Jul 2018 16:24:02 +010019
+20
+kolab-autoconf (1.3.0-1) unstable; urgency=medium21
+22
+ * Adjust dependencies and build dependencies.23
+24
+ -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Wed, 27 Jun 2018 16:24:02 +010025
+26
kolab-autoconf (1.3-1) unstable; urgency=medium27
28
* Release of version 1.3.29
debian.control
Changed
10
1
2
Maintainer: André Keller <andre.keller@vshn.ch>3
Section: database4
Priority: optional5
-Build-Depends: debhelper (>=9.0.0)6
+Build-Depends: debhelper (>=9.0.0), psa | bash7
Standards-Version: 3.9.58
9
Package: kolab-autoconf10
debian.rules
Changed
16
1
2
#!/usr/bin/make -f3
4
+export DH_OPTIONS=-v5
+export DH_VERBOSE=16
+7
+override_dh_auto_install:8
+ if [ ! -f "/etc/plesk-release" ]; then \9
+ echo "misc:Depends=php-net-ldap3" >> $(CURDIR)/debian/kolab-autoconf.substvars ; \10
+ fi11
+12
+ dh_auto_install13
+14
%:15
dh $@16
kolab-autoconf-1.3.tar.gz/lib/Autodiscover.php -> kolab-autoconf-1.3.1.tar.gz/lib/Autodiscover.php
Changed
40
1
2
protected function get_user($email, $domain)3
{4
// initialize LDAP connection5
- $this->ldap();6
+ $result = $this->init_ldap();7
+8
+ if (!$result) {9
+ $this->config = array_merge(10
+ $this->config,11
+ Array('mail' => $email, 'domain' => $domain)12
+ );13
+14
+ return;15
+ }16
17
// find domain18
if (!$this->ldap->find_domain($domain)) {19
20
/**21
* Initialize LDAP connection22
*/23
- protected function ldap()24
+ protected function init_ldap()25
{26
- $uri = parse_url($this->conf->get('ldap_uri'));27
+ $ldap_uri = $this->conf->get('ldap_uri', false);28
+29
+ if (!$ldap_uri) {30
+ return false;31
+ }32
+33
+ $uri = parse_url($ldap_uri);34
35
- $this->_ldap_server = $uri['host'];36
+ $this->_ldap_server = ($uri['scheme'] === 'ldaps' ? 'ldaps://' : '') . $uri['host'];37
$this->_ldap_port = $uri['port'];38
$this->_ldap_scheme = $uri['scheme'];39
$this->_ldap_bind_dn = $this->conf->get('ldap', 'service_bind_dn');40
kolab-autoconf-1.3.tar.gz/lib/Conf.php -> kolab-autoconf-1.3.1.tar.gz/lib/Conf.php
Changed
45
1
2
{3
// Do some magic configuration loading here.4
if (!file_exists(self::CONFIG_FILE)) {5
+ $this->_conf = Array(6
+ 'autodiscover' => Array(7
+ 'activesync' => '%d',8
+ 'imap' => 'ssl://%d:993',9
+ 'smtp' => 'ssl://%d:465',10
+ 'service_name' => 'Kolab Groupware',11
+ 'service_short' => 'Kolab',12
+ )13
+ );14
+15
return;16
}17
18
19
return (string) $value;20
}21
22
- public function get_list($key1, $key2 = NULL)23
+ public function get_list($key1, $key2 = null)24
{25
$list = array();26
$value = $this->get($key1, $key2);27
28
return $list;29
}30
31
- public function get_raw($key1, $key2 = NULL)32
+ public function get_raw($key1, $key2 = null)33
{34
if (isset($this->_conf[$key1])) {35
if ($key2) {36
37
return null;38
}39
40
- public function expand($str, $custom = FALSE)41
+ public function expand($str, $custom = false)42
{43
if (preg_match_all('/%\((?P<variable>\w+)\)s/', $str, $matches)) {44
if (isset($matches['variable']) && !empty($matches['variable'])) {45
kolab-autoconf-1.3.tar.gz/lib/Log.php -> kolab-autoconf-1.3.1.tar.gz/lib/Log.php
Changed
10
1
2
}3
4
if (!empty($args)) {5
- $logline .= var_export($args, TRUE);6
+ $logline .= var_export($args, true);7
}8
}9
10
kolab-autoconf.dsc
Changed
21
1
2
Source: kolab-autoconf3
Binary: kolab-autoconf4
Architecture: all5
-Version: 1.3-16
+Version: 1.3.1-17
Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>8
Uploaders: Tobias Brunner <tobias.brunner@vshn.ch>9
Homepage: http://www.kolab.org/10
Standards-Version: 3.9.311
Vcs-Browser: http://git.kolabsys.com/apt/kolab-autoconf/12
Vcs-Git: git://git.kolabsys.com/git/apt/kolab-autoconf13
-Build-Depends: debhelper (>= 8)14
+Build-Depends: debhelper (>= 8), psa | bash15
Package-List:16
kolab-autoconf deb admin extra17
Files:18
- 00000000000000000000000000000000 0 kolab-autoconf-1.3.tar.gz19
+ 00000000000000000000000000000000 0 kolab-autoconf-1.3.1.tar.gz20
00000000000000000000000000000000 0 debian.tar.gz21
Refresh
Refresh
Login required, please
login
in order to comment
Request History
vanmeeuwen created request about 6 years ago
Release version 1.3.1
vanmeeuwen accepted review about 6 years ago
Accept
vanmeeuwen accepted review about 6 years ago
Accept
vanmeeuwen approved review about 6 years ago
Accept
vanmeeuwen accepted request about 6 years ago
Accept