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:   15-Aug-2006 09:11:06
  Branch: HEAD                             Handle: 2006081508110600

  Modified files:
    openpkg-src/heartbeat   heartbeat.patch heartbeat.spec

  Log:
    upgrading package: heartbeat 2.0.6 -> 2.0.7

  Summary:
    Revision    Changes     Path
    1.7         +35 -35     openpkg-src/heartbeat/heartbeat.patch
    1.18        +2  -2      openpkg-src/heartbeat/heartbeat.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/heartbeat/heartbeat.patch
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 heartbeat.patch
  --- openpkg-src/heartbeat/heartbeat.patch     14 Jul 2006 07:51:30 -0000      
1.6
  +++ openpkg-src/heartbeat/heartbeat.patch     15 Aug 2006 07:11:06 -0000      
1.7
  @@ -1,7 +1,7 @@
   Index: configure
  ---- configure.orig   2006-04-24 09:39:25 +0200
  -+++ configure        2006-05-02 14:13:49 +0200
  -@@ -2074,8 +2074,7 @@
  +--- configure.orig   2006-08-14 06:38:08 +0200
  ++++ configure        2006-08-15 09:03:14 +0200
  +@@ -2091,8 +2091,7 @@
    
    pf_argv_set=""
    case "$host_os" in
  @@ -11,7 +11,7 @@
                INIT_EXT=".sh"
                ;;
    
  -@@ -2252,7 +2251,7 @@
  +@@ -2318,7 +2317,7 @@
    _ACEOF
    
    
  @@ -20,7 +20,7 @@
    
    
    cat >>confdefs.h <<_ACEOF
  -@@ -24113,13 +24112,13 @@
  +@@ -23363,13 +23362,13 @@
    
    fi
    
  @@ -37,7 +37,7 @@
    cat >conftest.$ac_ext <<_ACEOF
    /* confdefs.h.  */
    _ACEOF
  -@@ -24182,7 +24181,7 @@
  +@@ -23432,7 +23431,7 @@
    #define HAVE_LIBGNUGETOPT 1
    _ACEOF
    
  @@ -46,15 +46,15 @@
    
    fi
    
  -@@ -36949,7 +36948,6 @@
  +@@ -36221,7 +36220,6 @@
        # We had to eliminate -Wnested-externs because of libtool changes
            WARNLIST="all missing-prototypes
                missing-declarations
   -            strict-prototypes
  +             declaration-after-statement
                pointer-arith
                write-strings
  -             cast-qual cast-align
  -@@ -41494,7 +41492,7 @@
  +@@ -40767,7 +40765,7 @@
    _ACEOF
    
    
  @@ -63,33 +63,9 @@
    
    
    cat >>confdefs.h <<_ACEOF
  -Index: replace/Makefile.in
  ---- replace/Makefile.in.orig 2006-02-10 18:21:40 +0100
  -+++ replace/Makefile.in      2006-02-11 09:44:47 +0100
  -@@ -425,7 +425,7 @@
  -       rm -f "$${dir}/so_locations"; \
  -     done
  - libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES) 
  --    $(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) 
$(libreplace_la_LIBADD) $(LIBS)
  -+    $(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) 
$(libreplace_la_LIBADD)
  - 
  - mostlyclean-compile:
  -     -rm -f *.$(OBJEXT)
  -Index: replace/uuid_parse.c
  ---- replace/uuid_parse.c.orig        2005-11-09 17:06:21 +0100
  -+++ replace/uuid_parse.c     2006-02-11 09:44:52 +0100
  -@@ -496,7 +496,7 @@
  -                      * with IEEE 802 addresses obtained from
  -                      * network cards
  -                      */
  --                    node_id[0] |= 0x80;
  -+                    node_id[0] |= 0x01;
  -             }
  -             has_init = 1;
  -     }
   Index: crm/admin/Makefile.in
  ---- crm/admin/Makefile.in.orig       2006-07-13 18:57:27 +0200
  -+++ crm/admin/Makefile.in    2006-07-14 09:19:24 +0200
  +--- crm/admin/Makefile.in.orig       2006-08-14 06:37:51 +0200
  ++++ crm/admin/Makefile.in    2006-08-15 09:01:02 +0200
   @@ -480,8 +480,7 @@
    noinst_HEADERS = 
    crmadmin_SOURCES = crmadmin.c
  @@ -141,3 +117,27 @@
    
    iso8601_SOURCES = test.iso8601.c
    iso8601_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
  +Index: replace/Makefile.in
  +--- replace/Makefile.in.orig 2006-08-14 06:38:05 +0200
  ++++ replace/Makefile.in      2006-08-15 09:01:02 +0200
  +@@ -431,7 +431,7 @@
  +       rm -f "$${dir}/so_locations"; \
  +     done
  + libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES) 
  +-    $(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) 
$(libreplace_la_LIBADD) $(LIBS)
  ++    $(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) 
$(libreplace_la_LIBADD)
  + 
  + mostlyclean-compile:
  +     -rm -f *.$(OBJEXT)
  +Index: replace/uuid_parse.c
  +--- replace/uuid_parse.c.orig        2005-11-09 17:06:21 +0100
  ++++ replace/uuid_parse.c     2006-08-15 09:01:02 +0200
  +@@ -496,7 +496,7 @@
  +                      * with IEEE 802 addresses obtained from
  +                      * network cards
  +                      */
  +-                    node_id[0] |= 0x80;
  ++                    node_id[0] |= 0x01;
  +             }
  +             has_init = 1;
  +     }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/heartbeat/heartbeat.spec
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 heartbeat.spec
  --- openpkg-src/heartbeat/heartbeat.spec      14 Jul 2006 07:51:30 -0000      
1.17
  +++ openpkg-src/heartbeat/heartbeat.spec      15 Aug 2006 07:11:06 -0000      
1.18
  @@ -34,8 +34,8 @@
   Class:        EVAL
   Group:        System
   License:      GPL
  -Version:      2.0.6
  -Release:      20060714
  +Version:      2.0.7
  +Release:      20060815
   
   #   list of sources
   Source0:      http://linux-ha.org/download/heartbeat-%{version}.tar.gz
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to