Attachment 188020 Details for Bug 223684 – Patch: updating www/davical to v1.1.6.

[patch] Patch: updating www/davical to v1.1.6.

updating_to_1.1.6.patch (text/plain), 4.46 KB, created by Alexandre C. Guimarães on 2017-11-15 15:54:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre C. Guimarães

Created: 2017-11-15 15:54:55 UTC

Size: 4.46 KB

patch

obsolete

>Index: www/davical/Makefile
>===================================================================
>--- www/davical/Makefile	(revision 454220)
>+++ www/davical/Makefile	(working copy)
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	davical
> DISTVERSIONPREFIX=	r
>-DISTVERSION=	1.1.5
>-PORTREVISION=	2
>+DISTVERSION=	1.1.6
> CATEGORIES?=	www
> MASTER_SITES=	https://gitlab.com/${PORTNAME}-project/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/
> 
>@@ -21,7 +20,7 @@
> 		${LOCALBASE}/bin/pwgen:sysutils/pwgen \
> 		php-libawl>=0.54:devel/php-libawl
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}-7ccc7c449176475891ec50d5524928628df6f8d1
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}-3ba605288fb0fc0a4f2abce09874f8dab5ffdfb8
> 
> NO_BUILD=	yes
> USES=		pgsql php shebangfix
>Index: www/davical/distinfo
>===================================================================
>--- www/davical/distinfo	(revision 454220)
>+++ www/davical/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1485803035
>-SHA256 (davical-r1.1.5.tar.gz) = 3b4e1e3007eb0261cdd23544a5516bb46085cdfa2954ab4a35443d762eedd19c
>-SIZE (davical-r1.1.5.tar.gz) = 1781265
>+TIMESTAMP = 1510759997
>+SHA256 (davical-r1.1.6.tar.gz) = 54785cbcb804fac60061cbe5f419b0cf6ef3885286ea5b968d6ce8292d7a332f
>+SIZE (davical-r1.1.6.tar.gz) = 1784517
>Index: www/davical/files/patch-git_39001794
>===================================================================
>--- www/davical/files/patch-git_39001794	(revision 454220)
>+++ www/davical/files/patch-git_39001794	(nonexistent)
>@@ -1,59 +0,0 @@
>-From 39001794a3121c33c8cba50398b653a94328be40 Mon Sep 17 00:00:00 2001
>-From: Florian Schlichting <fsfs@debian.org>
>-Date: Tue, 3 Oct 2017 22:36:29 +0200
>-Subject: [PATCH] Update caldav_functions.sql for Postgresql 10
>-
>-From version 10, Postgresql does not allow set-returning functions in
>-CASE statements. As we're using the functions recursively, we cannot
>-use LATERAL as suggested in the error message, but we can switch the
>-condition inside-out with only a limited amount of repetition.
>-
>---- dba/caldav_functions.sql
>-+++ dba/caldav_functions.sql
>-@@ -897,21 +897,37 @@ LANGUAGE plpgsql IMMUTABLE STRICT;
>- 
>- -- Expanded group memberships out to some depth
>- CREATE or REPLACE FUNCTION expand_memberships( INT8, INT ) RETURNS SETOF INT8 AS $$
>--  SELECT group_id FROM group_member WHERE member_id = $1
>--      UNION
>--  SELECT expanded.g_id FROM (SELECT CASE WHEN $2 > 0 THEN expand_memberships( group_id, $2 - 1) END AS g_id
>--                               FROM group_member WHERE member_id = $1) AS expanded
>--                       WHERE expanded.g_id IS NOT NULL;
>--$$ LANGUAGE sql STABLE STRICT;
>-+BEGIN
>-+  IF $2 > 0 THEN
>-+    RETURN QUERY
>-+      SELECT group_id FROM group_member WHERE member_id = $1
>-+        UNION
>-+      SELECT expanded.g_id FROM (SELECT expand_memberships( group_id, $2 - 1) AS g_id
>-+                                 FROM group_member WHERE member_id = $1) AS expanded
>-+                            WHERE expanded.g_id IS NOT NULL;
>-+  ELSE
>-+    RETURN QUERY
>-+      SELECT group_id FROM group_member WHERE member_id = $1;
>-+  END IF;
>-+END
>-+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
>- 
>- -- Expanded group members out to some depth
>- CREATE or REPLACE FUNCTION expand_members( INT8, INT ) RETURNS SETOF INT8 AS $$
>--  SELECT member_id FROM group_member WHERE group_id = $1
>--      UNION
>--  SELECT expanded.m_id FROM (SELECT CASE WHEN $2 > 0 THEN expand_members( member_id, $2 - 1) END AS m_id
>--                               FROM group_member WHERE group_id = $1) AS expanded
>--                       WHERE expanded.m_id IS NOT NULL;
>--$$ LANGUAGE sql STABLE STRICT;
>-+BEGIN
>-+  IF $2 > 0 THEN
>-+    RETURN QUERY
>-+      SELECT member_id FROM group_member WHERE group_id = $1
>-+        UNION
>-+      SELECT expanded.m_id FROM (SELECT expand_members( member_id, $2 - 1) AS m_id
>-+                                 FROM group_member WHERE group_id = $1) AS expanded
>-+                            WHERE expanded.m_id IS NOT NULL;
>-+  ELSE
>-+    RETURN QUERY
>-+      SELECT member_id FROM group_member WHERE group_id = $1;
>-+  END IF;
>-+END
>-+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
>
>Property changes on: www/davical/files/patch-git_39001794
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

rigoletto: maintainer-approval+

Actions: View | Diff

Attachments on bug 223684: 188019 | 188020