[CVS] RPM: rpm/ cpu-os-macros.tar.gz

2011-04-07 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   07-Apr-2011 22:29:52
  Branch: HEAD Handle: 2011040720295200

  Modified files:
rpm cpu-os-macros.tar.gz

  Log:
fix %_arch to be canonical for %ix86, x86_64  sparc

  Summary:
RevisionChanges Path
1.3 BLOBrpm/cpu-os-macros.tar.gz
  

  (cd rpm  \
   uudecode '@@ .'  \
   mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig  \
   xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig 
cpu-os-macros.tar.gz  \
   rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta)
  Index: rpm/cpu-os-macros.tar.gz
  
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ cpu-os-macros.tar.gz

2011-04-07 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   07-Apr-2011 22:30:22
  Branch: rpm-5_4  Handle: 2011040720302200

  Modified files:   (Branch: rpm-5_4)
rpm cpu-os-macros.tar.gz

  Log:
fix %_arch to be canonical for %ix86, x86_64  sparc

  Summary:
RevisionChanges Path
1.2.6.1 BLOBrpm/cpu-os-macros.tar.gz
  

  (cd rpm  \
   uudecode '@@ .'  \
   mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig  \
   xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig 
cpu-os-macros.tar.gz  \
   rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta)
  Index: rpm/cpu-os-macros.tar.gz
  
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/ cpu-os-macros.tar.gz

2011-04-07 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   07-Apr-2011 22:30:38
  Branch: rpm-5_3  Handle: 2011040720303800

  Modified files:   (Branch: rpm-5_3)
rpm cpu-os-macros.tar.gz

  Log:
fix %_arch to be canonical for %ix86, x86_64  sparc

  Summary:
RevisionChanges Path
1.2.4.1 BLOBrpm/cpu-os-macros.tar.gz
  

  (cd rpm  \
   uudecode '@@ .'  \
   mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig  \
   xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig 
cpu-os-macros.tar.gz  \
   rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta)
  Index: rpm/cpu-os-macros.tar.gz
  
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ hdrfmt.c

2011-04-07 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   08-Apr-2011 00:02:10
  Branch: HEAD Handle: 2011040722020901

  Modified files:
rpm CHANGES
rpm/rpmdb   hdrfmt.c

  Log:
- spewage: fix: rework sql/json markup to use the EVRD parser.

  Summary:
