RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   07-Feb-2008 19:09:55
  Branch: rpm-5_0                          Handle: 2008020718095401

  Modified files:           (Branch: rpm-5_0)
    rpm                     CHANGES system.h
    rpm/lib                 cpio.c tar.c

  Log:
    - rse: add support for QNX by adjusting to its 3-parameter based
    makedev(2)

  Summary:
    Revision    Changes     Path
    1.2054.2.40 +1  -0      rpm/CHANGES
    2.136.2.2   +2  -2      rpm/lib/cpio.c
    1.7.2.1     +1  -1      rpm/lib/tar.c
    2.104.2.2   +24 -0      rpm/system.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2054.2.39 -r1.2054.2.40 CHANGES
  --- rpm/CHANGES	7 Feb 2008 05:33:17 -0000	1.2054.2.39
  +++ rpm/CHANGES	7 Feb 2008 18:09:54 -0000	1.2054.2.40
  @@ -1,4 +1,5 @@
   5.0.2 -> 5.0.3:
  +    - rse: add support for QNX by adjusting to its 3-parameter based makedev(2)
       - proyvind: add sparcv9v2 (Niagara 2) architecture
       - proyvind: add arch macros for alpha and sparc
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/cpio.c
  ============================================================================
  $ cvs diff -u -r2.136.2.1 -r2.136.2.2 cpio.c
  --- rpm/lib/cpio.c	18 Jan 2008 17:07:10 -0000	2.136.2.1
  +++ rpm/lib/cpio.c	7 Feb 2008 18:09:55 -0000	2.136.2.2
  @@ -168,13 +168,13 @@
       GET_NUM_FIELD(hdr.devMajor, major);
       GET_NUM_FIELD(hdr.devMinor, minor);
       /*@-shiftimplementation@*/
  -    st->st_dev = makedev(major, minor);
  +    st->st_dev = Makedev(major, minor);
       /*@=shiftimplementation@*/
   
       GET_NUM_FIELD(hdr.rdevMajor, major);
       GET_NUM_FIELD(hdr.rdevMinor, minor);
       /*@-shiftimplementation@*/
  -    st->st_rdev = makedev(major, minor);
  +    st->st_rdev = Makedev(major, minor);
       /*@=shiftimplementation@*/
   
       GET_NUM_FIELD(hdr.namesize, nameSize);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/tar.c
  ============================================================================
  $ cvs diff -u -r1.7 -r1.7.2.1 tar.c
  --- rpm/lib/tar.c	3 Dec 2007 21:11:53 -0000	1.7
  +++ rpm/lib/tar.c	7 Feb 2008 18:09:55 -0000	1.7.2.1
  @@ -221,7 +221,7 @@
       major = strntoul(hdr->devMajor, NULL, 8, sizeof(hdr->devMajor));
       minor = strntoul(hdr->devMinor, NULL, 8, sizeof(hdr->devMinor));
       /*@-shiftimplementation@*/
  -    st->st_dev = makedev(major, minor);
  +    st->st_dev = Makedev(major, minor);
       /*@=shiftimplementation@*/
       st->st_rdev = st->st_dev;		/* XXX compat? */
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/system.h
  ============================================================================
  $ cvs diff -u -r2.104.2.1 -r2.104.2.2 system.h
  --- rpm/system.h	25 Jan 2008 16:46:00 -0000	2.104.2.1
  +++ rpm/system.h	7 Feb 2008 18:09:54 -0000	2.104.2.2
  @@ -730,6 +730,30 @@
   #endif
   
   /**
  + * makedev() on QNX takes three parameters
  + * the additional one (first place) specifies the node for QNET
  + * as this applic is not QNET aware, we can set it to 'local node'
  + */
  +#if defined(__QNXNTO__)
  +#include &lt;sys/netmgr.h&gt;
  +#define Makedev(x,y)   makedev(ND_LOCAL_NODE,(x),(y))
  +#else
  +#define Makedev(x,y)   makedev((x),(y))
  +#endif
  +
  +/**
  + * makedev() on QNX takes three parameters
  + * the additional one (first place) specifies the node for QNET
  + * as this applic is not QNET aware, we can set it to 'local node'
  + */
  +#if defined(__QNXNTO__)
  +#include &lt;sys/netmgr.h&gt;
  +#define Makedev(x,y)   makedev(ND_LOCAL_NODE,(x),(y))
  +#else
  +#define Makedev(x,y)   makedev((x),(y))
  +#endif
  +
  +/**
    * Mark --initdb and --verifydb for destruction.
    */
   #define	SUPPORT_INITDB		1
  @@ .