# HG changeset patch # User Michael Schloh von Bennewitz # Date 1322742264 -3600 # Node ID 610cba0674b974ddefd301ef87f9364663b6cc6f # Parent 41738a0e98d14fc07ae69895c06093f6692ea4d0 Update to new vendor version and integrate latest package vendor config. diff -r 41738a0e98d1 -r 610cba0674b9 davical/davical-apache.conf --- a/davical/davical-apache.conf Tue Nov 29 18:44:37 2011 +0100 +++ b/davical/davical-apache.conf Thu Dec 01 13:24:24 2011 +0100 @@ -79,8 +79,8 @@ php_admin_flag register_argc_argv off # configure DAViCal -php_value include_path @l_prefix@/lib/davical/davical/inc:@l_prefix@/lib/davical/awl/inc -php_value error_reporting "E_ALL & ~E_NOTICE" +php_value include_path @l_prefix@/lib/davical/davical/inc:@l_prefix@/lib/davical/davical/htdocs:@l_prefix@/lib/davical/awl/inc +php_value error_reporting "E_ALL&~E_NOTICE" php_value default_charset "utf-8" RewriteEngine on RewriteRule ^/caldav/(.*)$ /caldav.php/$1 [PT] diff -r 41738a0e98d1 -r 610cba0674b9 davical/davical-setup.sh --- a/davical/davical-setup.sh Tue Nov 29 18:44:37 2011 +0100 +++ b/davical/davical-setup.sh Thu Dec 01 13:24:24 2011 +0100 @@ -40,8 +40,10 @@ # create database ( echo "CREATE ROLE $db_user LOGIN ENCRYPTED PASSWORD '$db_pass' NOCREATEDB NOCREATEUSER;" echo "CREATE TABLESPACE $db_name OWNER $db_user LOCATION '$db_dir';" - echo "CREATE DATABASE $db_name OWNER $db_user TABLESPACE $db_name ENCODING 'SQL_ASCII';" + echo "CREATE DATABASE $db_name OWNER $db_user TABLESPACE $db_name TEMPLATE template0 ENCODING 'UTF8';" ) | PGPASSWORD="$db_spass" @l_prefix@/bin/psql -q -U "$db_suser" -d "$db_sname" -f- + + # ensure PL/PgSQL language is available PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" \ -c "CREATE LANGUAGE plpgsql;" @@ -55,7 +57,11 @@ PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" -A -t \ -f "@l_prefix@/lib/davical/davical/dba/base-data.sql" 2>&1 | grep -v NOTICE - # create schema 2/2 (from original "update-davical-database" script) + # create schema 2/3 (from nowhere, but required by appuser_permissions.txt below) + PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" -A -t \ + -f "@l_prefix@/lib/davical/davical/dba/views/dav_principal.sql" 2>&1 | grep -v NOTICE + + # create schema 3/3 (from original "update-davical-database" script) PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" -A -t \ -f "@l_prefix@/lib/davical/davical/dba/supported_locales.sql" 2>&1 | grep -v NOTICE PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" -A -t \ @@ -63,8 +69,6 @@ PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" -A -t \ -f "@l_prefix@/lib/davical/davical/dba/rrule_functions.sql" 2>&1 | egrep -v '(NOTICE|ERROR)' PGPASSWORD="$db_spass" @l_prefix@/bin/psql -q -U "$db_suser" -d "$db_name" -A -t \ - -f "/opmi/lib/davical/davical/dba/views/dav_principal.sql" - PGPASSWORD="$db_spass" @l_prefix@/bin/psql -q -U "$db_suser" -d "$db_name" -A -t \ -f "@l_prefix@/lib/davical/davical/dba/appuser_permissions.txt" 2>&1 | grep -v NOTICE # set admin password @@ -73,8 +77,11 @@ ;; uninstall ) + # destroy PL/PgSQL language PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" \ -c "DROP LANGUAGE plpgsql CASCADE;" 2>&1 | grep -v NOTICE + + # destroy database ( echo "DROP DATABASE $db_name;" echo "DROP TABLESPACE $db_name;" echo "DROP ROLE $db_user;" @@ -82,6 +89,7 @@ ;; edit ) + # edit database PGPASSWORD="$db_spass" @l_prefix@/bin/psql -U "$db_suser" -d "$db_name" ;; esac diff -r 41738a0e98d1 -r 610cba0674b9 davical/davical.patch --- a/davical/davical.patch Tue Nov 29 18:44:37 2011 +0100 +++ b/davical/davical.patch Thu Dec 01 13:24:24 2011 +0100 @@ -1,7 +1,7 @@ -Index: davical-0.9.9.5/dba/appuser_permissions.txt ---- davical-0.9.9.5/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 -+++ davical-0.9.9.5/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 -@@ -1,65 +1,69 @@ +Index: davical-0.9.9.7/dba/appuser_permissions.txt +--- davical-0.9.9.7/dba/appuser_permissions.txt.orig 2011-10-06 11:14:54.000000000 +0200 ++++ davical-0.9.9.7/dba/appuser_permissions.txt 2011-10-25 09:45:26.000000000 +0200 +@@ -1,66 +1,69 @@ -# -# This file is used by update-rscds-database to set the correct -# permissions for the application user. In newer installations @@ -66,6 +66,9 @@ - ON addressbook_address_adr - ON addressbook_address_tel - ON addressbook_address_email +- ON timezones +- ON tz_aliases +- ON tz_localnames + ON collection, + caldav_data, + calendar_item, @@ -93,28 +96,28 @@ + addressbook_resource, + addressbook_address_adr, + addressbook_address_tel, -+ addressbook_address_email ++ addressbook_address_email, ++ timezones, ++ tz_aliases, ++ tz_localnames + TO davical; GRANT SELECT,UPDATE -- ON relationship_type_rt_id_seq + ON relationship_type_rt_id_seq - ON dav_id_seq - ON usr_user_no_seq - ON roles_role_no_seq - ON session_session_id_seq - ON principal_type_principal_type_id_seq - ON sync_tokens_sync_token_seq -+ ON relationship_type_rt_id_seq, +- ON timezones_our_tzno_seq + dav_id_seq, + usr_user_no_seq, + roles_role_no_seq, + session_session_id_seq, + principal_type_principal_type_id_seq, -+ sync_tokens_sync_token_seq -+ TO davical; - - GRANT SELECT,INSERT - ON time_zone ++ sync_tokens_sync_token_seq, ++ timezones_our_tzno_seq + TO davical; GRANT SELECT @@ -126,10 +129,29 @@ + principal_type + TO davical; -Index: davical-0.9.9.5/inc/always.php.in ---- davical-0.9.9.5/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 -+++ davical-0.9.9.5/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 -@@ -123,20 +123,8 @@ +Index: davical-0.9.9.7/dba/views/dav_principal.sql +--- davical-0.9.9.7/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 ++++ davical-0.9.9.7/dba/views/dav_principal.sql 2011-10-25 09:38:48.000000000 +0200 +@@ -2,7 +2,6 @@ + -- record 1:1 with the principal table + + +-DROP VIEW dav_principal CASCADE; + CREATE OR REPLACE VIEW dav_principal AS + SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, + username, password, fullname, email, +Index: davical-0.9.9.7/inc/always.php.in +--- davical-0.9.9.7/inc/always.php.in.orig 2011-09-25 11:04:29.000000000 +0200 ++++ davical-0.9.9.7/inc/always.php.in 2011-10-25 09:38:48.000000000 +0200 +@@ -58,6 +58,7 @@ + $c->images = $c->base_url . '/images'; + + // Add a default for newly created users ++date_default_timezone_set("UTC"); + $c->template_usr = array( 'active' => true, + 'locale' => 'en_GB', + 'date_format_type' => 'E', +@@ -125,20 +126,8 @@ * too early. */ ob_start( ); @@ -152,15 +174,3 @@ } else if ( @file_exists('config/config.php') ) { include('config/config.php'); -Index: davical-0.9.9.5/dba/views/dav_principal.sql ---- davical-0.9.9.5/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 -+++ davical-0.9.9.5/dba/views/dav_principal.sql 2010-11-22 14:33:59.832463699 +0100 -@@ -2,7 +2,7 @@ - -- record 1:1 with the principal table - - --DROP VIEW dav_principal CASCADE; -+DROP VIEW IF EXISTS dav_principal CASCADE; - CREATE OR REPLACE VIEW dav_principal AS - SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, - username, password, fullname, email, diff -r 41738a0e98d1 -r 610cba0674b9 davical/davical.spec --- a/davical/davical.spec Tue Nov 29 18:44:37 2011 +0100 +++ b/davical/davical.spec Thu Dec 01 13:24:24 2011 +0100 @@ -22,9 +22,9 @@ ## # package version -%define V_opkg 0.9.9.5 -%define V_davical 0.9.9.5 -%define V_awl 0.47 +%define V_opkg 0.9.9.7 +%define V_davical 0.9.9.7 +%define V_awl 0.49 # package information Name: davical @@ -37,7 +37,7 @@ Group: Network License: GPL Version: %{V_opkg} -Release: 20110915 +Release: 20111130 # package options %define with_ssl no @@ -86,7 +86,7 @@ prog davical:awl = { version = %{V_awl} url = http://debian.mcmillan.net.nz/packages/awl/ - regex = awl_(__VER__)\.tar\.gz + regex = awl-(__VER__)\.tar\.gz } %prep @@ -98,7 +98,11 @@ davical-%{V_davical}/scripts/build-always.sh %build - cd davical-%{V_davical} && %{l_make} %{l_mflags} htdocs/always.php + ln -s awl-%{V_awl} awl + ( cd davical-%{V_davical} + %{l_shtool} subst %{l_value -s -a} inc/always.php.in + %{l_make} %{l_mflags} htdocs/always.php + ) || exit $? %install # remove build cruft @@ -135,7 +139,11 @@ $RPM_BUILD_ROOT%{l_prefix}/etc/davical/ # install DAViCal Apache configuration file + l_hostname=`%{l_shtool} echo -e %h` + l_domainname=`%{l_shtool} echo -e %d | cut -c2-` %{l_shtool} install -c -m 644 %{l_value -s -a} \ + -e "s;@l_hostname@;$l_hostname;g" \ + -e "s;@l_domainname@;$l_domainname;g" \ %{SOURCE davical-apache.conf} \ $RPM_BUILD_ROOT%{l_prefix}/etc/davical/ @@ -162,7 +170,12 @@ # determine installation files %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ - '%config %{l_prefix}/etc/davical/*' \ + '%config %attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/etc/davical/*' \ + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*' \ + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*' \ + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*' \ + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*/*' \ + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*/*/*' \ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/davical' \ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/davical/*' @@ -179,9 +192,15 @@ echo " \$ $RPM_INSTALL_PREFIX/bin/openpkg rc postgresql start" echo " \$ $RPM_INSTALL_PREFIX/sbin/davical-setup install" echo "" +%if "%{with_ssl}" == "yes" echo "2. By default, DAViCal runs its own SSL/TLS based Apache server" echo " under 127.0.0.1, TCP port 8443. Please change this by editing" echo " the \"Listen 127.0.0.1:8443\" directive in:" +%else + echo "2. By default, DAViCal runs its own Apache server" + echo " under 127.0.0.1, TCP port 8080. Please change this by editing" + echo " the \"Listen 127.0.0.1:8080\" directive in:" +%endif echo " $RPM_INSTALL_PREFIX/etc/davical/davical-apache.conf" echo "" echo "3. Now start DAViCal by running the command"