[CVS] RPM: rpm-5_4: rpm/scripts/ URPM-Makefile.PL.in

2015-02-23 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:   23-Feb-2015 11:22:43
  Branch: rpm-5_4  Handle: 2015022310224300

  Modified files:   (Branch: rpm-5_4)
rpm/scripts URPM-Makefile.PL.in

  Log:
- URPM: specify CC in order to use clang.

  Summary:
RevisionChanges Path
1.1.2.3 +1  -0  rpm/scripts/URPM-Makefile.PL.in
  

  patch -p0 '@@ .'
  Index: rpm/scripts/URPM-Makefile.PL.in
  
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 URPM-Makefile.PL.in
  --- rpm/scripts/URPM-Makefile.PL.in   10 Mar 2012 21:15:17 -  1.1.2.2
  +++ rpm/scripts/URPM-Makefile.PL.in   23 Feb 2015 10:22:43 -  1.1.2.3
  @@ -116,6 +116,7 @@
   'OBJECT'= join(' ', @objects),
   'VERSION_FROM' = 'URPM.pm',
   'MAKEFILE'   = 'Makefile.perl',
  +'CC' = @CC@,
   'CCFLAGS'= $ccflags,
   'dynamic_lib' = { OTHERLDFLAGS = $ldflags },
   'OPTIMIZE'   = '-g',
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/build/ parsePreamble.c rpm/lib/ rpmds.c rpm/rp...

2015-02-23 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:   23-Feb-2015 11:47:08
  Branch: rpm-5_4  Handle: 2015022310470701

  Modified files:   (Branch: rpm-5_4)
rpm/build   parsePreamble.c
rpm/lib rpmds.c
rpm/rpmdb   rpmtag.h

  Log:
- revert rpm.org tag renaming compaitibility.

  Summary:
RevisionChanges Path
2.194.2.12  +4  -4  rpm/build/parsePreamble.c
2.170.2.30  +6  -6  rpm/lib/rpmds.c
1.70.4.17   +8  -12 rpm/rpmdb/rpmtag.h
  

  patch -p0 '@@ .'
  Index: rpm/build/parsePreamble.c
  
  $ cvs diff -u -r2.194.2.11 -r2.194.2.12 parsePreamble.c
  --- rpm/build/parsePreamble.c 24 Sep 2014 16:24:58 -  2.194.2.11
  +++ rpm/build/parsePreamble.c 23 Feb 2015 10:47:08 -  2.194.2.12
  @@ -856,8 +856,8 @@
return rc;
break;
   /* Aliases for Requires(hint): */
  -case RPMTAG_OLDSUGGESTSFLAGS:
  -case RPMTAG_OLDENHANCESFLAGS:
  +case RPMTAG_SUGGESTSFLAGS:
  +case RPMTAG_ENHANCESFLAGS:
tag = RPMTAG_REQUIREFLAGS;
tagflags = RPMSENSE_MISSINGOK;
if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags)))
  @@ -991,8 +991,8 @@
   {RPMTAG_BUGURL,  0, 0, bugurl},
   {RPMTAG_CVSID,   0, 0, cvsid},
   {RPMTAG_SVNID,   0, 0, svnid},
  -{RPMTAG_OLDSUGGESTSFLAGS,0, 0, suggests},
  -{RPMTAG_OLDENHANCESFLAGS,0, 0, enhances},
  +{RPMTAG_SUGGESTSFLAGS,   0, 0, suggests},
  +{RPMTAG_ENHANCESFLAGS,   0, 0, enhances},
   {RPMTAG_BUILDSUGGESTS,   0, 0, buildsuggests},
   {RPMTAG_BUILDENHANCES,   0, 0, buildenhances},
   {RPMTAG_VARIANTS,0, 0, variants},
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmds.c
  
  $ cvs diff -u -r2.170.2.29 -r2.170.2.30 rpmds.c
  --- rpm/lib/rpmds.c   12 Oct 2014 21:20:58 -  2.170.2.29
  +++ rpm/lib/rpmds.c   23 Feb 2015 10:47:08 -  2.170.2.30
  @@ -283,13 +283,13 @@
