Hack to prevent unneeded demo app from building on older libc
where it will break the build
-Index: rpm-5.4.9/tools/Makefile.am
+Index: rpm-5.4.14/tools/Makefile.am
===================================================================
---- rpm-5.4.9.orig/tools/Makefile.am
-+++ rpm-5.4.9/tools/Makefile.am
-@@ -24,7 +24,7 @@ AM_CFLAGS = $(OPENMP_CFLAGS)
+--- rpm-5.4.14.orig/tools/Makefile.am
++++ rpm-5.4.14/tools/Makefile.am
+@@ -29,7 +29,7 @@ EXTRA_PROGRAMS = nix-copy-closure nix-en
+ xiu-instantiate xiu-store
+ noinst_PROGRAMS =
- EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh
-
--EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \
-+EXTRA_PROGRAMS = augtool cudftool debugedit \
- nix-build nix-channel nix-collect-garbage nix-copy-closure \
- nix-env nix-hash nix-install-package nix-instantiate \
- nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \
-@@ -60,7 +60,7 @@ pkgbin_PROGRAMS = \
+-EXTRA_PROGRAMS += augtool cudftool dbconvert debugedit \
++EXTRA_PROGRAMS += augtool cudftool debugedit \
+ nix-build nix-channel nix-collect-garbage \
+ nix-log2xml nix-prefetch-url nix-pull nix-push \
+ xiu-echo xiu-hash \
+@@ -64,7 +64,7 @@ pkgbin_PROGRAMS = \
rpmcache rpmdigest rpmrepo rpmspecdump \
rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@
if WITH_DB
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.9/tools/debugedit.c
+Index: rpm-5.4.14/tools/debugedit.c
===================================================================
---- rpm-5.4.9.orig/tools/debugedit.c
-+++ rpm-5.4.9/tools/debugedit.c
-@@ -1432,21 +1432,24 @@ handle_build_id (DSO *dso, Elf_Data *bui
+--- rpm-5.4.14.orig/tools/debugedit.c
++++ rpm-5.4.14/tools/debugedit.c
+@@ -1445,21 +1445,24 @@ handle_build_id (DSO *dso, Elf_Data *bui
auto inline void process (const void *data, size_t size)
{
memchunk chunk = { .data = (void *) data, .size = size };
GElf_Shdr shdr;
- } u;
- Elf_Data x = { .d_version = EV_CURRENT, .d_buf = &u };
--
++ } u1, u2;
++ Elf_Data src = { .d_version = EV_CURRENT, .d_buf = &u1 };
++ Elf_Data dest = { .d_version = EV_CURRENT, .d_buf = &u2 };
+
- x.d_type = ELF_T_EHDR;
- x.d_size = sizeof u.ehdr;
- u.ehdr = dso->ehdr;
- u.ehdr.e_phoff = u.ehdr.e_shoff = 0;
- if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL)
-+ } u1, u2;
-+ Elf_Data src = { .d_version = EV_CURRENT, .d_buf = &u1 };
-+ Elf_Data dest = { .d_version = EV_CURRENT, .d_buf = &u2 };
-+
+ src.d_type = ELF_T_EHDR;
+ src.d_size = sizeof u1.ehdr;
+ dest.d_size = sizeof u2.ehdr;
{
bad:
fprintf (stderr, "Failed to compute header checksum: %s\n",
-@@ -1454,29 +1457,31 @@ handle_build_id (DSO *dso, Elf_Data *bui
+@@ -1467,29 +1470,31 @@ handle_build_id (DSO *dso, Elf_Data *bui
exit (1);
}
tools/debugedit.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
-diff --git a/tools/debugedit.c b/tools/debugedit.c
---- a/tools/debugedit.c
-+++ b/tools/debugedit.c
-@@ -1512,6 +1512,28 @@ handle_build_id (DSO *dso, Elf_Data *build_id,
+Index: rpm-5.4.14/tools/debugedit.c
+===================================================================
+--- rpm-5.4.14.orig/tools/debugedit.c
++++ rpm-5.4.14/tools/debugedit.c
+@@ -1525,6 +1525,28 @@ handle_build_id (DSO *dso, Elf_Data *bui
}
}
int
main (int argc, char *argv[])
{
-@@ -1608,6 +1630,9 @@ main (int argc, char *argv[])
+@@ -1621,6 +1643,9 @@ main (int argc, char *argv[])
exit (1);
}
dso = fdopen_dso (fd, file);
if (dso == NULL)
exit (1);
---
-1.8.1.2
-
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
-Index: rpm-5.4.0/configure.ac
+Index: rpm-5.4.14/configure.ac
===================================================================
---- rpm-5.4.0.orig/configure.ac 2012-06-01 11:41:19.741480143 -0700
-+++ rpm-5.4.0/configure.ac 2012-06-01 11:41:51.773481676 -0700
-@@ -193,7 +193,7 @@
+--- rpm-5.4.14.orig/configure.ac
++++ rpm-5.4.14/configure.ac
+@@ -201,7 +201,7 @@ dnl # GNU GCC (usually "gcc")
my_save_cflags="$CFLAGS"
CFLAGS=$c
AC_MSG_CHECKING([whether GCC supports $c])
Upstream-Status: Pending
-diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
-index 0e1bdd7..8b522bb 100644
---- a/rpmdb/rpmdb.h
-+++ b/rpmdb/rpmdb.h
+Index: rpm-5.4.14/rpmdb/rpmdb.h
+===================================================================
+--- rpm-5.4.14.orig/rpmdb/rpmdb.h
++++ rpm-5.4.14/rpmdb/rpmdb.h
@@ -9,6 +9,7 @@
#include <assert.h>
#include <rpmtypes.h>
#include <rpmtag.h> /* XXX Header typedef */
-diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h
-index 8af6480..2166b4c 100644
---- a/rpmdb/rpmtag.h
-+++ b/rpmdb/rpmtag.h
+Index: rpm-5.4.14/rpmdb/rpmtag.h
+===================================================================
+--- rpm-5.4.14.orig/rpmdb/rpmtag.h
++++ rpm-5.4.14/rpmdb/rpmtag.h
@@ -7,6 +7,7 @@
#include <rpmiotypes.h>
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---- a/lua/Makefile.am.orig
-+++ b/lua/Makefile.am
-@@ -320,7 +320,7 @@
+Index: rpm-5.4.14/lua/Makefile.am
+===================================================================
+--- rpm-5.4.14.orig/lua/Makefile.am
++++ rpm-5.4.14/lua/Makefile.am
+@@ -326,7 +326,7 @@ clean-local:
# XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install.
# XXX CVS has lua/luac sub-directories in the Attic that collide with the
# XXX lua/luac executable names when using cvs update.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.9/python/rpmmodule.c
+Index: rpm-5.4.14/python/rpmmodule.c
===================================================================
---- rpm-5.4.9.orig/python/rpmmodule.c
-+++ rpm-5.4.9/python/rpmmodule.c
+--- rpm-5.4.14.orig/python/rpmmodule.c
++++ rpm-5.4.14/python/rpmmodule.c
@@ -494,12 +494,16 @@ void init_rpm(void)
REGISTER_ENUM(RPMSENSE_EQUAL);
REGISTER_ENUM(RPMSENSE_NOTEQUAL);
we may have slightly different, but yet compatible versions. If we do end
up breaking things, we'll deal with it at that time.
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [configuration]
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.8/syck/autogen.sh
+Index: rpm-5.4.14/syck/autogen.sh
===================================================================
---- rpm-5.4.8.orig/syck/autogen.sh
-+++ rpm-5.4.8/syck/autogen.sh
+--- rpm-5.4.14.orig/syck/autogen.sh
++++ rpm-5.4.14/syck/autogen.sh
@@ -34,12 +34,6 @@ libtoolize () {
eval $_libtoolize $_libtoolize_args
}
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.0/lib/rpmrc.c
+Index: rpm-5.4.14/lib/rpmrc.c
===================================================================
---- rpm-5.4.0.orig/lib/rpmrc.c 2011-08-10 17:04:35.798814821 -0500
-+++ rpm-5.4.0/lib/rpmrc.c 2011-08-10 17:33:51.505871895 -0500
-@@ -916,8 +916,8 @@
+--- rpm-5.4.14.orig/lib/rpmrc.c
++++ rpm-5.4.14/lib/rpmrc.c
+@@ -925,8 +925,8 @@ static void getMachineInfo(int type, /*@
static void rpmRebuildTargetVars(const char ** target, const char ** canontarget)
{
int x;
/* Rebuild the compat table to recalculate the current target arch. */
-@@ -927,23 +927,60 @@
+@@ -936,23 +936,60 @@ static void rpmRebuildTargetVars(const c
rpmSetTables(RPM_MACHTABLE_BUILDARCH, RPM_MACHTABLE_BUILDOS);
if (target && *target) {
}
} else {
const char *a = NULL;
-@@ -988,8 +1025,16 @@
+@@ -995,8 +1032,16 @@ static void rpmRebuildTargetVars(const c
addMacro(NULL, "_target", NULL, ct, RMIL_RPMRC);
delMacro(NULL, "_target_cpu");
addMacro(NULL, "_target_cpu", NULL, ca, RMIL_RPMRC);
if (canontarget)
*canontarget = ct;
-@@ -997,8 +1041,12 @@
+@@ -1004,8 +1049,12 @@ static void rpmRebuildTargetVars(const c
ct = _free(ct);
ca = _free(ca);
/*@-usereleased@*/
Signed-off-by: Mei Lei <lei.mei@intel.com>
-Index: rpm-5.4.8/rpmdb/DB_CONFIG.in
+Index: rpm-5.4.14/rpmdb/DB_CONFIG.in
===================================================================
---- rpm-5.4.8.orig/rpmdb/DB_CONFIG.in
-+++ rpm-5.4.8/rpmdb/DB_CONFIG.in
+--- rpm-5.4.14.orig/rpmdb/DB_CONFIG.in
++++ rpm-5.4.14/rpmdb/DB_CONFIG.in
@@ -29,7 +29,7 @@ set_thread_count 64
# ================ Memory Pool
--- /dev/null
+Support both db5 and db6.
+
+Upstream-status: Inappropriate [configuration]
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+Index: rpm/configure.ac
+===================================================================
+--- rpm.orig/configure.ac
++++ rpm/configure.ac
+@@ -547,8 +547,6 @@ else
+ MYPATH=$PATH
+ fi
+
+-DBXY=db60
+-
+ AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
+ AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
+ AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
+@@ -560,22 +558,6 @@ AC_PATH_PROG(__CMAKE, cmake, %{_bindir}/
+ AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
+ AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
+ AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
+-AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive, $MYPATH)
+-AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint, %{_bindir}/${DBXY}_checkpoint, $MYPATH)
+-AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock, $MYPATH)
+-AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
+-AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup, %{_bindir}/${DBXY}_hotbackup, $MYPATH)
+-AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
+-AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify, %{_bindir}/${DBXY}_log_verify, $MYPATH)
+-AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog, $MYPATH)
+-AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover, $MYPATH)
+-AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate, %{_bindir}/${DBXY}_replicate, $MYPATH)
+-AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH)
+-AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen, %{_bindir}/${DBXY}_sql_codegen, $MYPATH)
+-AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
+-AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH)
+-AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade, $MYPATH)
+-AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
+ AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
+ AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
+ AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
+@@ -1604,13 +1586,18 @@ RPM_CHECK_LIB(
+
+ dnl # Berkeley-DB & SQLite
+ DBLIBSRCS=""
++DBXY=db
++
+ # XXX won't handle --includedir override
+-CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
++CPPFLAGS_save="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-6.0"
++with_db_save="${with_db}"
+ RPM_CHECK_LIB(
+ [Berkeley-DB], [db],
+ [db-6.0], [db_create], [db.h],
+- [yes,external], [db3],
++ [yes,external], [db6],
+ [ DBLIBSRCS="$DBLIBSRCS db3.c"
++ DBXY=db60
+ AM_CONDITIONAL(WITH_DB, [ true ])
+ AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ])
+ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
+@@ -1619,10 +1606,32 @@ RPM_CHECK_LIB(
+ WITH_DB_SUBDIR=""
+ fi
+ ],
+- [ AM_CONDITIONAL(WITH_DB, [ false ])
+- AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ])
++ [ # Reset a few variables to fresh
++ with_db="${with_db_save}"
++ CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-5.3"
++ RPM_CHECK_LIB(
++ [Berkeley-DB], [db],
++ [db-5.3], [db_create], [db.h],
++ [yes,external], [db53],
++ [ DBLIBSRCS="$DBLIBSRCS db3.c"
++ DBXY=db53
++ AM_CONDITIONAL(WITH_DB, [ true ])
++ AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ])
++ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
++ AC_DEFINE(HAVE_DB_H, 1, [Have <db.h> header])
++ else
++ WITH_DB_SUBDIR=""
++ fi
++ ],
++ [ AM_CONDITIONAL(WITH_DB, [ false ])
++ AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ])
++ ])
+ ])
+
++if test ".$ac_cv_lib_db_6_0_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then
++ CPPFLAGS="${CPPFLAGS_save}"
++fi
++
+ dnl # Sqlite external
+ RPM_CHECK_LIB(
+ [SQLite], [sqlite],
+@@ -1633,10 +1642,11 @@ RPM_CHECK_LIB(
+
+ dnl # Sqlite 3.7.0.1 from db-5.1.19
+ dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS.
++if test ".$ac_cv_lib_db_6_0_db_create" = .yes; then
+ RPM_CHECK_LIB(
+ [Berkeley-DB (+SQLite3)], [dbsql],
+ [db_sql-6.0], [sqlite3_open], [dbsql.h],
+- [yes,external], [db3/sql],
++ [yes,external], [db6/sql],
+ [
+ AM_CONDITIONAL(WITH_DBSQL, [ true ])
+ AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library])
+@@ -1650,12 +1660,50 @@ RPM_CHECK_LIB(
+ ], [
+ AM_CONDITIONAL(WITH_DBSQL, [ false ])
+ ])
++elif test ".$ac_cv_lib_db_5_3_db_create" = .yes; then
++RPM_CHECK_LIB(
++ [Berkeley-DB (+SQLite3)], [dbsql],
++ [db_sql-5.3], [sqlite3_open], [dbsql.h],
++ [yes,external], [db53/sql],
++ [
++ AM_CONDITIONAL(WITH_DBSQL, [ true ])
++ AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library])
++ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
++ WITH_DB_CPPFLAGS="${WITH_DB_CPPFLAGS} -I\$(top_srcdir)/db/sql/generated"
++ WITH_DB_LIBS="${WITH_DBSQL_LIBS}"
++ DBLIBSRCS="$DBLIBSRCS sqlite.c"
++ else
++ WITH_DBSQL_SUBDIR=""
++ fi
++ ], [
++ AM_CONDITIONAL(WITH_DBSQL, [ false ])
++ ])
++else
++AM_CONDITIONAL(WITH_DBSQL, [ false ])
++fi
+
+ DBLIBOBJS=`echo $DBLIBSRCS | sed -e "s/\.c/\.lo/g"`
+
+ AC_SUBST(DBLIBSRCS)
+ AC_SUBST(DBLIBOBJS)
+
++AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive, $MYPATH)
++AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint, %{_bindir}/${DBXY}_checkpoint, $MYPATH)
++AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock, $MYPATH)
++AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
++AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup, %{_bindir}/${DBXY}_hotbackup, $MYPATH)
++AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
++AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify, %{_bindir}/${DBXY}_log_verify, $MYPATH)
++AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog, $MYPATH)
++AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover, $MYPATH)
++AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate, %{_bindir}/${DBXY}_replicate, $MYPATH)
++AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH)
++AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen, %{_bindir}/${DBXY}_sql_codegen, $MYPATH)
++AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
++AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH)
++AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade, $MYPATH)
++AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
++
+ AC_ARG_WITH(db-largefile, AS_HELP_STRING([--with-db-largefile], [build Berkeley-DB with LARGEFILE support]))
+ AC_ARG_WITH(db-mutex, AS_HELP_STRING([--with-db-mutex=ARG], [build Berkeley-DB with MUTEX type ARG]))
+
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.9/rpmdb/rpmdb.c
+Index: rpm-5.4.14/rpmdb/rpmdb.c
===================================================================
---- rpm-5.4.9.orig/rpmdb/rpmdb.c
-+++ rpm-5.4.9/rpmdb/rpmdb.c
-@@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC *
+--- rpm-5.4.14.orig/rpmdb/rpmdb.c
++++ rpm-5.4.14/rpmdb/rpmdb.c
+@@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC *
vp->flags |= DB_DBT_USERMEM;
rc = dbiGet(dbi, dbcursor, kp, vp, flags);
if (rc == DB_BUFFER_SMALL) {
if (uh == NULL || uh == (void *)-1)
fprintf(stderr,
"==> mmap(%p[%u], 0x%x, 0x%x, %d, 0x%x) error(%d): %s\n",
-@@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC *
+@@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC *
if (munmap(uh, uhlen) != 0)
fprintf(stderr, "==> munmap(%p[%u]) error(%d): %s\n",
uh, (unsigned)uhlen, errno, strerror(errno));
}
}
} else
-Index: rpm-5.4.9/rpmdb/db3.c
+Index: rpm-5.4.14/rpmdb/db3.c
===================================================================
---- rpm-5.4.9.orig/rpmdb/db3.c
-+++ rpm-5.4.9/rpmdb/db3.c
-@@ -1452,7 +1452,7 @@ assert(db != NULL);
+--- rpm-5.4.14.orig/rpmdb/db3.c
++++ rpm-5.4.14/rpmdb/db3.c
+@@ -1509,7 +1509,7 @@ assert(db != NULL);
#endif
}
Debug the platform score generation...
-Index: rpm-5.4.9/lib/rpmrc.c
+Index: rpm-5.4.14/lib/rpmrc.c
===================================================================
---- rpm-5.4.9.orig/lib/rpmrc.c
-+++ rpm-5.4.9/lib/rpmrc.c
+--- rpm-5.4.14.orig/lib/rpmrc.c
++++ rpm-5.4.14/lib/rpmrc.c
@@ -465,6 +465,8 @@ static rpmRC rpmPlatform(const char * pl
rc = (rpmRC) rpmiobSlurp(platform, &iob);
}
+ fprintf(stderr, "D: rpmPlatform mireAppend STRCMP %s -- ", p);
+ #if !defined(RPM_VENDOR_OE) /* Skip the explicit-platform */
#if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
/* do not use vendor and GNU attribution */
- p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL);
-@@ -518,6 +527,7 @@ static rpmRC rpmPlatform(const char * pl
+@@ -519,6 +528,7 @@ static rpmRC rpmPlatform(const char * pl
(cvog && *cvog->gnu ? "-" : NULL),
(cvog ? cvog->gnu : NULL), NULL);
#endif
+ fprintf(stderr, "%s\n", p);
xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre);
p = _free(p);
-
-@@ -686,9 +696,12 @@ int rpmPlatformScore(const char * platfo
+ #endif
+@@ -688,9 +698,12 @@ int rpmPlatformScore(const char * platfo
if ((mire = (miRE) mi_re) != NULL)
for (i = 0; i < mi_nre; i++) {
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff --git a/lib/rpmfc.c b/lib/rpmfc.c
-index 0c3befd..9306999 100644
---- a/lib/rpmfc.c
-+++ b/lib/rpmfc.c
-@@ -1692,7 +1692,6 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp)
+Index: rpm-5.4.14/lib/rpmfc.c
+===================================================================
+--- rpm-5.4.14.orig/lib/rpmfc.c
++++ rpm-5.4.14/lib/rpmfc.c
+@@ -1734,7 +1734,6 @@ rpmRC rpmfcGenerateDepends(void * _spec,
/* ... then generate dependencies using %{__find_requires} et al. */
rc = rpmfcGenerateDependsHelper(spec, pkg, fi);
printDeps(pkg->header);
}
/* Generate scriptlet Dependencies. */
-@@ -1720,8 +1719,8 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp)
+@@ -1762,8 +1761,8 @@ rpmRC rpmfcGenerateDepends(void * _spec,
av[ac] = NULL;
fc = rpmfcNew();
--- /dev/null
+Occasionally the cp -p fails with a non-zero return code. This will cause
+the system abort the build.
+
+Upstream-status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+Index: rpm/rpmdb/Makefile.am
+===================================================================
+--- rpm.orig/rpmdb/Makefile.am
++++ rpm/rpmdb/Makefile.am
+@@ -234,11 +234,14 @@ lcov-report:
+ #lcov-upload: lcov
+ # rsync -rvz -e ssh --delete lcov/* ???
+
++$(builddir)/logio_recover_template: $(srcdir)/logio_recover_template
++ @if test ".$(builddir)" != ".$(srcdir)"; then \
++ cp -fp $(srcdir)/logio_recover_template \
++ $(builddir)/logio_recover_template ; \
++ fi
++
+ logio_BUILT = logio_auto.c logio_autop.c logio_auto.h logio_template
+-$(logio_BUILT): logio.awk logio.src logio_recover_template
+- @test -e $(builddir)/logio_recover_template || \
+- cp -p $(srcdir)/logio_recover_template \
+- $(builddir)/logio_recover_template
++$(logio_BUILT): logio.awk logio.src $(builddir)/logio_recover_template
+ @rm -f $(logio_BUILT)
+ @$(AWK) -f $(srcdir)/logio.awk \
+ -v header_file=logio_auto.h \
Upstream-Status: Pending
-Index: rpm-5.4.9/lib/fsm.c
+Index: rpm-5.4.14/lib/fsm.c
===================================================================
---- rpm-5.4.9.orig/lib/fsm.c 2014-06-10 10:54:08.601049402 +0000
-+++ rpm-5.4.9/lib/fsm.c 2014-06-10 10:55:45.633046077 +0000
-@@ -495,6 +495,11 @@
+--- rpm-5.4.14.orig/lib/fsm.c
++++ rpm-5.4.14/lib/fsm.c
+@@ -495,6 +495,11 @@ static int saveHardLink(/*@special@*/ /*
}
if (fsm->goal == IOSM_PKGBUILD) --fsm->li->linksLeft;
fsm->li->filex[fsm->li->linksLeft] = fsm->ix;
/*@-observertrans -dependenttrans@*/
fsm->li->nsuffix[fsm->li->linksLeft] = fsm->nsuffix;
-@@ -1876,8 +1881,13 @@
+@@ -1878,8 +1883,13 @@ if (!(fsmGetFi(fsm)->mapflags & IOSM_PAY
fsm->postpone = iosmFileActionSkipped(fsm->action);
if (fsm->goal == IOSM_PKGINSTALL || fsm->goal == IOSM_PKGBUILD) {
/*@-evalorder@*/ /* FIX: saveHardLink can modify fsm */
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---- rpm-5.4.0/lib/Makefile.am.orig
-+++ rpm-5.4.0/lib/Makefile.am
-@@ -90,6 +90,9 @@
- libsql_la_SOURCES = libsql.c
- libsql_la_LIBADD = librpm.la $(RPMDB_LDADD_COMMON)
+Index: rpm-5.4.14/lib/Makefile.am
+===================================================================
+--- rpm-5.4.14.orig/lib/Makefile.am
++++ rpm-5.4.14/lib/Makefile.am
+@@ -120,6 +120,9 @@ librpm.la: $(librpm_la_OBJECTS) $(librpm
+ #libsql_la_SOURCES = libsql.c
+ #libsql_la_LIBADD = librpm.la $(RPMDB_LDADD_COMMON)
+# pkglib libraries needs to have usrlib libraries already installed!
+install-pkglibLTLIBRARIES: install-usrlibLTLIBRARIES
Upstream-Status: Inappropriate [configuration]
-diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in
-index 8b94c94..e0b4689 100644
---- a/rpmdb/DB_CONFIG.in
-+++ b/rpmdb/DB_CONFIG.in
-@@ -4,6 +4,7 @@
+Index: rpm-5.4.14/rpmdb/DB_CONFIG.in
+===================================================================
+--- rpm-5.4.14.orig/rpmdb/DB_CONFIG.in
++++ rpm-5.4.14/rpmdb/DB_CONFIG.in
+@@ -4,6 +4,7 @@ set_data_dir .
set_create_dir .
set_lg_dir ./log
set_tmp_dir ./tmp
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.9/lib/depends.c
+Index: rpm-5.4.14/lib/depends.c
===================================================================
---- rpm-5.4.9.orig/lib/depends.c
-+++ rpm-5.4.9/lib/depends.c
-@@ -594,7 +594,7 @@ int rpmtsAddInstallElement(rpmts ts, Hea
+--- rpm-5.4.14.orig/lib/depends.c
++++ rpm-5.4.14/lib/depends.c
+@@ -595,7 +595,7 @@ int rpmtsAddInstallElement(rpmts ts, Hea
platform = rpmExpand(arch, "-unknown-", os, NULL);
rc = rpmPlatformScore(platform, platpat, nplatpat);
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
---- rpm-5.4.9.orig/configure.ac 2012-05-16 12:16:36.589813548 -0500
-+++ rpm-5.4.9/configure.ac 2012-05-16 12:26:01.070813518 -0500
-@@ -120,6 +120,9 @@
+Index: rpm-5.4.14/configure.ac
+===================================================================
+--- rpm-5.4.14.orig/configure.ac
++++ rpm-5.4.14/configure.ac
+@@ -121,6 +121,9 @@ AC_PROG_YACC
AC_PATH_PROG(AS, as, as)
dnl # GCC specifics
AC_PROG_GCC_TRADITIONAL
AC_ARG_ENABLE(build-pic,
-diff -ur rpm-5.4.9.orig/lua/Makefile.am rpm-5.4.9/lua/Makefile.am
---- rpm-5.4.9.orig/lua/Makefile.am 2012-04-07 19:15:25.000000000 -0500
-+++ rpm-5.4.9/lua/Makefile.am 2012-05-16 12:26:19.556856688 -0500
-@@ -40,7 +40,7 @@
+Index: rpm-5.4.14/lua/Makefile.am
+===================================================================
+--- rpm-5.4.14.orig/lua/Makefile.am
++++ rpm-5.4.14/lua/Makefile.am
+@@ -41,7 +41,7 @@ rpmluac_LDADD = liblua.la
# --- bin2c doesn't need anything but a compiler
bin2c$(EXEEXT): bin2c.c
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in
---- rpm-5.4.8.orig/macros/macros.in 2012-03-21 19:04:06.000000000 -0500
-+++ rpm-5.4.8/macros/macros.in 2012-06-07 17:02:53.903046624 -0500
-@@ -985,7 +985,7 @@
+Index: rpm-5.4.14/macros/macros.in
+===================================================================
+--- rpm-5.4.14.orig/macros/macros.in
++++ rpm-5.4.14/macros/macros.in
+@@ -1022,7 +1022,7 @@ $_arbitrary_tags_tests Foo:Bar
#==============================================================================
# ---- rpmbuild macros.
#------------------------------------------------------------------------
# cmake(...) configuration
-@@ -997,15 +997,15 @@
+@@ -1038,15 +1038,15 @@ $_arbitrary_tags_tests Foo:Bar
#------------------------------------------------------------------------
# perl(...) configuration
#------------------------------------------------------------------------
# java(...) configuration.
-@@ -1013,11 +1013,11 @@
+@@ -1054,11 +1054,11 @@ $_arbitrary_tags_tests Foo:Bar
#------------------------------------------------------------------------
# libtool(...) configuration.
#------------------------------------------------------------------------
# mono(...) configuration.
-@@ -1029,7 +1029,7 @@
+@@ -1070,7 +1070,7 @@ $_arbitrary_tags_tests Foo:Bar
#------------------------------------------------------------------------
# tcl(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/tcl}
+%{load:%{_usrlibrpm}/macros.d/tcl}
- # \endverbatim
- #*/
+ #------------------------------------------------------------------------
+ # typelib(...) configuration.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c
---- rpm-5.4.0.orig/lib/order.c 2010-12-13 17:36:39.000000000 -0600
-+++ rpm-5.4.0/lib/order.c 2011-08-10 11:11:43.194686332 -0500
-@@ -2170,7 +2170,7 @@
+Index: rpm-5.4.14/lib/order.c
+===================================================================
+--- rpm-5.4.14.orig/lib/order.c
++++ rpm-5.4.14/lib/order.c
+@@ -2175,7 +2175,7 @@ rescan:
const char * dp;
rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
? RPMLOG_WARNING : RPMLOG_ERR;
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---- rpm-5.4.8/configure.ac.orig 2012-04-24 09:10:01.856749153 -0500
-+++ rpm-5.4.8/configure.ac 2012-04-24 09:10:35.198731504 -0500
-@@ -1149,30 +1149,10 @@
+Index: rpm-5.4.14/configure.ac
+===================================================================
+--- rpm-5.4.14.orig/configure.ac
++++ rpm-5.4.14/configure.ac
+@@ -1186,30 +1186,10 @@ AC_SUBST(WITH_PERL_SUBDIR)
AC_SUBST(WITH_PERL_SUBPACKAGE)
AC_SUBST(WITH_PERL_LIBS)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
---- rpm-5.4.9.orig/configure.ac 2012-05-17 16:37:20.594790192 -0500
-+++ rpm-5.4.9/configure.ac 2012-05-17 16:39:23.126933596 -0500
-@@ -1909,7 +1909,7 @@
+Index: rpm-5.4.14/configure.ac
+===================================================================
+--- rpm-5.4.14.orig/configure.ac
++++ rpm-5.4.14/configure.ac
+@@ -1951,7 +1951,7 @@ grep -v 'define HAVE_UNISTD_H' confdefs.
esac
RPM_CHECK_LIB(
[OSSP uuid], [uuid],
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.8/rpmdb/hdrfmt.c
+Index: rpm-5.4.14/rpmdb/hdrfmt.c
===================================================================
---- rpm-5.4.8.orig/rpmdb/hdrfmt.c
-+++ rpm-5.4.8/rpmdb/hdrfmt.c
-@@ -2403,8 +2403,10 @@ static int pkgoriginTag(Header h, HE_t
+--- rpm-5.4.14.orig/rpmdb/hdrfmt.c
++++ rpm-5.4.14/rpmdb/hdrfmt.c
+@@ -2409,8 +2409,10 @@ static int pkgoriginTag(Header h, HE_t h
int rc = 1;
he->tag = RPMTAG_PACKAGEORIGIN;
Upstream-Status: Pending
-diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c
---- rpm-5.4.10/build/files.c 2013-03-17 13:17:38.233358389 +0100
-+++ rpm-5.4.10-collision/build/files.c 2013-03-17 13:07:37.468483625 +0100
-@@ -1323,6 +1323,26 @@
+Index: rpm-5.4.14/build/files.c
+===================================================================
+--- rpm-5.4.14.orig/build/files.c
++++ rpm-5.4.14/build/files.c
+@@ -1328,6 +1328,26 @@ static rpmuint32_t getDigestAlgo(Header
return dalgo;
}
/**
* Add file entries to header.
* @todo Should directories have %doc/%config attributes? (#14531)
-@@ -1370,6 +1390,7 @@
+@@ -1374,6 +1394,7 @@ memset(buf, 0, sizeof(buf)); /* XXX valg
for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) {
const char *s;
/* Merge duplicate entries. */
while (i < (fl->fileListRecsUsed - 1) &&
-@@ -1437,6 +1458,13 @@
+@@ -1436,6 +1457,13 @@ memset(buf, 0, sizeof(buf)); /* XXX valg
/* Leave room for both dirname and basename NUL's */
dpathlen += (strlen(flp->diskURL) + 2);
/*
* Make the header, the OLDFILENAMES will get converted to a
* compressed file list write before we write the actual package to
-@@ -1519,7 +1547,11 @@
+@@ -1518,7 +1546,11 @@ memset(buf, 0, sizeof(buf)); /* XXX valg
/* XXX Hash instead of 64b->32b truncate to prevent aliasing. */
{ ino_t _ino = flp->fl_ino;
-- ui32 = hashFunctionString(0, &_ino, sizeof(_ino));
+ /* don't use hash here, as hash collisions which happen on large packages
+ cause bus errors in rpmbuild
-+ ui32 = hashFunctionString(0, &_ino, sizeof(_ino));
+ ui32 = hashFunctionString(0, &_ino, sizeof(_ino));
+ */
+ ui32 = fileid + 1;
}
he->tag = RPMTAG_FILEINODES;
he->t = RPM_UINT32_TYPE;
-@@ -1752,39 +1780,6 @@
+@@ -1751,39 +1783,6 @@ if (_rpmbuildFlags & 4) {
IOSM_MAP_TYPE | IOSM_MAP_MODE | IOSM_MAP_UID | IOSM_MAP_GID;
if (isSrc)
fi->fmapflags[i] |= IOSM_FOLLOW_SYMLINKS;
}
ui32 = fl->totalFileSize;
---- rpm-5.4.10/lib/fsm.c~
-+++ rpm-5.4.10/lib/fsm.c
-@@ -898,6 +898,7 @@ int fsmMapAttrs(IOSM_t fsm)
+Index: rpm-5.4.14/lib/fsm.c
+===================================================================
+--- rpm-5.4.14.orig/lib/fsm.c
++++ rpm-5.4.14/lib/fsm.c
+@@ -904,6 +904,7 @@ int fsmMapAttrs(IOSM_t fsm)
if (fi && i >= 0 && i < (int) fi->fc) {
mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms);
mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms);
dev_t finalRdev = (dev_t)(fi->frdevs ? fi->frdevs[i] : 0);
rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0);
-@@ -937,6 +938,7 @@ int fsmMapAttrs(IOSM_t fsm)
+@@ -943,6 +944,7 @@ int fsmMapAttrs(IOSM_t fsm)
if ((S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode))
&& st->st_nlink == 0)
st->st_nlink = 1;
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh
---- rpm-5.4.9.orig/scripts/pkgconfigdeps.sh 2009-02-13 08:13:37.000000000 -0600
-+++ rpm-5.4.9/scripts/pkgconfigdeps.sh 2012-06-07 17:35:42.730003847 -0500
-@@ -18,8 +18,8 @@
+Index: rpm-5.4.14/scripts/pkgconfigdeps.sh
+===================================================================
+--- rpm-5.4.14.orig/scripts/pkgconfigdeps.sh
++++ rpm-5.4.14/scripts/pkgconfigdeps.sh
+@@ -18,8 +18,8 @@ case $1 in
*.pc)
# Query the dependencies of the package.
DIR=`dirname ${filename}`
$pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
[ -n "$n" ] || continue
# We have a dependency. Make a note that we need the pkgconfig
-@@ -42,8 +42,8 @@
+@@ -42,8 +42,8 @@ case $1 in
[ -n "$oneshot" ] && echo "$oneshot"; oneshot=""
# Query the dependencies of the package.
DIR=`dirname ${filename}`
Upstream-Status: Inappropriate [embedded specific]
-diff --git a/lib/rpmrc.c b/lib/rpmrc.c
-index e676601..9140bbe 100644
---- a/lib/rpmrc.c
-+++ b/lib/rpmrc.c
-@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * platform)
+Index: rpm-5.4.14/lib/rpmrc.c
+===================================================================
+--- rpm-5.4.14.orig/lib/rpmrc.c
++++ rpm-5.4.14/lib/rpmrc.c
+@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * pl
#endif
}
#if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
/* do not use vendor and GNU attribution */
p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL);
-@@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * platform)
+@@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * pl
#endif
xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre);
p = _free(p);
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
---- rpm-5.4.0.orig/lib/depends.c 2011-02-15 20:40:13.002849708 -0600
-+++ rpm-5.4.0/lib/depends.c 2011-02-15 20:47:05.838981632 -0600
-@@ -248,7 +248,7 @@
+Index: rpm-5.4.14/lib/depends.c
+===================================================================
+--- rpm-5.4.14.orig/lib/depends.c
++++ rpm-5.4.14/lib/depends.c
+@@ -250,7 +250,7 @@ static int rpmtsAddUpgrades(rpmts ts, rp
he->p.ptr = _free(he->p.ptr);
}
/*
* If we're capable of installing multiple colors
* but at least one of the packages are white (0), we
-@@ -505,7 +505,7 @@
+@@ -507,7 +507,7 @@ assert(lastx >= 0 && lastx < ts->orderCo
return 0;
}
/* Is "compat" compatible w/ arch? */
int _isCompatibleArch(const char * arch, const char * compat)
{
-@@ -649,7 +649,7 @@
+@@ -663,7 +663,7 @@ assert(he->p.str != NULL);
if (arch == NULL || (parch = rpmteA(p)) == NULL)
continue;
/* XXX hackery for alias matching. */
if (!_isCompatibleArch(arch, parch))
continue;
-@@ -815,6 +815,12 @@
+@@ -829,6 +829,12 @@ int rpmtsAddEraseElement(rpmts ts, Heade
return rc;
}
/*@only@*/ /*@null@*/ /*@unchecked@*/
static char *sysinfo_path = NULL;
-@@ -1296,7 +1302,7 @@
+@@ -1311,7 +1317,7 @@ retry:
sysinfo_path = rpmExpand("%{?_rpmds_sysinfo_path}", NULL);
if (!(sysinfo_path != NULL && *sysinfo_path == '/')) {
sysinfo_path = _free(sysinfo_path);
}
}
-diff -ur rpm-5.4.0.orig/lib/rpmds.c rpm-5.4.0/lib/rpmds.c
---- rpm-5.4.0.orig/lib/rpmds.c 2011-02-15 20:40:13.004855352 -0600
-+++ rpm-5.4.0/lib/rpmds.c 2011-02-15 20:41:55.598846670 -0600
-@@ -1737,7 +1737,7 @@
+Index: rpm-5.4.14/lib/rpmds.c
+===================================================================
+--- rpm-5.4.14.orig/lib/rpmds.c
++++ rpm-5.4.14/lib/rpmds.c
+@@ -1759,7 +1759,7 @@ int rpmdsSysinfo(rpmPRCO PRCO, const cha
/*@-observertrans @*/
_sysinfo_path = _free(_sysinfo_path);
/*@=observertrans @*/
}
}
/*@=modobserver@*/
-diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c
---- rpm-5.4.0.orig/lib/rpmrc.c 2011-02-15 20:40:13.006853913 -0600
-+++ rpm-5.4.0/lib/rpmrc.c 2011-02-15 20:44:39.708972391 -0600
+Index: rpm-5.4.14/lib/rpmrc.c
+===================================================================
+--- rpm-5.4.14.orig/lib/rpmrc.c
++++ rpm-5.4.14/lib/rpmrc.c
@@ -38,7 +38,13 @@
static const char * configTarget = NULL;
/*@only@*/ /*@relnull@*/ /*@unchecked@*/
void * platpat = NULL;
-@@ -685,16 +691,17 @@
+@@ -694,16 +700,17 @@ static void defaultMachine(/*@out@*/ con
int rc;
while (!gotDefaults) {
/* utsname fields on some platforms (like HP-UX) are very small
(just about 8 characters). This is too small for OpenPKG, so cheat! */
rc = uname(&un_real);
-@@ -771,9 +778,7 @@
+@@ -780,9 +787,7 @@ static void defaultMachine(/*@out@*/ con
if (cp != NULL && cp != _platform)
cp = _free(cp);
#endif
if (configTarget && !parseCVOG(configTarget, &cvog) && cvog != NULL) {
gotDefaults = 1;
-@@ -1096,6 +1101,8 @@
+@@ -1101,6 +1106,8 @@ int rpmReadConfigFiles(/*@unused@*/ cons
#ifdef PREMACROFILES
if (rpmReadRC(PREMACROFILES)) return -1;
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.9/lib/rpmrc.c
+Index: rpm-5.4.14/lib/rpmrc.c
===================================================================
---- rpm-5.4.9.orig/lib/rpmrc.c
-+++ rpm-5.4.9/lib/rpmrc.c
+--- rpm-5.4.14.orig/lib/rpmrc.c
++++ rpm-5.4.14/lib/rpmrc.c
@@ -328,10 +328,15 @@ static void setDefaults(void)
/*@modifies rpmGlobalMacroContext, internalState @*/
{
}
#if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
-Index: rpm-5.4.9/macros/macros.in
+Index: rpm-5.4.14/macros/macros.in
===================================================================
---- rpm-5.4.9.orig/macros/macros.in
-+++ rpm-5.4.9/macros/macros.in
-@@ -875,9 +875,9 @@ $_arbitrary_tags_tests Foo:Bar
+--- rpm-5.4.14.orig/macros/macros.in
++++ rpm-5.4.14/macros/macros.in
+@@ -900,9 +900,9 @@ $_arbitrary_tags_tests Foo:Bar
%_os @RPMCANONOS@
%_gnu @RPMCANONGNU@
#==============================================================================
# ---- configure macros.
-@@ -920,9 +920,10 @@ $_arbitrary_tags_tests Foo:Bar
+@@ -945,9 +945,10 @@ $_arbitrary_tags_tests Foo:Bar
%_build_os %{_host_os}
%_host @host@
%_host_alias @host_alias@%{nil}
%_target %{_host}
%_target_alias %{_host_alias}
%_target_cpu %{_host_cpu}
-Index: rpm-5.4.9/python/rpmmodule.c
+Index: rpm-5.4.14/python/rpmmodule.c
===================================================================
---- rpm-5.4.9.orig/python/rpmmodule.c
-+++ rpm-5.4.9/python/rpmmodule.c
+--- rpm-5.4.14.orig/python/rpmmodule.c
++++ rpm-5.4.14/python/rpmmodule.c
@@ -65,8 +65,8 @@ static PyObject * archScore(PyObject * s
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch))
return NULL;
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff --git a/python/rpmmodule.c b/python/rpmmodule.c
-index f7282bc..dde68ca 100644
---- a/python/rpmmodule.c
-+++ b/python/rpmmodule.c
+Index: rpm-5.4.14/python/rpmmodule.c
+===================================================================
+--- rpm-5.4.14.orig/python/rpmmodule.c
++++ rpm-5.4.14/python/rpmmodule.c
@@ -392,7 +392,8 @@ void init_rpm(void)
if (Py_AtExit(rpm_exithook) == -1)
return;
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.9/macros/macros.in
+Index: rpm-5.4.14/macros/macros.in
===================================================================
---- rpm-5.4.9.orig/macros/macros.in
-+++ rpm-5.4.9/macros/macros.in
+--- rpm-5.4.14.orig/macros/macros.in
++++ rpm-5.4.14/macros/macros.in
@@ -27,11 +27,12 @@
#==============================================================================
# ---- filesystem macros.
-diff --git a/syck/lib/syck.h b/syck/lib/syck.h
-index 04be1d9..73830a6 100644
---- a/syck/lib/syck.h
-+++ b/syck/lib/syck.h
+Index: rpm-5.4.14/syck/lib/syck.h
+===================================================================
+--- rpm-5.4.14.orig/syck/lib/syck.h
++++ rpm-5.4.14/syck/lib/syck.h
@@ -621,9 +621,6 @@ long syck_seq_count( SyckNode *seq )
*/
void syckerror( char *msg )
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600
-+++ rpm-5.4.0/lib/rpmts.c 2012-04-12 15:01:12.990184067 -0500
-@@ -403,8 +403,8 @@
+Index: rpm-5.4.14/lib/rpmts.c
+===================================================================
+--- rpm-5.4.14.orig/lib/rpmts.c
++++ rpm-5.4.14/lib/rpmts.c
+@@ -410,8 +410,8 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __
if (sdb == NULL)
continue;
mi = rpmmiInit(sdb, rpmtag, keyp, keylen);
while ((h = rpmmiNext(mi)) != NULL) {
size_t hnamelen;
-@@ -439,6 +439,15 @@
+@@ -446,6 +446,15 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __
bhnamelen = hnamelen;
}
mi = rpmmiFree(mi);
+++ /dev/null
-rpmts.c: respect to the arch priorities
-
-Let rpm respect to the priorities when choose alternatives rpm, the arch
-which comes first is preferred.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- lib/rpmts.c | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/lib/rpmts.c b/lib/rpmts.c
-index 3fbbc9e..40ec08e 100644
---- a/lib/rpmts.c
-+++ b/lib/rpmts.c
-@@ -353,6 +353,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, /*@unused@*/ const void * data)
- Header h = NULL;
- size_t bhnamelen = 0;
- time_t bhtime = 0;
-+ const char *bharch = NULL;
- rpmTag rpmtag;
- const char * keyp;
- size_t keylen = 0;
-@@ -409,6 +410,7 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
- while ((h = rpmmiNext(mi)) != NULL) {
- size_t hnamelen;
- time_t htime;
-+ const char *harch = NULL;
-
- if (rpmtag == RPMTAG_PROVIDENAME && !rpmdsAnyMatchesDep(h, ds, 1))
- continue;
-@@ -431,12 +433,23 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
- if (htime <= bhtime)
- continue;
-
-+ /* XXX Respect to the arch priorities */
-+ he->tag = RPMTAG_ARCH;
-+ xx = headerGet(h, he, 0);
-+ harch = ((xx && he->p.str) ? xstrdup(he->p.str) : NULL);
-+ he->p.ptr = _free(he->p.ptr);
-+ if (bharch && (strcmp(bharch, harch) != 0))
-+ continue;
-+
- /* Save new "best" candidate. */
- (void)headerFree(bh);
- bh = NULL;
- bh = headerLink(h);
- bhtime = htime;
- bhnamelen = hnamelen;
-+ bharch = _free(bharch);
-+ bharch = xstrdup(harch);
-+ harch = _free(harch);
- }
- mi = rpmmiFree(mi);
-
-@@ -449,6 +462,7 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
- } while (1);
-
- }
-+ bharch = _free(bharch);
-
- /* Is there a suggested resolution? */
- if (bh == NULL)
---
-1.7.1
-
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.9/lib/psm.c
+Index: rpm-5.4.14/lib/psm.c
===================================================================
---- rpm-5.4.9.orig/lib/psm.c
-+++ rpm-5.4.9/lib/psm.c
-@@ -801,6 +801,10 @@ static rpmRC runScript(rpmpsm psm, Heade
+--- rpm-5.4.14.orig/lib/psm.c
++++ rpm-5.4.14/lib/psm.c
+@@ -806,6 +806,10 @@ static rpmRC runScript(rpmpsm psm, Heade
int xx;
int i;
if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX)
ssp = psm->sstates + ix;
if (ssp != NULL)
-@@ -867,14 +871,29 @@ assert(he->p.str != NULL);
+@@ -872,14 +876,29 @@ assert(he->p.str != NULL);
(F_ISSET(psm, UNORDERED) ? "a" : ""));
if (Phe->p.argv == NULL) {
ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path)
? 1 : 0);
}
-@@ -925,7 +944,12 @@ assert(he->p.str != NULL);
+@@ -930,7 +949,12 @@ assert(he->p.str != NULL);
goto exit;
if (rpmIsDebug() &&
{
static const char set_x[] = "set -x\n";
nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
-@@ -1060,12 +1084,22 @@ assert(he->p.str != NULL);
+@@ -1065,12 +1089,22 @@ assert(he->p.str != NULL);
{ const char * rootDir = rpmtsRootDir(ts);
if (!rpmtsChrootDone(ts) && rootDir != NULL &&
xx = Chdir("/");
rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"),
psm->stepName, sln, NVRA,
-@@ -2977,6 +3011,13 @@ assert(psm->te != NULL);
+@@ -2985,6 +3019,13 @@ assert(psm->te != NULL);
case PSM_SCRIPT: /* Run current package scriptlets. */
/* XXX running %verifyscript/%sanitycheck doesn't have psm->te */
{ rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL);
rc = runInstScript(psm);
if (rc)
-@@ -2984,11 +3025,24 @@ assert(psm->te != NULL);
+@@ -2992,11 +3033,24 @@ assert(psm->te != NULL);
else
xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
rpmtsGetRdb(ts)->db_txn = NULL;
break;
case PSM_IMMED_TRIGGERS:
/* Run triggers in this package other package(s) set off. */
-@@ -2998,7 +3052,18 @@ assert(psm->te != NULL);
+@@ -3006,7 +3060,18 @@ assert(psm->te != NULL);
F_SET(psm, GOTTRIGGERS);
}
if (psm->triggers != NULL)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c
---- rpm-5.4.0.orig/lib/rpmrc.c 2011-02-15 20:40:13.006853913 -0600
-+++ rpm-5.4.0/lib/rpmrc.c 2011-02-15 20:44:39.708972391 -0600
-@@ -1216,11 +1223,15 @@
+Index: rpm-5.4.14/lib/rpmrc.c
+===================================================================
+--- rpm-5.4.14.orig/lib/rpmrc.c
++++ rpm-5.4.14/lib/rpmrc.c
+@@ -1228,11 +1228,15 @@ int rpmShowRC(FILE * fp)
if (DNEVR != NULL)
fprintf(fp, " %s\n", DNEVR+2);
}
+++ /dev/null
-Increase the maximum number of solver databases!
-
-Previously the max was set to 5, up this to 20... this should be more
-then enough for now.. also add an RPM_ERROR message in case we exceed the
-new maximum.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-diff -urN rpm-5.4.0.orig/rpmio/rpmbag.c rpm-5.4.0/rpmio/rpmbag.c
---- rpm-5.4.0.orig/rpmio/rpmbag.c 2010-10-17 21:43:55.000000000 -0500
-+++ rpm-5.4.0/rpmio/rpmbag.c 2011-02-18 18:46:00.246892502 -0600
-@@ -16,7 +16,7 @@
- /*@unchecked@*/
- int _rpmbag_debug = 0;
-
--static size_t _maxnsdbp = 5;
-+static size_t _maxnsdbp = 20;
-
- static void rpmbagFini(void * _bag)
- /*@globals fileSystem @*/
-@@ -70,6 +70,8 @@
- sdbp[i] = xcalloc(1, sizeof(*sdbp[i]));
- sdbp[i]->dbmode = dbmode;
- sdbp[i]->_db = _db;
-+ } else if (bag && bag->sdbp && bag->nsdbp >= _maxnsdbp) {
-+ rpmlog(RPMLOG_ERR, _("Attempted to open more then %d solver databases. Increase _maxnsdbp in rpmio/rpmbag.c\n"), _maxnsdbp);
- }
-
- return 0;
+++ /dev/null
-git: fix: stud-out git_strerror when --without-git
-
-Patch taken from the cvs repo,http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html.
-
-Upstream-Status: Backport
-
-Signed-off-by: Morgan Little <morgan.little@windriver.com>
-
-Server: rpm5.org Name: Jeff Johnson
-Root: /v/rpm/cvs Email: j...@rpm5.org
-Module: rpm Date: 07-Jun-2012 16:17:02
-Branch: rpm-5_4 Handle: 2012060714165803
-
-Modified files: (Branch: rpm-5_4)
- rpm CHANGES
- rpm/rpmio rpmgit.c tgit.c
-
-Log:
- - git: fix: stub-out git_strerror when --without-git.
-
-Summary:
- Revision Changes Path
- 2.1.2.11 +3 -1 rpm/rpmio/rpmgit.c
- 1.1.2.7 +0 -1 rpm/rpmio/tgit.c
-____________________________________________________________________________
-Index: rpm/rpmio/rpmgit.c
-============================================================================
---- rpm/rpmio/rpmgit.c
-+++ rpm/rpmio/rpmgit.c
-@@ -145,6 +145,9 @@
- #endif /* defined(WITH_LIBGT2) */
-
- /*==============================================================*/
-+#if !defined(WITH_LIBGIT2)
-+#define git_strerror(_rc) ""
-+#endif
-
- static int Xchkgit(/*@unused@*/ rpmgit git, const char * msg,
- int error, int printit,
-@@ -157,7 +157,6 @@
- int rc = error;
-
- if (printit && rc) {
-- /* XXX git_strerror? */
- rpmlog(RPMLOG_ERR, "%s:%s:%u: %s(%d): %s\n",
- func, fn, ln, msg, rc, git_strerror(rc));
- }
-Index: rpm/rpmio/tgit.c
-============================================================================
---- rpm/rpmio/tgit.c
-+++ rpm/rpmio/tgit.c
-@@ -34,7 +34,6 @@
- int rc = error;
-
- if (printit && rc) {
-- /* XXX git_strerror? */
- rpmlog(RPMLOG_ERR, "%s:%s:%u: %s(%d): %s\n",
- func, fn, ln, msg, rc, git_strerror(rc));
- }
-
tagname.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
-diff -urpN a/rpmdb/tagname.c b/rpmdb/tagname.c
---- a/rpmdb/tagname.c
-+++ b/rpmdb/tagname.c
+Index: rpm-5.4.14/rpmdb/tagname.c
+===================================================================
+--- rpm-5.4.14.orig/rpmdb/tagname.c
++++ rpm-5.4.14/rpmdb/tagname.c
@@ -3,6 +3,19 @@
*/
Author: Khem Raj <raj.khem@gmail.com>
Date: 2011-03-03
Description:
-This patch fixes build issue found when compiling rpm-natibe on ubuntu
+This patch fixes build issue found when compiling rpm-native on ubuntu
11.04-alpha. Problem is that linker does not get correct set of dependent
libraries when linking mtree binary which results in undefined symbols
in librpmio.so. This patch adds correct flags to mtree_LDADD to account
for rpmio deps
-Index: rpm-5.4.0/tools/Makefile.am
+Index: rpm-5.4.14/tools/Makefile.am
===================================================================
---- rpm-5.4.0.orig/tools/Makefile.am
-+++ rpm-5.4.0/tools/Makefile.am
-@@ -169,7 +169,7 @@ grep_LDADD = $(RPMIO_LDADD_COMMON)
+--- rpm-5.4.14.orig/tools/Makefile.am
++++ rpm-5.4.14/tools/Makefile.am
+@@ -186,7 +186,7 @@ grep_LDADD = $(RPMIO_LDADD_COMMON)
mtree_SOURCES = rpmmtree.c
mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---- a/lua/local/luuid.c.orig
-+++ b/lua/local/luuid.c
+Index: rpm-5.4.14/lua/local/luuid.c
+===================================================================
+--- rpm-5.4.14.orig/lua/local/luuid.c
++++ rpm-5.4.14/lua/local/luuid.c
@@ -21,7 +21,7 @@
#ifdef LUA_USE_UUID
/* Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>]) */
static int luuid_generate(lua_State *L)
-
---- a/rpmio/rpmuuid.c.orig
-+++ b/rpmio/rpmuuid.c
+Index: rpm-5.4.14/rpmio/rpmuuid.c
+===================================================================
+--- rpm-5.4.14.orig/rpmio/rpmuuid.c
++++ rpm-5.4.14/rpmio/rpmuuid.c
@@ -16,7 +16,7 @@
#include "rpmlog.h"
#include "rpmuuid.h"
+#include <ossp/uuid.h>
#endif
#include "debug.h"
-
+
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: rpm-5.4.9/lib/verify.c
+Index: rpm-5.4.14/lib/verify.c
===================================================================
---- rpm-5.4.9.orig/lib/verify.c
-+++ rpm-5.4.9/lib/verify.c
-@@ -587,7 +587,7 @@ uint32_t fc = rpmfiFC(fi);
+--- rpm-5.4.14.orig/lib/verify.c
++++ rpm-5.4.14/lib/verify.c
+@@ -589,7 +589,7 @@ uint32_t fc = rpmfiFC(fi);
/* If not verifying %ghost, skip ghost files. */
/* XXX the broken!!! logic disables %ghost queries always. */
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: rpm-5.4.0/configure.ac
+Index: rpm-5.4.14/configure.ac
===================================================================
---- rpm-5.4.0.orig/configure.ac 2012-05-31 15:40:05.985990822 -0700
-+++ rpm-5.4.0/configure.ac 2012-05-31 15:41:15.601995311 -0700
-@@ -800,7 +800,7 @@
+--- rpm-5.4.14.orig/configure.ac
++++ rpm-5.4.14/configure.ac
+@@ -943,7 +943,7 @@ AC_CHECK_FUNCS([dnl
ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl
getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl
lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl
-- posix_fadvise posix_fallocate putenv realpath regcomp __secure_getenv dnl
-+ posix_fadvise posix_fallocate putenv realpath regcomp rpmatch __secure_getenv dnl
+- posix_fadvise posix_fallocate putenv realpath regcomp secure_getenv __secure_getenv dnl
++ posix_fadvise posix_fallocate putenv realpath regcomp rpmatch secure_getenv __secure_getenv dnl
setattrlist setenv setlocale setmode setxattr dnl
sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl
sigprocmask sigsuspend sigaction dnl
-Index: rpm-5.4.0/system.h
+Index: rpm-5.4.14/system.h
===================================================================
---- rpm-5.4.0.orig/system.h 2012-05-31 15:40:05.997991504 -0700
-+++ rpm-5.4.0/system.h 2012-05-31 15:42:04.941997731 -0700
-@@ -410,6 +410,14 @@
- #endif /* defined(__GNUC__) */
- #endif /* HAVE_MCHECK_H */
+--- rpm-5.4.14.orig/system.h
++++ rpm-5.4.14/system.h
+@@ -353,6 +353,14 @@ extern int _tolower(int) __THROW /*@*/;
+ #include <libgen.h>
+ #endif
+#ifndef HAVE_RPMATCH
+#define rpmatch(line) \
+ -1 )
+#endif
+
- /* Retrofit glibc __progname */
+ /* -- Retrofit glibc __progname */
#if defined __GLIBC__ && __GLIBC__ >= 2
#if __GLIBC_MINOR__ >= 1
2 files changed, 152 insertions(+), 1 deletions(-)
create mode 100644 tools/rpmdeps-oecore.c
-Index: rpm-5.4.9/tools/Makefile.am
+Index: rpm-5.4.14/tools/Makefile.am
===================================================================
---- rpm-5.4.9.orig/tools/Makefile.am
-+++ rpm-5.4.9/tools/Makefile.am
-@@ -58,7 +58,7 @@ pkgbin_PROGRAMS = \
+--- rpm-5.4.14.orig/tools/Makefile.am
++++ rpm-5.4.14/tools/Makefile.am
+@@ -62,7 +62,7 @@ pkgbin_PROGRAMS = \
@WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find mtree \
@WITH_SEMANAGE_SEMODULE@ wget \
rpmcache rpmdigest rpmrepo rpmspecdump \
if WITH_DB
pkgbin_PROGRAMS += dbconvert
endif
-@@ -168,6 +168,10 @@ rpmdeps_SOURCES = rpmdeps.c
+@@ -172,6 +172,10 @@ rpmdeps_SOURCES = rpmdeps.c
rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
rpmdeps_LDADD = $(RPM_LDADD_COMMON)
rpmdigest_SOURCES = rpmdigest.c
rpmdigest_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
rpmdigest_LDADD = $(RPMIO_LDADD_COMMON)
-Index: rpm-5.4.9/tools/rpmdeps-oecore.c
+Index: rpm-5.4.14/tools/rpmdeps-oecore.c
===================================================================
--- /dev/null
-+++ rpm-5.4.9/tools/rpmdeps-oecore.c
++++ rpm-5.4.14/tools/rpmdeps-oecore.c
@@ -0,0 +1,147 @@
+#include "system.h"
+const char *__progname;
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: rpm-5.4.9/rpmio/rpmio.h
+Index: rpm-5.4.14/rpmio/rpmio.h
===================================================================
---- rpm-5.4.9.orig/rpmio/rpmio.h 2010-09-29 07:54:30.000000000 -0700
-+++ rpm-5.4.9/rpmio/rpmio.h 2012-06-12 07:29:19.610745014 -0700
+--- rpm-5.4.14.orig/rpmio/rpmio.h
++++ rpm-5.4.14/rpmio/rpmio.h
@@ -23,7 +23,8 @@
*/
/*@{*/
#define USE_COOKIE_SEEK_POINTER 1
typedef _IO_off64_t _libio_off_t;
typedef _libio_off_t * _libio_pos_t;
-Index: rpm-5.4.9/system.h
+Index: rpm-5.4.14/system.h
===================================================================
---- rpm-5.4.9.orig/system.h 2012-04-26 10:46:49.000000000 -0700
-+++ rpm-5.4.9/system.h 2012-06-12 07:30:08.242747422 -0700
-@@ -410,7 +410,7 @@
+--- rpm-5.4.14.orig/system.h
++++ rpm-5.4.14/system.h
+@@ -481,7 +481,7 @@ extern void muntrace (void)
#endif /* defined(__LCLINT__) */
/* Memory allocation via macro defs to get meaningful locations from mtrace() */
#define xmalloc(_size) (malloc(_size) ? : vmefail(_size))
#define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(_size))
#define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(_size))
-Index: rpm-5.4.9/lib/librpm.vers
+Index: rpm-5.4.14/lib/librpm.vers
===================================================================
---- rpm-5.4.9.orig/lib/librpm.vers 2011-04-10 15:55:23.000000000 -0700
-+++ rpm-5.4.9/lib/librpm.vers 2012-06-12 07:29:19.610745014 -0700
-@@ -405,6 +405,10 @@
+--- rpm-5.4.14.orig/lib/librpm.vers
++++ rpm-5.4.14/lib/librpm.vers
+@@ -405,6 +405,10 @@ LIBRPM_0
specedit;
strict_erasures;
XrpmtsiInit;
local:
*;
};
-Index: rpm-5.4.9/rpmio/librpmio.vers
+Index: rpm-5.4.14/rpmio/librpmio.vers
===================================================================
---- rpm-5.4.9.orig/rpmio/librpmio.vers 2012-05-07 07:38:23.000000000 -0700
-+++ rpm-5.4.9/rpmio/librpmio.vers 2012-06-12 07:29:19.626745024 -0700
-@@ -994,6 +994,10 @@
- mongo_simple_int_command;
- mongo_simple_str_command;
- mongo_update;
+--- rpm-5.4.14.orig/rpmio/librpmio.vers
++++ rpm-5.4.14/rpmio/librpmio.vers
+@@ -1056,6 +1056,10 @@ LIBRPMIO_0
+ mongo_write_concern_set_mode;
+ mongo_write_concern_set_w;
+ mongo_write_concern_set_wtimeout;
+ xmalloc;
+ xrealloc;
+ xcalloc;
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
-DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
-PR = "r63"
+DEPENDS = "libpcre attr acl popt ossp-uuid file byacc-native"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
-SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;extract=rpm-5.4.9.tar.gz \
+SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;extract=rpm-5.4.14.tar.gz \
file://rpm-log-auto-rm.patch \
file://rpm-db-reduce.patch \
file://perfile_rpmdeps.sh \
file://header-include-fix.patch \
file://rpm-platform.patch \
file://rpm-showrc.patch \
- file://rpm-solvedb.patch \
file://rpm-tools-mtree-LDFLAGS.patch \
file://rpm-fileclass.patch \
file://rpm-canonarch.patch \
file://pythondeps.sh \
file://rpmdeps-oecore.patch \
file://rpm-resolvedep.patch \
- file://rpm-respect-arch.patch \
file://rpm-no-perl-urpm.patch \
file://rpm-macros.patch \
file://rpm-lua.patch \
file://dbconvert.patch \
file://rpm-uuid-include.patch \
file://makefile-am-exec-hook.patch \
- file://rpm-stub-out-git_strerror.patch \
file://rpm-db_buffer_small.patch \
file://rpm-py-init.patch \
file://python-rpm-rpmsense.patch \
file://rpm-verify-files.patch \
file://rpm-hardlink-segfault-fix.patch \
file://rpm-payload-use-hashed-inode.patch \
+ file://rpm-fix-logio-cp.patch \
+ file://rpm-db5-or-db6.patch \
"
# Uncomment the following line to enable platform score debugging
# to process certain package feeds.
#SRC_URI += "file://rpm-debug-platform.patch"
-SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"
-SRC_URI[sha256sum] = "bac7cc5bd9d0e8262fdc0099349924608da8f680f5cb243751f696552239dde8"
+SRC_URI[md5sum] = "25093d399a0b5d1342d24900a91b347d"
+SRC_URI[sha256sum] = "676e3ab41f72e3b504e04109cfb565a300742f56a7da084f202013b30eeae467"
inherit autotools gettext
PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3,"
-PACKAGECONFIG[beecrypt] = "--with-beecrypt,--without-beecrypt,beecrypt,"
+PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--without-beecrypt,beecrypt,"
PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,"
PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss,"
PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt,"
--with-path-macros=${rpm_macros} \
--with-path-lib=${libdir}/rpm \
--with-bugreport=http://bugzilla.yoctoproject.org \
- --program-prefix="
+ --program-prefix= \
+ YACC=byacc"
CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE"
sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \
-e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i ${S}/configure
+ ( cd ${S}/syck ; set +e ; rm -- -l* ; make distclean ) || :
+
export varprefix=${localstatedir}
oe_runconf
}
