OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-web, openpkg-src         Date:   22-Nov-2002 10:36:48
  Branch: HEAD                             Handle: 2002112209364701

  Added files:
    openpkg-src/apache      apache-php-db4.patch
  Modified files:
    openpkg-src/apache      apache.spec
    openpkg-web             news.txt

  Log:
    add support for DB 4.1.24 to Apache's PHP

  Summary:
    Revision    Changes     Path
    1.1         +14 -0      openpkg-src/apache/apache-php-db4.patch
    1.94        +3  -1      openpkg-src/apache/apache.spec
    1.2083      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  Index: openpkg-src/apache/apache-php-db4.patch
  ============================================================
  $ cvs update -p -r1.1 apache-php-db4.patch
  --- php-4.2.3/ext/dba/dba_db3.c.orig  Thu Apr 18 14:31:19 2002
  +++ php-4.2.3/ext/dba/dba_db3.c       Fri Nov 22 10:30:24 2002
  @@ -74,7 +74,11 @@
        }
   
        if (db_create(&dbp, NULL, 0) == 0 &&
  +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
  +                     dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode) == 
0) {
  +#else
                        dbp->open(dbp, info->path, NULL, type, gmode, filemode) == 0) {
  +#endif
                dba_db3_data *data;
   
                data = malloc(sizeof(*data));
  Index: openpkg-src/apache/apache.spec
  ============================================================
  $ cvs diff -u -r1.93 -r1.94 apache.spec
  --- openpkg-src/apache/apache.spec    20 Nov 2002 11:20:13 -0000      1.93
  +++ openpkg-src/apache/apache.spec    22 Nov 2002 09:36:48 -0000      1.94
  @@ -143,7 +143,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20021120
  +Release:      20021122
   
   #   list of sources
   Source0:      http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
  @@ -166,6 +166,7 @@
   Source21:     apache.base
   Source22:     apache.vhost
   Source23:     rc.apache
  +Patch0:       apache-php-db4.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -327,6 +328,7 @@
   %endif
   %if "%{with_mod_php}" == "yes"
       %setup3 -q -T -D -a 3
  +    %patch0 -p0
   %endif
   %if "%{with_mod_dav}" == "yes"
       %setup4 -q -T -D -a 4
  Index: openpkg-web/news.txt
  ============================================================
  $ cvs diff -u -r1.2082 -r1.2083 news.txt
  --- openpkg-web/news.txt      22 Nov 2002 07:46:24 -0000      1.2082
  +++ openpkg-web/news.txt      22 Nov 2002 09:36:47 -0000      1.2083
  @@ -1,3 +1,4 @@
  +22-Nov-2002: Upgraded package: P<apache-1.3.27-20021122>
   22-Nov-2002: Upgraded package: P<gup-0.5.8-20021122>
   22-Nov-2002: Upgraded package: P<ghostscript-8.00-20021122>
   22-Nov-2002: Upgraded package: P<lout-3.27-20021122>
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to