← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/php5/gutsy

« back to all changes in this revision

Viewing changes to ext/imap/config.m4

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, CVE-2007-0905, CVE-2007-0906, CVE-2007-0909, CVE-2007-0910
  • Date: 2007-02-20 17:54:46 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070220175446-nudqyuv0dfowel3r
Tags: 5.2.1-0ubuntu1
* New upstream security/bugfix release:
  - safe_mode & open_basedir bypasses inside the session extension
    [CVE-2007-0905]
  - multiple buffer overflows in various extensions and functions
    [CVE-2007-0906]
  - underflow in the internal sapi_header_op() function [CVE-2007-0907]
  - information disclosure in the wddx extension [CVE-2007-0908]
  - string format vulnerability in *print() functions on 64 bit systems
    [CVE-2007-0909]
  - possible clobbering of super-globals in several code paths
    [CVE-2007-0910]
* Adapted patches to new upstream release:
  - 006-debian_quirks.patch
  - 034-apache2_umask_fix.patch
  - 044-strtod_arm_fix.patch
* Drop 109-libdb4.4.patch: Obsolete, upstream now checks for db 4.5 and 4.4.
* Drop 114-zend_alloc.c_m68k_alignment.patch and
  115-zend_alloc.c_memleak.patch: Applied upstream.
* Add debian/patches/000upstream-str_ireplace_offbyone.patch:
  - Fix off-by-one in str_ireplace(), a regression introduced in 5.2.1.
  - Patch taken from upstream CVS:
    http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.630&r2=1.631
  - CVE-2007-0911
* debian/control: Set Ubuntu maintainer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/imap/config.m4
1
1
dnl
2
 
dnl $Id: config.m4,v 1.69.4.1 2006/09/24 18:06:37 iliaa Exp $
 
2
dnl $Id: config.m4,v 1.69.4.6 2007/01/23 12:37:21 bjori Exp $
3
3
dnl
4
4
 
5
5
AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
65
65
 
66
66
AC_DEFUN([PHP_IMAP_SSL_CHK], [
67
67
  if test "$PHP_IMAP_SSL" != "no"; then
 
68
    if test "$PHP_OPENSSL" = ""; then
 
69
      PHP_OPENSSL='no'
 
70
    fi
68
71
    PHP_SETUP_OPENSSL(IMAP_SHARED_LIBADD,
69
72
    [
70
73
      AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
114
117
    AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
115
118
      AC_DEFINE(HAVE_IMAP2004,1,[ ])
116
119
    ])
117
 
    
 
120
 
118
121
    dnl Check for new version of the utf8_mime2text() function
119
 
    AC_EGREP_HEADER(mail_append_set, $IMAP_INC_DIR/mail.h, [
120
 
      AC_DEFINE(HAVE_NEW_MIME2TEXT,1,[ ])
121
 
    ])
 
122
    old_CFLAGS=$CFLAGS
 
123
    CFLAGS="-I$IMAP_INC_DIR"
 
124
    AC_CACHE_CHECK(for utf8_mime2text signature, ac_cv_utf8_mime2text,
 
125
      AC_TRY_COMPILE([
 
126
#include <stdio.h>
 
127
#include <c-client.h>
 
128
      ],[
 
129
        SIZEDTEXT *src, *dst;
 
130
        utf8_mime2text(src, dst);
 
131
      ],[
 
132
        ac_cv_utf8_mime2text=old
 
133
      ],[
 
134
        ac_cv_utf8_mime2text=new
 
135
      ])
 
136
    )
 
137
    if test "$ac_cv_utf8_mime2text" = "new"; then
 
138
      AC_DEFINE(HAVE_NEW_MIME2TEXT, 1, [Whether utf8_mime2text() has new signature])
 
139
    fi
 
140
    CFLAGS=$old_CPPFLAGS
 
141
 
 
142
    old_CFLAGS=$CFLAGS
 
143
    CFLAGS="-I$IMAP_INC_DIR"
 
144
    AC_CACHE_CHECK(for U8T_CANONICAL, ac_cv_u8t_canonical,
 
145
      AC_TRY_COMPILE([
 
146
#include <c-client.h>
 
147
      ],[
 
148
         int i = U8T_CANONICAL;
 
149
      ],[
 
150
         ac_cv_u8t_canonical=yes
 
151
      ],[
 
152
         ac_cv_u8t_canonical=no
 
153
      ])
 
154
    )
 
155
    CFLAGS=$old_CPPFLAGS
 
156
 
 
157
    if test "$ac_cv_u8t_canonical" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then
 
158
                AC_MSG_ERROR([utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information.])
 
159
    fi
 
160
    if test "$ac_cv_u8t_canonical" = "yes" && test "$ac_cv_utf8_mime2text" = "old"; then
 
161
                AC_MSG_ERROR([utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information.])
 
162
    fi
122
163
 
123
164
    dnl Check for c-client version 2001
124
165
    old_CPPFLAGS=$CPPFLAGS