Kolab Groupware OBS

kolab-freebusy.spec Changed

@@ -21,32 +21,49 @@
 %endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
-%global upstream_version 1.1.2
 
 Name:           kolab-freebusy
-Version: 1.1.2.6
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Kolab Free/Busy Web Presentation Layer
 
 Group:          Applications/Internet
 License:        AGPLv3+
 URL:            http://kolab.org/about/kolab-freebusy
-Source0:        %{name}-%{upstream_version}.tar.gz
+Source0:        http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 Source1:        kolab-freebusy.logrotate
 
 BuildArch:      noarch
 
-BuildRequires:  roundcubemail(core) >= 1.5
+BuildRequires:  composer
+%if 0%{?fedora}
+# fix issue:
+# have choice for php-composer(justinrainbow/json-schema) >= 2.0 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema
+# have choice for php-composer(justinrainbow/json-schema) < 5 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema php-JsonSchema
+BuildRequires:  php-justinrainbow-json-schema4
+%endif
+
+BuildRequires:  php-Monolog
+BuildRequires:  php-sabre-dav >= 2.1.3
+BuildRequires:  roundcubemail(core)
+BuildRequires:  roundcubemail-plugins-kolab
 
 %if 0%{?suse_version}
 Requires:       http_daemon
 Requires:       php
 %else
 Requires:       webserver
-Requires:       php-common >= 5.6
+Requires:       php-common >= 5.3
 %endif
 
+Requires:       kolab-utils
 Requires:       logrotate
+Requires:       php-ldap
+Requires:       php-Monolog
+Requires:       php-kolab-net-ldap3
+Requires:       php-sabre-dav >= 2.1.3
+Requires:       roundcubemail(core)
+Requires:       roundcubemail-plugins-kolab
 
 %if 0%{?fedora} >= 21
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
@@ -58,7 +75,18 @@
 for its users.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q
+
+%build
+rm -rf composer.json
+mv composer.json-dist composer.json
+mkdir -p $HOME/.composer/
+echo '{}' > $HOME/.composer/composer.json
+%if 0%{?fedora} >= 25
+# workaround for misbehaving Kolab modules for PHP7, probably a swig issue
+export USE_ZEND_ALLOC=0
+%endif
+composer -vvv dumpautoload --optimize
 
 %install
 mkdir -p \
@@ -86,6 +114,8 @@
 popd
 
 cp -a public_html %{buildroot}/%{_datadir}/%{name}/public_html
+cp -a vendor %{buildroot}/%{_datadir}/%{name}/vendor
+
 cp -a config/config.ini.sample %{buildroot}/%{_sysconfdir}/%{name}/config.ini
 
 pushd %{buildroot}/%{_datadir}/%{name}/config
@@ -95,18 +125,11 @@
 popd
 
 pushd %{buildroot}/%{_datadir}/%{name}/
-ln -s ../roundcubemail/vendor vendor
 ln -s ../../..%{_localstatedir}/log/%{name} logs
 popd
 
 find %{buildroot}/%{_datadir}/%{name} -type f -name ".*" -delete
 
-%pretrans
-# upgrade path for `vendor` directory -> symlink change. It's a vendor directory, so we don't do the rpmmoved dance.
-if  -d "/usr/share/kolab-freebusy/vendor" -a ! -L "/usr/share/kolab-freebusy/vendor" ; then
-    rm -rf /usr/share/kolab-freebusy/vendor
-fi
-
 %pre
 # This is replaced by an actual directory
 if  -L "%{_datadir}/kolab-freebusy/config" ; then

buildtarball.sh Deleted

debian.changelog Changed

debian.control Changed

debian.rules Changed

debian.tar.gz/install Changed

debian.tar.gz/links Changed

kolab-freebusy-1.1.2.tar.gz/composer.json Changed

kolab-freebusy-1.1.2.tar.gz/config/config.ini.sample Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/Config.php Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/Directory.php Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/DirectoryLDAP.php Changed

@@ -49,7 +49,7 @@
 			'hosts'     => array($config'host'),
 			'port'      => $host'port' ?: 389,
 			'use_tls'   => $host'scheme' == 'tls',
