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: 11-Apr-2009 18:50:25 Branch: HEAD Handle: 2009041116502400 Modified files: rpm/rpmdb hdrfmt.c rpm/rpmio rpmborg.c rpmcurl.c rpmdpkg.c rpmlua.c rpmzq.c Log: - jbj: keep in sync with rpm-5.1.8. Summary: Revision Changes Path 1.136 +0 -17 rpm/rpmdb/hdrfmt.c 1.4 +0 -3 rpm/rpmio/rpmborg.c 1.2 +0 -3 rpm/rpmio/rpmcurl.c 1.6 +0 -7 rpm/rpmio/rpmdpkg.c 2.71 +2 -2 rpm/rpmio/rpmlua.c 1.25 +0 -4 rpm/rpmio/rpmzq.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmdb/hdrfmt.c ============================================================================ $ cvs diff -u -r1.135 -r1.136 hdrfmt.c --- rpm/rpmdb/hdrfmt.c 10 Apr 2009 13:12:31 -0000 1.135 +++ rpm/rpmdb/hdrfmt.c 11 Apr 2009 16:50:24 -0000 1.136 @@ -6013,9 +6013,6 @@ /*...@globals rpmGlobalMacroContext, h_errno, internalState @*/ /*...@modifies hsa, token, rpmGlobalMacroContext, internalState @*/ { -#ifdef DYING /* XXX tagName() does this now */ - char numbuf[64]; /* XXX big enuf for "Tag_0x01234567" */ -#endif char * t, * te; size_t i, j; size_t numElements; @@ -6145,14 +6142,7 @@ const char * tagN; /* XXX display "Tag_0x01234567" for arbitrary tags. */ if (tag->tagno != NULL && tag->tagno[0] & 0x40000000) { -#ifdef DYING /* XXX tagName() does this now */ - (void) snprintf(numbuf, sizeof(numbuf), "Tag_0x%08x", - (unsigned) tag->tagno[0]); - numbuf[sizeof(numbuf)-1] = '\0'; - tagN = numbuf; -#else tagN = myTagName(hsa->tags, tag->tagno[0], NULL); -#endif } else tagN = myTagName(hsa->tags, tag->tagno[0], NULL); assert(tagN != NULL); /* XXX can't happen */ @@ -6166,14 +6156,7 @@ const char * tagN; /* XXX display "Tag_0x01234567" for arbitrary tags. */ if (tag->tagno != NULL && tag->tagno[0] & 0x40000000) { -#ifdef DYING /* XXX tagName() does this now */ - (void) snprintf(numbuf, sizeof(numbuf), "Tag_0x%08x", - (unsigned) tag->tagno[0]); - numbuf[sizeof(numbuf)-1] = '\0'; - tagN = numbuf; -#else tagN = myTagName(hsa->tags, tag->tagno[0], NULL); -#endif tagT = numElements > 1 ? RPM_ARRAY_RETURN_TYPE : RPM_SCALAR_RETURN_TYPE; } else @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmborg.c ============================================================================ $ cvs diff -u -r1.3 -r1.4 rpmborg.c --- rpm/rpmio/rpmborg.c 21 Jan 2009 15:59:56 -0000 1.3 +++ rpm/rpmio/rpmborg.c 11 Apr 2009 16:50:24 -0000 1.4 @@ -91,9 +91,6 @@ /*==============================================================*/ #define POPT_XXX 0 -#if !defined(POPT_BIT_TOGGLE) -#define POPT_BIT_TOGGLE (POPT_ARG_VAL|POPT_ARGFLAG_XOR) -#endif /*...@unchecked@*/ /*...@observer@*/ static struct poptOption rpmborgCommandsPoptTable[] = { @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmcurl.c ============================================================================ $ cvs diff -u -r1.1 -r1.2 rpmcurl.c --- rpm/rpmio/rpmcurl.c 28 Jun 2008 17:41:48 -0000 1.1 +++ rpm/rpmio/rpmcurl.c 11 Apr 2009 16:50:24 -0000 1.2 @@ -68,9 +68,6 @@ /*==============================================================*/ #define POPTCURL_XXX 0 -#if !defined(POPT_BIT_TOGGLE) -#define POPT_BIT_TOGGLE (POPT_ARG_VAL|POPT_ARGFLAG_XOR) -#endif /*...@unchecked@*/ /*...@observer@*/ static struct poptOption optionsTable[] = { @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmdpkg.c ============================================================================ $ cvs diff -u -r1.5 -r1.6 rpmdpkg.c --- rpm/rpmio/rpmdpkg.c 25 Jan 2009 00:26:25 -0000 1.5 +++ rpm/rpmio/rpmdpkg.c 11 Apr 2009 16:50:24 -0000 1.6 @@ -14,10 +14,6 @@ #include "debug.h" -#if !defined(POPT_ARGFLAG_TOGGLE) /* XXX compat with popt < 1.15 */ -#define POPT_ARGFLAG_TOGGLE 0 -#endif - /*==============================================================*/ #define _KFB(n) (1U << (n)) @@ -127,9 +123,6 @@ /*==============================================================*/ #define POPT_XXX 0 -#if !defined(POPT_BIT_TOGGLE) -#define POPT_BIT_TOGGLE (POPT_ARG_VAL|POPT_ARGFLAG_XOR) -#endif /*...@unchecked@*/ /*...@observer@*/ static struct poptOption rpmdpkgCommandsPoptTable[] = { @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmlua.c ============================================================================ $ cvs diff -u -r2.70 -r2.71 rpmlua.c --- rpm/rpmio/rpmlua.c 10 Apr 2009 13:14:24 -0000 2.70 +++ rpm/rpmio/rpmlua.c 11 Apr 2009 16:50:24 -0000 2.71 @@ -215,9 +215,9 @@ if (fn[0] == '@' /* attention */) { fn++; #if !defined(POPT_ERROR_BADCONFIG) /* XXX popt-1.15- retrofit */ - if (!rpmSecuritySaneFile(fn)) + if (!rpmSecuritySaneFile(fn)) #else - if (!poptSaneFile(fn)) + if (!poptSaneFile(fn)) #endif { rpmlog(RPMLOG_WARNING, "existing RPM Lua script file \"%s\" considered INSECURE -- not loaded\n", fn); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmzq.c ============================================================================ $ cvs diff -u -r1.24 -r1.25 rpmzq.c --- rpm/rpmio/rpmzq.c 25 Mar 2009 20:26:47 -0000 1.24 +++ rpm/rpmio/rpmzq.c 11 Apr 2009 16:50:24 -0000 1.25 @@ -73,10 +73,6 @@ #include "debug.h" -#if !defined(POPT_ARGFLAG_TOGGLE) /* XXX compat with popt < 1.15 */ -#define POPT_ARGFLAG_TOGGLE 0 -#endif - /*...@unchecked@*/ int _rpmzq_debug = 0; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org