Date: Sat, 30 May 2026 10:33:19 +0000 From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 71d777d96603 - main - www/davical: update to 1.1.13 Message-ID: <6a1abcef.3bf90.37679761@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=71d777d96603ea842d7de11f18c67d893a5ed0f1 commit 71d777d96603ea842d7de11f18c67d893a5ed0f1 Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2026-05-30 10:32:43 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2026-05-30 10:32:43 +0000 www/davical: update to 1.1.13 --- www/davical/Makefile | 5 +- www/davical/distinfo | 6 +-- www/davical/files/patch-caldav-ACL.php | 85 ------------------------------ www/davical/files/patch-htdocs_caldav.php | 11 ---- www/davical/files/patch-principal-edit.php | 27 ---------- www/davical/pkg-plist | 4 +- 6 files changed, 6 insertions(+), 132 deletions(-) diff --git a/www/davical/Makefile b/www/davical/Makefile index 43d48acda575..463eac20dd13 100644 --- a/www/davical/Makefile +++ b/www/davical/Makefile @@ -1,7 +1,7 @@ PORTNAME= davical DISTVERSIONPREFIX= r -DISTVERSION= 1.1.12 -PORTREVISION= 1 +DISTVERSION= 1.1.13 +PORTREVISION= 0 CATEGORIES?= www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -23,7 +23,6 @@ USES= cpe pgsql php:flavors shebangfix USE_GITLAB= yes GL_ACCOUNT= davical-project -GL_TAGNAME= 4301a795ac7a7636846bcc15348d96c68a1830fd USE_PHP= calendar curl gettext iconv pdo \ pdo_pgsql pgsql session xml diff --git a/www/davical/distinfo b/www/davical/distinfo index 54d2abfc1fce..f32bf9553ff7 100644 --- a/www/davical/distinfo +++ b/www/davical/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679842018 -SHA256 (davical-project-davical-4301a795ac7a7636846bcc15348d96c68a1830fd_GL0.tar.gz) = 6d681e008f8b744d2be68653e5bbc0379b4e19deb3aeaa52afcf881d13f6b7a3 -SIZE (davical-project-davical-4301a795ac7a7636846bcc15348d96c68a1830fd_GL0.tar.gz) = 1909396 +TIMESTAMP = 1779738748 +SHA256 (davical-r1.1.13.tar.bz2) = e4b552efdcd8163ff5f74243bcc7f1cf8b69b51eec40125999863615be63bb7c +SIZE (davical-r1.1.13.tar.bz2) = 1620918 diff --git a/www/davical/files/patch-caldav-ACL.php b/www/davical/files/patch-caldav-ACL.php deleted file mode 100644 index 1f4ae0bf13e4..000000000000 --- a/www/davical/files/patch-caldav-ACL.php +++ /dev/null @@ -1,85 +0,0 @@ -commit effc00474111bf5dff1297dd3c6811c1fdf6b6ca -Author: Florian Schlichting <fsfs@debian.org> -Date: Thu Mar 23 22:14:41 2023 +0100 - - use "." to concatenate strings, not "+" (fixes #288) - - Unsupported operand types: string + string at /usr/share/davical/inc/caldav-ACL.php:146 - -diff --git a/inc/caldav-ACL.php b/inc/caldav-ACL.php -index 861d4389..cb0fa213 100644 ---- inc/caldav-ACL.php.orig -+++ inc/caldav-ACL.php -@@ -143,7 +143,7 @@ function process_ace( $grantor, $by_principal, $by_collection, $ace ) { - $grantee = new DAVResource( DeconstructURL($principal_content->GetContent()) ); - $grantee_id = $grantee->getProperty('principal_id'); - if ( !$grantee->Exists() || !$grantee->IsPrincipal() ) -- $request->PreconditionFailed(403,'recognized-principal', 'Principal "' + $principal_content->GetContent() + '" not found.'); -+ $request->PreconditionFailed(403,'recognized-principal', 'Principal "' . $principal_content->GetContent() . '" not found.'); - $sqlparms = array( ':to_principal' => $grantee_id); - $where = 'WHERE to_principal=:to_principal AND '; - if ( isset($by_principal) ) { -diff --git a/testing/tests/regression-suite/0946-ACL-err.result b/testing/tests/regression-suite/0946-ACL-err.result -new file mode 100644 -index 00000000..c0ad5ef7 ---- /dev/null -+++ testing/tests/regression-suite/0946-ACL-err.result -@@ -0,0 +1,11 @@ -+HTTP/1.1 403 Forbidden -+Date: Dow, 01 Jan 2000 00:00:00 GMT -+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -+DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -+Content-Length: 137 -+Content-Type: text/xml; charset="utf-8" -+ -+<?xml version="1.0" encoding="utf-8" ?> -+<error xmlns="DAV:"> -+ <recognized-principal/>Principal "/caldav.php/user40/" not found. -+</error> -diff --git a/testing/tests/regression-suite/0946-ACL-err.test b/testing/tests/regression-suite/0946-ACL-err.test -new file mode 100644 -index 00000000..945f3a13 ---- /dev/null -+++ testing/tests/regression-suite/0946-ACL-err.test -@@ -0,0 +1,41 @@ -+# -+# ACL setting default privileges on a collection to nothing, and -+# specific privileges to include read-acl. -+# -+TYPE=ACL -+URL=http://regression.host/caldav.php/user1/home/ -+HEADER=User-Agent: RFC3744 Spec Tests -+HEADER=Content-Type: text/xml; charset="UTF-8" -+HEAD -+ -+ -+BEGINDATA -+<?xml version="1.0" encoding="utf-8" ?> -+<acl xmlns="DAV:" xmlns:CalDAV="urn:ietf:params:xml:ns:caldav"> -+ <ace> -+ <principal> -+ <href>/caldav.php/user40/</href> -+ </principal> -+ <grant> -+ <privilege><read/></privilege> -+ <privilege><read-acl/></privilege> -+ <privilege><read-current-user-privilege-set/></privilege> -+ <privilege><CalDAV:read-free-busy/></privilege> -+ </grant> -+ </ace> -+ <ace> -+ <principal><authenticated/></principal> -+ <grant> -+ <privilege/> -+ </grant> -+ </ace> -+</acl> -+ENDDATA -+ -+QUERY -+SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal -+ FROM grants JOIN dav_principal p_to ON (to_principal=principal_id) -+ LEFT JOIN collection ON (by_collection=collection.collection_id) -+ WHERE collection.dav_name = '/user1/home/' -+ENDQUERY -+ diff --git a/www/davical/files/patch-htdocs_caldav.php b/www/davical/files/patch-htdocs_caldav.php deleted file mode 100644 index 3b8c0a807e77..000000000000 --- a/www/davical/files/patch-htdocs_caldav.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/caldav.php.orig 2017-01-30 20:16:26 UTC -+++ htdocs/caldav.php -@@ -119,6 +119,8 @@ try { - include('caldav-POST.php'); - break; - } -+ error_log('the value of add_member is : ', $add_member); -+ $add_member = true; - // fall through if POST add member - case 'PUT': - switch( $request->content_type ) { diff --git a/www/davical/files/patch-principal-edit.php b/www/davical/files/patch-principal-edit.php deleted file mode 100644 index 361be905cb0e..000000000000 --- a/www/davical/files/patch-principal-edit.php +++ /dev/null @@ -1,27 +0,0 @@ -commit e8f3a3e6f2c27e78c2778e0040b385b430dfc9fc -Author: Andrew Ruthven <puck@catalystcloud.nz> -Date: Sun Apr 30 12:13:37 2023 +1200 - - Add a missing space to a SQL statement to fix adding groups. - - It looks to me like this bug has been present since 2011. - - Closes: #294 - -diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php -index 603fd1e1..df975e22 100644 ---- inc/ui/principal-edit.php.orig -+++ inc/ui/principal-edit.php -@@ -495,9 +495,9 @@ function group_memberships_browser() { - function group_row_editor() { - global $c, $id, $editor, $can_write_principal; - $grouprow = new Editor("Group Members", "group_member"); -- $sql = 'SELECT principal_id, coalesce(displayname,fullname,username) FROM dav_principal '; -- $sql .= 'WHERE principal_id NOT IN (SELECT member_id FROM group_member WHERE group_id = '.$id.') '; -- $sql .= 'AND principal_id != '.$id; -+ $sql = 'SELECT principal_id, coalesce(displayname, fullname, username) FROM dav_principal '; -+ $sql .= 'WHERE principal_id NOT IN (SELECT member_id FROM group_member WHERE group_id = ' . $id . ') '; -+ $sql .= 'AND principal_id != ' . $id . ' '; - $sql .= 'ORDER BY 2'; - $grouprow->SetLookup( 'member_id', $sql); - $grouprow->SetSubmitName( 'savegrouprow' ); diff --git a/www/davical/pkg-plist b/www/davical/pkg-plist index 49ab907eba97..6448048ecc13 100644 --- a/www/davical/pkg-plist +++ b/www/davical/pkg-plist @@ -38,6 +38,7 @@ %%DATADIR%%/dba/patches/1.3.3.sql %%DATADIR%%/dba/patches/1.3.4.sql %%DATADIR%%/dba/patches/1.3.5.sql +%%DATADIR%%/dba/patches/1.3.6.sql %%DATADIR%%/dba/rrule_functions-8.1.sql %%DATADIR%%/dba/rrule_functions.sql %%DATADIR%%/dba/rrule_tests.sql @@ -61,7 +62,6 @@ %%WWWDIR%%/htdocs/admin.php %%WWWDIR%%/htdocs/always.php %%WWWDIR%%/htdocs/caldav.php -%%WWWDIR%%/htdocs/caldav.php.orig %%WWWDIR%%/htdocs/css/browse.css %%WWWDIR%%/htdocs/css/edit.css %%WWWDIR%%/htdocs/davical.css @@ -130,10 +130,8 @@ %%WWWDIR%%/inc/check_UTF8.php %%WWWDIR%%/inc/csrf_tokens.php %%WWWDIR%%/inc/davical_configuration_missing.php -%%WWWDIR%%/inc/drivers_imap_pam.php %%WWWDIR%%/inc/drivers_ldap.php %%WWWDIR%%/inc/drivers_pwauth_pam.php -%%WWWDIR%%/inc/drivers_rimap.php %%WWWDIR%%/inc/drivers_squid_pam.php %%WWWDIR%%/inc/external-fetch.php %%WWWDIR%%/inc/freebusy-functions.phphome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1abcef.3bf90.37679761>