head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.8 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.6 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.2 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.4.0.42 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.40 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.38 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.36 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.34 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.32 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.30 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.28 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.26 pkgsrc-2008Q1:1.4.0.24 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.22 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.20 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.18 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.16 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.14 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.12 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.10 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.8 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.6 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.4 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.2 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.0.2; locks; strict; comment @# @; 1.5 date 2010.02.10.18.08.34; author joerg; state dead; branches; next 1.4; 1.4 date 2005.04.21.23.47.46; author salo; state Exp; branches; next 1.3; 1.3 date 2004.10.31.18.23.24; author jdolecek; state Exp; branches 1.3.4.1; next 1.2; 1.2 date 2003.08.31.19.56.08; author jdolecek; state dead; branches; next 1.1; 1.1 date 2003.02.21.05.39.04; author lukem; state Exp; branches 1.1.2.1; next ; 1.3.4.1 date 2005.04.22.14.17.33; author salo; state Exp; branches; next ; 1.1.2.1 date 2003.02.21.05.39.04; author grant; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2003.04.16.14.52.27; author grant; state Exp; branches; next ; desc @@ 1.5 log @Retire PHP 4. @ text @$NetBSD: patch-ak,v 1.4 2005/04/21 23:47:46 salo Exp $ --- ext/imap/php_imap.c.orig 2005-01-25 15:23:37.000000000 +0100 +++ ext/imap/php_imap.c 2005-04-22 01:37:25.000000000 +0200 @@@@ -415,6 +415,11 @@@@ ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) +/* + * Optionally use the installed c-client linkage.c to determine which drivers + * are authenticators are linked in. Otherwise use this fixed list. + */ +#ifndef HAVE_IMAP_LINKAGE #ifndef PHP_WIN32 mail_link(&unixdriver); /* link in the unix driver */ mail_link(&mhdriver); /* link in the mh driver */ @@@@ -430,6 +435,10 @@@@ mail_link(&tenexdriver); /* link in the tenex driver */ mail_link(&mtxdriver); /* link in the mtx driver */ mail_link(&dummydriver); /* link in the dummy driver */ +#else /* HAVE_IMAP_LINKAGE */ + /* link in the c-client mail and auth drivers */ +#include "linkage.c" +#endif /* HAVE_IMAP_LINKAGE */ #ifndef PHP_WIN32 auth_link(&auth_log); /* link in the log authenticator */ @ 1.4 log @Apply cleanly after update to 4.3.11 @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.3 2004/10/31 18:23:24 jdolecek Exp $ @ 1.3 log @move php4-imap patches into php4/patches and use USE_PHP_EXT_PATCHES @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- ext/imap/php_imap.c.orig 2004-08-12 21:32:59.000000000 +0200 +++ ext/imap/php_imap.c 2004-10-31 18:49:03.000000000 +0100 @@@@ -414,6 +414,11 @@@@ d17 1 a17 1 @@@@ -429,6 +434,10 @@@@ @ 1.3.4.1 log @Pullup ticket 457 - requested by Takahiro Kambe security update for php4 Revisions pulled up: - pkgsrc/graphics/php-gd/Makefile 1.7 - pkgsrc/mail/php-imap/Makefile 1.5-1.7 - pkgsrc/net/pear-Net_SMTP/Makefile 1.3 - pkgsrc/net/pear-Net_SMTP/buildlink3.mk removed - pkgsrc/net/pear-Net_SMTP/builtin.mk removed - pkgsrc/net/pear-Net_SMTP/distinfo 1.2 - pkgsrc/net/pear-Net_Socket/Makefile 1.4 - pkgsrc/net/pear-Net_Socket/buildlink3.mk removed - pkgsrc/net/pear-Net_Socket/builtin.mk removed - pkgsrc/www/php-curl/Makefile 1.5 - pkgsrc/www/php4/Makefile 1.42 - pkgsrc/www/php4/Makefile.common 1.47 - pkgsrc/www/php4/PLIST 1.12 - pkgsrc/www/php4/buildlink3.mk 1.6 - pkgsrc/www/php4/distinfo 1.39-1.40 - pkgsrc/www/php4/patches/patch-ab removed - pkgsrc/www/php4/patches/patch-aj 1.9 - pkgsrc/www/php4/patches/patch-ak 1.4 - pkgsrc/www/php4/patches/patch-am removed - pkgsrc/www/pear-HTML_Common/Makefile 1.9 - pkgsrc/www/pear-HTTP_Request/Makefile 1.4 Module Name: pkgsrc Committed By: jdolecek Date: Mon Apr 11 20:02:57 UTC 2005 Modified Files: pkgsrc/doc: CHANGES pkgsrc/graphics/php-gd: Makefile pkgsrc/www/php-curl: Makefile pkgsrc/www/php4: Makefile Makefile.common PLIST buildlink3.mk distinfo pkgsrc/www/php4/patches: patch-aj Removed Files: pkgsrc/www/php4/patches: patch-am Log Message: Update php4 to 4.3.11. This is a maintenance release that in addition to over 70 non-critical bug fixes addresses several security issues inside the exif and fbsql extensions as well as the unserialize(), swf_definepoly() and getimagesize() functions. All Users of PHP are strongly encouraged to upgrade to this release. Bugfix release * Crash in bzopen() if supplied path to non-existent file. * DOM crashing when attribute appended to Document. * unserialize() float problem on non-English locales. * Crash in msg_send() when non-string is stored without being serialized. * Possible infinite loop in imap_mail_compose(). * Fixed crash in chunk_split(), when chunklen > strlen. * session_set_save_handler crashes PHP when supplied non-existent object ref. * Memory leak in zend_language_scanner.c. * Compile failures of zend_strtod.c. * Fixed crash in overloaded objects & overload() function. * cURL functions bypass open_basedir. PHP4 also doesn't bundle PEAR Net_Socket and Net_SMTP anymore now. --- Module Name: pkgsrc Committed By: jdolecek Date: Mon Apr 11 20:03:58 UTC 2005 Removed Files: pkgsrc/www/php4/patches: patch-ab Log Message: doesn't appear to be needed anymore --- Module Name: pkgsrc Committed By: jdolecek Date: Mon Apr 11 20:06:36 UTC 2005 Modified Files: pkgsrc/net/pear-Net_SMTP: distinfo Log Message: regen with RMD160 hash --- Module Name: pkgsrc Committed By: jdolecek Date: Mon Apr 11 20:08:43 UTC 2005 Modified Files: pkgsrc/net/pear-Net_SMTP: Makefile pkgsrc/net/pear-Net_Socket: Makefile pkgsrc/www/pear-HTML_Common: Makefile pkgsrc/www/pear-HTTP_Request: Makefile Removed Files: pkgsrc/net/pear-Net_SMTP: buildlink3.mk builtin.mk pkgsrc/net/pear-Net_Socket: buildlink3.mk builtin.mk Log Message: Net_Socket and Net_SMTP were unbundled from PHP4 in 4.3.11, g/c the related conditionals and buildlink logic, and convert to standard DEPENDS --- Module Name: pkgsrc Committed By: kim Date: Fri Apr 15 22:38:16 UTC 2005 Modified Files: pkgsrc/mail/php-imap: Makefile Log Message: I'm not sure why I need to set PHP_OPENSSL for OpenSSL to be found, but now the package builds again. --- Module Name: pkgsrc Committed By: jdolecek Date: Sat Apr 16 07:37:31 UTC 2005 Modified Files: pkgsrc/mail/php-imap: Makefile Log Message: g/c LIBS setting --- Module Name: pkgsrc Committed By: kim Date: Wed Apr 20 12:03:25 UTC 2005 Modified Files: pkgsrc/mail/php-imap: Makefile Log Message: Explain setting PHP_OPENSSL (from Stoned Elipot) --- Module Name: pkgsrc Committed By: salo Date: Thu Apr 21 23:47:47 UTC 2005 Modified Files: pkgsrc/www/php4: distinfo pkgsrc/www/php4/patches: patch-ak Log Message: Apply cleanly after update to 4.3.11 @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.4 2005/04/21 23:47:46 salo Exp $ d3 3 a5 3 --- ext/imap/php_imap.c.orig 2005-01-25 15:23:37.000000000 +0100 +++ ext/imap/php_imap.c 2005-04-22 01:37:25.000000000 +0200 @@@@ -415,6 +415,11 @@@@ d17 1 a17 1 @@@@ -430,6 +435,10 @@@@ @ 1.2 log @Update PHP to final 4.3.3 Some highlights of changes since 4.2.3: * PCRE updated to 4.3, GD to 2.0.15 * improved Apache2 support * much improved stream & URL wrapper support, output compression support * added CLI (Command Line Interface) SAPI * debug_backtrace() backported from ZendEngine2 * faster build system * huge number of other bug fixes and improvements Packaging changes: * 'pcre', 'xml', and 'session' modules folded back into main package - 'pcre' and 'xml' is required by PEAR, and 'session' is just too essential to be separate * 'gd' module now uses bundled PHP GD library, which is better integrated * PHP modules use shared distinfo when possible to ease future PHP updates * ${PREFIX}/bin/php is now CLI version, ${PREFIX}/libexec/cgi-big/php remains CGI version @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1 2003/02/21 05:39:04 lukem Exp $ d3 22 a24 31 --- ext/standard/string.c.orig Mon Jun 24 18:19:43 2002 +++ ext/standard/string.c @@@@ -616,7 +616,7 @@@@ PHP_FUNCTION(wordwrap) { const char *text, *breakchar = "\n"; char *newtext; - int textlen, breakcharlen = 1, newtextlen; + int textlen, breakcharlen = 1, newtextlen, alloced, chk; long current = 0, laststart = 0, lastspace = 0; long linelength = 75; zend_bool docut = 0; @@@@ -642,38 +642,40 @@@@ PHP_FUNCTION(wordwrap) for (current = 0; current < textlen; current++) { if (text[current] == breakchar[0]) { laststart = lastspace = current; - } - else if (text[current] == ' ') { + } else if (text[current] == ' ') { if (current - laststart >= linelength) { newtext[current] = breakchar[0]; laststart = current; } lastspace = current; - } - else if (current - laststart >= linelength - && laststart != lastspace) { + } else if (current - laststart >= linelength && laststart != lastspace) { newtext[lastspace] = breakchar[0]; laststart = lastspace; } } d26 2 a27 73 RETURN_STRINGL(newtext, textlen, 0); - } - else { + } else { /* Multiple character line break or forced cut */ if (linelength > 0) { - newtextlen = textlen + (textlen/linelength + 1) * breakcharlen + 1; - } - else { - newtextlen = textlen * (breakcharlen + 1) + 1; + chk = (int)(textlen/linelength + 1); + alloced = textlen + chk * breakcharlen + 1; + } else { + chk = textlen; + alloced = textlen * (breakcharlen + 1) + 1; } - newtext = emalloc(newtextlen); + newtext = emalloc(alloced); /* now keep track of the actual new text length */ newtextlen = 0; laststart = lastspace = 0; for (current = 0; current < textlen; current++) { + if (chk <= 0) { + alloced += (int) (((textlen - current + 1)/linelength + 1) * breakcharlen) + 1; + newtext = erealloc(newtext, alloced); + chk = (int) ((textlen - current)/linelength) + 1; + } /* when we hit an existing break, copy to new buffer, and * fix up laststart and lastspace */ if (text[current] == breakchar[0] @@@@ -683,6 +685,7 @@@@ PHP_FUNCTION(wordwrap) newtextlen += current-laststart+breakcharlen; current += breakcharlen - 1; laststart = lastspace = current + 1; + chk--; } /* if it is a space, check if it is at the line boundary, * copy and insert a break, or just keep track of it */ @@@@ -693,6 +696,7 @@@@ PHP_FUNCTION(wordwrap) memcpy(newtext+newtextlen, breakchar, breakcharlen); newtextlen += breakcharlen; laststart = current + 1; + chk--; } lastspace = current; } @@@@ -706,6 +710,7 @@@@ PHP_FUNCTION(wordwrap) memcpy(newtext+newtextlen, breakchar, breakcharlen); newtextlen += breakcharlen; laststart = lastspace = current; + chk--; } /* if the current word puts us over the linelength, copy * back up until the last space, insert a break, and move @@@@ -717,6 +722,7 @@@@ PHP_FUNCTION(wordwrap) memcpy(newtext+newtextlen, breakchar, breakcharlen); newtextlen += breakcharlen; laststart = lastspace = lastspace + 1; + chk--; } } @@@@ -727,6 +733,8 @@@@ PHP_FUNCTION(wordwrap) } newtext[newtextlen] = '\0'; + /* free unused memory */ + newtext = erealloc(newtext, newtextlen+1); RETURN_STRINGL(newtext, newtextlen, 0); } @ 1.1 log @Fix for wordwrap() buffer overflow, per http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2002-1396 (Patch obtained from RedHat's php-4.2.2-8.0.7.src.rpm.) Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ak was added on branch netbsd-1-6-1 on 2003-04-16 14:52:27 +0000 @ text @d1 107 @ 1.1.2.2 log @Create new file (requested by aymeric in ticket #1253): Fix for wordwrap() buffer overflow, per http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2002-1396 (Patch obtained from RedHat's php-4.2.2-8.0.7.src.rpm.) Bump PKGREVISION. @ text @a0 107 $NetBSD: patch-ak,v 1.1.2.1 2003/04/16 14:52:27 grant Exp $ --- ext/standard/string.c.orig Mon Jun 24 18:19:43 2002 +++ ext/standard/string.c @@@@ -616,7 +616,7 @@@@ PHP_FUNCTION(wordwrap) { const char *text, *breakchar = "\n"; char *newtext; - int textlen, breakcharlen = 1, newtextlen; + int textlen, breakcharlen = 1, newtextlen, alloced, chk; long current = 0, laststart = 0, lastspace = 0; long linelength = 75; zend_bool docut = 0; @@@@ -642,38 +642,40 @@@@ PHP_FUNCTION(wordwrap) for (current = 0; current < textlen; current++) { if (text[current] == breakchar[0]) { laststart = lastspace = current; - } - else if (text[current] == ' ') { + } else if (text[current] == ' ') { if (current - laststart >= linelength) { newtext[current] = breakchar[0]; laststart = current; } lastspace = current; - } - else if (current - laststart >= linelength - && laststart != lastspace) { + } else if (current - laststart >= linelength && laststart != lastspace) { newtext[lastspace] = breakchar[0]; laststart = lastspace; } } RETURN_STRINGL(newtext, textlen, 0); - } - else { + } else { /* Multiple character line break or forced cut */ if (linelength > 0) { - newtextlen = textlen + (textlen/linelength + 1) * breakcharlen + 1; - } - else { - newtextlen = textlen * (breakcharlen + 1) + 1; + chk = (int)(textlen/linelength + 1); + alloced = textlen + chk * breakcharlen + 1; + } else { + chk = textlen; + alloced = textlen * (breakcharlen + 1) + 1; } - newtext = emalloc(newtextlen); + newtext = emalloc(alloced); /* now keep track of the actual new text length */ newtextlen = 0; laststart = lastspace = 0; for (current = 0; current < textlen; current++) { + if (chk <= 0) { + alloced += (int) (((textlen - current + 1)/linelength + 1) * breakcharlen) + 1; + newtext = erealloc(newtext, alloced); + chk = (int) ((textlen - current)/linelength) + 1; + } /* when we hit an existing break, copy to new buffer, and * fix up laststart and lastspace */ if (text[current] == breakchar[0] @@@@ -683,6 +685,7 @@@@ PHP_FUNCTION(wordwrap) newtextlen += current-laststart+breakcharlen; current += breakcharlen - 1; laststart = lastspace = current + 1; + chk--; } /* if it is a space, check if it is at the line boundary, * copy and insert a break, or just keep track of it */ @@@@ -693,6 +696,7 @@@@ PHP_FUNCTION(wordwrap) memcpy(newtext+newtextlen, breakchar, breakcharlen); newtextlen += breakcharlen; laststart = current + 1; + chk--; } lastspace = current; } @@@@ -706,6 +710,7 @@@@ PHP_FUNCTION(wordwrap) memcpy(newtext+newtextlen, breakchar, breakcharlen); newtextlen += breakcharlen; laststart = lastspace = current; + chk--; } /* if the current word puts us over the linelength, copy * back up until the last space, insert a break, and move @@@@ -717,6 +722,7 @@@@ PHP_FUNCTION(wordwrap) memcpy(newtext+newtextlen, breakchar, breakcharlen); newtextlen += breakcharlen; laststart = lastspace = lastspace + 1; + chk--; } } @@@@ -727,6 +733,8 @@@@ PHP_FUNCTION(wordwrap) } newtext[newtextlen] = '\0'; + /* free unused memory */ + newtext = erealloc(newtext, newtextlen+1); RETURN_STRINGL(newtext, newtextlen, 0); } @