Projects
Kolab:16:Enterprise
kolab-autoconf
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 16
View file
kolab-autoconf.spec
Changed
@@ -29,7 +29,7 @@ %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name} Name: kolab-autoconf -Version: 1.3.4 +Version: 1.3.5 Release: 1%{?dist} Summary: Autodiscovery for clients of Kolab Groupware @@ -39,9 +39,8 @@ Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz -%if 0%{?plesk} < 1 -Requires: php-kolab-net-ldap3 -%endif +Requires: roundcubemail(core) >= 1.5 +BuildRequires: roundcubemail(core) >= 1.5 Obsoletes: kolab-autodiscover < %{version}-%{release} Provides: kolab-autodiscover = %{version}-%{release} @@ -67,10 +66,20 @@ ln -s ../../..%{_var}/log/%{name} logs popd + +rm -rf vendor +ln -s ../roundcubemail/vendor vendor + %if 0%{?plesk} < 1 %{__install} -pm 644 docs/%{name}.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf %endif +%pretrans +# upgrade path for `vendor` directory -> symlink change. Is just a vendor directory, so we don't do the rpmmoved dance. +if -d "/usr/share/kolab-autoconf/vendor" -a ! -L "/usr/share/kolab-autoconf/vendor" ; then + rm -rf /usr/share/kolab-autoconf/vendor +fi + %files %defattr(-,root,root,-) %doc docs/*
View file
debian.changelog
Changed
@@ -1,3 +1,15 @@ +kolab-autoconf (1.3.5-1) unstable; urgency=medium + + * PHP 8 fixes + + -- Christian Mollekopf <mollekopf@apheleia-it.ch> Thu, 22 Dec 2022 16:24:02 +0100 + +kolab-autoconf (1.3.4-2) unstable; urgency=medium + + * Symlink to roundcube vendor directory + + -- Christian Mollekopf <mollekopf@apheleia-it.ch> Thu, 22 Dec 2022 16:24:02 +0100 + kolab-autoconf (1.3.4-1) unstable; urgency=medium * Release 1.3.4
View file
debian.rules
Changed
@@ -4,10 +4,6 @@ export DH_VERBOSE=1 override_dh_auto_install: - if ! -f "/etc/plesk-release" ; then \ - echo "misc:Depends=php-net-ldap3" >> $(CURDIR)/debian/kolab-autoconf.substvars ; \ - fi - dh_auto_install %:
View file
debian.tar.gz/links
Changed
@@ -1,1 +1,2 @@ /var/log/kolab-autoconf usr/share/kolab-autoconf/logs +usr/share/roundcubemail/vendor /usr/share/kolab-autoconf/vendor
View file
kolab-autoconf-1.3.5.tar.gz/composer.json
Added
@@ -0,0 +1,17 @@ +{ + "name": "kolab/autoconf", + "description": "The Autoconf Service for Kolab", + "license": "AGPL-3.0+", + "require": { + "php": ">=5.4.0", + "pear/pear-core-minimal": "~1.10.1", + "pear/net_socket": "~1.2.1", + "pear/net_ldap2": "~2.2.0", + "kolab/net_ldap3": "dev-master", + "zf1s/zend-json": "~1.12.20", + "zf1s/zend-log": "~1.12.20" + }, + "require-dev": { + "phpunit/phpunit": "^4.8 || ^5.7 || ^6 || ^7" + } +}
View file
kolab-autoconf-1.3.4.tar.gz/lib/Autodiscover.php -> kolab-autoconf-1.3.5.tar.gz/lib/Autodiscover.php
Changed
@@ -156,7 +156,7 @@ if ($value = $this->conf->get('autodiscover', $type)) { $params = explode(';', $value); - $pass_secure = in_array($params1, array('CRAM-MD5', 'DIGEST-MD5')); + $pass_secure = in_array($params1 ?? null, array('CRAM-MD5', 'DIGEST-MD5')); $host = $params0; $host = str_replace('%d', $this->config'domain', $host); @@ -165,8 +165,8 @@ $this->config$type = array( 'hostname' => $url'host', 'port' => $url'port', - 'socketType' => $proto_map$url'scheme' ?: 'plain', - 'username' => $this->config'login' ?: $this->config'email', + 'socketType' => ($proto_map$url'scheme' ?? false) ?: 'plain', + 'username' => ($this->config'login' ?? false) ?: $this->config'email', 'authentication' => 'password-' . ($pass_secure ? 'encrypted' : 'cleartext'), ); } @@ -233,8 +233,6 @@ $this->_ldap_port = $this->_ldap_scheme == 'ldaps' ? 636 : 389; } - require_once 'Net/LDAP3.php'; - $this->ldap = new Net_LDAP3(array( 'debug' => in_array(strtolower($this->conf->get('autodiscover', 'debug_mode')), array('trace', 'debug')), 'log_hook' => array($this, 'ldap_log'),
View file
kolab-autoconf-1.3.4.tar.gz/lib/AutodiscoverMicrosoft.php -> kolab-autoconf-1.3.5.tar.gz/lib/AutodiscoverMicrosoft.php
Changed
@@ -159,11 +159,11 @@ $dispname = $xml->createElement('DisplayName'); $dispname = $user->appendChild($dispname); - $dispname->appendChild($xml->createTextNode($this->config'username')); + $dispname->appendChild($xml->createTextNode($this->config'username' ?? null)); $email = $xml->createElement('EMailAddress'); $email = $user->appendChild($email); - $email->appendChild($xml->createTextNode($this->config'login' ?: $this->config'email')); + $email->appendChild($xml->createTextNode(($this->config'login' ?? false) ?: $this->config'email')); $element = $xml->createElement('Type'); $element = $server->appendChild($element); @@ -212,11 +212,11 @@ $dispname = $xml->createElement('DisplayName'); $dispname = $user->appendChild($dispname); - $dispname->appendChild($xml->createTextNode($this->config'username')); + $dispname->appendChild($xml->createTextNode($this->config'username' ?? null)); $email = $xml->createElement('AutoDiscoverSMTPAddress'); $email = $user->appendChild($email); - $email->appendChild($xml->createTextNode($this->config'login' ?: $this->config'email')); + $email->appendChild($xml->createTextNode(($this->config'login' ?? false) ?: $this->config'email')); // @TODO: Microsoft supports also DAV protocol here foreach (array('imap', 'pop3', 'smtp') as $type) {
View file
kolab-autoconf-1.3.4.tar.gz/lib/Conf.php -> kolab-autoconf-1.3.5.tar.gz/lib/Conf.php
Changed
@@ -139,16 +139,18 @@ // Fall back to whatever is the equivalent of auth_mechanism as the // section (i.e. 'ldap', or 'sql') - $auth_mech = $this->_conf'kolab''auth_mechanism'; - if (isset($this->_conf$auth_mech)) { - if (isset($this->_conf$auth_mech$key1)) { - return $this->_conf$auth_mech$key1; + if (isset($this->_conf'kolab')) { + $auth_mech = $this->_conf'kolab''auth_mechanism' ?? null; + if ($auth_mech && isset($this->_conf$auth_mech)) { + if (isset($this->_conf$auth_mech$key1)) { + return $this->_conf$auth_mech$key1; + } } - } - // Fall back to global settings in the 'kolab' section. - if (isset($this->_conf'kolab'$key1)) { - return $this->_conf'kolab'$key1; + // Fall back to global settings in the 'kolab' section. + if (isset($this->_conf'kolab'$key1)) { + return $this->_conf'kolab'$key1; + } } return null;
View file
kolab-autoconf-1.3.4.tar.gz/public_html/index.php -> kolab-autoconf-1.3.5.tar.gz/public_html/index.php
Changed
@@ -35,6 +35,12 @@ die("Fatal error: ini_set/set_include_path does not work."); } + +// include composer autoloader (if available) +if (@file_exists(INSTALL_PATH . 'vendor/autoload.php')) { + require INSTALL_PATH . 'vendor/autoload.php'; +} + require_once INSTALL_PATH . '/lib/Autodiscover.php'; // Set internal charset
View file
kolab-autoconf.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-autoconf Binary: kolab-autoconf Architecture: all -Version: 1.3.4-1 +Version: 1.3.5-1 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://www.kolab.org/ @@ -13,5 +13,5 @@ Package-List: kolab-autoconf deb admin extra Files: - 00000000000000000000000000000000 0 kolab-autoconf-1.3.4.tar.gz + 00000000000000000000000000000000 0 kolab-autoconf-1.3.5.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.