OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 27-Jul-2009 17:23:04 Branch: HEAD Handle: 2009072716230400 Modified files: openpkg-src/dovecot dovecot.patch dovecot.spec Log: upgrading package: dovecot 1.2.1 -> 1.2.2 Summary: Revision Changes Path 1.11 +44 -44 openpkg-src/dovecot/dovecot.patch 1.36 +3 -3 openpkg-src/dovecot/dovecot.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/dovecot/dovecot.patch ============================================================================ $ cvs diff -u -r1.10 -r1.11 dovecot.patch --- openpkg-src/dovecot/dovecot.patch 5 Jul 2009 16:12:21 -0000 1.10 +++ openpkg-src/dovecot/dovecot.patch 27 Jul 2009 15:23:04 -0000 1.11 @@ -1,51 +1,51 @@ Index: configure.in ---- configure.in.orig 2009-05-18 03:39:35 +0200 -+++ configure.in 2009-05-18 22:39:30 +0200 -@@ -1962,14 +1962,14 @@ - - if test $want_pgsql != no; then - # based on code from PHP -- for i in /usr /usr/local /usr/local/pgsql; do -- for j in include include/pgsql include/postgres include/postgresql ""; do -+ for i in @l_prefix@; do -+ for j in include/postgresql; do - if test -r "$i/$j/libpq-fe.h"; then - PGSQL_INCLUDE=$i/$j - fi - done -- for lib in lib lib64; do -- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do -+ for lib in lib; do -+ for j in $lib; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then - PGSQL_LIBDIR=$i/$j - fi +--- configure.in.orig 2009-07-27 07:26:10 +0200 ++++ configure.in 2009-07-27 16:49:17 +0200 +@@ -1970,14 +1970,14 @@ + AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) + if test $PG_CONFIG = NO; then + # based on code from PHP +- for i in /usr /usr/local /usr/local/pgsql; do +- for j in include include/pgsql include/postgres include/postgresql ""; do ++ for i in @l_prefix@; do ++ for j in include/postgresql; do + if test -r "$i/$j/libpq-fe.h"; then + PGSQL_INCLUDE=$i/$j + fi + done +- for lib in lib lib64; do +- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do ++ for lib in lib; do ++ for j in $lib; do + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + PGSQL_LIBDIR=$i/$j + fi Index: configure ---- configure.orig 2009-05-18 03:39:51 +0200 -+++ configure 2009-05-18 22:39:30 +0200 -@@ -28482,14 +28482,14 @@ +--- configure.orig 2009-07-27 07:26:28 +0200 ++++ configure 2009-07-27 16:50:02 +0200 +@@ -29424,14 +29424,14 @@ - if test $want_pgsql != no; then - # based on code from PHP -- for i in /usr /usr/local /usr/local/pgsql; do -- for j in include include/pgsql include/postgres include/postgresql ""; do -+ for i in @l_prefix@; do -+ for j in include/postgresql; do - if test -r "$i/$j/libpq-fe.h"; then - PGSQL_INCLUDE=$i/$j - fi - done -- for lib in lib lib64; do -- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do -+ for lib in lib; do -+ for j in $lib; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then - PGSQL_LIBDIR=$i/$j - fi + if test $PG_CONFIG = NO; then + # based on code from PHP +- for i in /usr /usr/local /usr/local/pgsql; do +- for j in include include/pgsql include/postgres include/postgresql ""; do ++ for i in @l_prefix@; do ++ for j in include/postgresql; do + if test -r "$i/$j/libpq-fe.h"; then + PGSQL_INCLUDE=$i/$j + fi + done +- for lib in lib lib64; do +- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do ++ for lib in lib; do ++ for j in $lib; do + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + PGSQL_LIBDIR=$i/$j + fi Index: src/deliver/deliver.c ---- src/deliver/deliver.c.orig 2009-02-27 00:31:13 +0100 -+++ src/deliver/deliver.c 2009-05-18 22:39:30 +0200 -@@ -41,7 +41,7 @@ +--- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 ++++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 +@@ -46,7 +46,7 @@ #include <syslog.h> #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" @@ . patch -p0 <<'@@ .' Index: openpkg-src/dovecot/dovecot.spec ============================================================================ $ cvs diff -u -r1.35 -r1.36 dovecot.spec --- openpkg-src/dovecot/dovecot.spec 24 Jul 2009 05:37:58 -0000 1.35 +++ openpkg-src/dovecot/dovecot.spec 27 Jul 2009 15:23:04 -0000 1.36 @@ -23,7 +23,7 @@ # package version %define V_major 1.2 -%define V_minor 1 +%define V_minor 2 %define V_sieve_base 1.2 %define V_sieve 0.1.9 %define V_managesieve_base 1.2.1 @@ -42,13 +42,13 @@ Group: Mail License: MIT+LGPL Version: %{V_major}.%{V_minor} -Release: 20090724 +Release: 20090727 # package options %option with_fsl yes %option with_pam yes %option with_sieve yes -%option with_managesieve yes +%option with_managesieve no %option with_ldap no %option with_mysql no %option with_pgsql no @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org