[CVS] RPM: rpm/build/ spec.c

2010-03-20 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:   20-Mar-2010 17:40:15
  Branch: HEAD Handle: 2010032016401500

  Modified files:
rpm/build   spec.c

  Log:
- spec: oops, remove debugging spewage.

  Summary:
RevisionChanges Path
2.210   +0  -1  rpm/build/spec.c
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.209 -r2.210 spec.c
  --- rpm/build/spec.c  19 Mar 2010 16:40:32 -  2.209
  +++ rpm/build/spec.c  20 Mar 2010 16:40:15 -  2.210
  @@ -402,7 +402,6 @@
   
num = strtoul(fieldp, end, 10);
SKIPSPACE(end);
  -fprintf(stderr, num(%u) = strtoul(\%s\, \...%s\, 10)\n, num, fieldp, 
end);
if (*end != ':') {
rpmlog(RPMLOG_ERR, _(line %d: No ':' terminator: %s\n),
 spec-lineNum, spec-line);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/build/ spec.c

2010-03-19 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:   19-Mar-2010 17:40:32
  Branch: HEAD Handle: 2010031916403200

  Modified files:
rpm/build   spec.c

  Log:
- spec: fix: unbreak the parser damage from an attempt to simplify
code.

  Summary:
RevisionChanges Path
2.209   +3  -4  rpm/build/spec.c
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.208 -r2.209 spec.c
  --- rpm/build/spec.c  6 Mar 2010 03:31:19 -   2.208
  +++ rpm/build/spec.c  19 Mar 2010 16:40:32 -  2.209
  @@ -375,12 +375,12 @@
   case RPMTAG_SOURCE:
flag = RPMFILE_SOURCE;
name = source;
  - fieldp = spec-line;
  + fieldp = spec-line + strlen(name);
break;
   case RPMTAG_PATCH:
flag = RPMFILE_PATCH;
name = patch;
  - fieldp = spec-line;
  + fieldp = spec-line + strlen(name);
break;
   case RPMTAG_ICON:
flag = RPMFILE_ICON;
  @@ -400,10 +400,9 @@
   if (fieldp != NULL) {
char * end = NULL;
   
  - if (!xstrcasecmp(fieldp, name))
  - fieldp += strlen(name);
num = strtoul(fieldp, end, 10);
SKIPSPACE(end);
  +fprintf(stderr, num(%u) = strtoul(\%s\, \...%s\, 10)\n, num, fieldp, 
end);
if (*end != ':') {
rpmlog(RPMLOG_ERR, _(line %d: No ':' terminator: %s\n),
 spec-lineNum, spec-line);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/build/ spec.c

2009-12-05 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:   05-Dec-2009 19:28:14
  Branch: HEAD Handle: 2009120518281400

  Modified files:
rpm/build   spec.c

  Log:
- fix: ensure that all Spec/Package fields are initialized to 0 when
reused.

  Summary:
RevisionChanges Path
2.205   +6  -2  rpm/build/spec.c
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.204 -r2.205 spec.c
  --- rpm/build/spec.c  20 Aug 2009 16:42:47 -  2.204
  +++ rpm/build/spec.c  5 Dec 2009 18:28:14 -   2.205
  @@ -189,7 +189,9 @@
NULL, NULL, pkgFini);
pool = _pkgPool;
   }
  -return (Package) rpmioGetPool(pool, sizeof(*pkg));
  +pkg = (Package) rpmioGetPool(pool, sizeof(*pkg));
  +memset(((char *)pkg)+sizeof(pkg-_item), 0, 
sizeof(*pkg)-sizeof(pkg-_item));
  +return pkg;
   }
   
   Package newPackage(/*...@unused@*/ Spec spec)
  @@ -633,7 +635,9 @@
NULL, NULL, specFini);
pool = _specPool;
   }
  -return (Spec) rpmioGetPool(pool, sizeof(*spec));
  +spec = (Spec) rpmioGetPool(pool, sizeof(*spec));
  +memset(((char *)spec)+sizeof(spec-_item), 0, 
sizeof(*spec)-sizeof(spec-_item));
  +return spec;
   }
   
   Spec newSpec(void)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/build/ spec.c

2009-08-20 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:   20-Aug-2009 18:42:47
  Branch: HEAD Handle: 2009082016424700

  Modified files:
rpm/build   spec.c

  Log:
- rpm.org: Avoid adding Lua sources/patches twice when recursing
(ticket #82).

  Summary:
RevisionChanges Path
2.204   +12 -11 rpm/build/spec.c
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.203 -r2.204 spec.c
  --- rpm/build/spec.c  1 Jun 2009 13:40:28 -   2.203
  +++ rpm/build/spec.c  20 Aug 2009 16:42:47 -  2.204
  @@ -464,19 +464,20 @@
(flag  RPMFILE_PATCH) ? PATCH : SOURCE, num);
addMacro(spec-macros, buf, NULL, p-fullSource, RMIL_SPEC);
   #ifdef WITH_LUA
  -{rpmlua lua = NULL; /* global state */
  - const char * what = (flag  RPMFILE_PATCH) ? patches : sources;
  - rpmluav var = rpmluavNew();
  -
  - rpmluaPushTable(lua, what);
  - rpmluavSetListMode(var, 1);
  - rpmluavSetValue(var, RPMLUAV_STRING, body);
  - rpmluaSetVar(lua, var);
  + if (!spec-recursing) {
  + rpmlua lua = NULL; /* global state */
  + const char * what = (flag  RPMFILE_PATCH) ? patches : sources;
  + rpmluav var = rpmluavNew();
  +
  + rpmluaPushTable(lua, what);
  + rpmluavSetListMode(var, 1);
  + rpmluavSetValue(var, RPMLUAV_STRING, body);
  + rpmluaSetVar(lua, var);
   /*...@-moduncon@*/
  - var = (rpmluav) rpmluavFree(var);
  + var = (rpmluav) rpmluavFree(var);
   /*...@=moduncon@*/
  - rpmluaPop(lua);
  -}
  + rpmluaPop(lua);
  + }
   #endif
