diff --git a/CREDITS b/CREDITS index 71d1dede..d426fb70 100644 --- a/CREDITS +++ b/CREDITS @@ -40,6 +40,7 @@ Francois Marier Francois Perichon Frank Steinberg Henri Sivonen +Jan Losinski Ján Máté Jason Alavaliant Jens Zahner @@ -62,8 +63,11 @@ Patrick Näf Moser Paul Willoughby Peter Schaefer-Hutter Philipp Matthias Hahn +Pierre Giraud Raphael Hertzog +Rik Theys Rob Ostensen Sarenet S.A.U Egoitz Aurrekoetxea +Scott Balneaves Vincent Van Houtte Wolfgang Herget diff --git a/ChangeLog b/ChangeLog index 76c56101..8323f557 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,109 @@ +2017-10-09 Florian Schlichting + * 'perl update-davical-database' did not find the intended config file / patchdir + +2017-10-04 Florian Schlichting + * testsuite: support /principals/users/ and similar special URLs + * testsuite: update for calendar-user-type support + * Update scheduling test-suite: consistent linebreaks, unnecessary quoting, etags + * fix confusing comments + * fix "PHP Warning: preg_match(): No ending delimiter '.' found" + * add a log entry for login failures (fix #105) + * PUT: actually propagate database error to client (fix: #127) + * Update caldav_functions.sql for Postgresql 10 + * fix "PHP Notice: Undefined property" warnings + +2017-10-03 Pierre GIRAUD + * Add support for calendar-user-type + +2016-01-21 Frank Steinberg + * Resolve attendee group names to lists of individual users. Configurable by $c->enable_attendee_group_resolution (from !21) + +2017-09-21 Florian Schlichting + * update tests for changed etags, unstable REV/UID or sort order, improved property parsing + * dav_test: all files and I/O are UTF-8 + * create-database.sh: call update-davical-database with --dbuser instead of just --owner (see #124) + * Card search invalid when negate-condition="no" (fixes #126) + +2017-05-12 Florian Schlichting + * POST: Fix namespace for caldav scheduling privileges + +2017-05-11 Florian Schlichting + * dont put caldav.php in special URLs + +2017-05-01 Florian Schlichting + * log failed attempts to set_dav_property + * group memberships for the calendar-proxy-{read,write} pseudo-principal are always empty + * PROPPATCH: reject protected properties group-membership, calendar-proxy-{read,write}-for + +2017-04-29 Florian Schlichting + * caldav-proxy 5.2: calendar-proxy-read/write are themselves principal resources + * do not advertise ?add_member on a principal + +2017-06-03 Florian Schlichting + * Revert "Support http://.../freebusy.php?foo@example.com" + +2017-05-29 Florian Schlichting + * use new AWL class constructor (fixes: #119) + +2017-05-17 Florian Schlichting + * CalDAVRequest: make content-type match non-greedy + +2017-05-17 Andrew Ruthven + * Improve parsing of RFC5545 durations + +2017-05-16 Andrew Ruthven + * Support http://.../freebusy.php?foo@example.com + +2017-04-28 Florian Schlichting + * caldav: leave some info about the exception we are catching + +2017-04-25 Florian Schlichting + * fix config example as well + +2017-04-24 Florian Schlichting + * Merge branch 'server-array-upper' into 'master' + +2017-04-24 Jan Losinski + * Set the user agent string for external calendars + +2017-04-09 Florian Schlichting + * cardquery: query limit can be used independently of any query filter + +2017-04-08 Florian Schlichting + * cardquery: typo, ends-with has wildcard in front + * cardquery: a prop-filter without an actual filter rule means we simply need to ensure the property exists + +2017-04-13 Jan Losinski + * Convert array keys for $_SERVER to uppercase + +2017-04-08 Florian Schlichting + * dont send early exceptions to the client only, leave a trace in the error log too + * log an error instead of crashing on principal-property-search REPORT without a proper match clause (fix #114) + * do not output unescaped XML special characters in if-match error message (fixes: #113) + +2017-03-01 Rik Theys + * Fix modified mapping (fix #108) + +2017-04-07 Florian Schlichting + * drivers_ldap says "updated" has been replaced with "modified", so update example config accordingly + +2017-02-22 Scott Balneaves + * Only list active principals in grant selection + +2017-02-10 Scott Balneaves + * modify hide_older_than logic to allow through recurring events (fixes #103, !36) + +2017-04-07 Florian Schlichting + * fix sync of deleted events when hide_todo is set (fixes #100) + * Update testsuite for changes related to #112 (4cf6628) + +2017-03-29 Florian Schlichting + * cannot-modify-protected-property should be used with 403 Forbidden, not 409 Conflict + * do not put two sets of angle brackets around cannot-modify-protected-property error tag (fixes #112) + +2017-03-27 Florian Schlichting + * Fix display of deactivated users after LDAP sync to not include those in $c->do_not_sync_from_ldap + 2017-01-23 Florian Schlichting * Release 1.1.5 * Update ChangeLog and CREDITS diff --git a/VERSION b/VERSION index e25d8d9f..0664a8fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.5 +1.1.6 diff --git a/debian/changelog b/debian/changelog index 93fc3c6e..5d4b0eeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +davical (1.1.6-1) unstable; urgency=medium + + * New upstream release (closes: #704069, #784282, #856467) + * Update debian/watch to match changed Gitlab download URLs + * Update debian/rules to use dpkg variables instead of parsing + dpkg-parsechangelog output + * Update debian/control: Priority is optional, not extra (obsolete) + * Declare compliance with Debian Policy 4.1.1 + + -- Florian Schlichting Wed, 25 Oct 2017 11:40:25 +0200 + davical (1.1.5-1) unstable; urgency=medium * New upstream release (closes: #703130, #703138, #703342) diff --git a/debian/control b/debian/control index 94a06770..b93a61d1 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ Source: davical Section: web -Priority: extra +Priority: optional Maintainer: Davical Development Team Uploaders: Andrew McMillan , Florian Schlichting -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 Build-Depends: debhelper (>= 9), dh-exec, jdupes, - libawl-php (>= 0.57-1~), libawl-php (<< 0.58), + libawl-php (>= 0.58-1~), libawl-php (<< 0.59), gettext, php-apigen, 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.57-1~), libawl-php (<< 0.58), + libawl-php (>= 0.58-1~), libawl-php (<< 0.59), libdbd-pg-perl, libyaml-perl, php | php5, diff --git a/debian/rules b/debian/rules index e683a091..b2da0e49 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f -VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') +include /usr/share/dpkg/pkg-info.mk get-orig-source: make clean git clean -idx - tar cJf ../davical_$(VERSION).orig.tar.xz --exclude-vcs --exclude=.gitattributes --exclude=debian . + tar cJf ../davical_$(DEB_VERSION_UPSTREAM).orig.tar.xz --exclude-vcs --exclude=.gitattributes --exclude=debian . %: dh $@ diff --git a/debian/watch b/debian/watch index 1b500d77..b948caed 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -https://gitlab.com/davical-project/davical/tags \/davical-project\/davical\/repository\/archive.tar.gz\?ref=r([\d.]*) +https://gitlab.com/davical-project/davical/tags \/davical-project\/davical\/repository\/r([\d.]*)\/archive.tar.gz diff --git a/htdocs/always.php b/htdocs/always.php index f594c25c..3e12a903 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.57'; -$c->version_string = '1.1.5'; // The actual version # is replaced into that during the build /release process +$c->want_awl_version = '0.58'; +$c->version_string = '1.1.6'; // 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 ba2512c5..84d5ccb3 100644 --- a/inc/always.php.in +++ b/inc/always.php.in @@ -367,6 +367,11 @@ function ConstructURL( $partial_path, $force_script = false ) { $url = str_replace( 'caldav.php/caldav.php', 'caldav.php', $url ); // Ensure we don't double any 'caldav.php/' } + // don't put the script name in special URLs, these would not be valid resources + $url = str_replace('/principals/users/caldav.php/', '/principals/users/', $url ); + $url = str_replace('/principals/resources/caldav.php/', '/principals/resources/', $url ); + $url = str_replace('/__uids__/caldav.php/', '/__uids__/', $url ); + return $url; }