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:   17-Apr-2006 22:04:11
  Branch: HEAD                             Handle: 2006041721040901

  Modified files:
    openpkg-src/openpkg     HISTORY make.patch openpkg.spec

  Log:
    increase Solaris SMF timeout from 60 to 180 seconds; upgrade to GNU
    make 3.81

  Summary:
    Revision    Changes     Path
    1.322       +2  -0      openpkg-src/openpkg/HISTORY
    1.2         +8  -28     openpkg-src/openpkg/make.patch
    1.475       +4  -4      openpkg-src/openpkg/openpkg.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/HISTORY
  ============================================================================
  $ cvs diff -u -r1.321 -r1.322 HISTORY
  --- openpkg-src/openpkg/HISTORY       20 Mar 2006 19:05:33 -0000      1.321
  +++ openpkg-src/openpkg/HISTORY       17 Apr 2006 20:04:09 -0000      1.322
  @@ -2,6 +2,8 @@
   2006
   ====
   
  +20060417 increase Solaris SMF timeout from 60 to 180 seconds
  +20060417 upgrade to GNU make 3.81
   20060320 upgrade to cURL 7.15.3
   20060313 upgrade to OSSP uuid 1.4.2
   20060311 upgrade to GNU config 20060310
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/make.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 make.patch
  --- openpkg-src/openpkg/make.patch    9 Jan 2003 13:38:24 -0000       1.1
  +++ openpkg-src/openpkg/make.patch    17 Apr 2006 20:04:09 -0000      1.2
  @@ -1,6 +1,7 @@
  ---- glob/glob.c.orig Wed Sep 25 03:11:43 2002
  -+++ glob/glob.c      Wed Sep 25 03:15:32 2002
  -@@ -215,13 +215,13 @@
  +Index: glob/glob.c
  +--- glob/glob.c.orig 2006-03-10 03:20:45 +0100
  ++++ glob/glob.c      2006-04-01 19:09:18 +0200
  +@@ -216,13 +216,13 @@
    #  ifdef HAVE_ALLOCA_H
    #   include <alloca.h>
    #  else     /* Not HAVE_ALLOCA_H.  */
  @@ -16,30 +17,10 @@
    #  endif /* sparc or HAVE_ALLOCA_H.  */
    # endif     /* GCC.  */
    
  -
  ---- glob/glob.h.orig Sat Jan 22 00:43:03 2000
  -+++ glob/glob.h      Fri Aug 23 02:37:03 2002
  -@@ -47,6 +47,9 @@
  - 
  - /* We need `size_t' for the following definitions.  */
  - #ifndef __size_t
  -+#if defined __FreeBSD__
  -+#define __size_t size_t
  -+#else
  - # if defined __GNUC__ && __GNUC__ >= 2
  - typedef __SIZE_TYPE__ __size_t;
  - # else
  -@@ -59,6 +62,7 @@
  -  */
  - #if !(defined __DECC && defined __SIZE_T)
  - typedef unsigned long int __size_t;
  -+#endif
  - #endif
  - # endif
  - #else
  ---- make.h.orig      Wed Sep 11 18:55:44 2002
  -+++ make.h   Mon Oct 21 22:05:11 2002
  -@@ -33,7 +33,7 @@
  +Index: make.h
  +--- make.h.orig      2006-02-16 00:54:43 +0100
  ++++ make.h   2006-04-01 19:09:18 +0200
  +@@ -31,7 +31,7 @@
    #  ifdef _AIX
     #pragma alloca
    #  else
  @@ -48,4 +29,3 @@
    char *alloca ();
    #   endif
    #  endif
  -
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================================
  $ cvs diff -u -r1.474 -r1.475 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  20 Mar 2006 19:05:33 -0000      1.474
  +++ openpkg-src/openpkg/openpkg.spec  17 Apr 2006 20:04:10 -0000      1.475
  @@ -38,7 +38,7 @@
   #   o any cc(1)
   
   #   the package version/release
  -%define       V_openpkg  20060320
  +%define       V_openpkg  20060417
   
   #   the used software versions
   %define       V_rpm      4.2.1
  @@ -46,7 +46,7 @@
   %define       V_bzip2    1.0.3
   %define       V_beecrypt 4.1.2
   %define       V_curl     7.15.3
  -%define       V_make     3.80
  +%define       V_make     3.81
   %define       V_gzip     1.3.5
   %define       V_patch    2.5.9
   %define       V_tar      1.15.1
  @@ -1847,7 +1847,7 @@
                         echo "            type='method'"
                         echo "            name='start'"
                         echo "            exec='${prefix}/etc/rc all start'"
  -                      echo "            timeout_seconds='60'>"
  +                      echo "            timeout_seconds='180'>"
                         echo "            <method_context>"
                         echo "                <method_credential user='root' 
group='root' />"
                         echo "            </method_context>"
  @@ -1856,7 +1856,7 @@
                         echo "            type='method'"
                         echo "            name='stop'"
                         echo "            exec='${prefix}/etc/rc all stop'"
  -                      echo "            timeout_seconds='60'>"
  +                      echo "            timeout_seconds='180'>"
                         echo "        </exec_method>"
                         echo "        <property_group name='startd' 
type='framework'>"
                         echo "            <propval"
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to