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: 25-Jul-2004 11:49:12
Branch: HEAD Handle: 2004072510491200
Added files:
openpkg-src/apache apache.patch.php
Modified files:
openpkg-src/apache apache.spec
Log:
fix building against PDFLib 6.0.0p1 which no longer has a
PDF_open_fp() function
Summary:
Revision Changes Path
1.3 +62 -0 openpkg-src/apache/apache.patch.php
1.249 +5 -3 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch.php
============================================================================
$ cvs diff -u -r0 -r1.3 apache.patch.php
--- /dev/null 2004-07-25 11:49:12 +0200
+++ apache.patch.php 2004-07-25 11:49:12 +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.248 -r1.249 apache.spec
--- openpkg-src/apache/apache.spec 16 Jul 2004 09:21:30 -0000 1.248
+++ openpkg-src/apache/apache.spec 25 Jul 2004 09:49:12 -0000 1.249
@@ -66,7 +66,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040716
+Release: 20040725
# package options (suexec related)
%option with_suexec yes
@@ -210,7 +210,8 @@
Source26: apache.sh
Patch0: apache.patch
Patch1: apache.patch.modowa
-Patch2:
http://www.hardened-php.net/hardened-php-%{V_mod_php}-%{V_mod_php_hardened}.patch.gz
+Patch2: apache.patch.php
+Patch3:
http://www.hardened-php.net/hardened-php-%{V_mod_php}-%{V_mod_php_hardened}.patch.gz
# build information
Prefix: %{l_prefix}
@@ -515,9 +516,10 @@
-e 's;^typedef short SHORT\;;;' \
ext/mssql/php_mssql.h
%endif
+ %patch -p0 -P 2
) || exit $?
%if "%{with_mod_php_hardened}" == "yes"
- %patch -p0 -P 2
+ %patch -p0 -P 3
%endif
%endif
%if "%{with_mod_dav}" == "yes"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]