nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-30 18:37:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

release davical 1.1.11

Browse Source
This commit is contained in:
Florian Schlichting 2022-10-04 13:51:15 +02:00
parent 5b41b49f35
commit 88670bfa39
9 changed files with 86 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CREDITS
View File

@ -35,6 +35,7 @@ Daniel Aleksandersen <code@daniel.priv.no>
Danny de Weille <info@hackdefense.com>
DAViCal Administrator <davical@fry.dotcal.com>
Dávid Takács <david.takacs@cafeopen.eu>
Dirk Bauer <dirk.bauer@iserv.eu>
Émile Morel <emorel@quarkslab.com>
Emmanuel Seyman <eseyman@edd.fr>
fbiete@gmail.com <fbiete@gmail.com>
@ -58,6 +59,7 @@ Jim Hague <jim.hague@acm.org>
Klaus M Pfeiffer <kmp+gitlab@kmp.or.at>
lebarjack <lebarjack@agenda.univ-lille2.fr>
Leho Kraav <leho@kraav.com>
linda.fliss <linda.fliss@iserv.eu>
Marc <github@mleuser.de>
Masahiro Mikami <ZBN15427@nifty.com>
Matthias Althaus <contact@althaus.it>
@ -72,6 +74,7 @@ Nishanth Aravamudan <nish.aravamudan@canonical.com>
Nomad Arton <pch13@myzel.net>
Patrick Näf Moser <patrick@moser-naef.ch>
Paul Kallnbach <p.kallnbach@gorilla-computing.de>
Paul Waite <85040614+paulwaite87@users.noreply.github.com>
Paul Willoughby <paulw@nationalfitness.com>
Peter Schaefer-Hutter <pschaefer@users.sourceforge.net>
Philipp Matthias Hahn <pmhahn@pmhahn.de>

51
ChangeLog
View File

