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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   27-Aug-2003 15:13:16
  Branch: HEAD                             Handle: 2003082714131600

  Modified files:
    openpkg-src/openpkg     rpm.patch.bugfix rpm.patch.feature
                            rpm.patch.porting rpm.patch.regen

  Log:
    import Michael's system.h patch into official patch set and regenerate
    rpm.patch.xxx files

  Summary:
    Revision    Changes     Path
    1.8         +4  -1      openpkg-src/openpkg/rpm.patch.bugfix
    1.8         +4  -1      openpkg-src/openpkg/rpm.patch.feature
    1.11        +15 -13     openpkg-src/openpkg/rpm.patch.porting
    1.8         +4  -1      openpkg-src/openpkg/rpm.patch.regen
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpm.patch.bugfix
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 rpm.patch.bugfix
  --- openpkg-src/openpkg/rpm.patch.bugfix      26 Aug 2003 13:55:17 -0000      1.7
  +++ openpkg-src/openpkg/rpm.patch.bugfix      27 Aug 2003 13:13:16 -0000      1.8
  @@ -10,7 +10,10 @@
   ##  'patch' tool to upgrade those files. Each patch snippet is annotated
   ##  with a short description.
   ##
  -##  Created on: 26-Aug-2003
  +##  Created on: 27-Aug-2003
  +##
  +##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
  +##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
   ##
   
   +---------------------------------------------------------------------------
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpm.patch.feature
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 rpm.patch.feature
  --- openpkg-src/openpkg/rpm.patch.feature     26 Aug 2003 13:55:17 -0000      1.7
  +++ openpkg-src/openpkg/rpm.patch.feature     27 Aug 2003 13:13:16 -0000      1.8
  @@ -10,7 +10,10 @@
   ##  'patch' tool to upgrade those files. Each patch snippet is annotated
   ##  with a short description.
   ##
  -##  Created on: 26-Aug-2003
  +##  Created on: 27-Aug-2003
  +##
  +##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
  +##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
   ##
   
   +---------------------------------------------------------------------------
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpm.patch.porting
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 rpm.patch.porting
  --- openpkg-src/openpkg/rpm.patch.porting     27 Aug 2003 10:10:18 -0000      1.10
  +++ openpkg-src/openpkg/rpm.patch.porting     27 Aug 2003 13:13:16 -0000      1.11
  @@ -10,7 +10,10 @@
   ##  'patch' tool to upgrade those files. Each patch snippet is annotated
   ##  with a short description.
   ##
  -##  Created on: 26-Aug-2003
  +##  Created on: 27-Aug-2003
  +##
  +##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
  +##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
   ##
   
   +---------------------------------------------------------------------------
  @@ -625,7 +628,7 @@
   +---------------------------------------------------------------------------
   Index: system.h
   --- system.h 1 Mar 2003 19:53:08 -0000       1.1.1.10
  -+++ system.h 24 Aug 2003 13:10:21 -0000
  ++++ system.h 27 Aug 2003 13:07:49 -0000
   @@ -256,10 +256,6 @@
    #include <err.h>
    #endif
  @@ -643,7 +646,7 @@
   +---------------------------------------------------------------------------
   Index: system.h
   --- system.h 1 Mar 2003 19:53:08 -0000       1.1.1.10
  -+++ system.h 24 Aug 2003 13:10:21 -0000
  ++++ system.h 27 Aug 2003 13:07:49 -0000
   @@ -550,7 +546,7 @@
    #define lchown chown
    #endif
  @@ -653,13 +656,14 @@
    # define GETMNTENT_ONE 0
    # define GETMNTENT_TWO 0
    # if HAVE_SYS_MNTCTL_H
  +
   +---------------------------------------------------------------------------
  -| Drop GCC inline attribute when not compiling with GCC
  +| Drop GCC "inline" attribute if not compiling with GCC.
   +---------------------------------------------------------------------------
   Index: system.h
  ---- system.h.dist    2003-08-27 10:29:28.000000000 +0200
  -+++ system.h 2003-08-27 11:19:01.000000000 +0200
  -@@ -599,11 +599,16 @@
  +--- system.h 1 Mar 2003 19:53:08 -0000       1.1.1.10
  ++++ system.h 27 Aug 2003 13:07:49 -0000
  +@@ -603,9 +599,14 @@
    
    #if defined(__LCLINT__)
    #define FILE_RCSID(id)
  @@ -667,13 +671,11 @@
   +#elif defined(__GNUC__)
    #define FILE_RCSID(id) \
    static inline const char *rcsid(const char *p) { \
  -         return rcsid(p = id); \
  - }
  ++        return rcsid(p = id); \
  ++}
   +#else
   +#define FILE_RCSID(id) \
   +static const char *rcsid(const char *p) { \
  -+        return rcsid(p = id); \
  -+}
  +         return rcsid(p = id); \
  + }
    #endif
  - 
  - #endif      /* H_SYSTEM */
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpm.patch.regen
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 rpm.patch.regen
  --- openpkg-src/openpkg/rpm.patch.regen       26 Aug 2003 13:55:17 -0000      1.7
  +++ openpkg-src/openpkg/rpm.patch.regen       27 Aug 2003 13:13:16 -0000      1.8
  @@ -10,7 +10,10 @@
   ##  'patch' tool to upgrade those files. Each patch snippet is annotated
   ##  with a short description.
   ##
  -##  Created on: 26-Aug-2003
  +##  Created on: 27-Aug-2003
  +##
  +##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
  +##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
   ##
   
   +---------------------------------------------------------------------------
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to