Projects
Kolab:16
kolab-freebusy-old
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 2
View file
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
View file
buildtarball.sh
Deleted
@@ -1,22 +0,0 @@ -#!/bin/bash - -set -e - -VERSION=1.1.2 -GIT_REF=master -NAME=kolab-freebusy-$VERSION - -ROOT_DIR=$(pwd) - -rm -Rf /tmp/$NAME -mkdir /tmp/$NAME -cd /tmp/$NAME - -rm -f $NAME.tar.gz - -d "$NAME" && rm -rf "$NAME" -git clone --branch master ssh://git@git.kolab.org/diffusion/F/freebusy.git $NAME -pushd $NAME -git reset --hard $GIT_REF -git archive --prefix=$NAME/ -o "$ROOT_DIR/$NAME.tar.gz" HEAD - -cd "$PWD"
View file
debian.changelog
Changed
@@ -1,9 +1,3 @@ -kolab-freebusy (1.1.0.0-0~kolab4) unstable; urgency=low - - * New release - - -- Christian Mollekopf <mollekopf@apheleia-it.ch> Wed, 09 Aug 2023 11:17:36 +0100 - kolab-freebusy (1.1.0-0~kolab4) unstable; urgency=low * Remove superfluous `conffiles` @@ -11,13 +5,13 @@ -- Christoph Erhardt <kolab@sicherha.de> Thu, 06 Jan 2022 11:17:36 +0100 -kolab-freebusy (1.1.2.6~kolab3) unstable; urgency=low +kolab-freebusy (1.1.2-0~kolab3) unstable; urgency=low * bring postinst script in line with other web packages -- Daniel Hoffend <dh@dotlan.net> Tue, 12 Nov 2019 21:45:23 +0100 -kolab-freebusy (1.1.2.6~kolab2) unstable; urgency=low +kolab-freebusy (1.1.2-0~kolab2) unstable; urgency=low * Release of version 1.1.2
View file
debian.control
Changed
@@ -15,8 +15,7 @@ php-net-ldap3, php-sabre-vobject-3, roundcubemail-core, - roundcubemail-plugin-libcalendaring, - roundcubemail-plugin-libkolab + roundcubemail-plugins-kolab Description: Free/Busy for Kolab Groupware The Kolab Groupware Free/Busy web application offers simple and extended Free/Busy information for Kolab Groupware users,
View file
debian.rules
Changed
@@ -11,6 +11,19 @@ fi override_dh_install: + if -f composer.json-dist ; then \ + rm -rf composer.json ; \ + mv composer.json-dist composer.json ; \ + fi + mkdir -p $(CURDIR)/debian/home/.composer/ + echo '{}' > $(CURDIR)/debian/home/.composer/composer.json + patch -p1 < debian/patches/add-composer-autoloader.diff || : + HOME=$(CURDIR)/debian/home/ composer -vvv dumpautoload --optimize + sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_psr4.php + sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_namespaces.php + sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_classmap.php + sed -i -e "s|__DIR__ . '/../..' . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_static.php || true + dh_install --list-missing -XLICENSE # install sample config
View file
debian.tar.gz/install
Changed
@@ -1,2 +1,3 @@ lib usr/share/kolab-freebusy/ +vendor usr/share/kolab-freebusy/ public_html usr/share/kolab-freebusy/
View file
debian.tar.gz/links
Changed
@@ -3,5 +3,4 @@ etc/roundcubemail/defaults.inc.php /usr/share/kolab-freebusy/config/defaults.inc.php usr/share/roundcubemail/plugins /usr/share/kolab-freebusy/lib/plugins usr/share/roundcubemail/program/lib/Roundcube /usr/share/kolab-freebusy/lib/Roundcube -usr/share/roundcubemail/vendor /usr/share/kolab-freebusy/vendor var/log/kolab-freebusy /usr/share/kolab-freebusy/logs
View file
kolab-freebusy-1.1.2.tar.gz/composer.json
Changed
@@ -2,9 +2,13 @@ "name": "kolab/free-busy", "description": "Kolab Free/Busy Service", "license": "AGPL-3.0", - "version": "1.1.2", + "version": "1.1.0", "repositories": { + "type": "pear", + "url": "http://pear.php.net/" + }, + { "type": "vcs", "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git" } @@ -16,7 +20,8 @@ "sabre/vobject": "~3.3.3" }, "require-dev": { - "kolab/net_ldap3": "dev-master" + "pear-pear.php.net/net_ldap2": ">=2.0.12", + "kolab/Net_LDAP3": "dev-master" }, "minimum-stability": "dev" }
View file
kolab-freebusy-1.1.2.tar.gz/config/config.ini.sample
Changed
@@ -34,7 +34,7 @@ ; base_dn and filter can use these variables: ; %dc = domain root dn, %u = username part, %s = the full username base_dn = "ou=People,dc=example,dc=org" -filter = "(&(objectClass=kolabInetOrgPerson)(|(mail=%s)(alias=%s)))" +filter = "(&(objectClass=kolabInetOrgPerson)(|(mail=%s)(alias=%s))" mail_attributes = mail lc_attributes = mail primary_domain = "example.org"
View file
kolab-freebusy-1.1.2.tar.gz/lib/Kolab/Config.php
Changed
@@ -175,7 +175,7 @@ } else if (is_array($config)) { $pkey = rtrim($prefix, '.'); - $this->data$pkey = is_array($this->data$pkey ?? null) ? array_replace_recursive((array)$this->data$pkey, $config) : $config; + $this->data$pkey = is_array($this->data$pkey) ? array_replace_recursive((array)$this->data$pkey, $config) : $config; } foreach ((array)$config as $key => $val) {
View file
kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/Directory.php
Changed
@@ -78,11 +78,11 @@ // forward request to Source instance if ($data = $source->getFreeBusyData($this->postprocessAttrib($user), $extended)) { // send data through the according format converter - $converter = Format::factory($this->config'format' ?? null); + $converter = Format::factory($this->config'format'); $data = $converter->toVCalendar($data); // cache the generated data - if ($data && !empty($this->config'cacheto') && !$source->isCached()) { + if ($data && $this->config'cacheto' && !$source->isCached()) { $path = preg_replace_callback( '/%\{?(a-z0-9+)\}?/', function($m) use ($user) { return $user$m1; }, @@ -117,4 +117,4 @@ return $attrib; } -} +} \ No newline at end of file
View file
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
View file
kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/HTTPAuth.php
Changed
@@ -44,7 +44,7 @@ // First try token authentication if enabled and user/token detected in the URL if (!empty($_SERVER'FREEBUSY_URI') && Config::boolean($config'allow_token') - && preg_match('|(^@/+@^@/+)/(a-f0-9{32})/|', $_SERVER'FREEBUSY_URI', $matches) + && preg_match('|(^@/+@^@/+)/(a-f0-9{32})$|', $_SERVER'FREEBUSY_URI', $matches) && self::checkToken($config, $matches1, $matches2) ) { return true; @@ -155,6 +155,7 @@ } } + $_SERVER'FREEBUSY_USER' = $user; $status = $valid ? 'SUCCESS' : 'FAILURE'; Logger::get('httpauth')->addInfo("Token: authenticating user $user/$token/$ip: $status");
View file
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';
View file
kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/Utils.php
Changed
@@ -99,7 +99,7 @@ } // range from-to specified (IPv4 only) - list($lower, $upper) = array_pad(explode('-', $range), 2, null); + list($lower, $upper) = explode('-', $range); if (strlen($upper) && !$ipv6) { if ($ipbin >= ip2long(trim($lower)) && $ipbin <= ip2long(trim($upper))) { return true; @@ -107,7 +107,7 @@ } // subnet/length is given - list($subnet, $bits) = array_pad(explode('/', $range), 2, null); + list($subnet, $bits) = explode('/', $range); // IPv6 subnet if (strlen($bits) && $ipv6) {
View file
kolab-freebusy-1.1.2.tar.gz/public_html/index.php
Changed
@@ -56,7 +56,7 @@ $log = Logger::get('web'); - $uri = $_SERVER'REDIRECT_URL' ?? null; + $uri = $_SERVER'REDIRECT_URL'; // we're not always redirected here if (empty($uri)) { @@ -66,7 +66,7 @@ $log->addDebug('Request (redirect): ' . $uri, array('ip' => $remote_ip, 'trusted' => $trusted_ip)); } - list($uri, $args) = array_pad(explode('?', $uri), 2, null); + list($uri, $args) = explode('?', $uri); // check HTTP authentication if (!$trusted_ip && $config->httpauth) { @@ -84,7 +84,7 @@ header('Content-type: text/plain; charset=utf-8', true); // analyse request - $user = $_SERVER'FREEBUSY_USER' ?? null; + $user = $_SERVER'FREEBUSY_USER'; $extended = !empty($_SERVER'FREEBUSY_EXTENDED'); if (!$user) {
View file
kolab-freebusy.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-freebusy Binary: kolab-freebusy Architecture: all -Version: 1.1.2.6-1~kolab1 +Version: 1.1.2-0~kolab4 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://www.kolab.org Standards-Version: 3.9.3
View file
release.sh
Deleted
@@ -1,15 +0,0 @@ -#!/bin/bash - -./buildtarball.sh - -# Autobump the version -CURRENT_VERSION=$(grep '^Version: ' ./*.spec | sed 's/Version: //') -NEW_VERSION=$(echo "$CURRENT_VERSION" | awk -F. '/0-9+\./{$NF++;print}' OFS=.) -echo "Bumping from $CURRENT_VERSION to $NEW_VERSION" - -sed -i "s/$CURRENT_VERSION/$NEW_VERSION/" debian.changelog -sed -i "s/^Version:.*/Version: $NEW_VERSION-1~kolab1/" ./*.dsc -sed -i "s/^Version:.*/Version: $NEW_VERSION/" ./*.spec - -osc ci -m "New release $NEW_VERSION" -osc sr Kolab:16 --yes -m "New release $NEW_VERSION"
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
.