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

2017-07-10 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:   10-Jul-2017 11:38:54
  Branch: rpm-5_4  Handle: 20090419190007259511927

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio   Makefile.am librpmio.vers macro.c poptIO.c rpmio.c
rpmjss.h
  Removed files:(Branch: rpm-5_4)
rpm/rpmio   rpmjs.cpp rpmjs.h rpmjsio.c rpmjsio.h rpmjsio.msg

  Log:
- rpmjs: upgrade js-1.8.5 with mozjs-45 (internal).

  Summary:
RevisionChanges Path
1.3501.2.582+1  -0  rpm/CHANGES
1.293.2.105 +23 -12 rpm/rpmio/Makefile.am
2.199.2.98  +7  -10 rpm/rpmio/librpmio.vers
2.249.2.49  +4  -5  rpm/rpmio/macro.c
1.94.2.41   +2  -2  rpm/rpmio/poptIO.c
1.230.2.62  +2  -2  rpm/rpmio/rpmio.c
1.1 +0  -901rpm/rpmio/rpmjs.cpp
1.10+0  -141rpm/rpmio/rpmjs.h
1.4 +0  -2960   rpm/rpmio/rpmjsio.c
1.1 +0  -56 rpm/rpmio/rpmjsio.h
1.1 +0  -90 rpm/rpmio/rpmjsio.msg
1.1.2.5 +0  -2  rpm/rpmio/rpmjss.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.581 -r1.3501.2.582 CHANGES
  --- rpm/CHANGES   1 Jul 2017 04:35:47 -   1.3501.2.581
  +++ rpm/CHANGES   10 Jul 2017 09:38:53 -  1.3501.2.582
  @@ -1,4 +1,5 @@
   5.4.17 -> 5.4.18:
  +- jbj: rpmjs: upgrade js-1.8.5 with mozjs-45 (internal).
   - jbj: macros: update %efi 