body = _free(body);
   }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/build/ spec.c

2008-02-26 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   27-Feb-2008 08:52:52
  Branch: HEAD Handle: 2008022707525200

  Modified files:
rpm/build   spec.c

  Log:
- rpm.org: Add %{sources} and %{patches} macros to build.

  Summary:
RevisionChanges Path
2.181   +22 -0  rpm/build/spec.c
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.180 -r2.181 spec.c
  --- rpm/build/spec.c  27 Feb 2008 06:38:09 -  2.180
  +++ rpm/build/spec.c  27 Feb 2008 07:52:52 -  2.181
  @@ -11,6 +11,8 @@
   #include rpmfi.h
   #include rpmts.h
   
  +#include rpmlua.h
  +
   #include debug.h
   
   /[EMAIL PROTECTED]@*/
  @@ -395,6 +397,19 @@
sprintf(buf, %sURL%d,
(flag  RPMFILE_PATCH) ? PATCH : SOURCE, num);
addMacro(spec-macros, buf, NULL, p-fullSource, RMIL_SPEC);
  +#ifdef WITH_LUA
  +{rpmlua lua = NULL; /* global state */
  + const char * what = (flag  RPMFILE_PATCH) ? patches : sources;
  + rpmluav var = rpmluavNew();
  +
  + rpmluaPushTable(lua, what);
  + rpmluavSetListMode(var, 1);
  + rpmluavSetValue(var, RPMLUAV_STRING, body);
  + rpmluaSetVar(lua, var);
  + var = rpmluavFree(var);
  + rpmluaPop(lua);
  +}
  +#endif
body = _free(body);
   }
   
  @@ -583,6 +598,13 @@
   spec-passPhrase = _free(spec-passPhrase);
   spec-cookie = _free(spec-cookie);
   
  +#ifdef WITH_LUA
  +{rpmlua lua = NULL; /* global state */
  + rpmluaDelVar(lua, patches);
  + rpmluaDelVar(lua, sources);   
  +}
  +#endif
  +
   spec-sources = freeSources(spec-sources);
   spec-packages = freePackages(spec-packages);
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/build/ spec.c rpm/ macros.in

2007-12-31 Thread Michael Jennings 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Michael Jennings
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   01-Jan-2008 03:00:17
  Branch: HEAD Handle: 2008010102001600

  Modified files:
rpm macros.in
rpm/build   spec.c

  Log:
Don't revert to old (historically buggy) small buffer size.

  Summary:
RevisionChanges Path
2.175   +1  -1  rpm/build/spec.c
1.225   +2  -2  rpm/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.174 -r2.175 spec.c
  --- rpm/build/spec.c  27 Dec 2007 14:16:11 -  2.174
  +++ rpm/build/spec.c  1 Jan 2008 02:00:16 -   2.175
  @@ -472,7 +472,7 @@
   spec-st = newSt();
   
   spec-fileStack = NULL;
  -spec-lbuf_len = 
(size_t)rpmExpandNumeric(%{?_spec_line_buffer_size}%{!?_spec_line_buffer_size:1});
  +spec-lbuf_len = 
(size_t)rpmExpandNumeric(%{?_spec_line_buffer_size}%{!?_spec_line_buffer_size:10});
   spec-lbuf = (char *)xcalloc(1, spec-lbuf_len);
   spec-line = spec-lbuf;
   spec-nextline = NULL;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.224 -r1.225 macros.in
  --- rpm/macros.in 31 Dec 2007 12:49:55 -  1.224
  +++ rpm/macros.in 1 Jan 2008 02:00:16 -   1.225
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.224 2007/12/31 12:49:55 rse Exp $
  +# $Id: macros.in,v 1.225 2008/01/01 02:00:16 mej Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -537,7 +537,7 @@
   
   #
   # Byte size of line buffer for .spec file parsing
  -%_spec_line_buffer_size 1
  +%_spec_line_buffer_size 10
   
   
#==
   #  Database configuration macros.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/build/ spec.c

2007-08-27 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   27-Aug-2007 13:44:39
  Branch: HEAD Handle: 2007082712443900

  Modified files:
rpm/build   spec.c

  Log:
fix cut-n-paste error.

  Summary:
RevisionChanges Path
2.154   +1  -1  rpm/build/spec.c
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.153 -r2.154 spec.c
  --- rpm/build/spec.c  19 Aug 2007 17:43:02 -  2.153
  +++ rpm/build/spec.c  27 Aug 2007 11:44:39 -  2.154
  @@ -96,7 +96,7 @@
   
   /* Locate package with fullName */
   for (p = spec-packages; p != NULL; p = p-next) {
  - (void) headerGetEntry(spec-packages-header, RPMTAG_NAME,
  + (void) headerGetEntry(p-header, RPMTAG_NAME,
NULL, pname, NULL);
if (pname  (! strcmp(fullName, pname))) {
break;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org