Date: Fri, 26 Nov 2010 09:44:27 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r442 - branches/experimental/mail/thunderbird-devel/files Message-ID: <201011260944.oAQ9iRp4028808@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: andreast Date: Fri Nov 26 09:44:26 2010 New Revision: 442 Log: Add fix for ldap regex stuff. Same as in seamonkey except the Makefile.in part. Testing done on amd64, i386 and powerpc. Sparc64 is ongoing by flo. Added: branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 Added: branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 Fri Nov 26 09:44:26 2010 (r442) @@ -0,0 +1,99 @@ +Index: mozilla/directory/c-sdk/ldap/include/portable.h +=================================================================== +RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/portable.h,v +retrieving revision 5.15 +diff -u -8 -p -r5.15 portable.h +--- directory/c-sdk/ldap/include/portable.h 3 Oct 2006 20:43:40 -0000 5.15 ++++ directory/c-sdk/ldap/include/portable.h 6 Oct 2010 19:06:58 -0000 +@@ -117,17 +117,17 @@ + #else + #define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) + #endif + + /* + * some systems don't have the BSD re_comp and re_exec routines + */ + #ifndef NEED_BSDREGEX +-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) ++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) + #define NEED_BSDREGEX + #endif + #endif + + /* + * many systems do not have the setpwfile() library routine... we just + * enable use for those systems we know have it. + */ +Index: mozilla/directory/c-sdk/ldap/include/regex.h +=================================================================== +RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/regex.h,v +retrieving revision 5.2 +diff -u -8 -p -r5.2 regex.h +--- directory/c-sdk/ldap/include/regex.h 15 Oct 2003 17:26:00 -0000 5.2 ++++ directory/c-sdk/ldap/include/regex.h 6 Oct 2010 19:06:59 -0000 +@@ -68,18 +68,18 @@ extern "C" { + #define LDAP_CALL + #endif + #endif + + #ifdef NEEDPROTOS + int re_init( void ); + void re_lock( void ); + int re_unlock( void ); +-char * LDAP_CALL re_comp( char *pat ); +-int LDAP_CALL re_exec( char *lp ); ++char * LDAP_CALL re_comp( const char *pat ); ++int LDAP_CALL re_exec( const char *lp ); + void LDAP_CALL re_modw( char *s ); + int LDAP_CALL re_subs( char *src, char *dst ); + #else /* NEEDPROTOS */ + int re_init(); + void re_lock(); + int re_unlock(); + char * LDAP_CALL re_comp(); + int LDAP_CALL re_exec(); +Index: mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c +=================================================================== +RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c,v +retrieving revision 5.2 +diff -u -8 -p -r5.2 regex.c +--- directory/c-sdk/ldap/libraries/libldap/regex.c 15 Oct 2003 17:26:03 -0000 5.2 ++++ directory/c-sdk/ldap/libraries/libldap/regex.c 6 Oct 2010 19:06:59 -0000 +@@ -262,17 +262,17 @@ chset(REGEXCHAR c) + bittab[((c) & (unsigned)BLKIND) >> 3] |= bitarr[(c) & BITIND]; + } + + #define badpat(x) (*nfa = END, x) + #define store(x) *mp++ = x + + char * + LDAP_CALL +-re_comp( char *pat ) ++re_comp( const char *pat ) + { + register REGEXCHAR *p; /* pattern pointer */ + register REGEXCHAR *mp=nfa; /* nfa pointer */ + register REGEXCHAR *lp; /* saved pointer.. */ + register REGEXCHAR *sp=nfa; /* another one.. */ + + register int tagi = 0; /* tag stack index */ + register int tagc = 1; /* actual tag count */ +@@ -508,17 +508,17 @@ static REGEXCHAR *pmatch(); + * If a match is found, bopat[0] and eopat[0] are set + * to the beginning and the end of the matched fragment, + * respectively. + * + */ + + int + LDAP_CALL +-re_exec( char *lp ) ++re_exec( const char *lp ) + { + register REGEXCHAR c; + register REGEXCHAR *ep = 0; + register REGEXCHAR *ap = nfa; + + bol = (REGEXCHAR*)lp; + + bopat[0] = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011260944.oAQ9iRp4028808>