[CVS] RPM: beecrypt/ config.h.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: beecrypt Date: 06-May-2016 04:58:07 Branch: HEAD Handle: 2016050602580700 Removed files: beecryptconfig.h.in Log: - ignore autogenerated. Summary: RevisionChanges Path 1.10+0 -384beecrypt/config.h.in rm -f beecrypt/config.h.in <<'@@ .' Index: beecrypt/config.h.in [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: beecrypt/ depcomp
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: beecrypt Date: 06-May-2016 04:51:38 Branch: HEAD Handle: 2016050602513800 Removed files: beecryptdepcomp Log: - ignore autogenerated. Summary: RevisionChanges Path 1.4 +0 -630beecrypt/depcomp rm -f beecrypt/depcomp <<'@@ .' Index: beecrypt/depcomp [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: lua/local/ lposix.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: lua Date: 06-May-2016 00:29:30 Branch: rpm-5_4 Handle: 2016050522293000 Modified files: (Branch: rpm-5_4) lua/local lposix.c Log: - lua: readd a symlink() syscall wrapper. Summary: RevisionChanges Path 1.14.4.11 +8 -0 lua/local/lposix.c patch -p0 <<'@@ .' Index: lua/local/lposix.c $ cvs diff -u -r1.14.4.10 -r1.14.4.11 lposix.c --- lua/local/lposix.c19 Apr 2016 12:55:44 - 1.14.4.10 +++ lua/local/lposix.c5 May 2016 22:29:30 - 1.14.4.11 @@ -769,6 +769,13 @@ return pushresult(L, (lua_toboolean(L,3) ? symlink : link)(oldpath, newpath), NULL); } +static int Psymlink(lua_State *L) +{ + const char *oldpath = luaL_checkstring(L, 1); + const char *newpath = luaL_checkstring(L, 2); + return pushresult(L, + symlink(oldpath, newpath), NULL); +} /*** Read value of a symbolic link. @@ -3755,6 +3762,7 @@ MENTRY( Pkill ), MENTRY( Pkillpg ), MENTRY( Plink ), + MENTRY( Psymlink), MENTRY( Plocaltime ), MENTRY( Plseek ), MENTRY( Pmkdir ), @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ Makefile.am
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-2016 00:27:47 Branch: rpm-5_4 Handle: 2016050522274700 Modified files: (Branch: rpm-5_4) rpm/rpmio Makefile.am Log: - get rid of autotests for now. Summary: RevisionChanges Path 1.293.2.67 +1 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.293.2.66 -r1.293.2.67 Makefile.am --- rpm/rpmio/Makefile.am 20 Apr 2016 09:35:50 - 1.293.2.66 +++ rpm/rpmio/Makefile.am 5 May 2016 22:27:47 - 1.293.2.67 @@ -5,7 +5,7 @@ LINT = splint MCCABE = pmccabe -SUBDIRS = auto # tests +SUBDIRS = # auto # tests CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmmrb.c
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-2016 00:27:16 Branch: rpm-5_4 Handle: 2016050522271600 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmmrb.c Log: - mruby: spew version info. Summary: RevisionChanges Path 1.1.2.4 +15 -0 rpm/rpmio/rpmmrb.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmmrb.c $ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpmmrb.c --- rpm/rpmio/rpmmrb.c24 Sep 2014 13:03:04 - 1.1.2.3 +++ rpm/rpmio/rpmmrb.c5 May 2016 22:27:16 - 1.1.2.4 @@ -2,6 +2,7 @@ #include #include +#include #if defined(WITH_MRBEMBED) #include @@ -94,6 +95,15 @@ return _rpmmrbI; } +#if defined(WITH_MRBEMBED) +static void rpmmrbInfo(void) +{ +int _lvl = RPMLOG_DEBUG; + +rpmlog(_lvl, " %s\n", MRUBY_DESCRIPTION); +} +#endif /* WITH_MRBEMBED */ + rpmmrb rpmmrbNew(char **av, uint32_t flags) { static const char *_av[] = { "rpmmrb", NULL }; @@ -110,6 +120,7 @@ ac = argvCount((ARGV_t)av); #if defined(WITH_MRBEMBED) +rpmmrbInfo(); mrb_state * I = mrb_open(); assert(I); mrb->I = (void *) I; @@ -143,6 +154,10 @@ mrb_gv_set(I, zero_sym, mrb_str_new_lit(I, "-e")); } +#ifdef NOTYET +(void) rpmmrbRun(mrb, rpmmrbInitStringIO, NULL); +#endif + #endif /* WITH_MRBEMBED */ return rpmmrbLink(mrb); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmperl.c
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-2016 00:26:51 Branch: rpm-5_4 Handle: 2016050522265100 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmperl.c Log: - perl: spew version info. Summary: RevisionChanges Path 2.12.2.4+11 -0 rpm/rpmio/rpmperl.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmperl.c $ cvs diff -u -r2.12.2.3 -r2.12.2.4 rpmperl.c --- rpm/rpmio/rpmperl.c 24 Sep 2014 13:03:04 - 2.12.2.3 +++ rpm/rpmio/rpmperl.c 5 May 2016 22:26:51 - 2.12.2.4 @@ -1,6 +1,7 @@ #include "system.h" #include +#include #include #undef _ /* XXX everyone gotta be different */ @@ -91,6 +92,15 @@ return _rpmperlI; } +#if defined(WITH_PERLEMBED) +static void rpmperlInfo(void) +{ +int _lvl = RPMLOG_DEBUG; + +rpmlog(_lvl, " perl-%s\n", PERL_VERSION_STRING); +} +#endif /* WITH_MRBEMBED */ + rpmperl rpmperlNew(char ** av, uint32_t flags) { rpmperl perl = @@ -125,6 +135,7 @@ /* XXX claimed necessary on HP-UX */ PERL_SYS_INIT3(, (char ***), ); initialized++; + rpmperlInfo(); } perl->I = perl_alloc(); PERL_SET_CONTEXT(my_perl); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmsquirrel.c
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-2016 00:26:14 Branch: rpm-5_4 Handle: 2016050522261400 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmsquirrel.c Log: - no debugging. Summary: RevisionChanges Path 2.6.4.7 +1 -1 rpm/rpmio/rpmsquirrel.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsquirrel.c $ cvs diff -u -r2.6.4.6 -r2.6.4.7 rpmsquirrel.c --- rpm/rpmio/rpmsquirrel.c 5 May 2016 22:25:38 - 2.6.4.6 +++ rpm/rpmio/rpmsquirrel.c 5 May 2016 22:26:14 - 2.6.4.7 @@ -23,7 +23,7 @@ #include "debug.h" /*@unchecked@*/ -int _rpmsquirrel_debug = -1; +int _rpmsquirrel_debug; /*@unchecked@*/ /*@relnull@*/ rpmsquirrel _rpmsquirrelI = NULL; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmsquirrel.c
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-2016 00:25:38 Branch: rpm-5_4 Handle: 2016050522253800 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmsquirrel.c Log: - squirrel: permit squirrel commands when initializing. - squirrel: spew version of squirrel being used. Summary: RevisionChanges Path 2.6.4.6 +38 -10 rpm/rpmio/rpmsquirrel.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsquirrel.c $ cvs diff -u -r2.6.4.5 -r2.6.4.6 rpmsquirrel.c --- rpm/rpmio/rpmsquirrel.c 1 Aug 2014 17:47:02 - 2.6.4.5 +++ rpm/rpmio/rpmsquirrel.c 5 May 2016 22:25:38 - 2.6.4.6 @@ -3,6 +3,8 @@ #define _RPMIOB_INTERNAL /* XXX necessary? */ #include +#include +#include #include #ifdef WITH_SQUIRREL @@ -21,7 +23,7 @@ #include "debug.h" /*@unchecked@*/ -int _rpmsquirrel_debug = 0; +int _rpmsquirrel_debug = -1; /*@unchecked@*/ /*@relnull@*/ rpmsquirrel _rpmsquirrelI = NULL; @@ -91,9 +93,20 @@ va_end(vl); } #endif -#endif -/* XXX FIXME: honor 0x800 in flags to use global interpreter */ +static void rpmsquirrelInfo(void) +{ +int _lvl = RPMLOG_DEBUG; + +rpmlog(_lvl, " %s\n", SQUIRREL_VERSION); +} + +static const char * _rpmsquirrelI_init = "\ +print(\"_rpmsquirrelI_init\n\");\n\ +"; + +#endif /* defined(WITH_SQUIRREL) */ + static rpmsquirrel rpmsquirrelI(void) /*@globals _rpmsquirrelI @*/ /*@modifies _rpmsquirrelI @*/ @@ -105,14 +118,19 @@ rpmsquirrel rpmsquirrelNew(char ** av, uint32_t flags) { -rpmsquirrel squirrel = -#ifdef NOTYET - (flags & 0x8000) ? rpmsquirrelI() : -#endif - rpmsquirrelGetPool(_rpmsquirrelPool); +rpmsquirrel squirrel = (flags & 0x8000) + ? rpmsquirrelI() + : rpmsquirrelGetPool(_rpmsquirrelPool); + +if (squirrel->iob == NULL) + squirrel->iob = rpmiobNew(0); + +if (squirrel->I) + goto exit; #if defined(WITH_SQUIRREL) static char * _av[] = { "rpmsquirrel", NULL }; +static int oneshot; SQInteger stacksize = 1024; HSQUIRRELVM v = sq_open(stacksize); int ac; @@ -121,6 +139,11 @@ if (av == NULL) av = _av; ac = argvCount((ARGV_t)av); +if (!oneshot) { + rpmsquirrelInfo(); + oneshot++; +} + assert(v); squirrel->I = v; sq_setforeignptr(v, squirrel); @@ -167,10 +190,15 @@ } assert(!SQ_FAILED(sq_newslot(v, -3, SQFalse))); sq_pop(v, 1); -#endif /* defined(WITH_SQUIRREL) */ -squirrel->iob = rpmiobNew(0); +{static const char _squirrelI_init[] = "%{?_squirrelI_init}"; +const char * s = rpmExpand(_rpmsquirrelI_init, _squirrelI_init, NULL); +(void) rpmsquirrelRun(squirrel, s, NULL); +s = _free(s); +} +#endif /* defined(WITH_SQUIRREL) */ +exit: return rpmsquirrelLink(squirrel); } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmtcl.c
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-2016 00:23:43 Branch: rpm-5_4 Handle: 2016050522234300 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmtcl.c Log: - tcl: spew version of tcl in use. Summary: RevisionChanges Path 2.13.2.3+16 -0 rpm/rpmio/rpmtcl.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmtcl.c $ cvs diff -u -r2.13.2.2 -r2.13.2.3 rpmtcl.c --- rpm/rpmio/rpmtcl.c24 Sep 2014 13:03:04 - 2.13.2.2 +++ rpm/rpmio/rpmtcl.c5 May 2016 22:23:43 - 2.13.2.3 @@ -1,6 +1,7 @@ #include "system.h" #include +#include #include #ifdef WITH_TCL @@ -123,6 +124,15 @@ return _rpmtclI; } +#if defined(WITH_TCL) +static void rpmtclInfo(void) +{ +int _lvl = RPMLOG_DEBUG; + +rpmlog(_lvl, " tcl-%s\n", TCL_PATCH_LEVEL); +} +#endif /* WITH_TCL */ + rpmtcl rpmtclNew(char ** av, uint32_t flags) { rpmtcl tcl = @@ -136,10 +146,16 @@ Tcl_Interp * tclI = Tcl_CreateInterp(); char b[32]; int ac; +static int oneshot; if (av == NULL) av = _av; ac = argvCount((ARGV_t)av); +if (!oneshot) { + rpmtclInfo(); + oneshot++; +} + Tcl_SetVar(tclI, "argv", Tcl_Merge(ac-1, (const char *const *)av+1), TCL_GLOBAL_ONLY); (void)sprintf(b, "%d", ac-1); Tcl_SetVar(tclI, "argc", b, TCL_GLOBAL_ONLY); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmsq.c
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-2016 00:22:50 Branch: rpm-5_4 Handle: 201605055000 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmsq.c Log: - fix: portability for __APPLE__. Summary: RevisionChanges Path 1.42.6.8+4 -0 rpm/rpmio/rpmsq.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsq.c $ cvs diff -u -r1.42.6.7 -r1.42.6.8 rpmsq.c --- rpm/rpmio/rpmsq.c 29 Sep 2014 18:26:48 - 1.42.6.7 +++ rpm/rpmio/rpmsq.c 5 May 2016 22:22:50 - 1.42.6.8 @@ -11,6 +11,10 @@ #include #include +#if defined(__APPLE__) +#include +#endif + #include /* portability fallback for sighold(3) */ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmio.c
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-2016 00:20:56 Branch: rpm-5_4 Handle: 2016050522205600 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmio.c Log: - typo. Summary: RevisionChanges Path 1.230.2.30 +1 -1 rpm/rpmio/rpmio.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.c $ cvs diff -u -r1.230.2.29 -r1.230.2.30 rpmio.c --- rpm/rpmio/rpmio.c 11 Apr 2016 06:58:42 - 1.230.2.29 +++ rpm/rpmio/rpmio.c 5 May 2016 22:20:56 - 1.230.2.30 @@ -2835,7 +2835,7 @@ int(*writefn) (void *cookie, const char *, int) = (int (*) (void *, const char *, int)) iof->write; fpos_t (*seekfn) (void *cookie, fpos_t, int) = - (fpos_t (*) (void *, fpos_t, int)) iof->seek = + (fpos_t (*) (void *, fpos_t, int)) iof->seek; int(*closefn) (void *cookie) = (int (*) (void *)) iof->close; /* XXX FIXME: read/write/seek/close vectors based on stdio fmode. */ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ tagname.c
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-2016 00:20:16 Branch: rpm-5_4 Handle: 2016050522201600 Modified files: (Branch: rpm-5_4) rpm/rpmdb tagname.c Log: - fix: hotwire le32toh() on __APPLE__ Summary: RevisionChanges Path 1.34.2.16 +5 -0 rpm/rpmdb/tagname.c patch -p0 <<'@@ .' Index: rpm/rpmdb/tagname.c $ cvs diff -u -r1.34.2.15 -r1.34.2.16 tagname.c --- rpm/rpmdb/tagname.c 11 Apr 2016 22:04:46 - 1.34.2.15 +++ rpm/rpmdb/tagname.c 5 May 2016 22:20:16 - 1.34.2.16 @@ -3,7 +3,12 @@ */ #include "system.h" + +#if defined(__APPLE__) /* XXX hotwire le32toh */ +#define le32toh(x) (x) +#else #include +#endif /* Don't redefine this macro if it already exists */ #ifndef le32toh @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am
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-2016 00:18:45 Branch: rpm-5_4 Handle: 2016050522184500 Modified files: (Branch: rpm-5_4) rpm/rpmdb Makefile.am Log: - add tprintf. Summary: RevisionChanges Path 1.134.2.30 +4 -1 rpm/rpmdb/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmdb/Makefile.am $ cvs diff -u -r1.134.2.29 -r1.134.2.30 Makefile.am --- rpm/rpmdb/Makefile.am 13 Mar 2016 23:44:47 - 1.134.2.29 +++ rpm/rpmdb/Makefile.am 5 May 2016 22:18:45 - 1.134.2.30 @@ -35,7 +35,7 @@ logio.awk logio.src logio_recover_template logio_template logio.c \ logio_rec.c logio_auto.c logio_autop.c logio_auto.h -EXTRA_PROGRAMS = qfcalc qfgraph logio tjfn tqf # tbdb +EXTRA_PROGRAMS = qfcalc qfgraph logio tjfn tqf tprintf # tbdb noinst_PROGRAMS = json RPMMISC_LDADD_COMMON = \ @@ -380,6 +380,9 @@ -r $(testdir)/fodder/*.rpm \ $(testdir)/fodder/fmtmod.qf +tprintf_SOURCES = tprintf.c +tprintf_CFLAGS = $(AM_CPPFLAGS) + #tbdb_SOURCES = tbdb.c bdb.c #tbdb_LDADD = $(mylibs) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org