From 88670bfa39ac8f2426332b3db71043c787489911 Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Tue, 4 Oct 2022 13:51:15 +0200 Subject: [PATCH] release davical 1.1.11 --- CREDITS | 3 ++ ChangeLog | 51 ++++++++++++++++++++++++++++++++ VERSION | 2 +- debian/changelog | 9 ++++++ debian/control | 6 ++-- debian/copyright | 10 +++---- debian/davical.lintian-overrides | 14 ++++----- htdocs/always.php | 24 ++------------- inc/always.php.in | 6 ++-- 9 files changed, 86 insertions(+), 39 deletions(-) diff --git a/CREDITS b/CREDITS index 64e29043..6bd479bd 100644 --- a/CREDITS +++ b/CREDITS @@ -35,6 +35,7 @@ Daniel Aleksandersen Danny de Weille DAViCal Administrator Dávid Takács +Dirk Bauer Émile Morel Emmanuel Seyman fbiete@gmail.com @@ -58,6 +59,7 @@ Jim Hague Klaus M Pfeiffer lebarjack Leho Kraav +linda.fliss Marc Masahiro Mikami Matthias Althaus @@ -72,6 +74,7 @@ Nishanth Aravamudan Nomad Arton Patrick Näf Moser Paul Kallnbach +Paul Waite <85040614+paulwaite87@users.noreply.github.com> Paul Willoughby Peter Schaefer-Hutter Philipp Matthias Hahn diff --git a/ChangeLog b/ChangeLog index b161d8bf..f391f942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,54 @@ +2022-10-04 Florian Schlichting + * 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 + * Fixed php8 deprecation for htmlspecialchars (#fixes 266) + +2022-07-12 Andrew Ruthven + * Another attempt to make the results deterministic + +2022-06-29 Andrew Ruthven + * 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 + * fixed debug injection + +2022-02-18 Andrew Ruthven + * 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 + * improved refresh-alarms.php script + +2022-02-13 Andrew Ruthven + * 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 + * Debian Bullseye has PostgreSQL 13. + * Debian Unstable now has PostgreSQL 14. + * Switch testing to Bullseye, drop Stretch + 2021-09-18 Andrew Ruthven * Don't try and use get_magic_quotes_gpc or get_magic_quotes_runtime on PHP 8 or newer. diff --git a/VERSION b/VERSION index 5ed5faa5..9ee1f786 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.10 +1.1.11 diff --git a/debian/changelog b/debian/changelog index c2e5900d..948eb95e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 04 Oct 2022 13:56:36 +0200 + davical (1.1.10-1) unstable; urgency=medium * New upstream release (closes: #703388) diff --git a/debian/control b/debian/control index da261289..d0b63fd2 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.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, diff --git a/debian/copyright b/debian/copyright index 4f3d7d36..09f233a2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Files: * Copyright: 2006 - 2013, Andrew McMillan 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 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 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 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 - 2014-2021, Florian Schlichting + 2014-2022, Florian Schlichting License: GPL-2+ License: GPL-2+ diff --git a/debian/davical.lintian-overrides b/debian/davical.lintian-overrides index a29c5981..cc0c933c 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 #!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] diff --git a/htdocs/always.php b/htdocs/always.php index 83bbfd7d..bf6afd9a 100644 --- a/htdocs/always.php +++ b/htdocs/always.php @@ -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)) ); } /** diff --git a/inc/always.php.in b/inc/always.php.in index 8fcd01e6..c8c84c78 100644 --- a/inc/always.php.in +++ b/inc/always.php.in @@ -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("&", "&", htmlspecialchars($_SERVER['REQUEST_URI'])); +if (isset($_SERVER['REQUEST_URI'])) { + $_SERVER['REQUEST_URI'] = str_replace("&", "&", 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];