(http://rpm5.org/community/rpm-devel/5699.html)/
   - jbj: scripts: honor COMPRESS envvar (if set) 
(http://rpm5.org/community/rpm-devel/5698.html)
   - jbj: scripts: get rid of unused 
(http://rpm5.org/community/rpm-devel/5697.html)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.293.2.104 -r1.293.2.105 Makefile.am
  --- rpm/rpmio/Makefile.am 4 Jul 2017 03:09:00 -   1.293.2.104
  +++ rpm/rpmio/Makefile.am 10 Jul 2017 09:38:54 -  1.293.2.105
  @@ -17,8 +17,7 @@
   EXTRA_DIST = librpmio.vers \
getdate.y html-parse.c html-parse.h libsqlio.c \
rpmcpio.c rpmcpio.h rpmgenbasedir.c rpmgenpkglist.c rpmgensrclist.c \
  - rpmjsio.msg rpmtar.c rpmtar.h \
  - rpmjs0ad.cpp rpmjs185.cpp rpmjs17.cpp rpmjs24.cpp rpmjs31.cpp 
rpmjs38.cpp rpmjs45.cpp \
  + rpmtar.c rpmtar.h \
tdir.c teio.c tfts.c tget.c tgfs.c tgit.c tglob.c thkp.c thtml.c \
tinv.c tkey.c tmire.c tmq.c tmqtt.c todbc.c tput.c tpython.c trpmio.c \
tsexp.c tsvn.c tsw.c lookup3.c duktape.c tjsmn.c tjson.c yajl.c \
  @@ -163,8 +162,8 @@
pcrs.h rpmacl.h rpmaio.h rpmasn.h rpmaug.h rpmbag.h rpmbc.h rpmbz.h \
rpmcap.h rpmcdsa.h rpmct.h rpmcudf.h rpmcvs.h rpmdate.h rpmdav.h \
rpmdir.h rpmeio.h rpmev.h rpmficl.h rpmgc.h rpmgfs.h rpmgit.h \
  - rpmhash.h rpmhkp.h rpmhook.h rpmio_internal.h rpmjni.h rpmjs.h \
  - rpmjsio.h rpmkeyring.h rpmku.h rpmltc.h rpmlua.h \
  + rpmhash.h rpmhkp.h rpmhook.h rpmio_internal.h rpmjni.h rpmjss.h \
  + rpmkeyring.h rpmku.h rpmltc.h rpmlua.h \
rpmmqtt.h rpmmrb.h rpmmsq.h rpmnix.h rpmnss.h rpmodbc.h \
rpmperl.h rpmpgp.h rpmpython.h rpmruby.h rpmsed.h rpmsm.h rpmsp.h \
rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h rpmsvn.h rpmsx.h rpmsyck.h \
  @@ -181,7 +180,7 @@
groestl.c hamsi.c jh.c keccak.c lane.c luffa.c md2.c md6.c radiogatun.c\
salsa10.c salsa20.c shabal.c shavite3.c simd.c skein.c tib3.c tiger.c \
rpmgit.c rpmio-stub.c \
  - rpmjs.cpp rpmjsio.c rpmkeyring.c \
  + rpmjs45shim.cpp rpmjss.cpp rpmkeyring.c \
rpmnix.c rpmodbc.c rpmsql.c set.c \
ar.c \
argv.c \
  @@ -282,8 +281,7 @@
   DISTCLEANFILES += $(defexec_DATA)
   endif
   
  -# XXX FIXME: error: inlining failed in call to always_inline ‘__signbit’
  -librpmio_la_LIBADD =
  +librpmio_la_LIBADD = $(top_builddir)/js/src/libmozjs.la
   #librpmio_la_LIBADD += duktape.o -lm
   if ENABLE_BUILD_INTLIBDEP
   librpmio_la_LIBADD += \
  @@ -322,11 +320,24 @@
@$(LTCOMPILE) -O0 -c $<
   keccak.lo: $(top_srcdir)/rpmio/keccak.c
@$(LTCOMPILE) -O0 -c $<
  -# XXX JS_ALWAYS_INLINE needs -O0 with -fgnu-tm
  -#rpmjs.lo: $(top_srcdir)/rpmio/rpmjs.c
  -#@$(LTCOMPILE) -O0 -c $<
  -rpmjs.lo: $(top_srcdir)/rpmio/rpmjs.cpp
  - @$(LTCOMPILE) -O0 -c $<
  +
  +moz_srcdir = ${top_srcdir}/js/extract
  +MOZ_CPPFLAGS = \
  + -DEXPORT_JS_API \
  +

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

2017-06-01 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:   01-Jun-2017 23:10:29
  Branch: rpm-5_4  Handle: 2017060121102801

  Added files:  (Branch: rpm-5_4)
rpm/rpmio   rpmzstd.h
  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio   Makefile.am librpmio.vers macro.c rpmio.c tzstd.c
zstdio.c

  Log:
- zstd: rearrange the code into final form.

  Summary:
RevisionChanges Path
1.3501.2.569+1  -0  rpm/CHANGES
1.293.2.86  +1  -1  rpm/rpmio/Makefile.am
2.199.2.85  +1  -0  rpm/rpmio/librpmio.vers
2.249.2.48  +4  -0  rpm/rpmio/macro.c
1.230.2.56  +0  -2  rpm/rpmio/rpmio.c
1.1.2.1 +111 -0 rpm/rpmio/rpmzstd.h
1.1.2.3 +9  -493rpm/rpmio/tzstd.c
1.1.2.2 +505 -26rpm/rpmio/zstdio.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.568 -r1.3501.2.569 CHANGES
  --- rpm/CHANGES   1 Jun 2017 18:38:24 -   1.3501.2.568
  +++ rpm/CHANGES   1 Jun 2017 21:10:28 -   1.3501.2.569
  @@ -1,4 +1,5 @@
   5.4.17 -> 5.4.18:
  +- jbj: zstd: rearrange the code into final form.
   - jbj: zstd: fix: rename from "zstio" to "zstdio".
   - jbj: zstd: stub in zstd compression framework.
   - jbj: msqio: abstract out the AIO queue (AIOQ_t for now).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.293.2.85 -r1.293.2.86 Makefile.am
  --- rpm/rpmio/Makefile.am 1 Jun 2017 18:38:25 -   1.293.2.85
  +++ rpm/rpmio/Makefile.am 1 Jun 2017 21:10:29 -   1.293.2.86
  @@ -161,7 +161,7 @@
rpmmqtt.h rpmmrb.h rpmmsq.h rpmnix.h rpmnss.h \
rpmodbc.h rpmperl.h rpmpgp.h rpmpython.h rpmruby.h rpmsed.h rpmsm.h 
rpmsp.h \
rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h rpmsvn.h rpmsx.h rpmsyck.h \
  - rpmtcl.h rpmtpm.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
  + rpmtcl.h rpmtpm.h rpmuuid.h rpmxar.h rpmz.h rpmzstd.h rpmzq.h \
set.h tar.h ugid.h rpmio-stub.h
   
   usrlibdir = $(libdir)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/librpmio.vers
  
  $ cvs diff -u -r2.199.2.84 -r2.199.2.85 librpmio.vers
  --- rpm/rpmio/librpmio.vers   1 Jun 2017 18:38:25 -   2.199.2.84
  +++ rpm/rpmio/librpmio.vers   1 Jun 2017 21:10:29 -   2.199.2.85
  @@ -1029,6 +1029,7 @@
   _rpmzstdPool;
   zstdio;
   rpmzstdClose;
  +rpmzstdDump;
   rpmzstdFdopen;
   rpmzstdFlush;
   rpmzstdNew;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  
  $ cvs diff -u -r2.249.2.47 -r2.249.2.48 macro.c
  --- rpm/rpmio/macro.c 30 May 2017 19:18:38 -  2.249.2.47
  +++ rpm/rpmio/macro.c 1 Jun 2017 21:10:29 -   2.249.2.48
  @@ -3490,6 +3490,10 @@
&&  magic[2] == 'Z' && magic[3] == 'O') /* lzop */
*compressed = COMPRESSED_LZOP;
   else
  +if (magic[0] == (unsigned char) 0x28 && magic[1] == 0xB5
  + &&  magic[2] == 0x2F)   /* zstd (magic[3] is a version) 
*/
  + *compressed = COMPRESSED_ZSTD;
  +else
   #if !defined(RPM_VENDOR_OPENPKG) && !defined(RPM_VENDOR_FEDORA) && 
!defined(RPM_VENDOR_MANDRIVA) /* extension-based-compression-detection */
   /* XXX Ick, LZMA has no magic. See http://lkml.org/lkml/2005/6/13/285 */
   if (magic[ 9] == (unsigned char) 0x00 && magic[10] == (unsigned char) 
0x00 &&
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  
  $ cvs diff -u -r1.230.2.55 -r1.230.2.56 rpmio.c
  --- rpm/rpmio/rpmio.c 1 Jun 2017 18:38:25 -   1.230.2.55
  +++ rpm/rpmio/rpmio.c 1 Jun 2017 21:10:29 -   1.230.2.56
  @@ -3798,9 +3798,7 @@
   
   RPMIOPOOL_FREE(aio)
   RPMIOPOOL_FREE(msq)
  -#ifdef   NOTYET
   RPMIOPOOL_FREE(zstd)
  -#endif
   
   RPMIOPOOL_FREE(html)
   RPMIOPOOL_FREE(mire)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmzstd.h
  
  $ cvs diff -u -r0 -r1.1.2.1 rpmzstd.h
  --- /dev/null 2017-06-01 23:06:28.0 +0200
  +++ rpmzstd.h 2017-06-01 23:10:29.487568940 +0200
  @@ -0,0 +1,111 @@
  +#ifndef  _H_RPMZSTD_
  +#define  _H_RPMZSTD_
  +
  +/**
  + */

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

2017-05-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-May-2017 15:40:40
  Branch: rpm-5_4  Handle: 2017052013404000

  Added files:  (Branch: rpm-5_4)
rpm/rpmio   msqio.c rpmmsq.h tmq.c
  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio   Makefile.am librpmio.vers poptIO.c rpmio.c rpmio.h

  Log:
- rpmio: add ".msqio" to send/receive SysV messages.

  Summary:
RevisionChanges Path
1.3501.2.551+1  -0  rpm/CHANGES
1.293.2.80  +13 -9  rpm/rpmio/Makefile.am
2.199.2.75  +8  -0  rpm/rpmio/librpmio.vers
1.1.2.1 +400 -0 rpm/rpmio/msqio.c
1.94.2.28   +6  -3  rpm/rpmio/poptIO.c
1.230.2.46  +39 -26 rpm/rpmio/rpmio.c
1.97.2.17   +5  -1  rpm/rpmio/rpmio.h
1.1.2.1 +112 -0 rpm/rpmio/rpmmsq.h
1.1.2.1 +400 -0 rpm/rpmio/tmq.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.550 -r1.3501.2.551 CHANGES
  --- rpm/CHANGES   13 May 2017 07:04:47 -  1.3501.2.550
  +++ rpm/CHANGES   20 May 2017 13:40:40 -  1.3501.2.551
  @@ -1,4 +1,5 @@
   5.4.17 -> 5.4.18:
  +- jbj: rpmio: add ".msqio" to send/receive SysV messages.
   - jbj: rpmsw: use clock_gettime (if available).
   - jbj: poptALL: spew info for rpm itself with -vv.
   - jbj: poptIO: spew info for rpm utilities with -vv.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.293.2.79 -r1.293.2.80 Makefile.am
  --- rpm/rpmio/Makefile.am 10 May 2017 17:05:20 -  1.293.2.79
  +++ rpm/rpmio/Makefile.am 20 May 2017 13:40:40 -  1.293.2.80
  @@ -15,12 +15,12 @@
rpmcpio.c rpmcpio.h rpmgenbasedir.c rpmgenpkglist.c rpmgensrclist.c \
rpmjsio.msg rpmtar.c rpmtar.h \
tdir.c tfts.c tget.c tgfs.c tgit.c tglob.c thkp.c thtml.c tinv.c tkey.c 
\
  - tmire.c tmqtt.c todbc.c tput.c tpython.c trpmio.c tsexp.c tsvn.c tsw.c \
  - lookup3.c duktape.c tjsmn.c tjson.c yajl.c testit.sh \
  + tmire.c tmq.c tmqtt.c todbc.c tput.c tpython.c trpmio.c tsexp.c \
  + tsvn.c tsw.c lookup3.c duktape.c tjsmn.c tjson.c yajl.c testit.sh \
microjson.c mongoc-counters.defs
   
   EXTRA_PROGRAMS = rpmcpio rpmdpkg rpmtar rpmz
  -EXTRA_PROGRAMS += bdes duk thtml tinv tkey tmacro tpw turg
  +EXTRA_PROGRAMS += bdes duk thtml tinv tkey tmacro tmq tpw turg
   noinst_PROGRAMS = tjsmn tmqtt
   
   EXTRA_PROGRAMS += bsdiff bspatch pcrsed rpmborg rpmcurl \
  @@ -37,17 +37,17 @@
   noinst_PROGRAMS += tgit
   else
   EXTRA_PROGRAMS += tgit
  -endif 
  +endif
   if WITH_LIBTPM
   noinst_PROGRAMS += ttpm
   else
   EXTRA_PROGRAMS += ttpm
  -endif 
  +endif
   if WITH_UNIXODBC
   noinst_PROGRAMS += todbc
   else
   EXTRA_PROGRAMS += todbc
  -endif 
  +endif
   bin_PROGRAMS =
   man_MANS =
   
  @@ -157,8 +157,8 @@
rpmcdsa.h rpmct.h rpmcudf.h rpmcvs.h rpmdate.h rpmdav.h rpmdir.h \
rpmficl.h rpmgc.h rpmgfs.h rpmgit.h rpmhash.h \
rpmhkp.h rpmhook.h rpmio_internal.h rpmjni.h rpmjs.h rpmjsio.h \
  - rpmkeyring.h \
  - rpmku.h rpmltc.h rpmlua.h rpmmqtt.h rpmmrb.h rpmnix.h rpmnss.h \
  + rpmkeyring.h rpmku.h rpmltc.h rpmlua.h \
  + rpmmqtt.h rpmmrb.h rpmmsq.h rpmnix.h rpmnss.h \
rpmodbc.h rpmperl.h rpmpgp.h rpmpython.h rpmruby.h rpmsed.h rpmsm.h 
rpmsp.h \
rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h rpmsvn.h rpmsx.h rpmsyck.h \
rpmtcl.h rpmtpm.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
  @@ -194,6 +194,7 @@
mire.c \
mongoc.c \
mount.c \
  + msqio.c \
pcrs.c \
poptIO.c \
rpmacl.c \
  @@ -280,7 +281,7 @@
   librpmio_la_LDFLAGS += $(LDFLAGS)
   #librpmio_la_LIBADD  += $(LIBS)
   endif
  -#librpmio.la: $(librpmio_la_OBJECTS) $(librpmio_la_DEPENDENCIES) 
  +#librpmio.la: $(librpmio_la_OBJECTS) $(librpmio_la_DEPENDENCIES)
   #$(librpmio_la_LINK) -rpath $(usrlibdir) $(librpmio_la_OBJECTS) 
$(librpmio_la_LIBADD)
   
   #libsqlio_la_SOURCES = libsqlio.c
  @@ -661,6 +662,9 @@
   tjsmn_SOURCES = tjsmn.c
   tjsmn_LDADD = $(RPMIO_LDADD_COMMON)
   
  +tmq_SOURCES = tmq.c
  +tmq_LDADD = $(RPMIO_LDADD_COMMON)
  +
   tmqtt_SOURCES = tmqtt.c
   tmqtt_LDADD = $(RPMIO_LDADD_COMMON)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/librpmio.vers
  
  $ cvs diff -u -r2.199.2.74 -r2.199.2.75 librpmio.vers
  ---

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

2014-09-17 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:   18-Sep-2014 00:32:54
  Branch: rpm-5_4  Handle: 2014091722325004

  Added files:  (Branch: rpm-5_4)
rpm/rpmio   rpmdate.c rpmdate.h
  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio   Makefile.am librpmio.vers macro.c rpmio.c
rpm/tools   date.c

  Log:
- date: add date(1) object and macro embedding.

  Summary:
RevisionChanges Path
1.3501.2.444+1  -0  rpm/CHANGES
1.293.2.35  +2  -1  rpm/rpmio/Makefile.am
2.199.2.41  +2  -0  rpm/rpmio/librpmio.vers
2.249.2.17  +34 -0  rpm/rpmio/macro.c
1.1.2.1 +304 -0 rpm/rpmio/rpmdate.c
1.1.2.1 +70 -0  rpm/rpmio/rpmdate.h
1.230.2.24  +3  -0  rpm/rpmio/rpmio.c
1.1.2.2 +20 -183rpm/tools/date.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.443 -r1.3501.2.444 CHANGES
  --- rpm/CHANGES   17 Sep 2014 03:36:19 -  1.3501.2.443
  +++ rpm/CHANGES   17 Sep 2014 22:32:50 -  1.3501.2.444
  @@ -1,4 +1,5 @@
   5.4.15 - 5.4.16:
  +- jbj: date: add date(1) object and macro embedding.
   - jbj: rpmpgp: add pgpImplExport{Pubkey,Signature} vectors/wrappers.
   - jbj: rpmpgp: switch to LibTomCrypt, default to ECDSA/SHA256 signing.
   - jbj: java: bsh-2.0b5.jar in a linux jdk1.7.0_03 JVM using JNI 
embedding.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.293.2.34 -r1.293.2.35 Makefile.am
  --- rpm/rpmio/Makefile.am 11 Sep 2014 18:18:32 -  1.293.2.34
  +++ rpm/rpmio/Makefile.am 17 Sep 2014 22:32:51 -  1.293.2.35
  @@ -117,7 +117,7 @@
radiogatun.h \
salsa10.h salsa20.h shabal.h shavite3.h simd.h skein.h tib3.h tiger.h \
poptIO.h rpmacl.h rpmasn.h rpmaug.h rpmbag.h rpmbc.h rpmbz.h \
  - rpmcdsa.h rpmct.h rpmcudf.h rpmcvs.h rpmdav.h rpmdir.h rpmficl.h 
rpmgc.h rpmgit.h rpmhash.h \
  + rpmcdsa.h rpmct.h rpmcudf.h rpmcvs.h rpmdate.h rpmdav.h rpmdir.h 
rpmficl.h rpmgc.h rpmgit.h rpmhash.h \
rpmhkp.h rpmhook.h rpmio_internal.h rpmjni.h rpmjs.h rpmjsio.h \
rpmkeyring.h \
rpmku.h rpmltc.h rpmlua.h rpmmg.h rpmmrb.h rpmnix.h rpmnss.h \
  @@ -167,6 +167,7 @@
rpmct.c \
rpmcudf.c \
rpmcvs.c \
  + rpmdate.c \
rpmdav.c \
rpmdir.c \
rpmficl.c \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/librpmio.vers
  
  $ cvs diff -u -r2.199.2.40 -r2.199.2.41 librpmio.vers
  --- rpm/rpmio/librpmio.vers   17 Sep 2014 03:36:21 -  2.199.2.40
  +++ rpm/rpmio/librpmio.vers   17 Sep 2014 22:32:51 -  2.199.2.41
  @@ -398,6 +398,8 @@
   rpmcvsNew;
   rpmDefineMacro;
   _ctx_debug;
  +_rpmdate_debug;
  +rpmdateNew;
   rpmDigestAlgo;
   rpmDigestASN1;
   rpmDigestDup;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/macro.c
  
  $ cvs diff -u -r2.249.2.16 -r2.249.2.17 macro.c
  --- rpm/rpmio/macro.c 11 Sep 2014 18:46:20 -  2.249.2.16
  +++ rpm/rpmio/macro.c 17 Sep 2014 22:32:51 -  2.249.2.17
  @@ -73,6 +73,8 @@
   #define  _RPMAUG_INTERNAL/* XXX for _rpmaugFoo globals */
   #include rpmaug.h
   #include rpmct.h
  +#define  _RPMDATE_INTERNAL
  +#include rpmdate.h
   #include rpmficl.h
   #include rpmgit.h
   #include rpmjs.h
  @@ -2424,6 +2426,38 @@
continue;
}
   
  + /* Embedded date(1). */
  + if (STREQ(date, f, fn)) {
  + char ** av = NULL;
  + char * script = parseEmbedded(s, (size_t)(se-s), av);
  + rpmdate date = rpmdateNew(av, 0);   /* XXX _globalI? */
  +
  + if (date == NULL) {
  +   /* XXX return error message as result? */
  + rc = 1;
  + } else {
  +   /* XXX return script body as result? */
  +   int nac = argvCount(date-results);
  +   int i;
  +   for (i = 0; i  nac; i++) {
  + const char * result = date-results[i];
  + size_t len = strlen(result);
  + if (len  mb-nb)
  + len = mb-nb;
  + memcpy(mb-t, result, len);
  + mb-t += len;
  +

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

2012-03-25 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:   25-Mar-2012 20:13:40
  Branch: rpm-5_4  Handle: 2012032518133801

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio   Makefile.am librpmio.vers poptIO.c rpmio.c set.c
set.h

  Log:
- set: make the version-set into an rpmset object.

  Summary:
RevisionChanges Path
1.3501.2.234+1  -0  rpm/CHANGES
1.293.2.14  +2  -3  rpm/rpmio/Makefile.am
2.199.2.16  +6  -0  rpm/rpmio/librpmio.vers
1.94.2.4+5  -1  rpm/rpmio/poptIO.c
1.230.2.6   +2  -0  rpm/rpmio/rpmio.c
1.1.2.4 +67 -55 rpm/rpmio/set.c
1.1.2.2 +86 -16 rpm/rpmio/set.h
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.233 -r1.3501.2.234 CHANGES
  --- rpm/CHANGES   25 Mar 2012 16:37:24 -  1.3501.2.233
  +++ rpm/CHANGES   25 Mar 2012 18:13:38 -  1.3501.2.234
  @@ -1,4 +1,5 @@
   5.4.7 - 5.4.8:
  +- jbj: set: make the version-set into an rpmset object.
   - jbj: set: swipe the dependency set encoding from Alt.
   - jbj: tests: dink with perl module load path to load from within tree.
   - jbj: tests: dink with python module load path to load from within tree.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.293.2.13 -r1.293.2.14 Makefile.am
  --- rpm/rpmio/Makefile.am 25 Mar 2012 17:07:40 -  1.293.2.13
  +++ rpm/rpmio/Makefile.am 25 Mar 2012 18:13:39 -  1.293.2.14
  @@ -11,7 +11,6 @@
fnmatch_loop.c getdate.y rpmcpio.c rpmcpio.h \
rpmgenbasedir.c rpmgenpkglist.c rpmgensrclist.c \
rpmjsio.msg rpmtar.c rpmtar.h \
  - set.c set.h \
tdir.c tfts.c tget.c tgit.c tglob.c thkp.c thtml.c tinv.c tkey.c \
tmire.c todbc.c tput.c trpmio.c tsexp.c tsvn.c tsw.c lookup3.c tpw.c \
librpmio.vers testit.sh
  @@ -101,7 +100,7 @@
rpmodbc.h rpmperl.h rpmpython.h rpmruby.h rpmsm.h rpmsp.h \
rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h rpmsvn.h rpmsx.h rpmsyck.h \
rpmtcl.h rpmtpm.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
  - tar.h ugid.h rpmio-stub.h
  + set.h tar.h ugid.h rpmio-stub.h
   
   usrlibdir = $(libdir)
   usrlib_LTLIBRARIES = librpmio.la
  @@ -120,7 +119,7 @@
rpmodbc.c rpmperl.c rpmpgp.c rpmpython.c rpmrpc.c rpmruby.c rpmsm.c 
rpmsp.c \
rpmsq.c rpmsql.c rpmsquirrel.c rpmssl.c rpmsvn.c rpmsw.c rpmsx.c \
rpmsyck.c rpmtcl.c rpmtpm.c rpmuuid.c rpmxar.c rpmzlog.c rpmzq.c \
  - strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
  + set.c strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
   librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
   if HAVE_LD_VERSION_SCRIPT
   librpmio_la_LDFLAGS += 
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/rpmio/librpmio.vers
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/librpmio.vers
  
  $ cvs diff -u -r2.199.2.15 -r2.199.2.16 librpmio.vers
  --- rpm/rpmio/librpmio.vers   25 Mar 2012 00:36:53 -  2.199.2.15
  +++ rpm/rpmio/librpmio.vers   25 Mar 2012 18:13:39 -  2.199.2.16
  @@ -601,6 +601,12 @@
   rpmrubyNew;
   rpmrubyRun;
   rpmrubyRunFile;
  +_rpmsetPool;
  +_rpmset_debug;
  +rpmsetAdd;
  +rpmsetCmp;
  +rpmsetFinish;
  +rpmsetNew;
   _rpmsm_debug;
   _rpmsmI;
   rpmsmNew;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/poptIO.c
  
  $ cvs diff -u -r1.94.2.3 -r1.94.2.4 poptIO.c
  --- rpm/rpmio/poptIO.c18 Mar 2012 14:02:14 -  1.94.2.3
  +++ rpm/rpmio/poptIO.c25 Mar 2012 18:13:39 -  1.94.2.4
  @@ -54,6 +54,8 @@
   #include rpmsp.h
   #include rpmsx.h
   
  +#include set.h
  +
   #include debug.h
   
   const char *__progname;
  @@ -636,7 +638,9 @@
{ rpmcvsdebug, '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, 
_rpmcvs_debug, -1,
N_(Debug CVS wrappers ), NULL},
{ rpmgitdebug, '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, 
_rpmgit_debug, -1,
  - N_(Debug CVS wrappers ), NULL},
  + N_(Debug GIT wrappers ), NULL},
  + { rpmsetdebug, '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, 
_rpmset_debug, -1,
  + N_(Debug SET-VERSION wrappers ), NULL},
{ rpmsvndebug, '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,