OpenPKG Specs: davical/davical.patch@4a34d7a82eab (annotated)

davical/davical.patch@4a34d7a82eab (annotated)

davical/davical.patch

Tue, 29 Mar 2011 20:04:34 +0200

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Tue, 29 Mar 2011 20:04:34 +0200
changeset 334: 4a34d7a82eab
parent 294: 88d9122d2641
child 361: 45eaa38991fd
permissions: -rw-r--r--

Rework package yet again, correcting and introducing new buildconf logic:
Conditionally disable bootstrap stage comparison correctly, correct
english grammar, better find system as(1) and ld(1), indotruce detailed
optimization option messages, more completely guess cpu types, allow
profiled bootstrapping without a preinstalled GCC because many other
compilers have long since implemented 64-bit arithmetic, instruct make
to build sequentially (not in sparallel) when building a profiled
bootstrap as GCC online documents recommend, and generally improve
comment blocks.

The single most important correction in this changeset relates to the
GCC changed optimization policy since at least GCC 4.5, in which -march
is always passed and not always correctly guessed. In the case of this
package, allowing GCC to guess the architecture leads to wild build
errors at various subcomponents (zlib, libgcc, libiberty...) and
bootstrap stages. It seems quite platform specific, and the safest
approach to correcting this seems to be explicitly always specifying the
-march argument when bootstrapping GCC. Because the best choice 'native'
is not available when bootstrapping using a foreign (non GCC) compiler,
a guess is made according to rpmmacros l_platform in that case.

It is questionable as to whether these recent optimization changes
on the part of GCC or this package are compatible with each other,
or if either are complete or correct at all. At least applying these
corrections allows this package to build again in most cases test.

 Index: davical-0.9.9.3/dba/appuser_permissions.txt
 --- davical-0.9.9.3/dba/appuser_permissions.txt.orig	2010-04-19 02:32:58.000000000 +0200
 +++ davical-0.9.9.3/dba/appuser_permissions.txt	2010-09-21 17:32:46.000000000 +0200
@@ -1,65 +1,69 @@
 -#
 -# This file is used by update-rscds-database to set the correct
 -# permissions for the application user.  In newer installations
 -# the application user will probably be called app_davical (and
 -# the administrative user will be called dba_davical) but in
 -# older installations the application user was called 'general'
 -# and the administrative user was probably 'postgres'.
 -#
 -# See the wiki topic 'Database/Users' for more discussion.
 -#
 -# This file includes lines like:
 -#   GRANT SELECT,...
 -# which define what gets granted to the following lines like:
 -#   ON table1, table2, sequence1, function 3, view4, ...
 -# no user-serviceable parts inside, all whitespace is ignored,
 -# your mileage should not vary :-)
 -#
 +--
 +-- This file is used by update-rscds-database to set the correct
 +-- permissions for the application user.  In newer installations
 +-- the application user will probably be called app_davical (and
 +-- the administrative user will be called dba_davical) but in
 +-- older installations the application user was called 'general'
 +-- and the administrative user was probably 'postgres'.
 +--
 +-- See the wiki topic 'Database/Users' for more discussion.
 +--
 +-- This file includes lines like:
 +--   GRANT SELECT,...
 +-- which define what gets granted to the following lines like:
 +--   ON table1, table2, sequence1, function 3, view4, ...
 +-- no user-serviceable parts inside, all whitespace is ignored,
 +-- your mileage should not vary :-)
 +--
  GRANT SELECT,INSERT,UPDATE,DELETE
 -  ON collection
 -  ON caldav_data
 -  ON calendar_item
 -  ON relationship
 -  ON locks
 -  ON property
 -  ON freebusy_ticket
 -  ON usr
 -  ON usr_setting
 -  ON roles
 -  ON role_member
 -  ON session
 -  ON tmp_password
 -  ON group_member
 -  ON principal
 -  ON relationship_type
 -  ON sync_tokens
 -  ON sync_changes
 -  ON grants
 -  ON dav_principal
 -  ON access_ticket
 -  ON dav_binding
 -  ON calendar_alarm
 -  ON calendar_attendee
 -  ON addressbook_resource
 -  ON addressbook_address_adr
 -  ON addressbook_address_tel
 -  ON addressbook_address_email
 +  ON collection,
 +     caldav_data,
 +     calendar_item,
 +     relationship,
 +     locks,
 +     property,
 +     freebusy_ticket,
 +     usr,
 +     usr_setting,
 +     roles,
 +     role_member,
 +     session,
 +     tmp_password,
 +     group_member,
 +     principal,
 +     relationship_type,
 +     sync_tokens,
 +     sync_changes,
 +     grants,
 +     dav_principal,
 +     access_ticket,
 +     dav_binding,
 +     calendar_alarm,
 +     calendar_attendee,
 +     addressbook_resource,
 +     addressbook_address_adr,
 +     addressbook_address_tel,
 +     addressbook_address_email
 +  TO davical;
  GRANT SELECT,UPDATE
 -  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,
 +     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
 +  TO davical;
  GRANT SELECT
 -  ON supported_locales
 -  ON awl_db_revision
 -  ON principal_type
 +  ON supported_locales,
 +     awl_db_revision,
 +     principal_type
 +  TO davical;
 Index: davical-0.9.9.3/inc/always.php.in
 --- davical-0.9.9.3/inc/always.php.in.orig	2010-09-21 03:40:44.000000000 +0200
 +++ davical-0.9.9.3/inc/always.php.in	2010-09-21 18:20:41.000000000 +0200
@@ -117,20 +117,8 @@
  * too early.
  */
  ob_start( );
 -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
 -  include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
 -}
 -else if ( @file_exists('/etc/davical/config.php') ) {
 -  include('/etc/davical/config.php');
 -}
 -else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
 -  include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
 -}
 -else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
 -  include('/usr/local/etc/davical/config.php');
 -}
 -else if ( @file_exists('../config/config.php') ) {
 -  include('../config/config.php');
 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) {
 +  include_once("@l_prefix@/etc/davical/davical-config.php");
  }
  else if ( @file_exists('config/config.php') ) {
    include('config/config.php');
 Index: davical-0.9.9.3/dba/views/dav_principal.sql
 --- davical-0.9.9.3/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
 +++ davical-0.9.9.3/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,

OpenPKG Specs / annotate

davical/davical.patch@4a34d7a82eab (annotated)

davical/davical.patch