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

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   04-Jun-2004 10:34:15
  Branch: HEAD                             Handle: 2004060409341500

  Modified files:
    openpkg-src/php         php.spec

  Log:
    added Hardened PHP as option

  Summary:
    Revision    Changes     Path
    1.83        +57 -43     openpkg-src/php/php.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/php/php.spec
  ============================================================================
  $ cvs diff -u -r1.82 -r1.83 php.spec
  --- openpkg-src/php/php.spec  3 Jun 2004 18:32:04 -0000       1.82
  +++ openpkg-src/php/php.spec  4 Jun 2004 08:34:15 -0000       1.83
  @@ -23,6 +23,10 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   package component versions
  +%define       V_php                     4.3.7
  +%define       V_php_hardened            0.1.2
  +
   #   package information
   Name:         php
   Summary:      Personal HomePage (PHP)
  @@ -33,49 +37,50 @@
   Class:        BASE
   Group:        Language
   License:      PHP
  -Version:      4.3.7
  -Release:      20040603
  +Version:      %{V_php}
  +Release:      20040604
   
   #   package options
  -%option       with_calendar      no
  -%option       with_mysql         no
  -%option       with_pgsql         no
  -%option       with_gd            no
  -%option       with_bdb           no
  -%option       with_debug         no
  -%option       with_pdflib        no
  -%option       with_zlib          no
  -%option       with_bzip2         no
  -%option       with_ssl           no
  -%option       with_openldap      no
  -%option       with_openldapsasl  no
  -%option       with_mm            no
  -%option       with_pcre          no
  -%option       with_ftp           no
  -%option       with_java          no
  -%option       with_oci7          no
  -%option       with_oci8          no
  -%option       with_freetype      no
  -%option       with_gettext       no
  -%option       with_imap          no
  -%option       with_xml           no
  -%option       with_dom           no
  -%option       with_bc            no
  -%option       with_transsid      no
  -%option       with_curl          no
  -%option       with_mhash         no
  -%option       with_mcrypt        no
  -%option       with_wddx          no
  -%option       with_gdbm          no
  -%option       with_versioning    no
  -%option       with_snmp          no
  -%option       with_odbc          no
  -%option       with_mbregex       no
  -%option       with_mbstring      no
  -%option       with_exif          no
  -%option       with_iconv         no
  -%option       with_sendmail      no
  -%option       with_pear          no
  +%option       with_bc                   no
  +%option       with_bdb                  no
  +%option       with_bzip2                no
  +%option       with_calendar             no
  +%option       with_curl                 no
  +%option       with_debug                no
  +%option       with_dom                  no
  +%option       with_exif                 no
  +%option       with_freetype             no
  +%option       with_ftp                  no
  +%option       with_gdbm                 no
  +%option       with_gd                   no
  +%option       with_gettext              no
  +%option       with_hardened             no
  +%option       with_iconv                no
  +%option       with_imap                 no
  +%option       with_java                 no
  +%option       with_mbregex              no
  +%option       with_mbstring             no
  +%option       with_mcrypt               no
  +%option       with_mhash                no
  +%option       with_mm                   no
  +%option       with_mysql                no
  +%option       with_oci7                 no
  +%option       with_oci8                 no
  +%option       with_odbc                 no
  +%option       with_openldap             no
  +%option       with_openldapsasl         no
  +%option       with_pcre                 no
  +%option       with_pdflib               no
  +%option       with_pear                 no
  +%option       with_pgsql                no
  +%option       with_sendmail             no
  +%option       with_snmp                 no
  +%option       with_ssl                  no
  +%option       with_transsid             no
  +%option       with_versioning           no
  +%option       with_wddx                 no
  +%option       with_xml                  no
  +%option       with_zlib                 no
   
   #   fixing implicit extension dependencies and correlations
   %if "%{with_pear}" == "yes"
  @@ -96,7 +101,8 @@
   %endif
   
   #   list of sources
  -Source0:      http://static.php.net/www.php.net/distributions/php-%{version}.tar.gz
  +Source0:      http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
  +Patch0:       
http://www.hardened-php.net/hardened-php-%{V_php}-%{V_php_hardened}.patch.gz
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -230,10 +236,15 @@
   
   %track
       prog php = {
  -        version   = %{version}
  +        version   = %{V_php}
           url       = http://www.php.net/downloads.php
           regex     = php-(\d+\.\d+\.\d+)\.tar\.gz
       }
  +    prog php:hardened = {
  +        version   = %{V_php_hardened}
  +        url       = http://www.hardened-php.net/download.php
  +        regex     = hardened-php-%{V_php}-(\d+(\.\d+)+).patch.gz
  +    }
   
   %prep
       %setup -q
  @@ -241,6 +252,9 @@
           -e 's;\(/include\)/freetype2;\1;' \
           configure \
           ext/gd/config.m4
  +%if "%{with_hardened}" == "yes"
  +    %patch -p1
  +%endif
   
   %build
       #   configure package
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to