OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jul-2004 12:12:10
Branch: OPENPKG_2_1_SOLID Handle: 2004072711120900
Added files: (Branch: OPENPKG_2_1_SOLID)
openpkg-src/apache apache.patch.php
Modified files: (Branch: OPENPKG_2_1_SOLID)
openpkg-src/apache apache.patch apache.spec
Log:
MFC: latest fixes from CURRENT for PHP and Expat
Summary:
Revision Changes Path
1.13.2.2 +13 -4 openpkg-src/apache/apache.patch
1.2.4.1 +62 -0 openpkg-src/apache/apache.patch.php
1.241.2.6 +3 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.13.2.1 -r1.13.2.2 apache.patch
--- openpkg-src/apache/apache.patch 7 Jul 2004 13:47:36 -0000 1.13.2.1
+++ openpkg-src/apache/apache.patch 27 Jul 2004 10:12:09 -0000 1.13.2.2
@@ -79,10 +79,19 @@
}
-Index: Configure
---- apache_1.3.31/src/Configure.orig 2004-04-09 19:01:50 +0200
-+++ apache_1.3.31/src/Configure 2004-07-06 22:05:44 +0200
-@@ -1869,19 +1875,8 @@
+Index: apache_1.3.31/src/Configure
+--- apache_1.3.31/src/Configure.orig 2004-07-26 14:20:53 +0200
++++ apache_1.3.31/src/Configure 2004-07-26 14:41:24 +0200
+@@ -1867,27 +1867,12 @@
+ # set the default, based on whether expat-lite is bundled. if it is present,
+ # then we can always include expat.
+ if [ "x$RULE_EXPAT" = "xdefault" ]; then
+- if [ -d ./lib/expat-lite/ ]; then
+- RULE_EXPAT=yes
+- else
+- RULE_EXPAT=no
+- fi
++ RULE_EXPAT=no
fi
if [ "x$RULE_EXPAT" = "xyes" ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch.php
============================================================================
$ cvs diff -u -r0 -r1.2.4.1 apache.patch.php
--- /dev/null 2004-07-27 12:12:10 +0200
+++ apache.patch.php 2004-07-27 12:12:10 +0200
@@ -0,0 +1,62 @@
+Index: ext/pdf/pdf.c
+--- ext/pdf/pdf.c.orig 2004-02-28 23:58:56 +0100
++++ ext/pdf/pdf.c 2004-07-25 11:35:57 +0200
+@@ -240,6 +240,16 @@
+ ZEND_GET_MODULE(pdf)
+ #endif
+
++ZEND_BEGIN_MODULE_GLOBALS(pdf)
++FILE *fp;
++ZEND_END_MODULE_GLOBALS(pdf)
++ZEND_DECLARE_MODULE_GLOBALS(pdf)
++#ifdef ZTS
++#define PDF_G(v) TSRMG(pdf_globals_id, zend_pdf_globals *, v)
++#else
++#define PDF_G(v) (pdf_globals.v)
++#endif
++
+ /* {{{ _free_pdf_doc
+ */
+ static void _free_pdf_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+@@ -305,6 +315,15 @@
+ }
+ /* }}} */
+
++/* {{{ pdf_flushwrite_fp
++ */
++static size_t pdf_flushwrite_fp(PDF *p, void *data, size_t size)
++{
++ FILE *fp = PDF_G(fp);
++ return fwrite(data, size, 1, fp);
++}
++/* }}} */
++
+ /* {{{ pdf_flushwrite
+ */
+ static size_t pdf_flushwrite(PDF *p, void *data, size_t size)
+@@ -339,8 +358,13 @@
+
+ /* {{{ PHP_MINIT_FUNCTION
+ */
++static void php_pdf_init_globals (zend_pdf_globals *g)
++{
++ g->fp = NULL;
++}
+ PHP_MINIT_FUNCTION(pdf)
+ {
++ ZEND_INIT_MODULE_GLOBALS(pdf, php_pdf_init_globals, NULL);
+ if ((PDF_get_majorversion() != PDFLIB_MAJORVERSION) ||
+ (PDF_get_minorversion() != PDFLIB_MINORVERSION)) {
+ php_error(E_ERROR,"PDFlib error: Version mismatch in wrapper code");
+@@ -469,9 +493,8 @@
+ pdf = PDF_new2(custom_errorhandler, pdf_emalloc, pdf_realloc, pdf_efree, NULL);
+
+ if(fp) {
+- if (PDF_open_fp(pdf, fp) < 0) {
+- RETURN_FALSE;
+- }
++ PDF_G(fp) = fp;
++ PDF_begin_document_callback(pdf, pdf_flushwrite_fp, "");
+ } else {
+ PDF_open_mem(pdf, pdf_flushwrite);
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.241.2.5 -r1.241.2.6 apache.spec
--- openpkg-src/apache/apache.spec 16 Jul 2004 09:56:46 -0000 1.241.2.5
+++ openpkg-src/apache/apache.spec 27 Jul 2004 10:12:09 -0000 1.241.2.6
@@ -66,7 +66,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 2.1.1
+Release: 2.1.2
# package options (suexec related)
%option with_suexec yes
@@ -212,6 +212,7 @@
Patch1: apache.patch.modowa
Patch2:
http://www.hardened-php.net/hardened-php-%{V_mod_php}-%{V_mod_php_hardened}.patch.gz
Patch3: apache.patch.modssl
+Patch4: apache.patch.php
# build information
Prefix: %{l_prefix}
@@ -517,6 +518,7 @@
-e 's;^typedef short SHORT\;;;' \
ext/mssql/php_mssql.h
%endif
+ %patch -p0 -P 4
) || exit $?
%if "%{with_mod_php_hardened}" == "yes"
%patch -p0 -P 2
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
