Projects
Kolab:16
kolab-freebusy
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 15
View file
kolab-freebusy.spec
Changed
@@ -30,40 +30,22 @@ Group: Applications/Internet License: AGPLv3+ URL: http://kolab.org/about/kolab-freebusy -Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: kolab-freebusy.logrotate BuildArch: noarch -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 +BuildRequires: roundcubemail(core) >= 1.5 %if 0%{?suse_version} Requires: http_daemon Requires: php %else Requires: webserver -Requires: php-common >= 5.3 +Requires: php-common >= 5.6 %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 @@ -77,17 +59,6 @@ %prep %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 \ %{buildroot}/%{_ap_sysconfdir}/conf.d/ \ @@ -114,7 +85,7 @@ popd cp -a public_html %{buildroot}/%{_datadir}/%{name}/public_html -cp -a vendor %{buildroot}/%{_datadir}/%{name}/vendor +ln -s ../roundcubemail/vendor vendor cp -a config/config.ini.sample %{buildroot}/%{_sysconfdir}/%{name}/config.ini @@ -130,6 +101,12 @@ 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
Added
@@ -0,0 +1,22 @@ +#!/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.control
Changed
@@ -15,7 +15,8 @@ php-net-ldap3, php-sabre-vobject-3, roundcubemail-core, - roundcubemail-plugins-kolab + roundcubemail-plugin-libcalendaring, + roundcubemail-plugin-libkolab 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
kolab-freebusy-1.1.2.tar.gz/composer.json
Changed
@@ -2,13 +2,9 @@ "name": "kolab/free-busy", "description": "Kolab Free/Busy Service", "license": "AGPL-3.0", - "version": "1.1.0", + "version": "1.1.2", "repositories": { - "type": "pear", - "url": "http://pear.php.net/" - }, - { "type": "vcs", "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git" } @@ -20,8 +16,7 @@ "sabre/vobject": "~3.3.3" }, "require-dev": { - "pear-pear.php.net/net_ldap2": ">=2.0.12", - "kolab/Net_LDAP3": "dev-master" + "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/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,7 +155,6 @@ } } - $_SERVER'FREEBUSY_USER' = $user; $status = $valid ? 'SUCCESS' : 'FAILURE'; Logger::get('httpauth')->addInfo("Token: authenticating user $user/$token/$ip: $status");
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
.