-			'root_dn'   => ($config'root_dn' ?? null) ?: ($config'base_dn' ?? null),
+			'root_dn'   => $config'root_dn' ?: $config'base_dn',
 			'log_hook'  => array($this, 'log'),
 		) + $config;
 
@@ -113,10 +113,10 @@
 
 			// result attributes
 			$attribs = array_unique(array_merge(
-					Config::convert($this->config'mail_attributes' ?? null, Config::ARR),
-					Config::convert($this->config'attributes' ?? null, Config::ARR), // deprecated
-					Config::convert($this->config'resolve_dn' ?? null, Config::ARR),
-					Config::convert($this->config'resolve_attribute' ?? null, Config::ARR)
+					Config::convert($this->config'mail_attributes', Config::ARR),
+					Config::convert($this->config'attributes', Config::ARR), // deprecated
+					Config::convert($this->config'resolve_dn', Config::ARR),
+					Config::convert($this->config'resolve_attribute', Config::ARR)
 			));
 
 			// search with configured base_dn and filter

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/HTTPAuth.php Changed

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/SourceIMAP.php Changed

@@ -139,7 +139,7 @@
 				}
 
 				// set ACL (temporarily)
-				if ($config'acl' ?? null) {
+				if ($config'acl') {
 					$folder->_old_acl = $folder->get_myrights();
 					$imap->set_acl($folder->name, $config'user', $config'acl');
 				}
@@ -147,7 +147,7 @@
 				foreach ($folder->select($query) as $event) {
 					//$log->debug('Processing event', $event);
 
-					if ($event'cancelled' ?? null) {
+					if ($event'cancelled') {
 						continue;
 					}
 
@@ -178,16 +178,15 @@
 
 					// avoid duplicate entries
 					$key = $event'start'->format('c') . '/' . $event'end'->format('c');
-					if (!empty($seen$key)) {
+					if ($seen$key++) {
 						$log->debug('Skipping duplicate event at ' . $key, array($event'uid', $event'title'));
 						continue;
 					}
-                    $seen$key = true;
 
 					// copied from libvcalendar::_to_ical()
 					$ve = $this->to_vevent($event, $calendar, $user_email);
 
-					if ($event'recurrence' ?? null) {
+					if ($event'recurrence') {
 						if ($exdates = $event'recurrence''EXDATE')
 							unset($event'recurrence''EXDATE');
 						if ($rdates = $event'recurrence''RDATE')
@@ -309,7 +308,7 @@
 	private function imap_disconnect($imap, $config, $folders)
 	{
 		// reset ACL
-		if (($config'acl' ?? null) && !empty($folders)) {
+		if ($config'acl' && !empty($folders)) {
 			foreach ($folders as $folder) {
 				$imap->set_acl($folder->name, $config'user', $folder->_old_acl);
 			}
@@ -347,14 +346,13 @@
 	 */
 	private function check_participation($event, $user_email, &$status = null)
 	{
-        $is_organizer = false;
 		if (is_array($event'organizer') && !empty($event'organizer''email')) {
 			if (in_array($event'organizer''email', $user_email)) {
 				$is_organizer = true;
 			}
 		}
 
-		if (!$is_organizer && is_array($event'attendees' ?? null)) {
+		if (!$is_organizer && is_array($event'attendees')) {
 			foreach ($event'attendees' as $attendee) {
 				if (in_array($attendee'email', $user_email)) {
 					$status = $attendee'status';
@@ -363,7 +361,7 @@
 			}
 		}
 
-		if ($is_organizer || ($event'namespace' ?? null) == 'personal') {
+		if ($is_organizer || $event'namespace' == 'personal') {
 			$status = 'ACCEPTED';
 			if ($event'free_busy' == 'tentative') {
 				$status = 'TENTATIVE';

kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/Utils.php Changed

kolab-freebusy-1.1.2.tar.gz/public_html/index.php Changed

kolab-freebusy.dsc Changed

release.sh Deleted

Changes of Revision 2