From 05397d635c3f218b850775223aa5dd705da9f91c Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Fri, 12 Jan 2018 00:03:51 +0100 Subject: [PATCH] release 1.1.6 --- CREDITS | 2 ++ ChangeLog | 47 ++++++++++++++++++++++++++++++++ VERSION | 2 +- debian/changelog | 11 +++++++- debian/control | 6 ++-- debian/davical.lintian-overrides | 14 +++++----- htdocs/always.php | 4 +-- inc/always.php.in | 5 ++-- 8 files changed, 75 insertions(+), 16 deletions(-) diff --git a/CREDITS b/CREDITS index d426fb70..e887c3b6 100644 --- a/CREDITS +++ b/CREDITS @@ -27,6 +27,7 @@ Aurelien Requiem Benoît Bleuzé Christian Kier Christoph Anton Mitterer +CSchulz Cyril Giraud Daniel Aleksandersen DAViCal Administrator @@ -43,6 +44,7 @@ Henri Sivonen Jan Losinski Ján Máté Jason Alavaliant +Jean-Baptiste Guerraz Jens Zahner Jeppe Bob Dyrby Jeroen van Disseldorp diff --git a/ChangeLog b/ChangeLog index 8323f557..90222737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,50 @@ +2018-01-11 Florian Schlichting + * switch to doxygen for api docs + * put the most important debug options in a more visible place + +2016-01-21 Frank Steinberg + * Improved handling of event modifications + +2016-06-23 Andrew McMillan + * Fix common etag match code, use it everywhere. + * Tidy up some PHPdoc in DAVResource + +2018-01-10 Jean-Baptiste Guerraz + * use php ldap explode in order to be compatible with any dn + * sync ldap user - reactivate + +2018-01-09 Andrew McMillan + * Correctly handle durations without units like "PT" + +2018-01-09 Florian Schlichting + * add regression tests for iCal handling calendar delegations + * drop tests/regression-suite/0528, same as 0527 + * rename DAVResource->_is_proxy_request to _is_proxy_resource + * Finally: implement managing calendar delegations from iCal + * group-member-set and group-membership queries on proxy resources should be handled in DAVResource + * update regression tests due to FetchProxyGroups changes + * DAVPrincipal->FetchProxyGroups(): disable grants_proxy_access_from_p() + * DAVPrincipal->FetchProxyGroups(): invert arguments to pprivs() + +2018-01-08 Florian Schlichting + * add DAVResource->IsProxyCollection() + +2018-01-07 Florian Schlichting + * advertise support for principal-match REPORT + * clean up obsolete code: supported_methods and supported_reports was moved to DAVResource + +2018-01-04 Florian Schlichting + * update doc and fix a warning + +2018-01-03 Florian Schlichting + * UI: create external bindings with type set (fix: #132) + +2017-11-20 CSchulz + * add PT to follow alias + +2017-10-25 Florian Schlichting + * Document $c->hide_bound and $c->disable_caldav_proxy_propfind_collections config options + 2017-10-09 Florian Schlichting * 'perl update-davical-database' did not find the intended config file / patchdir diff --git a/VERSION b/VERSION index 0664a8fd..2bf1ca5f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.6 +1.1.7 diff --git a/debian/changelog b/debian/changelog index 5d4b0eeb..52930f16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +davical (1.1.7-1) unstable; urgency=medium + + * New upstream release + * Bump dependency on AWL to 0.59 + * Declare compliance with Debian Policy 4.1.3 + * Update lintian-overrides + + -- Florian Schlichting Fri, 12 Jan 2018 00:04:06 +0100 + davical (1.1.6-1) unstable; urgency=medium * New upstream release (closes: #704069, #784282, #856467) @@ -49,7 +58,7 @@ davical (1.1.4-1) unstable; urgency=medium references since it was moved to its own git repository. * Don't run make / make built-docs during package build to avoid nasty surprises; files should be up-to-date in git anyway - * Purge /etc/davical/.keep directory + * Purge /etc/davical/.keep directory * Clean source tree before creating orig-source tarball -- Florian Schlichting Mon, 11 Jan 2016 23:56:48 +0100 diff --git a/debian/control b/debian/control index 48840e77..4b64a51e 100644 --- a/debian/control +++ b/debian/control @@ -4,11 +4,11 @@ Priority: optional Maintainer: Davical Development Team Uploaders: Andrew McMillan , Florian Schlichting -Standards-Version: 4.1.1 +Standards-Version: 4.1.3 Build-Depends: debhelper (>= 9), dh-exec, jdupes, - libawl-php (>= 0.58-1~), libawl-php (<< 0.59), + libawl-php (>= 0.59-1~), libawl-php (<< 0.60), gettext, doxygen, php-cli | php5-cli, @@ -20,7 +20,7 @@ Homepage: https://www.davical.org/ Package: davical Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, - libawl-php (>= 0.58-1~), libawl-php (<< 0.59), + libawl-php (>= 0.59-1~), libawl-php (<< 0.60), libdbd-pg-perl, libyaml-perl, php | php5, diff --git a/debian/davical.lintian-overrides b/debian/davical.lintian-overrides index 8cc3e4b2..a29c5981 100644 --- a/debian/davical.lintian-overrides +++ b/debian/davical.lintian-overrides @@ -1,8 +1,8 @@ # this is lintian being stupid and failing to detect our alternative php-cli dependency - remove when dropping php5 -davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/archive-old-events.php -davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/cron-sync-ldap.php -davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/export_calendar.php -davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/load_calendar.php -davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/refresh-alarms.php -davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/sync-remote-caldav.php -davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/tz-update.php +davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/archive-old-events.php #!php +davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/cron-sync-ldap.php #!php +davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/export_calendar.php #!php +davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/load_calendar.php #!php +davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/refresh-alarms.php #!php +davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/sync-remote-caldav.php #!/usr/bin/php +davical: php-script-but-no-php-cli-dep usr/share/davical/scripts/tz-update.php #!php diff --git a/htdocs/always.php b/htdocs/always.php index 23c1b1e3..b4de04e0 100644 --- a/htdocs/always.php +++ b/htdocs/always.php @@ -244,8 +244,8 @@ if ( function_exists('awl_set_locale') ) { * */ $c->code_version = 0; -$c->want_awl_version = '0.58'; -$c->version_string = '1.1.6'; // The actual version # is replaced into that during the build /release process +$c->want_awl_version = '0.59'; +$c->version_string = '1.1.7'; // The actual version # is replaced into that during the build /release process if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) { $c->code_major = $matches[1]; $c->code_minor = $matches[2]; diff --git a/inc/always.php.in b/inc/always.php.in index 84d5ccb3..e511655a 100644 --- a/inc/always.php.in +++ b/inc/always.php.in @@ -344,6 +344,7 @@ function getStatusMessage($status) { * Construct a URL from the supplied dav_name. The URL will be urlencoded, * except for any '/' characters in it. * @param string $partial_path The part of the path after the script name +* @param boolean $force_script Whether to force-include caldav.php in the URL. Defaults to false. */ function ConstructURL( $partial_path, $force_script = false ) { global $c; @@ -379,9 +380,9 @@ function ConstructURL( $partial_path, $force_script = false ) { /** * Deconstruct a dav_name from the supplied URL. The dav_name will be urldecoded. * -* @param string $partial_path The part of the path after the script name +* @param string $url The full path including the script name */ -function DeconstructURL( $url, $force_script = false ) { +function DeconstructURL( $url ) { global $c; $dav_name = rawurldecode($url);