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: 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: Revision Changes 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 -901 rpm/rpmio/rpmjs.cpp 1.10 +0 -141 rpm/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 -0000 1.3501.2.581 +++ rpm/CHANGES 10 Jul 2017 09:38:53 -0000 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 -0000 1.293.2.104 +++ rpm/rpmio/Makefile.am 10 Jul 2017 09:38:54 -0000 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 \ + -DDLL_PREFIX='"lib"' -DDLL_SUFFIX='".so"' \ + -DMOZILLA_CLIENT \ + -D'moz_xmalloc(_len)=malloc(_len)' \ + -I${moz_srcdir}/mfbt \ + -I${moz_srcdir}/js/src \ + -I${top_srcdir}/js/include \ + -include ${moz_srcdir}/js/src/js/src/js-confdefs.h \ + -pthread \ + -DNDEBUG \ + -O3 +rpmjs45shim.lo: rpmjs45shim.cpp + @$(LTCOMPILE) $(MOZ_CPPFLAGS) -c $< +rpmjss.lo: rpmjss.cpp + @$(LTCOMPILE) $(MOZ_CPPFLAGS) -c $< YACC = byacc -d getdate.c: getdate.y @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/librpmio.vers ============================================================================ $ cvs diff -u -r2.199.2.97 -r2.199.2.98 librpmio.vers --- rpm/rpmio/librpmio.vers 21 Jun 2017 06:40:28 -0000 2.199.2.97 +++ rpm/rpmio/librpmio.vers 10 Jul 2017 09:38:54 -0000 2.199.2.98 @@ -690,17 +690,14 @@ _rpmjniPool; rpmjniNew; rpmjniRun; - _rpmjs_debug; - _rpmjs_options; - _rpmjs_zeal; - _rpmjsI; - _rpmjsPool; _rpmjsmnPool; - _rpmgsr; - rpmjsIPoptTable; - rpmjsNew; - rpmjsRun; - rpmjsRunFile; + _rpmjss_debug; + _rpmjssI; + _rpmjssPool; + rpmjssIPoptTable; + rpmjssNew; + rpmjssRun; + rpmjssRunFile; rpmKeyringAddKey; rpmKeyringFindKeyid; rpmKeyringFree; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/macro.c ============================================================================ $ cvs diff -u -r2.249.2.48 -r2.249.2.49 macro.c --- rpm/rpmio/macro.c 1 Jun 2017 21:10:29 -0000 2.249.2.48 +++ rpm/rpmio/macro.c 10 Jul 2017 09:38:54 -0000 2.249.2.49 @@ -106,7 +106,6 @@ #include <rpmdate.h> #include <rpmficl.h> #include <rpmgit.h> -#include <rpmjs.h> #if defined(WITH_NIX) #define _RPMNIX_INTERNAL @@ -114,7 +113,7 @@ #endif #include <rpmjni.h> -#include <rpmjs.h> +#include <rpmjss.h> #include <rpmmqtt.h> #include <rpmmrb.h> #include <rpmperl.h> @@ -2392,11 +2391,11 @@ if (STREQ("js", f, fn)) { char ** av = NULL; char * script = parseEmbedded(s, (size_t)(se-s), &av); - rpmjs js = rpmjsNew(av, _globalI); + rpmjss jss = rpmjssNew(av, _globalI); const char * result = NULL; /* XXX rpmjs returns malloc'd result. */ - if (rpmjsRun(js, script, &result) != RPMRC_OK) + if (rpmjssRun(jss, script, &result) != RPMRC_OK) rc = 1; else { if (result == NULL) @@ -2411,7 +2410,7 @@ } result = _free(result); } - js = rpmjsFree(js); + jss = rpmjssFree(jss); av = _free(av); script = _free(script); s = se; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/poptIO.c ============================================================================ $ cvs diff -u -r1.94.2.40 -r1.94.2.41 poptIO.c --- rpm/rpmio/poptIO.c 20 Jun 2017 02:57:33 -0000 1.94.2.40 +++ rpm/rpmio/poptIO.c 10 Jul 2017 09:38:54 -0000 1.94.2.41 @@ -56,7 +56,7 @@ #include <rpmficl.h> #include <rpmgit.h> #include <rpmhkp.h> -#include <rpmjs.h> +#include <rpmjss.h> #include <rpmmrb.h> #include <rpmmsq.h> #include <rpmnix.h> @@ -1064,7 +1064,7 @@ N_("Debug Mongo DB gridfs connection"), NULL}, { "rpmhkpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmhkp_debug, -1, N_("Debug hkp:// keyring"), NULL}, - { "rpmjsdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmjs_debug, -1, + { "rpmjssdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmjss_debug, -1, N_("Debug embedded JavaScript interpreter"), NULL}, #ifdef WITH_LUA { "rpmluadebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmlua_debug, -1, @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.c ============================================================================ $ cvs diff -u -r1.230.2.61 -r1.230.2.62 rpmio.c --- rpm/rpmio/rpmio.c 20 Jun 2017 02:57:33 -0000 1.230.2.61 +++ rpm/rpmio/rpmio.c 10 Jul 2017 09:38:54 -0000 1.230.2.62 @@ -50,7 +50,7 @@ #include <rpmficl.h> #include <rpmgit.h> #include <rpmjni.h> -#include <rpmjs.h> +#include <rpmjss.h> #include <rpmlua.h> /* XXX rpmioClean() calls rpmluaFree() */ #include <rpmmqtt.h> #include <rpmmrb.h> @@ -3781,7 +3781,7 @@ RPMIOPOOL_INTERP_FREE(python) RPMIOPOOL_INTERP_FREE(perl) RPMIOPOOL_INTERP_FREE(mrb) - RPMIOPOOL_INTERP_FREE(js) + RPMIOPOOL_INTERP_FREE(jss) RPMIOPOOL_INTERP_FREE(jni) RPMIOPOOL_INTERP_FREE(ficl) @@ . rm -f rpm/rpmio/rpmjs.cpp <<'@@ .' Index: rpm/rpmio/rpmjs.cpp ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f rpm/rpmio/rpmjs.h <<'@@ .' Index: rpm/rpmio/rpmjs.h ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f rpm/rpmio/rpmjsio.c <<'@@ .' Index: rpm/rpmio/rpmjsio.c ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f rpm/rpmio/rpmjsio.h <<'@@ .' Index: rpm/rpmio/rpmjsio.h ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f rpm/rpmio/rpmjsio.msg <<'@@ .' Index: rpm/rpmio/rpmjsio.msg ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmjss.h ============================================================================ $ cvs diff -u -r1.1.2.4 -r1.1.2.5 rpmjss.h --- rpm/rpmio/rpmjss.h 9 Jul 2017 16:11:12 -0000 1.1.2.4 +++ rpm/rpmio/rpmjss.h 10 Jul 2017 09:38:54 -0000 1.1.2.5 @@ -118,9 +118,7 @@ extern JSIO_t mozjs24; extern JSIO_t mozjs31; extern JSIO_t mozjs38; -#ifdef NOTYET extern JSIO_t mozjs45; -#endif struct rpmjss_s { struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
