Update to davical 1.1.1, from viq.

Add a patch to unbreak db initialization (remove quotes around LANGUAGE
'plpgsql', breaking with recent psqls ?)
This commit is contained in:
landry 2012-11-11 20:50:18 +00:00
parent d94387f78c
commit e53633398a
4 changed files with 35 additions and 10 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2012/03/07 08:38:44 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.3 2012/11/11 20:50:18 landry Exp $
COMMENT = CalDAV/CardDav calendar/contacts server COMMENT = CalDAV/CardDav calendar/contacts server
DISTNAME = davical-1.0.2 DISTNAME = davical-1.1.1
CATEGORIES = productivity net CATEGORIES = productivity net
REVISION = 0
HOMEPAGE = http://www.davical.org/ HOMEPAGE = http://www.davical.org/
@ -26,7 +25,7 @@ TINSTDIR = ${TRUEPREFIX}/davical
SUBST_VARS = TINSTDIR SUBST_VARS = TINSTDIR
RUN_DEPENDS += lang/php/${MODPHP_VERSION},-pdo_pgsql \ RUN_DEPENDS += lang/php/${MODPHP_VERSION},-pdo_pgsql \
www/awl \ www/awl>=0.53 \
devel/p5-YAML \ devel/p5-YAML \
databases/p5-DBD-Pg databases/p5-DBD-Pg

View File

@ -1,5 +1,2 @@
MD5 (davical-1.0.2.tar.gz) = NAqyE6YwN0LGaoAomJwgJw== SHA256 (davical-1.1.1.tar.gz) = Cb2So10nMP5of2gBeW2NoQkMuONsKRDAVqAbAMtzyvw=
RMD160 (davical-1.0.2.tar.gz) = 0kzMFjY/MHiew8CzhPmZmUBf7n0= SIZE (davical-1.1.1.tar.gz) = 2979425
SHA1 (davical-1.0.2.tar.gz) = XYuHAYQR1vOZWAnZWUUN11IqFJw=
SHA256 (davical-1.0.2.tar.gz) = EmM9/CKurvmAfjR9LIeY8qOvS53XEqi7c2URkVs7naY=
SIZE (davical-1.0.2.tar.gz) = 2739740

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-dba_davical_sql,v 1.1 2012/11/11 20:50:18 landry Exp $
http://postgresql.1045698.n5.nabble.com/Buildfarm-now-building-but-with-test-failures-td5119291.html#a5120094
Fix with psql > 9.xx ?
--- dba/davical.sql.orig Sun Nov 11 21:36:43 2012
+++ dba/davical.sql Sun Nov 11 21:37:04 2012
@@ -36,7 +36,7 @@ BEGIN
ELSE 0 END)::BIT(24);
END
$$
-LANGUAGE 'PlPgSQL' IMMUTABLE STRICT;
+LANGUAGE PlPgSQL IMMUTABLE STRICT;
-- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask
CREATE or REPLACE FUNCTION privilege_to_bits( TEXT[] ) RETURNS BIT(24) AS $$
@@ -62,7 +62,7 @@ BEGIN
RETURN out_bits;
END
$$
-LANGUAGE 'PlPgSQL' IMMUTABLE STRICT;
+LANGUAGE PlPgSQL IMMUTABLE STRICT;
-- This sequence is used in a number of places so that any DAV resource will have a unique ID

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2012/03/07 08:38:44 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.3 2012/11/11 20:50:18 landry Exp $
davical/ davical/
davical/INSTALL davical/INSTALL
davical/README davical/README
@ -69,6 +69,7 @@ davical/htdocs/davical.css
davical/htdocs/feed.php davical/htdocs/feed.php
davical/htdocs/freebusy.php davical/htdocs/freebusy.php
davical/htdocs/help.php davical/htdocs/help.php
davical/htdocs/iSchedule.php
davical/htdocs/images/ davical/htdocs/images/
davical/htdocs/images/down.gif davical/htdocs/images/down.gif
davical/htdocs/images/up.gif davical/htdocs/images/up.gif
@ -101,6 +102,7 @@ davical/inc/caldav-ACL.php
davical/inc/caldav-BIND.php davical/inc/caldav-BIND.php
davical/inc/caldav-DELETE.php davical/inc/caldav-DELETE.php
davical/inc/caldav-DELTICKET.php davical/inc/caldav-DELTICKET.php
davical/inc/caldav-GET-functions.php
davical/inc/caldav-GET.php davical/inc/caldav-GET.php
davical/inc/caldav-LOCK.php davical/inc/caldav-LOCK.php
davical/inc/caldav-MKCOL.php davical/inc/caldav-MKCOL.php
@ -135,6 +137,7 @@ davical/inc/drivers_rimap.php
davical/inc/drivers_squid_pam.php davical/inc/drivers_squid_pam.php
davical/inc/external-fetch.php davical/inc/external-fetch.php
davical/inc/freebusy-functions.php davical/inc/freebusy-functions.php
davical/inc/iSchedule-POST.php
davical/inc/iSchedule.php davical/inc/iSchedule.php
davical/inc/interactive-page.php davical/inc/interactive-page.php
davical/inc/log_caldav_action.php davical/inc/log_caldav_action.php
@ -155,6 +158,7 @@ davical/inc/ui/external-browse.php
davical/inc/ui/principal-browse.php davical/inc/ui/principal-browse.php
davical/inc/ui/principal-edit.php davical/inc/ui/principal-edit.php
davical/inc/vcard.php davical/inc/vcard.php
davical/inc/vtimezone.php
davical/inc/well-known.php davical/inc/well-known.php
davical/po/ davical/po/
davical/po/de.po davical/po/de.po
@ -196,6 +200,8 @@ davical/po/sv.values
davical/scripts/ davical/scripts/
davical/scripts/build-always.sh davical/scripts/build-always.sh
davical/scripts/cron-sync-ldap.php davical/scripts/cron-sync-ldap.php
davical/scripts/export_calendar.php
davical/scripts/load_calendar.php
davical/scripts/po/ davical/scripts/po/
davical/scripts/po/rebuild-translations.sh davical/scripts/po/rebuild-translations.sh
davical/scripts/refresh-alarms.php davical/scripts/refresh-alarms.php