diff options
author | wiz <wiz@pkgsrc.org> | 2011-10-13 15:57:03 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-10-13 15:57:03 +0000 |
commit | 6f72a059266e875458b05c0e3b14e1e5512b9c60 (patch) | |
tree | d8c3163cdca5e437288f6fcf6b4cb5127ca101fa /www/davical | |
parent | e7b7ccd11377945b4ec30d7883d1fe23f20ae192 (diff) | |
download | pkgsrc-6f72a059266e875458b05c0e3b14e1e5512b9c60.tar.gz |
Update to 0.9.9.6. Changes:
0.9.9.6:
Functionality Enhancements
Implementation of the Timezone Service Protocol (draft)
Bug Fixes
Fixes to the handling of time-range queries in the calendar-query report.
Fixes to LDAP authentication regressions introduced in 0.9.9.5.
Fix ability to save blank default privileges.
Other Changes
Add a script which can be run from cron to sync users from LDAP.
Most use of the deprecated iCalendar class has been switched to use the new vCalendar class.
0.9.9.5:
Functionality Enhancements
Experimental 'memcached' support is added to help large sites improve scalability.
The /setup.php URL is improved to provide better information
When a new user is created an 'addressbook' collection will be created in addition to their 'home' calendar.
Scheduling Extensions for CalDAV: When a meeting is scheduled with another person on the same server it should automatically appear in their calendar and scheduling inbox.
Implemented the principal-match REPORT.
Only include calendar-data (or addressbook-data) in the response to a sync-collection if there are fewer than 50 changes outstanding.
Add support for Digest authentication.
Add support for using IMAP as an auth source.
Add support for binding remote calendars External Bind(Rob Ostensen).
Bug Fixes
Repeat rule expansion now handles floating date-time and date correctly.
Access to calendar resources by users with only read-free-busy access should always be obfuscated.
The first user to log in after setting up a system using pam_auth or LDAP will no longer fail.
Correct handling for PUT of a VCALENDAR with unreferenced VTIMEZONE components.
Only include override components in an expanded report if they override in the expand period (or otherwise affect within the period).
Correct output of XML <error> responses containing error tags in the DAV namespace.
Correct handling of calendar-query REPORT where <prop> follows <filter>
Setup tests now handle where PHP config values are set to '0' or 'off' as equivalent.
Various bugfixes to caldav-client-v2.php script.
Don't restrict password character set for LDAP auth users.
Don't allow BIND to succeed with an empty password.
Correct sort ordering of members of a group.
Block access by expired tickets.
Other Changes
Group membership now always confers the group's 'Default privileges' to members of the group.
The handling of reading users from the database is refactored from old PHP4 code into some better object oriented classes.
Refactoring of the handling of PUT requests.
Add a workaround to let Apple Addressbook log in and use CardDAV even when account names contain '@'
Updated translations.
New translations for Norwegian, Brazilian Portuguese and Mexican Spanish.
Allow expansion to return expanded floating time events in floating time (extension to spec).
When an event is added but has no UID (invalid) we now add one.
Add support in the archive for building RPMs of DAViCal
Diffstat (limited to 'www/davical')
-rw-r--r-- | www/davical/Makefile | 15 | ||||
-rw-r--r-- | www/davical/PLIST | 84 | ||||
-rw-r--r-- | www/davical/distinfo | 14 | ||||
-rw-r--r-- | www/davical/patches/patch-ab | 12 | ||||
-rw-r--r-- | www/davical/patches/patch-ad | 8 | ||||
-rw-r--r-- | www/davical/patches/patch-ae | 8 |
6 files changed, 101 insertions, 40 deletions
diff --git a/www/davical/Makefile b/www/davical/Makefile index 272917a2ccc..8a8d4ef8b49 100644 --- a/www/davical/Makefile +++ b/www/davical/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2011/09/16 05:46:26 obache Exp $ +# $NetBSD: Makefile,v 1.9 2011/10/13 15:57:03 wiz Exp $ # DISTNAME= davical-${DAVICAL_VERSION} -DAVICAL_VERSION=0.9.9.4 -PKGREVISION= 1 +DAVICAL_VERSION=0.9.9.6 CATEGORIES= www MASTER_SITES= http://debian.mcmillan.net.nz/packages/davical/ @@ -36,7 +35,7 @@ INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}/config DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2:../../www/ap-php DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=4.3.1:../../databases/php-pgsql DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql>=${PHP_BASE_VERS}:../../databases/php-pdo_pgsql -DEPENDS+= ${PHP_PKG_PREFIX}-libawl>=0.45:../../devel/php-libawl +DEPENDS+= ${PHP_PKG_PREFIX}-libawl>=0.48:../../devel/php-libawl DEPENDS+= p5-DBD-postgresql>=2.16.1:../../databases/p5-DBD-postgresql DEPENDS+= p5-Class-DBI-Pg>=0.09:../../databases/p5-Class-DBI-Pg DEPENDS+= p5-YAML>=0.71:../../textproc/p5-YAML @@ -60,13 +59,15 @@ CONF_FILES_PERMS+= ${EGDIR}/config/example-config.php \ ${PKG_SYSCONFDIR}/config.php \ ${APACHE_USER} ${APACHE_GROUP} 0640 -REPLACE_PERL= scripts/po/extract.pl dba/update-davical-database +REPLACE_PERL= dba/update-davical-database REPLACE_INTERPRETER+= php -REPLACE.php.old= .*/bin/php +REPLACE.php.old= .*php REPLACE.php.new= ${PREFIX}/bin/php -REPLACE_FILES.php= scripts/sync-remote-caldav.php +REPLACE_FILES.php= scripts/cron-sync-ldap.php +REPLACE_FILES.php+= scripts/sync-remote-caldav.php REPLACE_FILES.php+= scripts/refresh-alarms.php +REPLACE_FILES.php+= scripts/tz-update.php SUBST_CLASSES+= conf-path SUBST_STAGE.conf-path= pre-configure diff --git a/www/davical/PLIST b/www/davical/PLIST index 8e4cc3233af..2775d3b793d 100644 --- a/www/davical/PLIST +++ b/www/davical/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2011/09/08 20:58:58 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2011/10/13 15:57:03 wiz Exp $ share/davical/dba/appuser_permissions.txt share/davical/dba/base-data.sql share/davical/dba/better_perms.sql @@ -19,6 +19,9 @@ share/davical/dba/patches/1.1.7.sql share/davical/dba/patches/1.1.8.sql share/davical/dba/patches/1.1.9.sql share/davical/dba/patches/1.2.1.sql +share/davical/dba/patches/1.2.10.sql +share/davical/dba/patches/1.2.10a.sql +share/davical/dba/patches/1.2.11.sql share/davical/dba/patches/1.2.1a.sql share/davical/dba/patches/1.2.1b.sql share/davical/dba/patches/1.2.2.sql @@ -36,10 +39,7 @@ share/davical/dba/rrule_tests.sql share/davical/dba/supported_locales.sql share/davical/dba/update-davical-database share/davical/dba/views/dav_principal.sql -share/davical/dba/windows/awl-tables.sql share/davical/dba/windows/create-database.bat -share/davical/dba/windows/rscds.sql -share/davical/dba/windows/schema-management.sql share/davical/htdocs/.htaccess share/davical/htdocs/admin.php share/davical/htdocs/always.php @@ -58,15 +58,17 @@ share/davical/htdocs/public.php share/davical/htdocs/robots.txt share/davical/htdocs/setup.php share/davical/htdocs/tools.php +share/davical/htdocs/tz.php share/davical/htdocs/upgrade.php share/davical/htdocs/well-known.php share/davical/inc/AtomFeed.php -share/davical/inc/CalDAVPrincipal.php share/davical/inc/CalDAVRequest.php +share/davical/inc/DAVPrincipal.php share/davical/inc/DAVResource.php share/davical/inc/DAVTicket.php share/davical/inc/DAViCalSession.php share/davical/inc/HTTPAuthSession.php +share/davical/inc/Principal.php share/davical/inc/PublicSession.php share/davical/inc/RRule-v2.php share/davical/inc/RRule.php @@ -88,14 +90,15 @@ share/davical/inc/caldav-PROPFIND.php share/davical/inc/caldav-PROPPATCH.php share/davical/inc/caldav-PUT-default.php share/davical/inc/caldav-PUT-functions.php +share/davical/inc/caldav-PUT-vcalendar.php share/davical/inc/caldav-PUT-vcard.php -share/davical/inc/caldav-PUT.php share/davical/inc/caldav-REPORT-calquery.php share/davical/inc/caldav-REPORT-cardquery.php share/davical/inc/caldav-REPORT-expand-property.php share/davical/inc/caldav-REPORT-freebusy.php share/davical/inc/caldav-REPORT-multiget.php share/davical/inc/caldav-REPORT-pps-set.php +share/davical/inc/caldav-REPORT-principal-match.php share/davical/inc/caldav-REPORT-principal.php share/davical/inc/caldav-REPORT-sync-collection.php share/davical/inc/caldav-REPORT.php @@ -103,9 +106,12 @@ share/davical/inc/caldav-client-v2.php share/davical/inc/caldav-client.php share/davical/inc/check_UTF8.php share/davical/inc/davical_configuration_missing.php +share/davical/inc/drivers_imap_pam.php share/davical/inc/drivers_ldap.php share/davical/inc/drivers_pwauth_pam.php +share/davical/inc/drivers_rimap.php share/davical/inc/drivers_squid_pam.php +share/davical/inc/external-fetch.php share/davical/inc/freebusy-functions.php share/davical/inc/iSchedule.php share/davical/inc/interactive-page.php @@ -115,28 +121,54 @@ share/davical/inc/page-footer.php share/davical/inc/page-header.php share/davical/inc/pubsub.php share/davical/inc/test-RRULE.php +share/davical/inc/tz/capabilities.php +share/davical/inc/tz/expand.php +share/davical/inc/tz/get.php +share/davical/inc/tz/list.php share/davical/inc/ui/collection-edit.php share/davical/inc/ui/principal-browse.php share/davical/inc/ui/principal-edit.php share/davical/inc/vcard.php share/davical/po/de.po -share/davical/po/es.po +share/davical/po/de.values +share/davical/po/es_AR.po +share/davical/po/es_AR.values +share/davical/po/es_MX.po +share/davical/po/es_MX.values +share/davical/po/es_VE.po +share/davical/po/es_VE.values share/davical/po/et.po +share/davical/po/et.values share/davical/po/fr.po +share/davical/po/fr.values share/davical/po/hu.po +share/davical/po/hu.values share/davical/po/it.po +share/davical/po/it.values share/davical/po/ja.po +share/davical/po/ja.values share/davical/po/messages.pot +share/davical/po/nb_NO.po +share/davical/po/nb_NO.values share/davical/po/nl.po +share/davical/po/nl.values share/davical/po/pl.po +share/davical/po/pl.values +share/davical/po/pofilelist.txt +share/davical/po/pt_BR.po +share/davical/po/pt_BR.values +share/davical/po/pt_PT.po +share/davical/po/pt_PT.values share/davical/po/ru.po -share/davical/po/strings.raw +share/davical/po/ru.values share/davical/po/sv.po +share/davical/po/sv.values share/davical/scripts/build-always.sh -share/davical/scripts/po/extract.pl +share/davical/scripts/cron-sync-ldap.php share/davical/scripts/po/rebuild-translations.sh share/davical/scripts/refresh-alarms.php share/davical/scripts/sync-remote-caldav.php +share/davical/scripts/tz-update.php share/doc/davical/COPYING share/doc/davical/CREDITS share/doc/davical/ChangeLog @@ -150,6 +182,7 @@ share/doc/davical/api/awl/caldav/RRule.html share/doc/davical/api/awl/caldav/RepeatRule.html share/doc/davical/api/awl/caldav/RepeatRuleDateTime.html share/doc/davical/api/awl/caldav/RepeatRuleTimeZone.html +share/doc/davical/api/awl/caldav/Rfc5545Duration.html share/doc/davical/api/awl/caldav/_inc---RRule-v2.php.html share/doc/davical/api/awl/caldav/_inc---RRule.php.html share/doc/davical/api/awl/caldav/_inc---caldav-client-v2.php.html @@ -158,6 +191,10 @@ share/doc/davical/api/awl/caldav/iCalDate.html share/doc/davical/api/blank.html share/doc/davical/api/classtrees_awl.html share/doc/davical/api/classtrees_davical.html +share/doc/davical/api/davical/AtomEntry.html +share/doc/davical/api/davical/AtomFeed.html +share/doc/davical/api/davical/AtomXHTMLContent.html +share/doc/davical/api/davical/CheckResult.html share/doc/davical/api/davical/DAVTicket/DAVTicket.html share/doc/davical/api/davical/DAVTicket/_inc---DAVTicket.php.html share/doc/davical/api/davical/DAViCalSession/DAViCalSession.html @@ -166,31 +203,43 @@ share/doc/davical/api/davical/DAViCalSession/_htdocs---tools.php.html share/doc/davical/api/davical/DAViCalSession/_inc---DAViCalSession.php.html share/doc/davical/api/davical/HTTPAuthSession/HTTPAuthSession.html share/doc/davical/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html -share/doc/davical/api/davical/Principal/CalDAVPrincipal.html -share/doc/davical/api/davical/Principal/_inc---CalDAVPrincipal.php.html +share/doc/davical/api/davical/Principal/DAVPrincipal.html +share/doc/davical/api/davical/Principal/Principal.html +share/doc/davical/api/davical/Principal/_inc---DAVPrincipal.php.html +share/doc/davical/api/davical/Principal/_inc---Principal.php.html share/doc/davical/api/davical/PublicSession/PublicSession.html share/doc/davical/api/davical/PublicSession/_inc---PublicSession.php.html share/doc/davical/api/davical/RRuleTest.html share/doc/davical/api/davical/Request/CalDAVRequest.html share/doc/davical/api/davical/Request/_inc---CalDAVRequest.php.html share/doc/davical/api/davical/Resource/DAVResource.html +share/doc/davical/api/davical/Resource/WritableCollection.html share/doc/davical/api/davical/Resource/_inc---DAVResource.php.html +share/doc/davical/api/davical/SqlToArray.html share/doc/davical/api/davical/VCard.html +share/doc/davical/api/davical/_htdocs---SqlToArray.php.html share/doc/davical/api/davical/_htdocs---admin.php.html share/doc/davical/api/davical/_htdocs---always.php.html +share/doc/davical/api/davical/_htdocs---createdb.php.html +share/doc/davical/api/davical/_htdocs---dbexec.php.html +share/doc/davical/api/davical/_htdocs---feed.php.html share/doc/davical/api/davical/_htdocs---freebusy.php.html share/doc/davical/api/davical/_htdocs---help.php.html share/doc/davical/api/davical/_htdocs---index.php.html +share/doc/davical/api/davical/_htdocs---newfile.php.html share/doc/davical/api/davical/_htdocs---setup.php.html share/doc/davical/api/davical/_htdocs---test.php.html share/doc/davical/api/davical/_htdocs---upgrade.php.html share/doc/davical/api/davical/_htdocs---well-known.php.html +share/doc/davical/api/davical/_inc---AtomFeed.php.html +share/doc/davical/api/davical/_inc---WritableCollection.php.html share/doc/davical/api/davical/_inc---caldav-LOCK.php.html share/doc/davical/api/davical/_inc---caldav-REPORT-calquery.php.html share/doc/davical/api/davical/_inc---caldav-REPORT-cardquery.php.html share/doc/davical/api/davical/_inc---caldav-REPORT-expand-property.php.html share/doc/davical/api/davical/_inc---caldav-REPORT-freebusy.php.html share/doc/davical/api/davical/_inc---caldav-REPORT-multiget.php.html +share/doc/davical/api/davical/_inc---caldav-REPORT-principal-match.php.html share/doc/davical/api/davical/_inc---caldav-REPORT-principal.php.html share/doc/davical/api/davical/_inc---check_UTF8.php.html share/doc/davical/api/davical/_inc---davical_configuration_missing.php.html @@ -222,15 +271,18 @@ share/doc/davical/api/davical/caldav/_inc---caldav-POST.php.html share/doc/davical/api/davical/caldav/_inc---caldav-PROPPATCH.php.html share/doc/davical/api/davical/caldav/_inc---caldav-PUT-default.php.html share/doc/davical/api/davical/caldav/_inc---caldav-PUT-functions.php.html +share/doc/davical/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html share/doc/davical/api/davical/caldav/_inc---caldav-PUT-vcard.php.html -share/doc/davical/api/davical/caldav/_inc---caldav-PUT.php.html share/doc/davical/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html share/doc/davical/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html share/doc/davical/api/davical/caldav/_inc---caldav-REPORT.php.html +share/doc/davical/api/davical/external-bind/_inc---external-fetch.php.html share/doc/davical/api/davical/iSchedule/_inc---iSchedule.php.html share/doc/davical/api/davical/iSchedule/iSchedule.html +share/doc/davical/api/davical/ldap/_inc---drivers_imap_pam.php.html share/doc/davical/api/davical/ldap/_inc---drivers_ldap.php.html share/doc/davical/api/davical/ldap/_inc---drivers_squid_pam.php.html +share/doc/davical/api/davical/ldap/imapPamDrivers.html share/doc/davical/api/davical/ldap/ldapDrivers.html share/doc/davical/api/davical/ldap/squidPamDrivers.html share/doc/davical/api/davical/logging/_inc---log_caldav_action.php.html @@ -299,6 +351,7 @@ share/doc/davical/api/packages.html share/doc/davical/api/phpdoc.ini share/doc/davical/api/todolist.html share/doc/davical/davical_en_user_guide.odt +share/doc/davical/translation.rst share/doc/davical/website/administration.php share/doc/davical/website/background.php share/doc/davical/website/clients.php @@ -334,11 +387,16 @@ share/doc/davical/website/clients/iPhone-2.png share/doc/davical/website/clients/iPhone-3.png share/doc/davical/website/clients/iPhone-4.png share/doc/davical/website/clients/iPhone-details.php +share/doc/davical/website/clients/ical4/001.png +share/doc/davical/website/clients/ical4/002.png +share/doc/davical/website/clients/ical4/003.png share/doc/davical/website/images/davical_logo.ico share/doc/davical/website/images/davical_logo.svg +share/doc/davical/website/images/flattr-badge-large.png share/doc/davical/website/images/icon.png share/doc/davical/website/images/larger.png share/doc/davical/website/images/logo.gif +share/doc/davical/website/images/paypal_donate_button.png share/doc/davical/website/inc/page-footer.php share/doc/davical/website/inc/page-header.php share/doc/davical/website/inc/page-middle.php @@ -346,8 +404,10 @@ share/doc/davical/website/index.php share/doc/davical/website/installation.php share/doc/davical/website/style.css share/doc/davical/website/wikiheader.css +share/examples/davical/config/apache-davical.conf share/examples/davical/config/debug-config.php share/examples/davical/config/example-administration.yml share/examples/davical/config/example-config.php +share/examples/davical/config/imap_pam_conf_php.txt share/examples/davical/config/other-config.php share/examples/davical/davical.conf diff --git a/www/davical/distinfo b/www/davical/distinfo index 00c16aedee4..ed761bc8c2d 100644 --- a/www/davical/distinfo +++ b/www/davical/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.4 2011/09/08 20:58:58 wiz Exp $ +$NetBSD: distinfo,v 1.5 2011/10/13 15:57:03 wiz Exp $ -SHA1 (davical-0.9.9.4.tar.gz) = 590d73bf2574449e81fcc3aabab2bf450eee683a -RMD160 (davical-0.9.9.4.tar.gz) = 89b12a13f061862c6269eccdb67faa448b0eebe1 -Size (davical-0.9.9.4.tar.gz) = 2194526 bytes +SHA1 (davical-0.9.9.6.tar.gz) = e9237e187afa82b669ffc20afc5bbf71a91d1afd +RMD160 (davical-0.9.9.6.tar.gz) = fe9cfbcd61c25126b84a91b8eec052926c14df45 +Size (davical-0.9.9.6.tar.gz) = 2674176 bytes SHA1 (patch-aa) = 3172ea7a359e1779431d732d0f1cb106e3b4dd4e -SHA1 (patch-ab) = 4a30513cac522527fb9f658e410ed9930111ecc3 +SHA1 (patch-ab) = d9c4c6729e7be6968306bdd96ed4269c0887a885 SHA1 (patch-ac) = 74e9b103d502886736dff4fa659fb3e50bae5032 -SHA1 (patch-ad) = 607fb6d6aaeb9476d449196914b1627130390482 -SHA1 (patch-ae) = 9c3d730e3a4166d7fabafe89d2d69dc36ff181b6 +SHA1 (patch-ad) = 7816ff4ee7440911e275f3152089760e82b5d180 +SHA1 (patch-ae) = e3f2b5c002c8289d40cd025a38c382d402fc659e diff --git a/www/davical/patches/patch-ab b/www/davical/patches/patch-ab index 5ff5ab95361..03ae8f6ea42 100644 --- a/www/davical/patches/patch-ab +++ b/www/davical/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.1.1.1 2010/05/23 21:36:30 jym Exp $ +$NetBSD: patch-ab,v 1.2 2011/10/13 15:57:03 wiz Exp $ ---- inc/always.php.in.orig 2010-04-01 09:21:58.000000000 +0000 +--- inc/always.php.in.orig 2011-09-25 09:04:29.000000000 +0000 +++ inc/always.php.in -@@ -72,7 +72,7 @@ if ( ! @include_once('AWLUtilities.php') - $try_paths = array( +@@ -79,7 +79,7 @@ if ( ! @include_once('AWLUtilities.php') '../../awl/inc' - , '/usr/share/awl/inc' + , '/usr/share/awl/inc' // Where it ends up on Debian + , '/usr/share/php/awl/inc' // Fedora's standard for PHP libraries - , '/usr/local/share/awl/inc' + , '@LIBAWLPATH@/inc' ); foreach( $try_paths AS $awl_include_path ) { if ( @file_exists($awl_include_path.'/AWLUtilities.php') ) { -@@ -121,11 +121,11 @@ if ( @file_exists('/etc/davical/'.$_SERV +@@ -131,11 +131,11 @@ if ( @file_exists('/etc/davical/'.$_SERV else if ( @file_exists('/etc/davical/config.php') ) { include('/etc/davical/config.php'); } diff --git a/www/davical/patches/patch-ad b/www/davical/patches/patch-ad index c11a7bebae2..15284363a0a 100644 --- a/www/davical/patches/patch-ad +++ b/www/davical/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2010/05/23 21:36:30 jym Exp $ +$NetBSD: patch-ad,v 1.2 2011/10/13 15:57:03 wiz Exp $ ---- scripts/po/rebuild-translations.sh.orig 2010-03-09 02:51:21.000000000 +0000 +--- scripts/po/rebuild-translations.sh.orig 2011-09-11 11:46:40.000000000 +0000 +++ scripts/po/rebuild-translations.sh -@@ -11,7 +11,7 @@ POTOOLS="scripts/po" +@@ -10,7 +10,7 @@ PODIR="po" LOCALEDIR="locale" APPLICATION="davical" @@ -10,4 +10,4 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/05/23 21:36:30 jym Exp $ +AWL_LOCATION="@LIBAWLPATH@" if [ ! -d "${AWL_LOCATION}" ]; then - AWL_LOCATION=/usr/share/awl + AWL_LOCATION="`find .. -type d -name 'awl-*.*'`" diff --git a/www/davical/patches/patch-ae b/www/davical/patches/patch-ae index 8885fa6b0e5..ac0b3b80ebb 100644 --- a/www/davical/patches/patch-ae +++ b/www/davical/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.1.1.1 2010/05/23 21:36:30 jym Exp $ +$NetBSD: patch-ae,v 1.2 2011/10/13 15:57:03 wiz Exp $ ---- inc/davical_configuration_missing.php.orig 2010-03-09 02:51:21.000000000 +0000 +--- inc/davical_configuration_missing.php.orig 2011-09-11 11:46:40.000000000 +0000 +++ inc/davical_configuration_missing.php @@ -4,7 +4,7 @@ include("page-header.php"); echo <<<EOBODY <h1>DAViCal Not Configured</h1> <h2>The Bad News</h2> --<p>There is no configuration file present in <b>/etc/davical/$_SERVER[SERVER_NAME]-conf.php</b> so -+<p>There is no configuration file present in <b>@PKG_SYSCONFDIR@/$_SERVER[SERVER_NAME]-conf.php</b> so +-<p>There is no configuration file present in <b>/etc/davical/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so ++<p>There is no configuration file present in <b>@PKG_SYSCONFDIR@/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so your installation is not fully set up.</p> <h2>The Good News</h2> <p>Well, you're seeing this! At least you have DAViCal <i>installed</i> :-) You also have Apache and PHP working |