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: 02-Dec-2010 16:01:00 Branch: HEAD Handle: 2010120215005001 Modified files: rpm/lib rpmds.c rpmte.c rpmte.h Log: - lib: sync with rpm-5.3.6. Summary: Revision Changes Path 2.170 +2 -0 rpm/lib/rpmds.c 2.109 +4 -2 rpm/lib/rpmte.c 2.76 +0 -2 rpm/lib/rpmte.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c ============================================================================ $ cvs diff -u -r2.169 -r2.170 rpmds.c --- rpm/lib/rpmds.c 12 Sep 2010 22:19:56 -0000 2.169 +++ rpm/lib/rpmds.c 2 Dec 2010 15:00:50 -0000 2.170 @@ -2991,6 +2991,7 @@ continue; /*...@notreached@*/ /*...@switchbreak@*/ break; case SHT_NOTE: +#if defined(HAVE_GELF_GETNOTE) /* XXX OpenIndiana & older elfutils haven't. */ if (!(shdr->sh_flags & SHF_ALLOC)) continue; data = NULL; @@ -3034,6 +3035,7 @@ } } } +#endif /* defined(HAVE_GELF_GETNOTE) */ /*...@switchbreak@*/ break; case SHT_GNU_verdef: data = NULL; @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmte.c ============================================================================ $ cvs diff -u -r2.108 -r2.109 rpmte.c --- rpm/lib/rpmte.c 12 Feb 2010 12:32:08 -0000 2.108 +++ rpm/lib/rpmte.c 2 Dec 2010 15:00:50 -0000 2.109 @@ -327,12 +327,14 @@ return (te != NULL ? te->release : NULL); } -#ifdef RPM_VENDOR_MANDRIVA const char * rpmteD(rpmte te) { +#ifdef RPM_VENDOR_MANDRIVA return (te != NULL ? te->distepoch : NULL); -} +#else + return NULL; #endif +} const char * rpmteA(rpmte te) { @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmte.h ============================================================================ $ cvs diff -u -r2.75 -r2.76 rpmte.h --- rpm/lib/rpmte.h 16 Oct 2010 01:47:40 -0000 2.75 +++ rpm/lib/rpmte.h 2 Dec 2010 15:00:51 -0000 2.76 @@ -332,7 +332,6 @@ extern const char * rpmteR(rpmte te) /*...@*/; -#ifdef RPM_VENDOR_MANDRIVA /** \ingroup rpmte * Retrieve distepoch string of transaction element. * @param te transaction element @@ -341,7 +340,6 @@ /*...@observer@*/ /*...@null@*/ extern const char * rpmteD(rpmte te) /*...@*/; -#endif /** \ingroup rpmte * Retrieve arch string of transaction element. @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org