[CVS] RPM: rpm/ INSTALL

2009-05-06 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:   06-May-2009 13:33:16
  Branch: HEAD Handle: 2009050611331600

  Modified files:
rpm INSTALL

  Log:
add reference to CPUInfo

  Summary:
RevisionChanges Path
2.122   +1  -0  rpm/INSTALL
  

  patch -p0 '@@ .'
  Index: rpm/INSTALL
  
  $ cvs diff -u -r2.121 -r2.122 INSTALL
  --- rpm/INSTALL   13 Apr 2009 18:53:09 -  2.121
  +++ rpm/INSTALL   6 May 2009 11:33:16 -   2.122
  @@ -49,6 +49,7 @@
   Electric Fence  optional  2.1 2.1.13  
http://perens.com/FreeSoftware/ElectricFence/
   Linux KeyUtils  optional  1.2 1.2 
http://people.redhat.com/~dhowells/keyutils/
   System libelf   optional  -   -   e.g. 
http://www.mr511.de/software/english.html
  +CPUInfo  optional  r143r143https://launchpad.net/cpuinfo
   --- - --- --- 
-
   
   [0] m4:NOTICE: Do not use GNU m4 1.4.10, it breaks GNU autoconf.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ Makefile.am

2009-05-06 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:   06-May-2009 13:44:32
  Branch: HEAD Handle: 2009050611443200

  Modified files:
rpm Makefile.am

  Log:
be sure to include cpuinfo.yaml when generating tarball

  Summary:
RevisionChanges Path
2.236   +1  -1  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.235 -r2.236 Makefile.am
  --- rpm/Makefile.am   6 May 2009 02:26:10 -   2.235
  +++ rpm/Makefile.am   6 May 2009 11:44:32 -   2.236
  @@ -4,7 +4,7 @@
   
   LINT = splint
   
  -EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \
  +EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL cpuinfo.yaml \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
db db3/configure xar xz pcre syck \
lua/[A-Z]* lua/*.[ch] lua/local/l* \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/lib/ rpmrc.c

2009-05-06 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:   06-May-2009 14:25:13
  Branch: HEAD Handle: 2009050612251300

  Modified files:
rpm/lib rpmrc.c

  Log:
start clean up after ourself in rpmCpuinfo()

  Summary:
RevisionChanges Path
2.278   +8  -7  rpm/lib/rpmrc.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.277 -r2.278 rpmrc.c
  --- rpm/lib/rpmrc.c   6 May 2009 02:26:11 -   2.277
  +++ rpm/lib/rpmrc.c   6 May 2009 12:25:13 -   2.278
  @@ -524,9 +524,8 @@
   rpmds cpuinfo = NULL;
   struct stat st;
   char *yaml; 
  -rpmsyck_node *tmp, node;
  +rpmsyck_node *tmp, cpuinfoYaml, node;
   FD_t fd;
  -hashTable map;
   
   _cpuinfo_path = rpmGetPath(%{?_rpmhome}%{!?_rpmhome: USRLIBRPM 
}/cpuinfo.yaml, NULL);
   if(Stat(_cpuinfo_path, st))
  @@ -539,8 +538,9 @@
   
   xx = rpmdsCpuinfo(cpuinfo, NULL);
   
  -map = rpmSyckLoad(yaml)[0].value.map;
  -htGetEntry(map, cpuinfo, tmp, NULL, NULL);
  +cpuinfoYaml = rpmSyckLoad(yaml);
  +yaml = _free(yaml);
  +htGetEntry(cpuinfoYaml[0].value.map, cpuinfo, tmp, NULL, NULL);
   node = tmp[0]-value.seq;
   
   /* TODO: cleanup.. */
  @@ -556,7 +556,8 @@