tagEVR = RPMTAG_TRIGGERVERSION;
tagF = RPMTAG_TRIGGERFLAGS;
break;
  -case RPMTAG_OLDSUGGESTSNAME:
  - tagEVR = RPMTAG_OLDSUGGESTSVERSION;
  - tagF = RPMTAG_OLDSUGGESTSFLAGS;
  +case RPMTAG_SUGGESTSNAME:
  + tagEVR = RPMTAG_SUGGESTSVERSION;
  + tagF = RPMTAG_SUGGESTSFLAGS;
break;
  -case RPMTAG_OLDENHANCESNAME:
  - tagEVR = RPMTAG_OLDENHANCESVERSION;
  - tagF = RPMTAG_OLDENHANCESFLAGS;
  +case RPMTAG_ENHANCESNAME:
  + tagEVR = RPMTAG_ENHANCESVERSION;
  + tagF = RPMTAG_ENHANCESFLAGS;
break;
   case RPMTAG_DIRNAMES:
tagEVR = (rpmTag) 0;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/rpmtag.h
  
  $ cvs diff -u -r1.70.4.16 -r1.70.4.17 rpmtag.h
  --- rpm/rpmdb/rpmtag.h16 Feb 2015 21:40:11 -  1.70.4.16
  +++ rpm/rpmdb/rpmtag.h23 Feb 2015 10:47:07 -  1.70.4.17
  @@ -346,14 +346,14 @@
   RPMTAG_PRETRANSPROG  = 1153, /* s */
   RPMTAG_POSTTRANSPROG = 1154, /* s */
   RPMTAG_DISTTAG   = 1155, /* s */
  -RPMTAG_OLDSUGGESTSNAME   = 1156, /* s[] extension */
  -#define  RPMTAG_OLDSUGGESTS RPMTAG_OLDSUGGESTSNAME   /* s[] */
  -RPMTAG_OLDSUGGESTSVERSION= 1157, /* s[] extension */
  -RPMTAG_OLDSUGGESTSFLAGS  = 1158, /* i[] extension */
  -RPMTAG_OLDENHANCESNAME   = 1159, /* s[] extension placeholder */
  -#define  RPMTAG_OLDENHANCES RPMTAG_OLDENHANCESNAME   /* s[] */
  -RPMTAG_OLDENHANCESVERSION= 1160, /* s[] extension placeholder */
  -RPMTAG_OLDENHANCESFLAGS  = 1161, /* i[] extension placeholder */
  +RPMTAG_SUGGESTSNAME  = 1156, /* s[] extension */
  +#define  RPMTAG_SUGGESTS RPMTAG_SUGGESTSNAME /* s[] */
  +RPMTAG_SUGGESTSVERSION   = 1157, /* s[] extension */
  +RPMTAG_SUGGESTSFLAGS = 1158, /* i[] extension */
  +RPMTAG_ENHANCESNAME  = 1159, /* s[] extension placeholder */
  +#define  RPMTAG_ENHANCES RPMTAG_ENHANCESNAME /* s[] */
  +RPMTAG_ENHANCESVERSION   = 1160, /* s[] extension placeholder */
  +RPMTAG_ENHANCESFLAGS = 1161, /* i[] extension placeholder */
   RPMTAG_PRIORITY  = 1162, /* i[] extension placeholder */
   RPMTAG_CVSID = 1163, /* s */
   #define  RPMTAG_SVNIDRPMTAG_CVSID/* s */
  @@ -473,19 +473,15 @@
   #endif   /* REFERENCE

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

2015-02-23 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:   23-Feb-2015 16:23:36
  Branch: rpm-5_4  Handle: 2015022315233500

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

  Log:
- create rpmqv.cc symlink automagically.

  Summary:
RevisionChanges Path
2.263.2.33  +5  -3  rpm/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.32 -r2.263.2.33 Makefile.am
  --- rpm/Makefile.am   9 Oct 2014 02:52:56 -   2.263.2.32
  +++ rpm/Makefile.am   23 Feb 2015 15:23:35 -  2.263.2.33
  @@ -201,13 +201,15 @@
   rpm_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS)
   rpm_LDADD =  rpm.o $(myLDADD)
   rpm.o:   $(top_srcdir)/rpmqv.c
  - $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV 
-o $@ -c $(top_srcdir)/rpmqv.cc
  + ln -sf $ rpmqv.cc
  + $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV 
-o $@ -c rpmqv.cc
   
   rpmbuild_SOURCES =   build.c
   rpmbuild_LDFLAGS =   @LDFLAGS_STATIC@ $(LDFLAGS)
   rpmbuild_LDADD = rpmbuild.o $(myLDADD)
  -rpmbuild.o: $(top_srcdir)/rpmqv.c
  - $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc
  +rpmbuild.o:  $(top_srcdir)/rpmqv.c
  + ln -sf $ rpmqv.cc
  + $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.cc
   
   .PHONY:  splint
   splint:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2015-02-23 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:   23-Feb-2015 19:55:36
  Branch: rpm-5_4  Handle: 2015022318553600

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

  Log:
- tests: update OWL3* info.

  Summary:
RevisionChanges Path
1.95.2.73   +13 -5  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.95.2.72 -r1.95.2.73 Makefile.am
  --- rpm/tests/Makefile.am 19 Feb 2015 22:04:44 -  1.95.2.72
  +++ rpm/tests/Makefile.am 23 Feb 2015 18:55:36 -  1.95.2.73
  @@ -291,6 +291,11 @@
@${rpm} -D'_gpg_name Ronald' --addsign --nopassword edos-test/*.rpm  
/dev/null
@${rpm} -qp edos-test/*.rpm  /dev/null
@${rpm} -Kv edos-test/*.rpm  /dev/null
  +#@echo -- EdDSA:
  +#@${rpm} --delsign cudf-test/*.rpm  /dev/null
  +#@${rpm} -vv -D'_gpg_name Edward' --addsign --nopassword cudf-test/*.rpm 
 /dev/null
  +#@${rpm} -qp cudf-test/*.rpm  /dev/null
  +#@${rpm} -Kv cudf-test/*.rpm  /dev/null
@echo -- ECDSA:
@${rpm} --delsign cudf-test/*.rpm  /dev/null
@${rpm} -D'_gpg_name Eric' --addsign --nopassword cudf-test/*.rpm  
/dev/null
  @@ -565,9 +570,10 @@
   OJUBA_mirror =   http://www.ojuba.org/downloads/releases
   OJUBA4_uri = $(OJUBA_mirror)/4/Everything/i386/os/Packages/
   # OWL == OpenWall Linux
  -OWL_mirror = http://distro.ibiblio.org/pub/linux/distributions/openwall/Owl
  +OWL_mirror = http://distro.ibiblio.org/openwall/Owl/
   OWL2_uri =   $(OWL_mirror)/2.0-stable/i386/RPMS/
  -OWL3_uri =   $(OWL_mirror)/3.0-stable/i686/RPMS/
  +OWL30_uri =  $(OWL_mirror)/3.0-stable/i686/RPMS/
  +OWL31_uri =  $(OWL_mirror)/3.1-stable/i686/RPMS/
   OWL2_manifest =  $(testdir)/ref/owl2-everything.i386.manifest
   # PCLOS -- PCLinuxOS
   # PLD -- PLD Linux
  @@ -625,7 +631,7 @@
MDV2009 MDV2010 MDV2011 MAG2011 \
MEEGO MOBLIN21 \
OJUBA4 \
  - OWL2 OWL3 \
  + OWL2 OWL30 OWL31 \
PLD3 \
SL55 SL54 SL53 SL52 SL51 SL50 \
SLES11_3 SLES11_2 SLES11_1  \
  @@ -660,7 +666,8 @@
   XXXcache =   /var/www/html/cache
   XXXIDMS =$(XXXcache)/i586-idms-linux/RPMS/
   XXXOWL2 =$(XXXcache)/i386-openwall-OWL2/RPMS/
  -XXXOWL3 =$(XXXcache)/i686-openwall-OWL3/RPMS/
  +XXXOWL3O =   $(XXXcache)/i686-openwall-OWL30/RPMS/
  +XXXOWL31 =   $(XXXcache)/i686-openwall-OWL31/RPMS/
   XXXALT51 =   $(XXXcache)/x86_64-alt-sisyphus/RPMS/
   
   XXXG =   /var/www/html/geode-RHEL6/RPMS/
  @@ -685,7 +692,8 @@
  G)$(cp) `cat ${G_manifest}` $@ ;; \
  IDMS) $(ln) -s ${XXXIDMS}/* $@ ;; \
  OWL2) $(ln) -s ${XXXOWL2}/* $@ ;; \
  -   OWL3) $(ln) -s ${XXXOWL3}/* $@ ;; \
  +   OWL30)$(ln) -s ${XXXOWL30}/* $@ ;; \
  +   OWL31)$(ln) -s ${XXXOWL31}/* $@ ;; \
  ALT51)$(ln) -s ${XXXALT51}/* $@ ;; \
  CM15) $(cp) $$(cat $ | ${sed} -e 
's,^.*/\(media/[^/]*/release/[^/]*\)/,${XXXCM15}\1,') $@ ;; \
  CM14) $(cp) $$(cat $ | ${sed} -e 's,^.*/,${XXXCM14}/,') $@ ;; \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/macros/ macros.in

