summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-apps/davical/ChangeLog7
-rw-r--r--www-apps/davical/Manifest10
-rw-r--r--www-apps/davical/davical-0.9.9.ebuild (renamed from www-apps/davical/davical-0.9.8.4-r1.ebuild)50
-rw-r--r--www-apps/davical/files/postinstall-en-0.9.9.txt (renamed from www-apps/davical/files/postinstall-en-0.9.8.4.txt)7
-rw-r--r--www-apps/davical/files/rscds.conf279
-rw-r--r--www-apps/davical/files/vhost-example17
6 files changed, 61 insertions, 309 deletions
diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
index 624732b0f..138daca08 100644
--- a/www-apps/davical/ChangeLog
+++ b/www-apps/davical/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Apr 2010; lebarjack <francois.perichon@univ-lille2.fr>
+ -davical-0.9.8.4-r1.ebuild, -files/postinstall-en-0.9.8.4.txt,
+ +davical-0.9.9.ebuild, +files/postinstall-en-0.9.9.txt, -files/rscds.conf,
+ +files/vhost-example:
+ New version for davical New installation layout. (Thanks to Aurelien Requiem
+ <aurelien@menfin.net>
+
12 Apr 2010; lebarjack <francois.perichon@univ-lille2.fr>
-davical-0.9.8.4.ebuild, +davical-0.9.8.4-r1.ebuild:
Source archive modified by upstream
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 7a84ab437..8555d6709 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,6 +1,6 @@
-AUX postinstall-en-0.9.8.4.txt 495 RMD160 b8ce8d897cd0b4ce3ce903cd330d9c74bde02446 SHA1 3e30f86fe6c082d90bebc8abff32ef0eda83e8b8 SHA256 37e301d655aba12ab43b97f7e01523a7966c611412bd550949501cf370634ec7
-AUX rscds.conf 11907 RMD160 bdd38b174cf76e2a2ea76da5ed09706d000ccd20 SHA1 12da666505dd8fb814e775f21f9bc7e623dc7597 SHA256 25d27389f72caf07e9c008bd1cfe791eac69a85309ab226946d9d7e4304ec9b7
-DIST davical-0.9.8.4.tar.gz 1894356 RMD160 c6a1da2c92f997e7aa1772ca6f29bc8f917c3cce SHA1 0188d24d20b3880862d99da272705d1be5e34afc SHA256 619b794b41c5507ff503ef78f43765e6f2433521228de40917e1d62603f2752c
-EBUILD davical-0.9.8.4-r1.ebuild 1700 RMD160 a50ecdf93e27f7e9609ebe674dc84a34f9c01f39 SHA1 9fa30c86d24c1f944cfbd90f9570f65406c8384c SHA256 dfffb923b6a527d43cc2ab2cf1a8a69c463dabf65512b67003847475bb45ad0d
-MISC ChangeLog 3670 RMD160 9ed70087dc9e79bf0faa797e7465a279e0af0638 SHA1 ac6dea1c1798746dd19272ca0015b18ef22406c1 SHA256 1619d12dc35b806a05df5b173adccb20392418166414762afc024ad68f4c3f19
+AUX postinstall-en-0.9.9.txt 829 RMD160 cd088da5602233551a9a2f57012b9ad2e1ebdf8d SHA1 257efaa0655ec85bdd71885cdd9ccc5b1900cb9c SHA256 9d3e8e91a6e464e50486f21f5d92620d41bba8a56719345a5e4a6b677fe5f1bf
+AUX vhost-example 433 RMD160 8ce2aee1f3bcad5ab296b3c09704630d533fbd38 SHA1 d0d5d1af9b0ce41866ddf034d048afc547820c88 SHA256 324589afec23b5d7f10b5c95a162cf0cdeb1e05253fd8f8206fffada95209ffa
+DIST davical-0.9.9.tar.gz 1949981 RMD160 74a4abecd7527b09e425dbff4b5c1cf845670205 SHA1 c1ec44757a769a5c999c8348958a8a6ad59379fc SHA256 9052f844b8b1139d62ec9f1cc8cb31a4f34d86b783476fe674148fe6fd99c96c
+EBUILD davical-0.9.9.ebuild 1707 RMD160 262591f251266dff5e5aa41c6ed20b3fce57a136 SHA1 73ea92a16d00805104d463062bf82a1e5e1f6c91 SHA256 ac389414249e2399c86e5e66ed6f185e4e454f135bfa7be7bc93082808dd50da
+MISC ChangeLog 4000 RMD160 9100f10b3cd8fdb4dd5162c9c90321300f10d9d2 SHA1 62718033b362d795ddb6c7a42a608c73f8186414 SHA256 b089134f3238a3ab8470a9a588a6e622e5ada28372f5d46e6f40d1158b12f2ba
MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/www-apps/davical/davical-0.9.8.4-r1.ebuild b/www-apps/davical/davical-0.9.9.ebuild
index 52bcbf9c3..011fba159 100644
--- a/www-apps/davical/davical-0.9.8.4-r1.ebuild
+++ b/www-apps/davical/davical-0.9.9.ebuild
@@ -2,52 +2,54 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI=2
-inherit webapp depend.php
+inherit depend.php webapp
DESCRIPTION="A CalDAV and iCal server"
HOMEPAGE="http://davical.org/"
-SRC_URI="http://debian.mcmillan.net.nz/packages/davical/${P}.tar.gz"
+SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-IUSE="doc vhosts"
+IUSE="doc"
DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
-RDEPEND="www-servers/apache
+RDEPEND="app-admin/pwgen
dev-lang/php[pcre,pdo,postgres,xml]
- app-admin/pwgen
- >=dev-php/awl-0.42
- dev-perl/yaml
dev-perl/DBI
- dev-perl/DBD-Pg"
+ dev-perl/DBD-Pg
+ dev-perl/yaml
+ >=dev-php/awl-0.43
+ www-servers/apache"
need_php5
need_httpd
src_compile() {
if use doc ; then
- ebegin "Generating documentation"
- phpdoc -c "docs/api/phpdoc.ini"
- eend $? || die "Documentation failed to build"
+ einfo "Generating documentation"
+ phpdoc -c "docs/api/phpdoc.ini"\
+ || die "Documentation failed to build"
fi
- emake inc/always.php || die "emake failed"
- scripts/po/rebuild-translations.sh
+ emake built-po || die "emake failed"
}
src_install() {
webapp_src_preinst
- local docs="INSTALL README debian/README.Debian \
- testing/README.regression_tests \
- TODO debian/changelog"
- dodoc-php ${docs} || die "dodoc failed"
+ dodoc-php INSTALL README debian/README.Debian \
+ testing/README.regression_tests TODO debian/changelog \
+ || die "dodoc failed"
- einfo "Installing main files"
- local dirs="htdocs inc locale"
+ einfo "Installing web files"
insinto "${MY_HTDOCSDIR}"
- doins -r ${dirs} || die "doins failed"
+ doins -r htdocs/* htdocs/.htaccess || die "doins failed"
+
+ einfo "Installing main files and i18n"
+ insinto "${MY_HOSTROOTDIR}"
+ doins -r inc locale || die "doins failed"
+ rm -f "${D}/${MY_HOSTROOTDIR}/inc/always.php.in"
einfo "Installing sql files"
insinto "${MY_SQLSCRIPTSDIR}"
@@ -55,12 +57,11 @@ src_install() {
if use doc ; then
einfo "Installing documentation"
- dohtml -r "docs/api/" || die "dohtml failed"
- dohtml -r "docs/website/" || die "dohtml failed"
+ dohtml -r docs/api/ docs/website/ || die "dohtml failed"
fi
insinto /etc/${PN}
- newins "${FILESDIR}/rscds.conf" calendar.example.com-conf.php \
+ doins config/* "${FILESDIR}/vhost-example" \
|| die "newins failed"
webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
@@ -68,5 +69,4 @@ src_install() {
fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
-
}
diff --git a/www-apps/davical/files/postinstall-en-0.9.8.4.txt b/www-apps/davical/files/postinstall-en-0.9.9.txt
index c5e7c3b95..004cc0346 100644
--- a/www-apps/davical/files/postinstall-en-0.9.8.4.txt
+++ b/www-apps/davical/files/postinstall-en-0.9.9.txt
@@ -10,3 +10,10 @@ If you are upgrading from a previous version of davical, don't forget to
upgrade the database structure with
cd /usr/share/webapps/davical/${PVR}/sqlscripts/
./update-davical-database -dbuser xxxxxxx -appuser xxxxxx
+
+If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/
+have been moved away from the htdocs directory and placed into hostroot for
+safety reasons. Update you include_path accordingly.
+
+You may have to configure the locale path in the davical configuration file.
+(add a $c->locale_path = '/path/to/the/locales';)
diff --git a/www-apps/davical/files/rscds.conf b/www-apps/davical/files/rscds.conf
deleted file mode 100644
index 0288764bb..000000000
--- a/www-apps/davical/files/rscds.conf
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-/***************************************************************************
-* *
-* These apply everywhere and will need setting *
-* *
-***************************************************************************/
-
-/****************************
-********* Mandatory *********
-*****************************/
-
-/**
-* Ex : $c->pg_connect[] = 'dbname=davical port=5432 user=general'
-* The application will attempt to
-* connect to the database, successively applying connection parameters from
-* the array in $c->pg_connect.
-* used in the web interface but also the caldav Server
-*/
-$c->pg_connect[] = "dbname=davical user=general";
-// $c->pg_connect[] = "dbname=davical user=general port=5433 host=somehost password=mypass";
-
-
-/****************************
-********* Desirable *********
-*****************************/
-
-/**
-* default : Really Simple CalDAV Store
-* Is used to specify the authentication realm of the server, as well as
-* being used as a name to display in various places.
-*/
-$c->system_name = "Really Simple CalDAV Store";
-
-/**
-* default is false
-* If true, then events requested from someone other than the admmin or owner
-* of a calendar will not get any alarm for it. Some client software also
-* allows you to configure calendar by calendar which ones allow alarms.
-*/
-$c->hide_alarm = true;
-
-/**
-*default is false
-*If true, then TODO requested from someone other than the admmin or owner
-* of a calendar will not get any answer
-*/
-$c->hide_TODO = true;
-
-/***************************************************************************
-* *
-* ADMIN web Interface *
-* *
-***************************************************************************/
-/**
-* Displayed on the login page to indicate who you should ask if you have
-* problems logging on. Also for the "From" of the email sent when a user
-* has lost his password and click on the login page
-* on "Help! I've forgotten my password"
-*/
-$c->admin_email ='calendar-admin@example.com';
-
-/**
-* default=true
-* if true the admin web interface will
-* have link on name to access details
-* <p>The "enable_row_linking" option controls whether javascript is used
-* to make the entire row clickable in browse lists in the administration
-* pages. Since this doesn't work in Konqueror you may want to set this
-* to false if you expect people to be using Konqueror with the DAViCal
-* administration pages.</p>
-*/
-// $c->enable_row_linking = true;
-
-/**
-* These should be an array of style sheets with a path specified relative
-* to the root directory. Used for overriding display styles in the admin
-* interface.
-* e.g. : $c->local_styles = array('/css/my.css');
-**/
-// $c->local_styles = array();
-// $c->print_styles = array();
-
-
-/***************************************************************************
-* *
-* Caldav Server *
-* *
-***************************************************************************/
-
-/**
-* The "collections_always_exist" value defines whether a MKCALENDAR
-* command is needed to create a calendar collection before calendar
-* resources can be stored in it. You will want to leave this to the
-* default (true) if people will be using Evolution or Sunbird /
-* Lightning against this because that software does not support the
-* creation of calendar collections.
-* Default: true
-*/
-// $c->collections_always_exist = true;
-
-/**
-* The name of a user's "home" calendar. This will be created for each
-* new user.
-* Default: 'home'
-*/
-// $c->home_calendar_name = 'home';
-
-/**
-* An array of groups / permissions which should be automatically added
-* for each new user created. This is a crude mechanism which we
-* will hopefully manage to work out some better approach for in the
-* future. For now, create an array that looks something like:
-* array( 9 => 'R', 4 => 'A' )
-* to create a 'read' relationship to user_no 9 and an 'all' relation
-* with user_no 4.
-* Default: none
-*/
-// $c->default_relationships = array();
-
-
-/***************************************************************************
-* *
-* External Authentication Sources *
-* *
-***************************************************************************/
-
-/**
-* Allow specifying another way to control access of the user by authenticating
-* him against other drivers such has LDAP (the default is the PgSQL DB)
-* $c->authenticate_hook['call'] should be set to the name of the plugin and must
-* be a valid function that will be call like this:
-* call_user_func( $c->authenticate_hook['call'], $username, $password )
-*
-* The login mecanism is made in 2 places:
-* - for the web interface in: index.php that calls RSCDSSession.php that extends
-* Session.php (from AWL libraries)
-* - for the caldav client in: caldav.php that calls BasicAuthSession.php
-* Both Session.php and BasicAuthSession.php check against the
-* authenticate_hook['call'], although for BasicAuthSession.php this will be for
-* each page. For Session.php this will only occur during login.
-*
-* $c->authenticate_hook['config'] should be set up with any configuration data
-* needed by the authenticate call for the moment used only in awl/inc/AuthPlugins.php
-* and he used to authenticate the user should be at least 'password,user_no'
-* awl/inc/AuthPlugins.php is a sample file not used by showing what could be
-* a hook
-*/
-
-/********************************/
-/******* Other AWL hook *********/
-/********************************/
-// require_once('auth-functions.php');
-// $c->authenticate_hook = array(
-// 'call' => 'AuthExternalAwl',
-// 'config' => array(
-// // A PgSQL database connection string for the database containing user records
-// 'connection' => 'dbname=wrms host=otherhost port=5433 user=general',
-// // Which columns should be fetched from the database
-// 'columns' => "user_no, active, email_ok, joined, last_update AS updated, last_used, username, password, fullname, email",
-// // a WHERE clause to limit the records returned.
-// 'where' => "active AND org_code=7"
-// )
-// );
-
-
-/********************************/
-/*********** LDAP hook **********/
-/********************************/
-/*
- * For Active Directory go down to the next example.
- */
-
-//$c->authenticate_hook['call'] = 'LDAP_check';
-//$c->authenticate_hook['config'] = array(
-// 'host' => 'www.tennaxia.net', //host name of your LDAP Server
-// 'port' => '389', //port
-
- /* For the initial bind to be anonymous leave bindDN and passDN
- commented out */
-// DN to bind to this server enabling to perform request
-// 'bindDN'=> 'cn=manager,cn=internal,dc=tennaxia,dc=net',
-// Password of the previous bindDN to bind to this server enabling to perform request
-// 'passDN'=> 'xxxxxxxx',
-
-// 'protocolVersion' => '3', //Version of LDAP protocol to use
-// 'baseDNUsers'=> 'dc=tennaxia,dc=net', //where to look at valid user
-// 'filterUsers' => 'objectClass=kolabInetOrgPerson', //filter which must validate a user according to RFC4515, i.e. surrounded by brackets
-// 'baseDNGroups' => 'ou=divisions,dc=tennaxia,dc=net', //not used ATM
-// 'filterGroups' => 'objectClass=groupOfUniqueNames', //not used ATM
- /** /!\ "username" should be set and "updated" must be set **/
-// 'mapping_field' => array("username" => "uid",
-// "updated" => "modifyTimestamp",
-// "fullname" => "cn" ,
-// "email" =>"mail"
-// ), //used to create the user based on his ldap properties
- /** used to set default value for all users, will be overcharged by ldap if defined also in mapping_field **/
-// 'default_value' => array("date_format_type" => "E","locale" => "fr_FR"),
- /** foreach key set start and length in the string provided by ldap
- example for openLDAP timestamp : 20070503162215Z **/
-// 'format_updated'=> array('Y' => array(0,4),'m' => array(4,2),'d'=> array(6,2),'H' => array(8,2),'M'=>array(10,2),'S' => array(12,2)),
-// 'startTLS' => 'yes', // Require that TLS is used for LDAP?
- // If ldap_start_tls is not working, it is probably
- // because php wants to validate the server's
- // certificate. Try adding "TLS_REQCERT never" to the
- // ldap configuration file that php uses (e.g. /etc/ldap.conf
- // or /etc/ldap/ldap.conf). Of course, this lessens security!
-// 'scope' => 'subtree', // Search scope to use, defaults to subtree.
-// // Allowed values: base, onelevel, subtree.
-//
-// );
-//
-//include('drivers_ldap.php');
-
-/*
- * Use the following LDAP example if you are using Active Directory
- *
- * You will need to change host, passDN and DOMAIN in bindDN
- * and baseDNUsers.
- */
-//$c->authenticate_hook['call'] = 'LDAP_check';
-//$c->authenticate_hook['config'] = array(
-// 'host' => 'ldap://ldap.example.net',
-// 'bindDN' => 'auth@DOMAIN',
-// 'passDN' => 'secret',
-// 'baseDNUsers' => 'dc=DOMAIN,dc=local',
-// 'protocolVersion' => 3,
-// 'optReferrals' => 0,
-// 'filterUsers' => '(&(objectcategory=person)(objectclass=user)(givenname=*))',
-// 'mapping_field' => array("username" => "uid",
-// "fullname" => "cn" ,
-// "email" => "mail"),
-// 'default_value' => array("date_format_type" => "E","locale" => "en_NZ"),
-// 'format_updated' => array('Y' => array(0,4),'m' => array(4,2),'d'=> array(6,2),'H' => array(8,2),'M'=>array(10,2),'S' => array(12,2))
-// );
-//include('drivers_ldap.php');
-
-
-/**
-* Authentication against PAM using the Squid helper script.
-*/
-//$c->authenticate_hook = array(
-// 'call' => 'SQUID_PAM_check',
-// 'config' => array( 'script' => '/usr/bin/pam_auth', 'email_base' => 'example.com' );
-// );
-//include('drivers_squid_pam.php');
-
-
-/**
-* The default locale will be "en_NZ";
-* If you are in a non-English locale, you can set the default_locale
-* configuration to one of the supported locales.
-*
-* Supported Locales (at present, see: "select * from supported_locales ;" for a full list)
-*
-* "de_DE", "en_NZ", "es_AR", "fr_FR", "nl_NL", "ru_RU"
-*
-* If you want locale support you probably know more about configuring it than me, but
-* at this stage it should be noted that all translations are UTF-8, and pages are
-* served as UTF-8, so you will need to ensure that the UTF-8 versions of these locales
-* are supported on your system.
-*
-* People interested in providing new translations are directed to the Wiki:
-* http://rscds.sourceforge.net/moin/TranslatingRscds
-**/
-// $c->default_locale = "en_NZ";
-
-/**
-* Default will be $_SERVER['SERVER_NAME'];
-* This is used to construct URLs which are passed in the answers to the client. You may
-* want to force this to a specific domain in responses if your system is accessed by
-* multiple names, otherwise you probably won't need to change it.
-*/
-// $c->domain_name;
-
-/**
-* Used as a fallback for the TZID of an event where one is not supplied as part
-* of a VEVENT. The local (server) time zone will be used as a default.
-*/
-// $c->local_tzid;
diff --git a/www-apps/davical/files/vhost-example b/www-apps/davical/files/vhost-example
new file mode 100644
index 000000000..5ac5c35f5
--- /dev/null
+++ b/www-apps/davical/files/vhost-example
@@ -0,0 +1,17 @@
+<VirtualHost 123.4.56.78 >
+ ServerName davical.example.net
+
+ DocumentRoot /var/www/myvhost/htdocs
+
+ <Directory /var/www/myvhost/htdocs/>
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ </Directory>
+
+ php_value include_path "/usr/share/php5/awl:/var/www/myvhost/inc"
+ php_value magic_quotes_gpc 0
+ php_value register_globals 0
+ php_value error_reporting "E_ALL & ~E_NOTICE"
+ php_value default_charset "utf-8"
+</VirtualHost>