RevisionChanges Path
1.3605  +1  -0  rpm/CHANGES
1.153   +71 -44 rpm/rpmdb/hdrfmt.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3604 -r1.3605 CHANGES
  --- rpm/CHANGES   6 Apr 2011 23:33:17 -   1.3604
  +++ rpm/CHANGES   7 Apr 2011 22:02:09 -   1.3605
  @@ -1,4 +1,5 @@
   5.4.0 - 5.4.1:
  +- jbj: spewage: fix: rework sql/json markup to use the EVRD parser.
   - jbj: build: fix: resurrect %description -l XY yet again.
   - jbj: build: fix: attempt arbitrary '%foo' tag iff '%' is seen.
   - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  
  $ cvs diff -u -r1.152 -r1.153 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c25 Jan 2011 18:11:53 -  1.152
  +++ rpm/rpmdb/hdrfmt.c7 Apr 2011 22:02:10 -   1.153
  @@ -527,7 +527,8 @@
   /*@unchecked@*/ /*@observer@*/ 
   static const struct spew_s _json_spew = {
   .spew_name   = json,
  -.spew_init   = db.Packages.save({\n,
  +/* XXX non-functional atm, /usr/lib/rpm/qf *.mongo template for now. */
  +.spew_init   = 
db.%{?__mongodb_collection}%{!?__mongodb_collection:packages}.save({\n,
   .spew_fini   = });\n,
   .spew_strlen = jsonstrlen,
   .spew_strcpy = jsonstrcpy
  @@ -3284,19 +3285,20 @@
   }
   
   static int PRCOSkip(rpmTag tag, rpmTagData N, rpmTagData EVR, rpmTagData F,
  - rpmuint32_t i)
  + uint32_t i)
/*@*/
   {
   int a = -2, b = -2;
  +int rc = 0;
  +
  +assert(N.argv[i] != NULL  *N.argv[i] != '\0');
   
  -if (N.argv[i] == NULL || *N.argv[i] == '\0')
  - return 1;
   if (tag == RPMTAG_REQUIRENAME  i  0
 !(a=strcmp(N.argv[i], N.argv[i-1]))
 !(b=strcmp(EVR.argv[i], EVR.argv[i-1]))
 (F.ui32p[i]  0x4e) == ((F.ui32p[i-1]  0x4e)))
  - return 1;
  -return 0;
  + rc = 1;
  +return rc;
   }
   
   static int PRCOxmlTag(Header h, HE_t he, rpmTag EVRtag, rpmTag Ftag)
  @@ -3308,9 +3310,9 @@
   rpmTagData EVR = { .ptr = NULL };
   rpmTagData F = { .ptr = NULL };
   size_t nb;
  -rpmuint32_t ac;
  -rpmuint32_t c;
  -rpmuint32_t i;
  +uint32_t ac;
  +uint32_t c;
  +uint32_t i;
   char *t;
   int rc = 1;  /* assume failure */
   int xx;
  @@ -3520,10 +3522,10 @@
   rpmTagData F = { .ptr = NULL };
   char instance[64];
   size_t nb;
  -rpmuint32_t ac;
  -rpmuint32_t c;
  -rpmuint32_t i;
  -char *t;
  +uint32_t ac;
  +uint32_t c;
  +uint32_t i;
  +char *te;
   int rc = 1;  /* assume failure */
   int xx;
   
  @@ -3544,7 +3546,7 @@
   F.ui32p = he-p.ui32p;
   
   xx = snprintf(instance, sizeof(instance), '%u', 
(unsigned)headerGetInstance(h));
  -nb = sizeof(*he-p.argv);
  +nb = 0;
   ac = 0;
   for (i = 0; i  c; i++) {
   /*@-nullstate@*/ /* EVR.argv might be NULL */
  @@ -3552,63 +3554,88 @@
continue;
   /*@=nullstate@*/
ac++;
  - nb += sizeof(*he-p.argv);
  - nb += strlen(instance) + sizeof(, '', '', '', '', '');
  + nb += strlen(instance) + sizeof(, '', '', '', '', '') - 1;
if (tag == RPMTAG_REQUIRENAME)
nb += sizeof(, '') - 1;
nb += strlen(N.argv[i]);
if (EVR.argv != NULL  EVR.argv[i] != NULL  *EVR.argv[i] != '\0') {
  - nb += strlen(EVR.argv[i]);
  - nb += sizeof(EQ0) - 1;
  + uint32_t Fx = ((F.ui32p[i]  1)  0x7);
  + EVR_t Revr = rpmEVRnew(Fx, 1);
  + int xx = rpmEVRparse(xstrdup(EVR.argv[i]), Revr);
  + const char * E = Revr-F[RPMEVR_E];
  + const char * V = Revr-F[RPMEVR_V];
  + const char * R = Revr-F[RPMEVR_R];
  +#ifdef   NOTYET  /* XXX turning this on breaks rpmrepo */
  + const char * D = Revr-F[RPMEVR_D];
  +#endif
  + xx = xx;
  + nb += (sizeof(, 'EQ')-1);
  + nb += (sizeof(, '')-1) + strlen(E);
  + nb += (sizeof(, '')-1) + strlen(V);
  + nb += (sizeof(, '')-1) +

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmdb/ hdrfmt.c

2011-04-07 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   08-Apr-2011 00:02:37
  Branch: rpm-5_4  Handle: 2011040722023600

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb   hdrfmt.c

  Log:
- spewage: fix: rework sql/json markup to use the EVRD parser.

  Summary:
RevisionChanges Path
1.3501.2.104+1  -0  rpm/CHANGES
1.151.2.3   +72 -45 rpm/rpmdb/hdrfmt.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.103 -r1.3501.2.104 CHANGES
  --- rpm/CHANGES   6 Apr 2011 23:34:00 -   1.3501.2.103
  +++ rpm/CHANGES   7 Apr 2011 22:02:36 -   1.3501.2.104
  @@ -1,4 +1,5 @@
   5.4.0 - 5.4.1:
  +- jbj: spewage: fix: rework sql/json markup to use the EVRD parser.
   - jbj: build: fix: resurrect %description -l XY yet again.
   - jbj: build: fix: attempt arbitrary '%foo' tag iff '%' is seen.
   - jbj: mongo: establish primary/filelists/other/srpm collection names.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  
  $ cvs diff -u -r1.151.2.2 -r1.151.2.3 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c26 Mar 2011 13:03:53 -  1.151.2.2
  +++ rpm/rpmdb/hdrfmt.c7 Apr 2011 22:02:36 -   1.151.2.3
  @@ -527,7 +527,8 @@
   /*@unchecked@*/ /*@observer@*/ 
   static const struct spew_s _json_spew = {
   .spew_name   = json,
  -.spew_init   = db.Packages.save({\n,
  +/* XXX non-functional atm, /usr/lib/rpm/qf *.mongo template for now. */
  +.spew_init   = 
db.%{?__mongodb_collection}%{!?__mongodb_collection:packages}.save({\n,
   .spew_fini   = });\n,
   .spew_strlen = jsonstrlen,
   .spew_strcpy = jsonstrcpy
  @@ -3286,19 +3287,20 @@
   }
   
   static int PRCOSkip(rpmTag tag, rpmTagData N, rpmTagData EVR, rpmTagData F,
  - rpmuint32_t i)
  + uint32_t i)
/*@*/
   {
   int a = -2, b = -2;
  +int rc = 0;
  +
  +assert(N.argv[i] != NULL  *N.argv[i] != '\0');
   
  -if (N.argv[i] == NULL || *N.argv[i] == '\0')
  - return 1;
   if (tag == RPMTAG_REQUIRENAME  i  0
 !(a=strcmp(N.argv[i], N.argv[i-1]))
 !(b=strcmp(EVR.argv[i], EVR.argv[i-1]))
  -  (F.ui32p[i]  0x4e) == ((F.ui32p[i-1]  0x4e)))
  - return 1;
  -return 0;
  +  (F.ui32p[i]  0x4e) == ((F.ui32p[i-1]  0x4e)) )
  + rc = 1;
  +return rc;
   }
   
   static int PRCOxmlTag(Header h, HE_t he, rpmTag EVRtag, rpmTag Ftag)
  @@ -3310,9 +3312,9 @@
   rpmTagData EVR = { .ptr = NULL };
   rpmTagData F = { .ptr = NULL };
   size_t nb;
  -rpmuint32_t ac;
  -rpmuint32_t c;
  -rpmuint32_t i;
  +uint32_t ac;
  +uint32_t c;
  +uint32_t i;
   char *t;
   int rc = 1;  /* assume failure */
   int xx;
  @@ -3522,10 +3524,10 @@
   rpmTagData F = { .ptr = NULL };
   char instance[64];
   size_t nb;
  -rpmuint32_t ac;
  -rpmuint32_t c;
  -rpmuint32_t i;
  -char *t;
  +uint32_t ac;
  +uint32_t c;
  +uint32_t i;
  +char *te;
   int rc = 1;  /* assume failure */
   int xx;
   
  @@ -3546,7 +3548,7 @@
   F.ui32p = he-p.ui32p;
   
   xx = snprintf(instance, sizeof(instance), '%u', 
(unsigned)headerGetInstance(h));
  -nb = sizeof(*he-p.argv);
  +nb = 0;
   ac = 0;
   for (i = 0; i  c; i++) {
   /*@-nullstate@*/ /* EVR.argv might be NULL */
  @@ -3554,63 +3556,88 @@
continue;
   /*@=nullstate@*/
ac++;
  - nb += sizeof(*he-p.argv);
  - nb += strlen(instance) + sizeof(, '', '', '', '', '');
  + nb += strlen(instance) + sizeof(, '', '', '', '', '') - 1;
if (tag == RPMTAG_REQUIRENAME)
nb += sizeof(, '') - 1;
nb += strlen(N.argv[i]);
if (EVR.argv != NULL  EVR.argv[i] != NULL  *EVR.argv[i] != '\0') {
  - nb += strlen(EVR.argv[i]);
  - nb += sizeof(EQ0) - 1;
  + uint32_t Fx = ((F.ui32p[i]  1)  0x7);
  + EVR_t Revr = rpmEVRnew(Fx, 1);
  + int xx = rpmEVRparse(xstrdup(EVR.argv[i]), Revr);
  + const char * E = Revr-F[RPMEVR_E];
  + const char * V = Revr-F[RPMEVR_V];
  + const char * R = Revr-F[RPMEVR_R];
  +#ifdef   NOTYET  /* XXX turning this on breaks rpmrepo */
  + const char * D = Revr-F[RPMEVR_D];
  +#endif
  + xx = xx;
  + nb += (sizeof(, 'EQ')-1);
  +