2015-02-23 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:   23-Feb-2015 21:29:08
  Branch: rpm-5_4  Handle: 2015022320290700

  Modified files:   (Branch: rpm-5_4)
rpm/macros  macros.in

  Log:
- OWL3: LOOP snipping.

  Summary:
RevisionChanges Path
1.39.2.44   +4  -2  rpm/macros/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.39.2.43 -r1.39.2.44 macros.in
  --- rpm/macros/macros.in  3 Oct 2014 19:20:11 -   1.39.2.43
  +++ rpm/macros/macros.in  23 Feb 2015 20:29:07 -  1.39.2.44
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.39.2.43 2014/10/03 19:20:11 jbj Exp $
  +# $Id: macros.in,v 1.39.2.44 2015/02/23 20:29:07 jbj 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
  @@ -704,9 +704,11 @@
glibc-commonglibc  \
glibcnscd  \
filesystemsetup
  +%_dependency_whiteout_OWL31  \
  + libusb1owl-hier
   
   %_dependency_whiteout\
  - %{?_dependency_whiteout_caos_core} \
  + %{?_dependency_whiteout_OWL31} \
%{?_dependency_whiteout_system} \
%{nil}
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tests/ spew.conf

2015-02-23 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:   23-Feb-2015 23:02:44
  Branch: rpm-5_4  Handle: 2015022322024400

  Modified files:   (Branch: rpm-5_4)
rpm/tests   spew.conf

  Log:
- add OWL30/OWL31

  Summary:
RevisionChanges Path
1.5.2.5 +5  -2  rpm/tests/spew.conf
  

  patch -p0 '@@ .'
  Index: rpm/tests/spew.conf
  
  $ cvs diff -u -r1.5.2.4 -r1.5.2.5 spew.conf
  --- rpm/tests/spew.conf   19 Feb 2012 18:28:26 -  1.5.2.4
  +++ rpm/tests/spew.conf   23 Feb 2015 22:02:44 -  1.5.2.5
  @@ -204,8 +204,11 @@
   %OWL2
   %packagesOWL2
   
  -%OWL3
  -%packagesOWL3
  +%OWL30
  +%packagesOWL30
  +
  +%OWL31
  +%packagesOWL31
   
   %PLD3
   %packagesPLD3
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: syck/lib/ Makefile.am gram.y syck.h token.c

2015-02-23 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: syck Date:   23-Feb-2015 10:13:25
  Branch: rpm-5_4  Handle: 2015022309132500

  Modified files:   (Branch: rpm-5_4)
syck/libMakefile.am gram.y syck.h token.c

  Log:
