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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   27-Jun-2005 15:47:33
  Branch: HEAD                             Handle: 2005062714473300

  Added files:
    openpkg-src/stunnel     stunnel.patch
  Modified files:
    openpkg-src/stunnel     stunnel.spec

  Log:
    The ucontext(3) based threading model is brand-new in stunnel 4.10 and
    unfortunately partly broken on some platforms. So, use the classical
    pthread(3) and fork(2) based models instead.

  Summary:
    Revision    Changes     Path
    1.3         +16 -0      openpkg-src/stunnel/stunnel.patch
    1.61        +3  -1      openpkg-src/stunnel/stunnel.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/stunnel/stunnel.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.3 stunnel.patch
  --- /dev/null 2005-06-27 15:47:31 +0200
  +++ stunnel.patch     2005-06-27 15:47:33 +0200
  @@ -0,0 +1,16 @@
  +The ucontext(3) based threading model is brand-new in stunnel 4.10 and
  +unfortunately partly broken on some platforms. So, use the classical
  +pthread(3) and fork(2) based models instead.
  +
  +Index: src/common.h
  +--- src/common.h.orig        2005-04-23 15:40:10 +0200
  ++++ src/common.h     2005-06-27 15:42:43 +0200
  +@@ -38,7 +38,7 @@
  + #endif
  + 
  + /* threads model */
  +-#if HAVE_UCONTEXT_H && HAVE_GETCONTEXT && HAVE_POLL
  ++#if 0
  + #define USE_UCONTEXT
  + #include <ucontext.h>
  + #elif HAVE_PTHREAD_H && HAVE_LIBPTHREAD
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/stunnel/stunnel.spec
  ============================================================================
  $ cvs diff -u -r1.60 -r1.61 stunnel.spec
  --- openpkg-src/stunnel/stunnel.spec  3 Jun 2005 10:33:38 -0000       1.60
  +++ openpkg-src/stunnel/stunnel.spec  27 Jun 2005 13:47:33 -0000      1.61
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      4.10
  -Release:      20050603
  +Release:      20050627
   
   #   package options
   %option       with_fsl  yes
  @@ -44,6 +44,7 @@
   Source2:      rc.stunnel
   Source3:      fsl.stunnel
   Source4:      stunnel.conf
  +Patch0:       stunnel.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -77,6 +78,7 @@
   
   %prep
       %setup -q
  +    %patch -p0
   
   %build
       #   FIXME: disable Pthread usage to workaround segfaults
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to