OpenPKG Specs: dovecot/dovecot.patch@4a34d7a82eab

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.

     1 Index: configure.in

     2 diff -Nau configure.in.orig configure.in

     3 --- configure.in.orig	2009-07-27 07:26:10 +0200

     4 +++ configure.in	2009-07-27 16:49:17 +0200

     5 @@ -1964,14 +1964,14 @@

     6    AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO)

     7    if test $PG_CONFIG = NO; then

     8      # based on code from PHP

     9 -    for i in /usr /usr/local /usr/local/pgsql; do

    10 -      for j in include include/pgsql include/postgres include/postgresql ""; do

    11 +    for i in @l_prefix@; do

    12 +      for j in include/postgresql; do

    13  	if test -r "$i/$j/libpq-fe.h"; then

    14  	  PGSQL_INCLUDE=$i/$j

    15  	fi

    16        done

    17 -      for lib in lib lib64; do

    18 -	for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do

    19 +      for lib in lib; do

    20 +	for j in $lib; do

    21  	  if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then

    22  	    PGSQL_LIBDIR=$i/$j

    23  	  fi

    24 Index: configure

    25 diff -Nau configure.orig configure

    26 --- configure.orig	2009-07-27 07:26:28 +0200

    27 +++ configure	2009-07-27 16:50:02 +0200

    28 @@ -29410,14 +29410,14 @@

    30    if test $PG_CONFIG = NO; then

    31      # based on code from PHP

    32 -    for i in /usr /usr/local /usr/local/pgsql; do

    33 -      for j in include include/pgsql include/postgres include/postgresql ""; do

    34 +    for i in @l_prefix@; do

    35 +      for j in include/postgresql; do

    36  	if test -r "$i/$j/libpq-fe.h"; then

    37  	  PGSQL_INCLUDE=$i/$j

    38  	fi

    39        done

    40 -      for lib in lib lib64; do

    41 -	for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do

    42 +      for lib in lib; do

    43 +	for j in $lib; do

    44  	  if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then

    45  	    PGSQL_LIBDIR=$i/$j

    46  	  fi

    47 Index: src/deliver/deliver.c

    48 diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c

    49 --- src/deliver/deliver.c.orig	2009-06-28 01:47:56 +0200

    50 +++ src/deliver/deliver.c	2009-07-27 16:47:39 +0200

    51 @@ -46,7 +46,7 @@

    52  #include <syslog.h>

    54  #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"

    55 -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"

    56 +#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail"

    57  #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"

    59  /* After buffer grows larger than this, create a temporary file to /tmp

    60 Index: src/master/master-settings.c

    61 diff -Nau src/master/master-settings.c.orig src/master/master-settings.c

    62 --- src/master/master-settings.c.orig	2009-05-13 19:32:34.000000000 +0200

    63 +++ src/master/master-settings.c	2009-05-27 14:29:11.985776641 +0200

    64 @@ -179,8 +179,8 @@

    66  	/* general */

    67  	MEMBER(protocols) "imap imaps",

    68 -	MEMBER(listen) "*",

    69 -	MEMBER(ssl_listen) "",

    70 +	MEMBER(listen) "127.0.0.1",

    71 +	MEMBER(ssl_listen) "127.0.0.1",

    73  	MEMBER(ssl) "yes",

    74  	MEMBER(ssl_ca_file) "",

    75 @@ -200,7 +200,7 @@

    76  	/* login */

    77  	MEMBER(login_dir) "login",

    78  	MEMBER(login_executable) NULL,

    79 -	MEMBER(login_user) "dovecot",

    80 +	MEMBER(login_user) "@l_musr@",

    81  	MEMBER(login_greeting) PACKAGE_NAME" ready.",

    82  	MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c",

    83  	MEMBER(login_log_format) "%$: %s",

    84 @@ -321,7 +321,7 @@

    85  	MEMBER(anonymous_username) "anonymous",

    86  	MEMBER(krb5_keytab) "",

    87  	MEMBER(gssapi_hostname) "",

    88 -	MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth",

    89 +	MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth",

    90  	MEMBER(failure_delay) 2,

    92  	MEMBER(verbose) FALSE,

OpenPKG Specs / file revision

dovecot/dovecot.patch@4a34d7a82eab

dovecot/dovecot.patch