@ -1,3 +1,54 @@
2022-10-04 Florian Schlichting <fsfs@debian.org>
* release davical 1.1.11
* test_bullseye_carddavclientinterop: user3 description is empty
* test_bullseye_carddavclientinterop: Interop is now capitalized
* switch egrep to grep -E to avoid test failure
* do not report VTODO in freebusy (fixes: #267)
2022-06-27 Dirk Bauer <dirk.bauer@iserv.eu>
* Fixed php8 deprecation for htmlspecialchars (#fixes 266)
2022-07-12 Andrew Ruthven <andrew@etc.gen.nz>
* Another attempt to make the results deterministic
2022-06-29 Andrew Ruthven <puck@catalystcloud.nz>
* Final result update?
* Try and be more deterministic.
* Report about dumping the database
* Make GET on a collection deterministic.
* Update test results
2022-02-18 linda.fliss <linda.fliss@iserv.eu>
* fixed debug injection
2022-02-18 Andrew Ruthven <puck@catalyst.net.nz>
* Fix test result
* Fix another PHP 8.1 error
* Limit results for get_include_subcollections
2022-02-09 Paul Waite <85040614+paulwaite87@users.noreply.github.com>
* Provide a facility for setting an override URL which will replace the Change Password UI, and the Forgotten Password UI with a clickable link.
2021-04-22 linda.fliss <linda.fliss@iserv.eu>
* improved refresh-alarms.php script
2022-02-13 Andrew Ruthven <puck@catalyst.net.nz>
* Fix the case of a variable
* Fix a second time where the array might be false.
* Fix iSchedule configuration with PHP 8
* Another fix for PHP 8.1
* Fix the version of AWL we want.
* Further fixes for PHP 8.1
* gmstrftime is deprecated in PHP 8.1
* More fixes for PHP 8.1
* Allow "&'<> in passwords.
* Fixes for warnings in PHP 8.1
2022-02-05 Andrew Ruthven <puck@catalyst.net.nz>
* Debian Bullseye has PostgreSQL 13.
* Debian Unstable now has PostgreSQL 14.
* Switch testing to Bullseye, drop Stretch
2021-09-18 Andrew Ruthven <puck@catalystcloud.nz>
* Don't try and use get_magic_quotes_gpc or get_magic_quotes_runtime on PHP 8
or newer.

2
VERSION
View File

@ -1 +1 @@
1.1.10
1.1.11

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
davical (1.1.11-1) unstable; urgency=medium
* New upstream release(closes: #1004285, #1004393)
* Depend on AWL 0.63
* Update copyright years
* Declare compliance with Debian Policy 4.6.1
-- Florian Schlichting <fsfs@debian.org> Tue, 04 Oct 2022 13:56:36 +0200
davical (1.1.10-1) unstable; urgency=medium
* New upstream release (closes: #703388)

6
debian/control vendored
View File

@ -4,11 +4,11 @@ Priority: optional
Maintainer: Davical Development Team <davical-devel@lists.sourceforge.net>
Uploaders: Andrew McMillan <awm@debian.org>,
Florian Schlichting <fsfs@debian.org>
Standards-Version: 4.5.1
Standards-Version: 4.6.1
Build-Depends: debhelper-compat (= 13),
dh-exec,
jdupes,
libawl-php (>= 0.62-1~), libawl-php (<< 0.63),
libawl-php (>= 0.63-1~), libawl-php (<< 0.64),
gettext,
doxygen,
php-cli | php5-cli
@ -20,7 +20,7 @@ Rules-Requires-Root: no
Package: davical
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends},
libawl-php (>= 0.62-1~), libawl-php (<< 0.63),
libawl-php (>= 0.63-1~), libawl-php (<< 0.64),
libdbd-pg-perl,
libyaml-perl,
php | php5,

10
debian/copyright vendored
View File

@ -7,7 +7,7 @@ Files: *
Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
2006 - 2008, Catalyst IT Ltd
2008 - 2013, Morphoss Ltd
2007 - 2021, Davical contributors (see CREDITS for details)
2007 - 2022, Davical contributors (see CREDITS for details)
License: GPL-2+
Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php
@ -18,7 +18,7 @@ Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php
Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
2006 - 2008, Catalyst IT Ltd
2008 - 2013, Morphoss Ltd
2007 - 2021, Davical contributors (see CREDITS for details)
2007 - 2022, Davical contributors (see CREDITS for details)
License: GPL-2
Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php
@ -28,14 +28,14 @@ Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php
Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
2006 - 2008, Catalyst IT Ltd
2008 - 2013, Morphoss Ltd
2007 - 2021, Davical contributors (see CREDITS for details)
2007 - 2022, Davical contributors (see CREDITS for details)
License: GPL-3+
Files: inc/caldav-client-v2.php
Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
2006 - 2008, Catalyst IT Ltd
2008 - 2013, Morphoss Ltd
2007 - 2021, Davical contributors (see CREDITS for details)
2007 - 2022, Davical contributors (see CREDITS for details)
License: LGPL-3+
Files: inc/check_UTF8.php
@ -93,7 +93,7 @@ License: 3-clause-bsd
Files: debian/*
Copyright: 2006-2012, Andrew McMillan <awm@debian.org>
2014-2021, Florian Schlichting <fsfs@debian.org>
2014-2022, Florian Schlichting <fsfs@debian.org>
License: GPL-2+
License: GPL-2+

14
debian/davical.lintian-overrides vendored
View File

@ -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 #!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
davical: php-script-but-no-php-cli-dep php (does not satisfy php-cli:any) [usr/share/davical/scripts/archive-old-events.php]
davical: php-script-but-no-php-cli-dep php (does not satisfy php-cli:any) [usr/share/davical/scripts/cron-sync-ldap.php]
davical: php-script-but-no-php-cli-dep php (does not satisfy php-cli:any) [usr/share/davical/scripts/export_calendar.php]
davical: php-script-but-no-php-cli-dep php (does not satisfy php-cli:any) [usr/share/davical/scripts/load_calendar.php]
davical: php-script-but-no-php-cli-dep php (does not satisfy php-cli:any) [usr/share/davical/scripts/refresh-alarms.php]
davical: php-script-but-no-php-cli-dep php (does not satisfy php-cli:any) [usr/share/davical/scripts/tz-update.php]
davical: php-script-but-no-php-cli-dep /usr/bin/php (does not satisfy php-cli:any) [usr/share/davical/scripts/sync-remote-caldav.php]

24
htdocs/always.php
View File

@ -291,8 +291,8 @@ if ( function_exists('awl_set_locale') ) {
*
*/
$c->code_version = 0;
$c->want_awl_version = '0.62';
$c->version_string = '1.1.10'; // The actual version # is replaced into that during the build /release process
$c->want_awl_version = '0.63';
$c->version_string = '1.1.11'; // 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];
@ -462,26 +462,8 @@ function DeconstructURL( $url ) {
* @param string $isodate The date to convert
*/
function ISODateToHTTPDate( $isodate ) {
// It is necessary to use English for this, explicitly. See Debian BTS Bug#661985 for more info.
$month = gmstrftime('%m', strtotime($isodate));
switch( intval($month) ) {
case 1: $month = 'Jan'; break;
case 2: $month = 'Feb'; break;
case 3: $month = 'Mar'; break;
case 4: $month = 'Apr'; break;
case 5: $month = 'May'; break;
case 6: $month = 'Jun'; break;
case 7: $month = 'Jul'; break;
case 8: $month = 'Aug'; break;
case 9: $month = 'Sep'; break;
case 10: $month = 'Oct'; break;
case 11: $month = 'Nov'; break;
case 12: $month = 'Dec'; break;
default:
throw new Exception('Invalid month '.$month);
}
// Use strtotime since strptime is not available on Windows platform.
return( gmstrftime('%a, %d '.$month.' %Y %H:%M:%S GMT', strtotime($isodate)) );
return( gmdate('D, d M Y H:i:s T', strtotime($isodate)) );
}
/**

6
inc/always.php.in
View File

@ -44,7 +44,9 @@ function clean_get() {
// relies on variables that are easily manipulated by the user. These lines and functions filter all those variables.
if(isset($_POST)) array_walk($_POST, 'filter_post');
$_GET = clean_get();
$_SERVER['REQUEST_URI'] = str_replace("&amp;", "&", htmlspecialchars($_SERVER['REQUEST_URI']));
if (isset($_SERVER['REQUEST_URI'])) {
$_SERVER['REQUEST_URI'] = str_replace("&amp;", "&", htmlspecialchars($_SERVER['REQUEST_URI']));
}
if (isset($_SERVER['HTTP_REFERER'])) {
$_SERVER['HTTP_REFERER'] = htmlspecialchars(@$_SERVER['HTTP_REFERER']);
}
@ -289,7 +291,7 @@ if ( function_exists('awl_set_locale') ) {
*
*/
$c->code_version = 0;
$c->want_awl_version = 0.62;
$c->want_awl_version = 0.63;
$c->version_string = '0.9.9.4'; // 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];