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

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   13-Mar-2007 17:42:49
  Branch: HEAD                             Handle: 2007031316424800

  Added files:
    openpkg-src/apache      apache.patch.modssl
    openpkg-src/apache-php4 apache-php4.patch.modssl
  Modified files:
    openpkg-src/apache      apache.spec
    openpkg-src/apache-php4 apache-php4.spec

  Log:
    enable SysV IPC semaphore based mutexes on NetBSD >= 1.5 and OpenBSD

  Summary:
    Revision    Changes     Path
    1.1         +13 -0      openpkg-src/apache-php4/apache-php4.patch.modssl
    1.10        +2  -0      openpkg-src/apache-php4/apache-php4.spec
    1.2         +13 -0      openpkg-src/apache/apache.patch.modssl
    1.386       +3  -1      openpkg-src/apache/apache.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache-php4/apache-php4.patch.modssl
  ============================================================================
  $ cvs diff -u -r0 -r1.1 apache-php4.patch.modssl
  --- /dev/null 2007-03-13 17:42:28 +0100
  +++ apache-php4.patch.modssl  2007-03-13 17:42:48 +0100
  @@ -0,0 +1,13 @@
  +Index: pkg.sslmod/mod_ssl.h
  +--- pkg.sslmod/mod_ssl.h.orig        2006-05-08 09:15:38 +0200
  ++++ pkg.sslmod/mod_ssl.h     2007-03-13 17:03:24 +0100
  +@@ -290,6 +290,9 @@
  + #if defined(USE_SYSVSEM_SERIALIZED_ACCEPT) ||\
  +     (defined(__FreeBSD__) && defined(__FreeBSD_version) &&\
  +      __FreeBSD_version >= 300000) ||\
  ++    (defined(__NetBSD__) && defined(__NetBSD_Version__) &&\
  ++    __NetBSD_Version__ >= 105000000) ||\
  ++    defined(__OpenBSD__) ||\
  +     (defined(LINUX) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) &&\
  +      LINUX >= 2 && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) ||\
  +     defined(SOLARIS2) || defined(__hpux) ||\
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache-php4/apache-php4.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 apache-php4.spec
  --- openpkg-src/apache-php4/apache-php4.spec  13 Mar 2007 10:02:41 -0000      
1.9
  +++ openpkg-src/apache-php4/apache-php4.spec  13 Mar 2007 16:42:48 -0000      
1.10
  @@ -234,6 +234,7 @@
   Patch5:       apache-php4.patch.php
   Patch6:       apache-php4.patch.modauthkerb
   Patch7:       apache-php4.patch.modauthradius
  +Patch8:       apache-php4.patch.modssl
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -556,6 +557,7 @@
       #   unpack optional extension modules
   %if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
       %setup -q -T -D -a 1
  +    %patch -p0 -d mod_ssl-%{V_mod_ssl} -P 8
   %endif
   %if "%{with_mod_perl}" == "yes"
       %setup -q -T -D -a 2
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.patch.modssl
  ============================================================================
  $ cvs diff -u -r0 -r1.2 apache.patch.modssl
  --- /dev/null 2007-03-13 17:42:28 +0100
  +++ apache.patch.modssl       2007-03-13 17:42:48 +0100
  @@ -0,0 +1,13 @@
  +Index: pkg.sslmod/mod_ssl.h
  +--- pkg.sslmod/mod_ssl.h.orig        2006-05-08 09:15:38 +0200
  ++++ pkg.sslmod/mod_ssl.h     2007-03-13 17:03:24 +0100
  +@@ -290,6 +290,9 @@
  + #if defined(USE_SYSVSEM_SERIALIZED_ACCEPT) ||\
  +     (defined(__FreeBSD__) && defined(__FreeBSD_version) &&\
  +      __FreeBSD_version >= 300000) ||\
  ++    (defined(__NetBSD__) && defined(__NetBSD_Version__) &&\
  ++    __NetBSD_Version__ >= 105000000) ||\
  ++    defined(__OpenBSD__) ||\
  +     (defined(LINUX) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) &&\
  +      LINUX >= 2 && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) ||\
  +     defined(SOLARIS2) || defined(__hpux) ||\
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  ============================================================================
  $ cvs diff -u -r1.385 -r1.386 apache.spec
  --- openpkg-src/apache/apache.spec    9 Mar 2007 11:13:41 -0000       1.385
  +++ openpkg-src/apache/apache.spec    13 Mar 2007 16:42:48 -0000      1.386
  @@ -68,7 +68,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20070309
  +Release:      20070313
   
   #   package options (suexec related)
   %option       with_suexec               yes
  @@ -237,6 +237,7 @@
   Patch4:       apache.patch.suphp
   Patch5:       apache.patch.modauthkerb
   Patch6:       apache.patch.modauthradius
  +Patch7:       apache.patch.modssl
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -557,6 +558,7 @@
       #   unpack optional extension modules
   %if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
       %setup -q -T -D -a 1
  +    %patch -p0 -d mod_ssl-%{V_mod_ssl} -P 7
   %endif
   %if "%{with_mod_perl}" == "yes"
       %setup -q -T -D -a 2
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to