[CVS] RPM: rpm-5_4: syck/lib/ Makefile.am

2013-08-08 Thread Anders F. Bj�rklund
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  a...@rpm5.org
  Module: syck Date:   08-Aug-2013 23:58:58
  Branch: rpm-5_4  Handle: 2013080821585800

  Modified files:   (Branch: rpm-5_4)
syck/libMakefile.am

  Log:
syck: use the configured bison flags (if any)

  Summary:
RevisionChanges Path
1.6.8.1 +1  -1  syck/lib/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: syck/lib/Makefile.am
  
  $ cvs diff -u -r1.6 -r1.6.8.1 Makefile.am
  --- syck/lib/Makefile.am  1 Apr 2009 20:43:58 -   1.6
  +++ syck/lib/Makefile.am  8 Aug 2013 21:58:58 -   1.6.8.1
  @@ -4,7 +4,7 @@
   
   LEXLIB = @LEXLIB@
   
  -YACC = bison
  +YACC = @YACC@ 
   AM_YFLAGS = -d -t -v -p syck
   
   #lib_LTLIBRARIES = libsyck.la
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/python/ system.h rpm/ system.h

2013-08-08 Thread Anders F. Bj�rklund
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  a...@rpm5.org
  Module: rpm  Date:   08-Aug-2013 23:45:26
  Branch: rpm-5_4  Handle: 2013080821452501

  Modified files:   (Branch: rpm-5_4)
rpm system.h
rpm/python  system.h

  Log:
macosx: fix the uuid build on mountain lion

  Summary:
RevisionChanges Path
1.5.2.1 +2  -0  rpm/python/system.h
2.129.2.6   +2  -0  rpm/system.h
  

  patch -p0 <<'@@ .'
  Index: rpm/python/system.h
  
  $ cvs diff -u -r1.5 -r1.5.2.1 system.h
  --- rpm/python/system.h   3 Dec 2010 18:29:22 -   1.5
  +++ rpm/python/system.h   8 Aug 2013 21:45:26 -   1.5.2.1
  @@ -9,7 +9,9 @@
   #include 
   #endif
   
  +#define  uuid_t  unistd_uuid_t   /* XXX Mac OS X dares to be different. 
*/
   #include "Python.h"
  +#undef   unistd_uuid_t   /* XXX Mac OS X dares to be different. 
*/
   
   #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 4
   #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/system.h
  
  $ cvs diff -u -r2.129.2.5 -r2.129.2.6 system.h
  --- rpm/system.h  26 Jul 2012 12:56:08 -  2.129.2.5
  +++ rpm/system.h  8 Aug 2013 21:45:25 -   2.129.2.6
  @@ -323,7 +323,9 @@
   #endif
   
   #if defined(HAVE_GRP_H)
  +#define  uuid_t  unistd_uuid_t   /* XXX Mac OS X dares to be different. 
*/
   #include 
  +#undef   unistd_uuid_t   /* XXX Mac OS X dares to be different. 
*/
   #endif
   
   #if defined(HAVE_LIMITS_H)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/tools/ debugedit.c

2013-08-08 Thread Pinto Elia
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   08-Aug-2013 18:39:05
  Branch: rpm-5_4  Handle: 2013080816390401

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/tools   debugedit.c

  Log:
debugedit.c: fix #rhbz725378

Fixed in @rpm.org with commit id 1684b696.
Here we make something different: we give a warn if we meet
stabs but erroring out if we did't find any usable debuginfo
(DWARF ELF). I do not know if this it's the right strategy.

  Summary:
RevisionChanges Path
1.3501.2.338+5  -0  rpm/CHANGES
2.23.2.11   +8  -2  rpm/tools/debugedit.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.337 -r1.3501.2.338 CHANGES
  --- rpm/CHANGES   8 Aug 2013 15:53:35 -   1.3501.2.337
  +++ rpm/CHANGES   8 Aug 2013 16:39:04 -   1.3501.2.338
  @@ -1,4 +1,9 @@
   5.4.12 -> 5.4.13:
  +- devzero2000: debugedit.c: fix #rhbz725378
  +  Fixed in @rpm.org with commit id 1684b696.
  +  Here we make something different: we give a warn if we meet
  +  stabs but erroring out if we did't find any usable debuginfo
  +  (DWARF ELF). I do not know if this it's the right strategy.
   - devzero2000: debugedit.c: fix #rhbz974860
 Patch from Kyle McMartin 
   - devzero2000: debugedit.c: fix #rhbz929365
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/debugedit.c
  
  $ cvs diff -u -r2.23.2.10 -r2.23.2.11 debugedit.c
  --- rpm/tools/debugedit.c 8 Aug 2013 15:53:36 -   2.23.2.10
  +++ rpm/tools/debugedit.c 8 Aug 2013 16:39:05 -   2.23.2.11
  @@ -1632,11 +1632,17 @@
  /* TODO: Handle stabs */
  if (strcmp (name, ".stab") == 0)
{
  -   fprintf (stderr, "Stabs debuginfo not supported: %s\n", file);
  -   exit (1);
  +   fprintf (stderr, "Warning: Stabs debuginfo currently not 
supported: %s\n", file);
  +   break;
}
  + /* The core DWARF data  containing DIEs */
  if (strcmp (name, ".debug_info") == 0)
edit_dwarf2 (dso);
  + else 
  +  {
  +   fprintf (stderr, "Failed to produce debuginfo: debug format not 
supported: %s\n", name);
  + exit(1);
  +  }
   
  break;
case SHT_NOTE:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/tools/ debugedit.c

2013-08-08 Thread Pinto Elia
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   08-Aug-2013 17:53:37
  Branch: rpm-5_4  Handle: 2013080815533501

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/tools   debugedit.c

  Log:
debugedit.c: fix #rhbz974860

 Patch from Kyle McMartin 

  Summary:
RevisionChanges Path
1.3501.2.337+2  -0  rpm/CHANGES
2.23.2.10   +6  -0  rpm/tools/debugedit.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.336 -r1.3501.2.337 CHANGES
  --- rpm/CHANGES   8 Aug 2013 15:38:33 -   1.3501.2.336
  +++ rpm/CHANGES   8 Aug 2013 15:53:35 -   1.3501.2.337
  @@ -1,4 +1,6 @@
   5.4.12 -> 5.4.13:
  +- devzero2000: debugedit.c: fix #rhbz974860
  +  Patch from Kyle McMartin 
   - devzero2000: debugedit.c: fix #rhbz929365
   - devzero2000: debugedit.c: fix #opensusebz 818502
   - devzero2000: add a simple lua test for testing the fix added in commit 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/debugedit.c
  
  $ cvs diff -u -r2.23.2.9 -r2.23.2.10 debugedit.c
  --- rpm/tools/debugedit.c 8 Aug 2013 15:38:34 -   2.23.2.9
  +++ rpm/tools/debugedit.c 8 Aug 2013 15:53:36 -   2.23.2.10
  @@ -1186,6 +1186,12 @@
  if (rtype != R_ALPHA_REFLONG)
goto fail;
  break;
  +#if defined(EM_AARCH64) && defined(R_AARCH64_ABS32)
  + case EM_AARCH64:
  +   if (rtype != R_AARCH64_ABS32)
  + goto fail;
  +   break;
  +#endif
default:
fail:
  error (1, 0, "%s: Unhandled relocation %d in .debug_info 
section",
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/tools/ debugedit.c

2013-08-08 Thread Pinto Elia
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   08-Aug-2013 17:38:34
  Branch: rpm-5_4  Handle: 2013080815383301

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/tools   debugedit.c

  Log:
debugedit.c: fix #rhbz929365

  Summary:
RevisionChanges Path
1.3501.2.336+1  -0  rpm/CHANGES
2.23.2.9+4  -1  rpm/tools/debugedit.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.335 -r1.3501.2.336 CHANGES
  --- rpm/CHANGES   8 Aug 2013 13:55:15 -   1.3501.2.335
  +++ rpm/CHANGES   8 Aug 2013 15:38:33 -   1.3501.2.336
  @@ -1,4 +1,5 @@
   5.4.12 -> 5.4.13:
  +- devzero2000: debugedit.c: fix #rhbz929365
   - devzero2000: debugedit.c: fix #opensusebz 818502
   - devzero2000: add a simple lua test for testing the fix added in commit 
 "permit empty-body no-operation for embedded interpreter macro
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/debugedit.c
  
  $ cvs diff -u -r2.23.2.8 -r2.23.2.9 debugedit.c
  --- rpm/tools/debugedit.c 8 Aug 2013 13:55:16 -   2.23.2.8
  +++ rpm/tools/debugedit.c 8 Aug 2013 15:38:34 -   2.23.2.9
  @@ -501,6 +501,9 @@
   edit_dwarf2_line (DSO *dso, rpmuint32_t off, char *comp_dir, int phase)
   {
 unsigned char *ptr = debug_sections[DEBUG_LINE].data, *dir;
  + /* XXX: Fix rhbz#929365, perhaps it is better to emit an error ? */
  +  if (ptr == NULL)
  +return 0;
 unsigned char **dirt;
 unsigned char *endsec = ptr + debug_sections[DEBUG_LINE].size;
 unsigned char *endcu, *endprol;
  @@ -511,7 +514,7 @@
   
 if (phase != 0)
   return 0;
  - 
  +
 ptr += off;

 endcu = ptr + 4;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/tools/ debugedit.c

2013-08-08 Thread Pinto Elia
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   08-Aug-2013 15:55:16
  Branch: rpm-5_4  Handle: 2013080813551501

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/tools   debugedit.c

  Log:
debugedit.c:

fix #opensusebz 818502

  Summary:
RevisionChanges Path
1.3501.2.335+1  -0  rpm/CHANGES
2.23.2.8+2  -0  rpm/tools/debugedit.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.334 -r1.3501.2.335 CHANGES
  --- rpm/CHANGES   8 Aug 2013 10:41:19 -   1.3501.2.334
  +++ rpm/CHANGES   8 Aug 2013 13:55:15 -   1.3501.2.335
  @@ -1,4 +1,5 @@
   5.4.12 -> 5.4.13:
  +- devzero2000: debugedit.c: fix #opensusebz 818502
   - devzero2000: add a simple lua test for testing the fix added in commit 
 "permit empty-body no-operation for embedded interpreter macro
 expansions." for the bug  https://bugs.launchpad.net/rpm/+bug/1209142
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/debugedit.c
  
  $ cvs diff -u -r2.23.2.7 -r2.23.2.8 debugedit.c
  --- rpm/tools/debugedit.c 19 May 2012 20:17:12 -  2.23.2.7
  +++ rpm/tools/debugedit.c 8 Aug 2013 13:55:16 -   2.23.2.8
  @@ -252,6 +252,7 @@
   #define DEBUG_RANGES 10
   #define DEBUG_TYPES  11
   #define DEBUG_MACRO  12
  +#define DEBUG_GDB_SCRIPT 13
   { ".debug_info", NULL, NULL, 0, 0, 0 },
   { ".debug_abbrev", NULL, NULL, 0, 0, 0 },
   { ".debug_line", NULL, NULL, 0, 0, 0 },
  @@ -265,6 +266,7 @@
   { ".debug_ranges", NULL, NULL, 0, 0, 0 },
   { ".debug_types", NULL, NULL, 0, 0, 0 },
   { ".debug_macro", NULL, NULL, 0, 0, 0 },
  +{ ".debug_gdb_scripts", NULL, NULL, 0, 0, 0 },
   { NULL, NULL, NULL, 0, 0, 0 }
 };
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/tests/ Makefile.am

2013-08-08 Thread Pinto Elia
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   08-Aug-2013 12:41:20
  Branch: rpm-5_4  Handle: 2013080810411901

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/tests   Makefile.am

  Log:
add a simple lua test

This is for testing the fix added in commit·
"permit empty-body no-operation for embedded interpreter macro
expansions." for the bug https://bugs.launchpad.net/rpm/+bug/1209142

  Summary:
RevisionChanges Path
1.3501.2.334+3  -0  rpm/CHANGES
1.95.2.63   +1  -0  rpm/tests/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.333 -r1.3501.2.334 CHANGES
  --- rpm/CHANGES   2 Aug 2013 13:00:07 -   1.3501.2.333
  +++ rpm/CHANGES   8 Aug 2013 10:41:19 -   1.3501.2.334
  @@ -1,4 +1,7 @@
   5.4.12 -> 5.4.13:
  +- devzero2000: add a simple lua test for testing the fix added in commit 
  +  "permit empty-body no-operation for embedded interpreter macro
  +  expansions." for the bug  https://bugs.launchpad.net/rpm/+bug/1209142
- devzero2000: RPMTAG_NOSOURCE and RPMTAG_NOPATCH should always 
be a
  list - either empty or with list of relevant source/patch 
numbers
(ref #rhbz: 991329, @rpm.org commit id 
eb3e20b5f40ca69790d1cc0b6a18)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.95.2.62 -r1.95.2.63 Makefile.am
  --- rpm/tests/Makefile.am 4 Aug 2013 03:13:04 -   1.95.2.62
  +++ rpm/tests/Makefile.am 8 Aug 2013 10:41:20 -   1.95.2.63
  @@ -974,6 +974,7 @@
   check-lua:
@echo "=== $@ ==="
@-${rpm} -E '%{lua:print("-->  lua: Hard Rocks!")}'
  + @-${rpm} -E '%{lua}'
@-${rpm} -e lua-test
@-${rpm} -U lua-test/lua-test-*.noarch.rpm
@-${rpm} -e lua-test
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org