- syck: repair bison damage.

  Summary:
RevisionChanges Path
1.6.8.2 +19 -19 syck/lib/Makefile.am
1.3.8.1 +1  -0  syck/lib/gram.y
1.5.8.1 +1  -1  syck/lib/syck.h
1.7.6.1 +8  -7  syck/lib/token.c
  

  patch -p0 '@@ .'
  Index: syck/lib/Makefile.am
  
  $ cvs diff -u -r1.6.8.1 -r1.6.8.2 Makefile.am
  --- syck/lib/Makefile.am  8 Aug 2013 21:58:58 -   1.6.8.1
  +++ syck/lib/Makefile.am  23 Feb 2015 09:13:25 -  1.6.8.2
  @@ -49,25 +49,25 @@
token.c \
implicit.c
   
  -gram.c:  gram.y
  - $(YACC) -d -t -v -p syck -o $@ $
  - -@if test -f gram.c; then \
  - { echo /*@-globs -mods -modnomods -moduncon -modunconnomods @*/;\
  -   echo /*@-noeffect -noeffectuncon @*/;\
  -   echo /*@-nullassign @*/;\
  -   echo /*@-readonlytrans @*/;\
  -   echo /*@-uniondef @*/;\
  -   echo /*@-warnlintcomments @*/;\
  -   cat gram.c;\
  -   echo /*@=warnlintcomments @*/;\
  -   echo /*@=uniondef @*/;\
  -   echo /*@=readonlytrans @*/;\
  -   echo /*@=nullassign @*/;\
  -   echo /*@=noeffect =noeffectuncon @*/;\
  -   echo /*@=globs =mods =modnomods =moduncon =modunconnomods @*/;\
  - }  _gram.c ;\
  -   mv -f _gram.c gram.c; \
  - fi
  +#gram.c: gram.y
  +#$(YACC) -d -t -v -p syck -o $@ $
  +#-@if test -f gram.c; then \
  +#{ echo /*@-globs -mods -modnomods -moduncon -modunconnomods @*/;\
  +#  echo /*@-noeffect -noeffectuncon @*/;\
  +#  echo /*@-nullassign @*/;\
  +#  echo /*@-readonlytrans @*/;\
  +#  echo /*@-uniondef @*/;\
  +#  echo /*@-warnlintcomments @*/;\
  +#  cat gram.c;\
  +#  echo /*@=warnlintcomments @*/;\
  +#  echo /*@=uniondef @*/;\
  +#  echo /*@=readonlytrans @*/;\
  +#  echo /*@=nullassign @*/;\
  +#  echo /*@=noeffect =noeffectuncon @*/;\
  +#  echo /*@=globs =mods =modnomods =moduncon =modunconnomods @*/;\
  +#}  _gram.c ;\
  +#  mv -f _gram.c gram.c; \
  +#fi
   
   BUILT_SOURCES = gram.c gram.h
   
  @@ .
  patch -p0 '@@ .'
  Index: syck/lib/gram.y
  
  $ cvs diff -u -r1.3 -r1.3.8.1 gram.y
  --- syck/lib/gram.y   31 Mar 2009 23:05:59 -  1.3
  +++ syck/lib/gram.y   23 Feb 2015 09:13:25 -  1.3.8.1
  @@ -9,6 +9,7 @@
   
   %start doc
   %pure-parser
  +%param {void *parser}
   
   
   %{
  @@ .
  patch -p0 '@@ .'
  Index: syck/lib/syck.h
  
  $ cvs diff -u -r1.5 -r1.5.8.1 syck.h
  --- syck/lib/syck.h   2 Apr 2009 13:23:49 -   1.5
  +++ syck/lib/syck.h   23 Feb 2015 09:13:25 -  1.5.8.1
  @@ -619,7 +619,7 @@
   /*
* Lexer prototypes
*/
  -void syckerror( char *msg )
  +void syckerror( void *, char *msg )
/*@*/;
   int syckparse( void * )
/*@globals fileSystem @*/
  @@ .
  patch -p0 '@@ .'
  Index: syck/lib/token.c
  
  $ cvs diff -u -r1.7 -r1.7.6.1 token.c
  --- syck/lib/token.c  3 Apr 2009 11:16:57 -   1.7
  +++ syck/lib/token.c  23 Feb 2015 09:13:25 -  1.7.6.1
  @@ -270,11 +270,11 @@
   return sycklex_yaml_utf8( sycklval, parser );
   
   case syck_yaml_utf16:
  -syckerror( UTF-16 is not currently supported in Syck.\nPlease 
contribute code to help this happen! );
  +syckerror( parser, UTF-16 is not currently supported in 
Syck.\nPlease contribute code to help this happen! );
   break;
   
   case syck_yaml_utf32:
  -syckerror( UTF-32 is not currently supported in Syck.\nPlease 
contribute code to help this happen! );
  +syckerror( parser, UTF-32 is not currently supported in 
Syck.\nPlease contribute code to help this happen! );
   break;
   
   case syck_bytecode_utf8:
  @@ -2739,14 +2739,15 @@
   }
   
   void 
  -syckerror( char *msg )
  +syckerror( void *p, char *msg )
   {
  +SyckParser * parser = (SyckParser *)p;
   /*@-mods@*/
  -if ( syck_parser_ptr-error_handler == NULL )
  -syck_parser_ptr-error_handler = syck_default_error_handler;
  +if ( parser-error_handler == NULL )

[CVS] RPM: rpm-5_4: syck/lib/ gram.y implicit.c syck.c syck.h token.c

2015-02-23 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: syck Date:   23-Feb-2015 10:37:02
  Branch: rpm-5_4  Handle: 2015022309370101

  Modified files:   (Branch: rpm-5_4)
syck/libgram.y implicit.c syck.c syck.h token.c

  Log:
- syck: compile with clang.

  Summary:
RevisionChanges Path
1.3.8.2 +8  -4  syck/lib/gram.y
1.3.8.1 +10 -0  syck/lib/implicit.c
1.5.4.2 +1  -1  syck/lib/syck.c
1.5.8.2 +3  -3  syck/lib/syck.h
1.7.6.2 +1  -1  syck/lib/token.c
  

  patch -p0 '@@ .'
  Index: syck/lib/gram.y
  
  $ cvs diff -u -r1.3.8.1 -r1.3.8.2 gram.y
  --- syck/lib/gram.y   23 Feb 2015 09:13:25 -  1.3.8.1
  +++ syck/lib/gram.y   23 Feb 2015 09:37:01 -  1.3.8.2
  @@ -9,11 +9,18 @@
   
   %start doc
   %pure-parser
  -%param {void *parser}
  +%parse-param {void* parser}
  +%lex-param {void* parser}
   
   
   %{
   
  +#define YYDEBUG 1
  +#define YYERROR_VERBOSE 1
  +#ifndef YYSTACK_USE_ALLOCA
  +#define YYSTACK_USE_ALLOCA 0
  +#endif
  +
   #include system.h
   #include syck.h
   #include debug.h
  @@ -21,9 +28,6 @@
   void apply_seq_in_map( SyckParser *parser, SyckNode *n )
/*@*/;
   
  -#define YYPARSE_PARAM   parser
  -#define YYLEX_PARAM parser
  -
   #define NULL_NODE(parser, node) \
   SyckNode *node = syck_new_str( , scalar_plain ); \
   if ( ((SyckParser *)parser)-taguri_expansion == 1 ) \
  @@ .
  patch -p0 '@@ .'
  Index: syck/lib/implicit.c
  
  $ cvs diff -u -r1.3 -r1.3.8.1 implicit.c
  --- syck/lib/implicit.c   17 Oct 2008 20:45:32 -  1.3
  +++ syck/lib/implicit.c   23 Feb 2015 09:37:02 -  1.3.8.1
  @@ -19,6 +19,11 @@
   #define YYLIMIT limit
   #define YYFILL(n)
   
  +#ifdef  __clang__
  +#pragma clang diagnostic push
  +#pragma clang diagnostic ignored -Wempty-body
  +#endif
  +
   void
   try_tag_implicit( SyckNode *n, int taguri )
   {
  @@ -2994,4 +2999,9 @@
   
   
   }
  +
  +#ifdef  __clang__
  +#pragma clang diagnostic pop
  +#endif
  +
   /*@=noret@*/
  @@ .
  patch -p0 '@@ .'
  Index: syck/lib/syck.c
  
  $ cvs diff -u -r1.5.4.1 -r1.5.4.2 syck.c
  --- syck/lib/syck.c   16 Feb 2015 21:23:18 -  1.5.4.1
  +++ syck/lib/syck.c   23 Feb 2015 09:37:02 -  1.5.4.2
  @@ -519,7 +519,7 @@
   }
   
   void
  -syck_default_error_handler( SyckParser *p, char *msg )
  +syck_default_error_handler( SyckParser *p, const char *msg )
   {
   printf( Error at [Line %d, Col %ld]: %s\n, 
   p-linect,
  @@ .
  patch -p0 '@@ .'
  Index: syck/lib/syck.h
  
  $ cvs diff -u -r1.5.8.1 -r1.5.8.2 syck.h
  --- syck/lib/syck.h   23 Feb 2015 09:13:25 -  1.5.8.1
  +++ syck/lib/syck.h   23 Feb 2015 09:37:02 -  1.5.8.2
  @@ -175,7 +175,7 @@
   typedef struct _syck_level SyckLevel;
   
   typedef SYMID (*SyckNodeHandler)(SyckParser *p, SyckNode *n);
  -typedef void (*SyckErrorHandler)(SyckParser *p, char *);
  +typedef void (*SyckErrorHandler)(SyckParser *p, const char *);
   typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *p, char *);
   typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long); 
   typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
  @@ -546,7 +546,7 @@
   SYMID syck_parse( SyckParser *p )
/*@globals fileSystem @*/
/*@modifies p, fileSystem @*/;
  -void syck_default_error_handler( SyckParser *p, char * )
  +void syck_default_error_handler( SyckParser *p, const char * )
/*@globals fileSystem @*/
/*@modifies p, fileSystem @*/;
   SYMID syck_yaml2byte_handler( SyckParser *p, SyckNode *n )
  @@ -619,7 +619,7 @@
   /*
* Lexer prototypes
*/
  -void syckerror( void *, char *msg )
  +void syckerror( void *, const char *msg )
/*@*/;
   int syckparse( void * )
/*@globals fileSystem @*/
  @@ .
  patch -p0 '@@ .'
  Index: syck/lib/token.c
  
  $ cvs diff -u -r1.7.6.1 -r1.7.6.2 token.c
  --- syck/lib/token.c  23 Feb 2015 09:13:25 -  1.7.6.1
  +++ syck/lib/token.c  23 Feb 2015 09:37:02 -  1.7.6.2
  @@ -2739,7 +2739,7 @@
   }
   
   void 
  -syckerror( void *p, char *msg )
  +syckerror( void *p, const char *msg )
   {
   SyckParser * parser = (SyckParser *)p;
   /*@-mods@*/
  @@ .

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

2015-02-23 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:   23-Feb-2015 11:04:45
  Branch: rpm-5_4  Handle: 2015022310044500

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

  Log:
- use byacc instead of bison.

  Summary:
RevisionChanges Path
1.293.2.46  +1  -0  rpm/rpmio/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.293.2.45 -r1.293.2.46 Makefile.am
  --- rpm/rpmio/Makefile.am 25 Oct 2014 18:11:56 -  1.293.2.45
  +++ rpm/rpmio/Makefile.am 23 Feb 2015 10:04:45 -  1.293.2.46
  @@ -280,6 +280,7 @@
   rpmjs.lo: $(top_srcdir)/rpmio/rpmjs.cpp
@$(LTCOMPILE) -O0 -c $
   
  +YACC = byacc -d
   getdate.c: getdate.y
@echo expect 10 shift/reduce conflicts
$(YACC) $(srcdir)/getdate.y
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org