if(htHasEntry(node[i].value.map, Arch)) {
htGetEntry(node[i].value.map, Arch, tmp, NULL, NULL);
rpmsyck_node arch = tmp[0]-value.seq;
  - cpus = htCreate(15*2, 0, 0, NULL, NULL);
  + for(j = 0; arch[j].type != T_END; j++);
  + cpus = htCreate(j*2, 0, 1, NULL, NULL);
for(j = 0; arch[j].type != T_END; j++) {
if(htHasEntry(arch[j].value.map, Extends)) {
if(htGetEntry(arch[j].value.map, Extends, 
tmp, NULL, NULL) 
  @@ -605,14 +606,14 @@
}
}
}
  + if(cpus) cpus = htFree(cpus);
}
}
   }
   
   xx = mireAppend(RPMMIRE_REGEX, 0, noarch, NULL, mi_re, mi_nre);
   
  -(void)rpmdsFree(cpuinfo);
  -cpuinfo = NULL;
  +cpuinfo = rpmdsFree(cpuinfo);
   
   cpu = mi_re[0].pattern;
   if(cpu != NULL)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ CHANGES

2009-05-06 Thread Ralf S. Engelschall
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  r...@rpm5.org
  Module: rpm  Date:   06-May-2009 19:05:31
  Branch: HEAD Handle: 2009050617053100

  Modified files:
rpm CHANGES

  Log:
HEAD is now open for RPM 5.3 development

  Summary:
RevisionChanges Path
1.2971  +5  -0  rpm/CHANGES
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2970 -r1.2971 CHANGES
  --- rpm/CHANGES   6 May 2009 02:26:10 -   1.2970
  +++ rpm/CHANGES   6 May 2009 17:05:31 -   1.2971
  @@ -1,5 +1,10 @@
   
  +5.2b1 - 5.3a1
  +
  +=
  +
   5.2a4 - 5.2b1:
  +[...]
   - proyvind: cpuinfo: move out cpuinfo feature dependencies to YAML.
   - proyvind: rpmsyck: first shot at YAML parser in pure C.
   - proyvind: get rid of parallel %___NVRDA macro, just merge it with 
%___NVRA in stead.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ configure.ac

2009-05-06 Thread Ralf S. Engelschall
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  r...@rpm5.org
  Module: rpm  Date:   06-May-2009 19:06:35
  Branch: HEAD Handle: 2009050617063500

  Modified files:
rpm configure.ac

  Log:
switch to 5.3 tagging on HEAD

  Summary:
RevisionChanges Path
2.373   +2  -2  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.372 -r2.373 configure.ac
  --- rpm/configure.ac  2 May 2009 20:06:27 -   2.372
  +++ rpm/configure.ac  6 May 2009 17:06:35 -   2.373
  @@ -8,8 +8,8 @@
   
   AC_PREREQ(2.63)
   AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
  -AC_INIT([rpm],[5.2.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
  -PACKAGE_TIMESTAMP=2008 dnl # [-MM[-DD[ HH[:MM
  +AC_INIT([rpm],[5.3.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
  +PACKAGE_TIMESTAMP=2009 dnl # [-MM[-DD[ HH[:MM
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
   
   AC_MSG_HEADER([INITIALIZATION])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_2: rpm/ configure.ac

2009-05-06 Thread Ralf S. Engelschall
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  r...@rpm5.org
  Module: rpm  Date:   06-May-2009 19:17:43
  Branch: rpm-5_2  Handle: 2009050617174200

  Modified files:   (Branch: rpm-5_2)
rpm configure.ac

  Log:
use the correct year

  Summary:
RevisionChanges Path
2.372.2.1   +1  -1  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.372 -r2.372.2.1 configure.ac
  --- rpm/configure.ac  2 May 2009 20:06:27 -   2.372
  +++ rpm/configure.ac  6 May 2009 17:17:42 -   2.372.2.1
  @@ -9,7 +9,7 @@
   AC_PREREQ(2.63)
   AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
   AC_INIT([rpm],[5.2.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
  -PACKAGE_TIMESTAMP=2008 dnl # [-MM[-DD[ HH[:MM
  +PACKAGE_TIMESTAMP=2009 dnl # [-MM[-DD[ HH[:MM
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
   
   AC_MSG_HEADER([INITIALIZATION])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_2: rpm/ devtool.conf rpm/lib/ Makefile.am rpmrc.c rpm...

2009-05-06 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:   06-May-2009 21:26:09
  Branch: rpm-5_2  Handle: 2009050619260801

  Modified files:   (Branch: rpm-5_2)
rpm devtool.conf
rpm/lib Makefile.am rpmrc.c
rpm/misclibrpmmisc.vers
rpm/rpmio   rpmsyck.c

  Log:
- jbj: tweak up build --with-syck but --without-libcpuinfo.

  Summary:
RevisionChanges Path
2.293.2.1   +8  -8  rpm/devtool.conf
2.188.2.1   +1  -0  rpm/lib/Makefile.am
2.278.2.1   +2  -0  rpm/lib/rpmrc.c
1.19.2.1+5  -0  rpm/misc/librpmmisc.vers
2.1.2.1 +2  -1  rpm/rpmio/rpmsyck.c
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.293 -r2.293.2.1 devtool.conf
  --- rpm/devtool.conf  2 May 2009 20:46:26 -   2.293
  +++ rpm/devtool.conf  6 May 2009 19:26:08 -   2.293.2.1
  @@ -4,14 +4,14 @@
   
   %common
   MODULE_NAMES=db lua file xar xz pcre syck js/src
  -MODULE_TAG_DB=
  -MODULE_TAG_LUA=
  -MODULE_TAG_FILE=
  -MODULE_TAG_XAR=
  -MODULE_TAG_XZ=
  -MODULE_TAG_PCRE=
  -MODULE_TAG_SYCK=
  -MODULE_TAG_JS_SRC=
  +MODULE_TAG_DB=rpm-5_2
  +MODULE_TAG_LUA=rpm-5_2
  +MODULE_TAG_FILE=rpm-5_2
  +MODULE_TAG_XAR=rpm-5_2
  +MODULE_TAG_XZ=rpm-5_2
  +MODULE_TAG_PCRE=rpm-5_2
  +MODULE_TAG_SYCK=rpm-5_2
  +MODULE_TAG_JS_SRC=rpm-5_2
   
   %checkout
   for name in $MODULE_NAMES $@; do
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/Makefile.am
  
  $ cvs diff -u -r2.188 -r2.188.2.1 Makefile.am
  --- rpm/lib/Makefile.am   15 Jan 2009 02:11:44 -  2.188
  +++ rpm/lib/Makefile.am   6 May 2009 19:26:09 -   2.188.2.1
  @@ -20,6 +20,7 @@
@WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
@WITH_PCRE_CPPFLAGS@ \
  + @WITH_SYCK_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@
   
   RPM_LDADD = \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.278 -r2.278.2.1 rpmrc.c
  --- rpm/lib/rpmrc.c   6 May 2009 12:25:13 -   2.278
  +++ rpm/lib/rpmrc.c   6 May 2009 19:26:09 -   2.278.2.1
  @@ -28,7 +28,9 @@
   
   #include rpmcli.h
   
  +#if defined(WITH_CPUINFO)
   #include rpmsyck.h
  +#endif
   
   #include debug.h
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/misc/librpmmisc.vers
  
  $ cvs diff -u -r1.19 -r1.19.2.1 librpmmisc.vers
  --- rpm/misc/librpmmisc.vers  21 Apr 2009 14:10:15 -  1.19
  +++ rpm/misc/librpmmisc.vers  6 May 2009 19:26:09 -   1.19.2.1
  @@ -128,9 +128,14 @@
   syck_new_parser;
   syck_output_handler;
   syck_parse;
  +syck_parser_error_handler;
   syck_parser_handler;
  +syck_parser_implicit_typing;
   syck_parser_str;
  +syck_parser_str_auto;
  +syck_parser_taguri_expansion;
   syck_seq_read;
  +syck_strndup;
   xar_add_frombuffer;
   xar_close;
   xar_extract_tobuffersz;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmsyck.c
  
  $ cvs diff -u -r2.1 -r2.1.2.1 rpmsyck.c
  --- rpm/rpmio/rpmsyck.c   6 May 2009 01:55:37 -   2.1
  +++ rpm/rpmio/rpmsyck.c   6 May 2009 19:26:09 -   2.1.2.1
  @@ -71,7 +71,8 @@
   return syck_add_sym( p, (char *) tn );
   }
   
  -rpmsyck_node rpmSyckLoad(char *yaml) {
  +rpmsyck_node rpmSyckLoad(char *yaml)
  +{
   SyckParser *parser;
   SYMID v;
   rpmsyck_node nodes;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_2: rpm/lib/ rpmrc.c rpm/rpmio/ rpmsyck.c rpmsyck.h

2009-05-06 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:   06-May-2009 21:41:41
  Branch: rpm-5_2  Handle: 2009050619414100

  Modified files:   (Branch: rpm-5_2)
rpm/lib rpmrc.c
rpm/rpmio   rpmsyck.c rpmsyck.h

  Log:
- jbj: adjust includes to keep WITH_SYCK out of rpmio/*.h files.

  Summary:
RevisionChanges Path
2.278.2.2   +3  -1  rpm/lib/rpmrc.c
2.1.2.2 +1  -1  rpm/rpmio/rpmsyck.c
2.1.2.1 +12 -6  rpm/rpmio/rpmsyck.h
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.278.2.1 -r2.278.2.2 rpmrc.c
  --- rpm/lib/rpmrc.c   6 May 2009 19:26:09 -   2.278.2.1
  +++ rpm/lib/rpmrc.c   6 May 2009 19:41:41 -   2.278.2.2
  @@ -28,7 +28,9 @@
   
   #include rpmcli.h
   
  -#if defined(WITH_CPUINFO)
  +#if defined(WITH_CPUINFO)  defined(WITH_SYCK)
  +#include syck.h
  +#define  _RPMSYCK_INTERNAL
   #include rpmsyck.h
   #endif
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmsyck.c
  
  $ cvs diff -u -r2.1.2.1 -r2.1.2.2 rpmsyck.c
  --- rpm/rpmio/rpmsyck.c   6 May 2009 19:26:09 -   2.1.2.1
  +++ rpm/rpmio/rpmsyck.c   6 May 2009 19:41:41 -   2.1.2.2
  @@ -4,9 +4,9 @@
   
   #include syck.h
   #include rpmhash.h
  +#define  _RPMSYCK_INTERNAL
   #include rpmsyck.h
   
  -
   static SYMID
   rpmsyck_parse_handler(SyckParser *p, SyckNode *n)
   {
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmsyck.h
  
  $ cvs diff -u -r2.1 -r2.1.2.1 rpmsyck.h
  --- rpm/rpmio/rpmsyck.h   6 May 2009 01:55:37 -   2.1
  +++ rpm/rpmio/rpmsyck.h   6 May 2009 19:41:41 -   2.1.2.1
  @@ -1,11 +1,10 @@
   #ifndef H_RPMSYCK
   #define H_RPMSYCK
   
  -#if defined(WITH_SYCK)
  -
  -#include syck.h
   #include rpmhash.h
   
  +/**
  + */
   typedef enum {
   T_STR,
   T_SEQ,
  @@ -13,8 +12,13 @@
   T_END
   } syck_type_t; 
   
  +/**
  + */
   typedef struct rpmsyck_node_s * rpmsyck_node;
   
  +#if defined(_RPMSYCK_INTERNAL)
  +/**
  + */
   struct rpmsyck_node_s {
   syck_type_t type;
   char *tag;
  @@ -24,9 +28,11 @@
hashTable map;
   } value;
   };
  -
  -rpmsyck_node rpmSyckLoad(char *yaml);
  -
   #endif
   
  +/**
  + */
  +rpmsyck_node rpmSyckLoad(char *yaml)
  + /*...@*/;
  +
   #endif /* H_RPMSYCK */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ CHANGES rpm/rpmio/ rpmlua.c

2009-05-06 Thread Ralf S. Engelschall
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  r...@rpm5.org
  Module: rpm  Date:   06-May-2009 21:42:42
  Branch: HEAD Handle: 2009050619424101

  Modified files:
rpm CHANGES
rpm/rpmio   rpmlua.c

  Log:
align semantics of Lua function rpm.hostname() with the C API function
buildHost()

  Summary:
RevisionChanges Path
1.2972  +1  -0  rpm/CHANGES
2.73+1  -1  rpm/rpmio/rpmlua.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2971 -r1.2972 CHANGES
  --- rpm/CHANGES   6 May 2009 17:05:31 -   1.2971
  +++ rpm/CHANGES   6 May 2009 19:42:41 -   1.2972
  @@ -1,5 +1,6 @@
   
   5.2b1 - 5.3a1
  + - rse: align semantics of Lua function rpm.hostname() with the C API 
function buildHost()
   
   =
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmlua.c
  
  $ cvs diff -u -r2.72 -r2.73 rpmlua.c
  --- rpm/rpmio/rpmlua.c18 Apr 2009 16:41:58 -  2.72
  +++ rpm/rpmio/rpmlua.c6 May 2009 19:42:42 -   2.73
  @@ -1155,7 +1155,7 @@
   if ((hbn = gethostbyname(hostname)) != NULL)
   h = hbn-h_name;
   else
  -h = localhost;
  +h = hostname;
   /*...@=multithreaded@*/
   lua_pushstring(L, (const char *)h);
   return 1;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_2: rpm/ CHANGES rpm/rpmio/ rpmlua.c

2009-05-06 Thread Ralf S. Engelschall
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  r...@rpm5.org
  Module: rpm  Date:   06-May-2009 21:43:18
  Branch: rpm-5_2  Handle: 2009050619431701

  Modified files:   (Branch: rpm-5_2)
rpm CHANGES
rpm/rpmio   rpmlua.c

  Log:
align semantics of Lua function rpm.hostname() with the C API function
buildHost()

  Summary:
RevisionChanges Path
1.2970.2.1  +1  -0  rpm/CHANGES
2.72.2.1+1  -1  rpm/rpmio/rpmlua.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2970 -r1.2970.2.1 CHANGES
  --- rpm/CHANGES   6 May 2009 02:26:10 -   1.2970
  +++ rpm/CHANGES   6 May 2009 19:43:17 -   1.2970.2.1
  @@ -1,5 +1,6 @@
   
   5.2a4 - 5.2b1:
  +- rse: align semantics of Lua function rpm.hostname() with the C API 
function buildHost()
   - proyvind: cpuinfo: move out cpuinfo feature dependencies to YAML.
   - proyvind: rpmsyck: first shot at YAML parser in pure C.
   - proyvind: get rid of parallel %___NVRDA macro, just merge it with 
%___NVRA in stead.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmlua.c
  
  $ cvs diff -u -r2.72 -r2.72.2.1 rpmlua.c
  --- rpm/rpmio/rpmlua.c18 Apr 2009 16:41:58 -  2.72
  +++ rpm/rpmio/rpmlua.c6 May 2009 19:43:18 -   2.72.2.1
  @@ -1155,7 +1155,7 @@
   if ((hbn = gethostbyname(hostname)) != NULL)
   h = hbn-h_name;
   else
  -h = localhost;
  +h = hostname;
   /*...@=multithreaded@*/
   lua_pushstring(L, (const char *)h);
   return 1;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/rpmio/ rpmlua.c

2009-05-06 Thread Ralf S. Engelschall
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  r...@rpm5.org
  Module: rpm  Date:   06-May-2009 21:44:15
  Branch: rpm-5_1  Handle: 2009050619441401

  Modified files:   (Branch: rpm-5_1)
rpm CHANGES
rpm/rpmio   rpmlua.c

  Log:
align semantics of Lua function rpm.hostname() with the C API function
buildHost()

  Summary:
RevisionChanges Path
1.2288.2.300+1  -0  rpm/CHANGES
2.52.2.11   +1  -1  rpm/rpmio/rpmlua.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.299 -r1.2288.2.300 CHANGES
  --- rpm/CHANGES   18 Apr 2009 17:23:31 -  1.2288.2.299
  +++ rpm/CHANGES   6 May 2009 19:44:14 -   1.2288.2.300
  @@ -1,4 +1,5 @@
   5.1.9 - 5.1.10:
  +- rse: align semantics of Lua function rpm.hostname() with the C API 
function buildHost()
   
   5.1.8 - 5.1.9:
   - rse: fix release tarball rolling after recent addition of local copies 
of XZ, PCRE and Syck
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmlua.c
  
  $ cvs diff -u -r2.52.2.10 -r2.52.2.11 rpmlua.c
  --- rpm/rpmio/rpmlua.c18 Apr 2009 16:45:17 -  2.52.2.10
  +++ rpm/rpmio/rpmlua.c6 May 2009 19:44:15 -   2.52.2.11
  @@ -1147,7 +1147,7 @@
   if ((hbn = gethostbyname(hostname)) != NULL)
   h = hbn-h_name;
   else
  -h = localhost;
  +h = hostname;
   /*...@=multithreaded@*/
   lua_pushstring(L, (const char *)h);
   return 1;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_2: js/src/ Makefile.am

2009-05-06 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: js   Date:   06-May-2009 22:00:59
  Branch: rpm-5_2  Handle: 2009050620005900

  Modified files:   (Branch: rpm-5_2)
js/src  Makefile.am

  Log:
- js: add the autogenerated jsautocfg.h/jsautokw.h first so they are
built early.

  Summary:
RevisionChanges Path
1.1.2.1 +4  -1  js/src/Makefile.am
  

  patch -p0 '@@ .'
  Index: js/src/Makefile.am
  
  $ cvs diff -u -r1.1 -r1.1.2.1 Makefile.am
  --- js/src/Makefile.am2 May 2009 20:06:29 -   1.1
  +++ js/src/Makefile.am6 May 2009 20:00:59 -   1.1.2.1
  @@ -15,6 +15,7 @@
   noinst_PROGRAMS =jscpucfg jskwgen js
   noinst_LTLIBRARIES = libjs.la
   noinst_HEADERS = \
  + jsautocfg.h jsautokw.h \
jsapi.h jsdbgapi.h \
jsarray.h jsatom.h jsbool.h jsconfig.h jscntxt.h jsdate.h \
jsemit.h jsexn.h jsfun.h jsgc.h jsinterp.h jsiter.h \
  @@ -24,7 +25,7 @@
jsscan.h jsscope.h jsscript.h jsstr.h jsutil.h jsxdrapi.h \
jsxml.h \
   jsbit.h jscompat.h jscpucfg.h jsotypes.h jsstddef.h \
  -prmjtime.h resource.h jsautocfg.h jsautokw.h \
  +prmjtime.h resource.h \
jsfile.h
   
   libjs_la_SOURCES = \
  @@ -49,6 +50,8 @@
   jsautokw.h: ./jskwgen
./jskwgen $@
   
  +BUILT_SOURCES = jsautocfg.h jsautokw.h
  +
   js_SOURCES = js.c
   js_CFLAGS =  -DXP_UNIX
   js_LDADD =   libjs.la
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org