[CVS] RPM: rpm/ CHANGES
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: 06-Jul-2007 19:54:56 Branch: HEAD Handle: 2007070618545600 Modified files: rpm CHANGES Log: oops. Summary: RevisionChanges Path 1.1436 +0 -3 rpm/CHANGES patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1435 -r1.1436 CHANGES --- rpm/CHANGES 6 Jul 2007 17:54:21 - 1.1435 +++ rpm/CHANGES 6 Jul 2007 17:54:56 - 1.1436 @@ -1,10 +1,7 @@ 4.5 - 5.0: - CHANGES - jbj: generate per-platform macros for major CPU-linux platforms. -=== - mgh: Stop the python module from using rpmrc files - mgh: Change python configuration to allow for --with-python 2.x, 2.4 or 2.5. (no value will scan as it previously did) - 1.1434 - jbj: parameterize upgrade/obsoletes tag. Panu's Big Mistake imho. - jbj: reset errno to 0 in rpmgiOpen to eliminate false ENOENT failure. - rse: do not build and install NLS data under po/ at all in case of --disable-nls @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/perl/ RPM.xs
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: 06-Jul-2007 20:24:17 Branch: HEAD Handle: 2007070619241600 Modified files: rpm/perlRPM.xs Log: Pl: longer reads rcfiles. Summary: RevisionChanges Path 1.4 +1 -1 rpm/perl/RPM.xs patch -p0 '@@ .' Index: rpm/perl/RPM.xs $ cvs diff -u -r1.3 -r1.4 RPM.xs --- rpm/perl/RPM.xs 18 Jun 2007 16:45:04 - 1.3 +++ rpm/perl/RPM.xs 6 Jul 2007 18:24:16 - 1.4 @@ -152,7 +152,7 @@ BOOT: { HV *header_tags, *constants; - rpmReadConfigFiles(rpmRcfiles, NULL); + rpmReadConfigFiles(NULL, NULL); header_tags = perl_get_hv(RPM::header_tag_map, TRUE); _populate_header_tags(header_tags); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ spec.c rpm/lib/ poptALL.c rpmrc.c r...
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: 06-Jul-2007 20:22:06 Branch: HEAD Handle: 2007070619220500 Modified files: rpm CHANGES rpmqv.c rpm/build spec.c rpm/lib poptALL.c rpmrc.c Log: - eliminate rcfile reading everywhere. Summary: RevisionChanges Path 1.1438 +1 -0 rpm/CHANGES 2.148 +2 -3 rpm/build/spec.c 2.31+2 -14 rpm/lib/poptALL.c 2.201 +6 -102rpm/lib/rpmrc.c 1.116 +2 -2 rpm/rpmqv.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1437 -r1.1438 CHANGES --- rpm/CHANGES 6 Jul 2007 18:08:42 - 1.1437 +++ rpm/CHANGES 6 Jul 2007 18:22:05 - 1.1438 @@ -1,4 +1,5 @@ 4.5 - 5.0: +- jbj: eliminate rcfile reading everywhere. - jbj: eliminate last known internal usage of rpmrc files. - jbj: generate per-platform macros for major CPU-linux platforms. - mgh: Stop the python module from using rpmrc files @@ . patch -p0 '@@ .' Index: rpm/build/spec.c $ cvs diff -u -r2.147 -r2.148 spec.c --- rpm/build/spec.c 25 May 2007 17:35:56 - 2.147 +++ rpm/build/spec.c 6 Jul 2007 18:22:05 - 2.148 @@ -758,7 +758,6 @@ char *target; const char * t; const char * te; -const char * rcfile = rpmcliRcfile; int nqueries = 0; if (qva-qva_showPackage == NULL) @@ -788,7 +787,7 @@ if (t != targets) { rpmFreeMacros(NULL); rpmFreeRpmrc(); - (void) rpmReadConfigFiles(rcfile, target); + (void) rpmReadConfigFiles(NULL, target); } res = _specQuery(ts, qva, arg, target); nqueries++; @@ -808,7 +807,7 @@ te++; rpmFreeMacros(NULL); rpmFreeRpmrc(); - (void) rpmReadConfigFiles(rcfile, target); + (void) rpmReadConfigFiles(NULL, target); } return res; } @@ . patch -p0 '@@ .' Index: rpm/lib/poptALL.c $ cvs diff -u -r2.30 -r2.31 poptALL.c --- rpm/lib/poptALL.c 16 Jun 2007 22:24:59 - 2.30 +++ rpm/lib/poptALL.c 6 Jul 2007 18:22:05 - 2.31 @@ -112,9 +112,6 @@ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char * rpmcliPipeOutput = NULL; -/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ -const char * rpmcliRcfile = NULL; - /[EMAIL PROTECTED]@*/ const char * rpmcliRootDir = /; @@ -167,7 +164,7 @@ if ((te = strchr(t, ',')) != NULL) *te = '\0'; } - rpmcliInitialized = rpmReadConfigFiles(rpmcliRcfile, t); + rpmcliInitialized = rpmReadConfigFiles(NULL, t); t = _free(t); } if (rpmcliInitialized) @@ -181,7 +178,7 @@ /[EMAIL PROTECTED]@*/ enum poptCallbackReason reason, const struct poptOption * opt, const char * arg, /[EMAIL PROTECTED]@*/ const void * data) - /[EMAIL PROTECTED] rpmRcfiles, rpmcliTargets, rpmcliQueryFlags, rpmCLIMacroContext, + /[EMAIL PROTECTED] rpmcliTargets, rpmcliQueryFlags, rpmCLIMacroContext, rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /[EMAIL PROTECTED] con, rpmcliTargets, rpmcliQueryFlags, rpmCLIMacroContext, rpmGlobalMacroContext, fileSystem, internalState @*/ @@ -384,15 +381,6 @@ { pipe, '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, rpmcliPipeOutput, 0, N_(send stdout to CMD), N_(CMD) }, -#if !defined(POPT_RCFILE) - { rcfile, '\0', POPT_ARG_STRING, rpmcliRcfile, 0, - N_(read FILE:... instead of default file(s)), - N_(FILE:...) }, -#else - { rcfile, '\0', 0, NULL, POPT_RCFILE, - N_(read FILE:... instead of default file(s)), - N_(FILE:...) }, -#endif { root, 'r', POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT, rpmcliRootDir, 0, N_(use ROOT as top level directory), N_(ROOT) }, @@ . patch -p0 '@@ .' Index: rpm/lib/rpmrc.c $ cvs diff -u -r2.200 -r2.201 rpmrc.c --- rpm/lib/rpmrc.c 2 Jul 2007 08:53:29 - 2.200 +++ rpm/lib/rpmrc.c 6 Jul 2007 18:22:05 - 2.201 @@ -24,9 +24,6 @@ #include misc.h #include debug.h -/[EMAIL
[CVS] RPM: rpm/ CHANGES build.h rpm/build/ rpmspec.h rpm/ configure.ac...
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: 06-Jul-2007 20:45:53 Branch: HEAD Handle: 2007070619455201 Modified files: rpm CHANGES build.h configure.ac rpmqv.c rpm/build rpmspec.h rpm/lib librpm.vers rpmcli.h rpmlib.h Log: - expunge every occurence of Rcfiles. Summary: RevisionChanges Path 1.1439 +1 -0 rpm/CHANGES 2.21+1 -1 rpm/build.h 2.58+1 -1 rpm/build/rpmspec.h 2.167 +0 -18 rpm/configure.ac 1.3 +0 -1 rpm/lib/librpm.vers 2.68+2 -5 rpm/lib/rpmcli.h 2.424 +2 -10 rpm/lib/rpmlib.h 1.117 +1 -1 rpm/rpmqv.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1438 -r1.1439 CHANGES --- rpm/CHANGES 6 Jul 2007 18:22:05 - 1.1438 +++ rpm/CHANGES 6 Jul 2007 18:45:52 - 1.1439 @@ -1,4 +1,5 @@ 4.5 - 5.0: +- jbj: expunge every occurence of Rcfiles. - jbj: eliminate rcfile reading everywhere. - jbj: eliminate last known internal usage of rpmrc files. - jbj: generate per-platform macros for major CPU-linux platforms. @@ . patch -p0 '@@ .' Index: rpm/build.h $ cvs diff -u -r2.20 -r2.21 build.h --- rpm/build.h 25 May 2007 17:35:52 - 2.20 +++ rpm/build.h 6 Jul 2007 18:45:52 - 2.21 @@ -7,7 +7,7 @@ int build(rpmts ts, const char * arg, BTA_t ba, /[EMAIL PROTECTED]@*/ const char * rcfile) - /[EMAIL PROTECTED] rpmRcfiles, rpmGlobalMacroContext, rpmCLIMacroContext, + /[EMAIL PROTECTED] rpmGlobalMacroContext, rpmCLIMacroContext, h_errno, fileSystem, internalState @*/ /[EMAIL PROTECTED] ts, ba-buildAmount, rpmGlobalMacroContext, rpmCLIMacroContext, fileSystem, internalState @*/; @@ . patch -p0 '@@ .' Index: rpm/build/rpmspec.h $ cvs diff -u -r2.57 -r2.58 rpmspec.h --- rpm/build/rpmspec.h 25 May 2007 17:35:56 - 2.57 +++ rpm/build/rpmspec.h 6 Jul 2007 18:45:53 - 2.58 @@ -251,7 +251,7 @@ * @return 0 on success, else no. of failures */ int rpmspecQuery(rpmts ts, QVA_t qva, const char * arg) - /[EMAIL PROTECTED] rpmRcfiles, rpmCLIMacroContext, + /[EMAIL PROTECTED] rpmCLIMacroContext, rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /[EMAIL PROTECTED] ts, qva, rpmCLIMacroContext, rpmGlobalMacroContext, fileSystem, internalState @*/; @@ . patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.166 -r2.167 configure.ac --- rpm/configure.ac 6 Jul 2007 18:08:42 - 2.166 +++ rpm/configure.ac 6 Jul 2007 18:45:52 - 2.167 @@ -1079,24 +1079,6 @@ AC_SUBST(MACROFILES) AC_MSG_RESULT([$MACROFILES]) -dnl # determine RPM run-command files path -AC_MSG_CHECKING([for RPM run-command files path]) -RPMRCFILES=${USRLIBRPM}/${RPMCANONVENDOR}/rpmrc -RPMRCFILES=${RPMRCFILES}:${USRLIBRPM}/${RPMCANONVENDOR}/rpmrc -RPMRCFILES=${RPMRCFILES}:/etc/rpmrc -RPMRCFILES=${RPMRCFILES}:~/.rpmrc -AC_ARG_WITH( -[path-rpmrc], -AS_HELP_STRING([--with-path-rpmrc=ARG], [build with colon-separated RPM run-command files path]), -[RPMRCFILES=$withval] -) -AC_DEFINE_UNQUOTED( -[RPMRCFILES], [$RPMRCFILES], -[Colon separated RPM run-command files path] -) -AC_SUBST(RPMRCFILES) -AC_MSG_RESULT([$RPMRCFILES]) - dnl # determine POPT configuration file path AC_MSG_CHECKING([for POPT configuration file path]) RPMPOPTFILE=${USRLIBRPM}/${VERSION}/rpmpopt @@ . patch -p0 '@@ .' Index: rpm/lib/librpm.vers $ cvs diff -u -r1.2 -r1.3 librpm.vers --- rpm/lib/librpm.vers 25 May 2007 18:34:13 - 1.2 +++ rpm/lib/librpm.vers 6 Jul 2007 18:45:53 - 1.3 @@ -251,7 +251,6 @@ rpmrbCheck; rpmrbOrder; rpmrbRun; -rpmRcfiles; rpmReadConfigFiles; rpmReadHeader; rpmReadPackageFile; @@ . patch -p0 '@@ .' Index: rpm/lib/rpmcli.h
[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmrc.c
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: 06-Jul-2007 21:05:57 Branch: HEAD Handle: 2007070620055700 Modified files: rpm CHANGES rpm/lib rpmrc.c Log: - eliminate recursive parser helpers. Summary: RevisionChanges Path 1.1440 +1 -0 rpm/CHANGES 2.202 +2 -541rpm/lib/rpmrc.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1439 -r1.1440 CHANGES --- rpm/CHANGES 6 Jul 2007 18:45:52 - 1.1439 +++ rpm/CHANGES 6 Jul 2007 19:05:57 - 1.1440 @@ -1,4 +1,5 @@ 4.5 - 5.0: +- jbj: eliminate recursive parser helpers. - jbj: expunge every occurence of Rcfiles. - jbj: eliminate rcfile reading everywhere. - jbj: eliminate last known internal usage of rpmrc files. @@ . patch -p0 '@@ .' Index: rpm/lib/rpmrc.c $ cvs diff -u -r2.201 -r2.202 rpmrc.c --- rpm/lib/rpmrc.c 6 Jul 2007 18:22:05 - 2.201 +++ rpm/lib/rpmrc.c 6 Jul 2007 19:05:57 - 2.202 @@ -65,16 +65,6 @@ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ struct rpmvarValue * next; }; -struct rpmOption { -const char * name; -int var; -int archSpecific; -/[EMAIL PROTECTED]@*/ int required; -int macroize; -int localize; -/[EMAIL PROTECTED]@*/ struct rpmOptionValue * value; -}; - typedef struct defaultEntry_s { /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char * name; /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char * defName; @@ -110,26 +100,8 @@ { buildarch, 0, 1 }, { buildos, 0, 1 } }; - -/* this *must* be kept in alphabetical order */ -/* The order of the flags is archSpecific, required, macroize, localize */ - -#define RPMVAR_OPTFLAGS 3 -#define RPMVAR_INCLUDE 43 -#define RPMVAR_MACROFILES 49 - -#define RPMVAR_NUM 55 /* number of RPMVAR entries */ -/[EMAIL PROTECTED]@*/ -static struct rpmOption optionTable[] = { -{ include, RPMVAR_INCLUDE, 0, 1, 0, 2 }, -{ macrofiles, RPMVAR_MACROFILES, 0, 0, 0, 1 }, -{ optflags,RPMVAR_OPTFLAGS,1, 0, 1, 0 }, -}; /[EMAIL PROTECTED]@*/ -/[EMAIL PROTECTED]@*/ -static int optionTableSize = sizeof(optionTable) / sizeof(*optionTable); - #define OS 0 #define ARCH 1 @@ -140,9 +112,6 @@ static int currTables[2] = { RPM_MACHTABLE_INSTOS, RPM_MACHTABLE_INSTARCH }; /[EMAIL PROTECTED]@*/ -static struct rpmvarValue values[RPMVAR_NUM]; - -/[EMAIL PROTECTED]@*/ static int defaultsInitialized = 0; /* prototypes */ @@ -151,13 +120,6 @@ /[EMAIL PROTECTED] *canontarget, rpmGlobalMacroContext, fileSystem, internalState @*/; -static int optionCompare(const void * a, const void * b) - /[EMAIL PROTECTED]/ -{ -return xstrcasecmp(((struct rpmOption *) a)-name, - ((struct rpmOption *) b)-name); -} - static /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ machCacheEntry machCacheFindEntry(const machCache cache, const char * key) /[EMAIL PROTECTED]/ @@ -170,76 +132,6 @@ return NULL; } -static int machCompatCacheAdd(char * name, const char * fn, int linenum, - machCache cache) - /[EMAIL PROTECTED] internalState @*/ - /[EMAIL PROTECTED] *name, cache-cache, cache-size, internalState @*/ -{ -machCacheEntry entry = NULL; -char * chptr; -char * equivs; -int delEntry = 0; -int i; - -while (*name xisspace(*name)) name++; - -chptr = name; -while (*chptr *chptr != ':') chptr++; -if (!*chptr) { - rpmError(RPMERR_RPMRC, _(missing second ':' at %s:%d\n), fn, linenum); - return 1; -} else if (chptr == name) { - rpmError(RPMERR_RPMRC, _(missing architecture name at %s:%d\n), fn, - linenum); - return 1; -} - -while (*chptr == ':' || xisspace(*chptr)) chptr--; -*(++chptr) = '\0'; -equivs = chptr + 1; -while (*equivs xisspace(*equivs)) equivs++; -if (!*equivs) { - delEntry = 1; -} - -if (cache-size) { - entry = machCacheFindEntry(cache, name); - if (entry) { -
[CVS] RPM: rpm/lib/ librpm.vers
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: 06-Jul-2007 21:35:58 Branch: HEAD Handle: 2007070620355800 Modified files: rpm/lib librpm.vers Log: - revert routines that were re-added for ABI compat after rpm-4.4.7. Summary: RevisionChanges Path 1.4 +0 -4 rpm/lib/librpm.vers patch -p0 '@@ .' Index: rpm/lib/librpm.vers $ cvs diff -u -r1.3 -r1.4 librpm.vers --- rpm/lib/librpm.vers 6 Jul 2007 18:45:53 - 1.3 +++ rpm/lib/librpm.vers 6 Jul 2007 19:35:58 - 1.4 @@ -202,11 +202,8 @@ rpmFreeFilesystems; rpmFreeRpmrc; rpmFreeSignature; -rpmGetArchInfo; rpmGetFilesystemList; rpmGetFilesystemUsage; -rpmGetMachine; -rpmGetOsInfo; rpmGetPassPhrase; _rpmgi_debug; rpmgiEscapeSpaces; @@ -224,7 +221,6 @@ rpmInstallSource; rpmInstallSourcePackage; rpmLookupSignatureType; -rpmMachineScore; rpmMkdirPath; rpmNAME; rpmNewSignature; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES configure.ac rpmrc.in
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: 06-Jul-2007 22:35:07 Branch: HEAD Handle: 2007070621350500 Modified files: rpm CHANGES configure.ac Removed files: rpm rpmrc.in Log: - eliminate rpmrc.in file itself. Summary: RevisionChanges Path 1.1443 +1 -0 rpm/CHANGES 2.168 +1 -1 rpm/configure.ac 2.72+0 -424rpm/rpmrc.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1442 -r1.1443 CHANGES --- rpm/CHANGES 6 Jul 2007 19:34:43 - 1.1442 +++ rpm/CHANGES 6 Jul 2007 20:35:05 - 1.1443 @@ -1,4 +1,5 @@ 4.5 - 5.0: +- jbj: eliminate rpmrc.in file itself. - jbj: revert routines that were re-added for ABI compat after rpm-4.4.7. - jbj: eliminate the voo-doo asm arch identification. - jbj: eliminate recursive parser helpers. @@ . patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.167 -r2.168 configure.ac --- rpm/configure.ac 6 Jul 2007 18:45:52 - 2.167 +++ rpm/configure.ac 6 Jul 2007 20:35:05 - 2.168 @@ -1109,7 +1109,7 @@ dnl # explicit list of files to generate AC_CONFIG_FILES([ po/Makefile.in -Doxyfile Makefile rpmrc macros rpmpopt rpm.spec +Doxyfile Makefile macros rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile scripts/Makefile scripts/macros.perl scripts/macros.php scripts/macros.python tools/Makefile misc/Makefile doc/Makefile @@ . rm -f rpm/rpmrc.in '@@ .' Index: rpm/rpmrc.in [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org