[packages/rpm] - updated to 5.4.12 - removed patches applied upstream - fix internal lua build
baggins
baggins at pld-linux.org
Mon Jul 29 13:53:53 CEST 2013
commit 2d012bd744f0e2c7ec5bc9cc05230607f4b6a42c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Jul 29 13:52:56 2013 +0200
- updated to 5.4.12
- removed patches applied upstream
- fix internal lua build
...enerate-rpmfc-dependencies-from-doc-files.patch | 10 ++++--
...ix-invalid-free-if-not-_defaultdocdir-set.patch | 11 -------
rpm-db5.2.patch | 8 ++---
rpm-fix-missing-types-in-headers.patch | 11 -------
rpm-query-always-noisy.patch | 2 +-
rpm-triggerin-compat.patch | 38 ----------------------
rpm.spec | 10 ++----
7 files changed, 14 insertions(+), 76 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 9526fa4..cfa02ac 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -42,13 +42,13 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM
Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
-Version: 5.4.11
+Version: 5.4.12
Release: 0.1
License: LGPL v2.1
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.11-0.20130708.src.rpm
Source0: %{name}-%{version}.tar.gz
-# Source0-md5: 38d5a4b3592d523953f2bccb6d631554
+# Source0-md5: 1af762bbedf936240b1e1a482cc7a193
Source100: cpu-os-macros.tar.gz
# Source100-md5: 928034a5bdceb398881bc14b5f29973b
Source1: %{name}.groups
@@ -141,7 +141,6 @@ Patch55: %{name}-disable-hmac-verify.patch
Patch56: %{name}-macros.patch
Patch57: %{name}-db5.2.patch
Patch58: %{name}-preserve-iterator.patch
-Patch59: %{name}-triggerin-compat.patch
Patch60: %{name}-python-sitescriptdir.patch
Patch61: %{name}-clean-docdir.patch
Patch62: %{name}-DB_CONFIG.patch
@@ -156,6 +155,7 @@ Patch70: python-%{name}sense-missingok.patch
Patch71: %{name}-changelog-encoding.patch
Patch72: %{name}-preserve-tag-type.patch
Patch73: gem_helper-spec-arg.patch
+Patch74: rpm-fix-internal-lua-build.patch
# Patches imported from Mandriva
@@ -217,8 +217,6 @@ Patch1022: %{name}-5.4.5-skip-dependencies-for-character-devices.patch
Patch1023: %{name}-5.4.5-rpmfc-use-strlen-not-sizeof.patch
# status: probably okay to merge
Patch1024: %{name}-5.4.5-rpmfc-apply-python-coloring-from-magic.patch
-# status: ready to merge
-Patch1025: %{name}-5.4.7-rpmfc-fix-invalid-free-if-not-_defaultdocdir-set.patch
# status: probably okay to merge
Patch1026: %{name}-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
# status: ready
@@ -882,7 +880,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
%patch56 -p1
%patch57 -p1
%patch58 -p1
-%patch59 -p1
%patch60 -p1
%patch61 -p1
%patch62 -p1
@@ -921,7 +918,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
%patch1022 -p1
%patch1023 -p1
%patch1024 -p1
-%patch1025 -p1
%patch1026 -p1
%patch1027 -p1
%patch1028 -p1
diff --git a/rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch b/rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
index 72faa1f..14275b3 100644
--- a/rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
+++ b/rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
@@ -19,13 +19,17 @@
/* Extract dependencies only from files with executable bit set. */
{ struct stat sb, * st = &sb;
-@@ -904,16 +914,10 @@ static int rpmfcSCRIPT(rpmfc fc)
+@@ -904,20 +914,10 @@ static int rpmfcSCRIPT(rpmfc fc)
(void) fclose(fp);
if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
- defaultdocdir = rpmExpand("%{?_defaultdocdir}", NULL);
-- if (defaultdocdir == NULL || *defaultdocdir == '\0')
-- defaultdocdir = strdup("/usr/share/doc");
+- /* XXX coverity #1035723 */
+- /* XXX coverity #1035883 */
+- if (defaultdocdir == NULL || *defaultdocdir == '\0') {
+- defaultdocdir = _free(defaultdocdir);
+- defaultdocdir = xstrdup("/usr/share/doc");
+- }
-
- if (strncmp(fn, defaultdocdir, strlen(defaultdocdir))) {
- if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)
diff --git a/rpm-5.4.7-rpmfc-fix-invalid-free-if-not-_defaultdocdir-set.patch b/rpm-5.4.7-rpmfc-fix-invalid-free-if-not-_defaultdocdir-set.patch
deleted file mode 100644
index 9e77639..0000000
--- a/rpm-5.4.7-rpmfc-fix-invalid-free-if-not-_defaultdocdir-set.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpm-5.4.7/lib/rpmfc.c.free~ 2012-03-10 19:45:12.592164430 +0100
-+++ rpm-5.4.7/lib/rpmfc.c 2012-03-10 19:45:15.353166385 +0100
-@@ -901,7 +901,7 @@ static int rpmfcSCRIPT(rpmfc fc)
- if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
- defaultdocdir = rpmExpand("%{?_defaultdocdir}", NULL);
- if (defaultdocdir == NULL || *defaultdocdir == '\0')
-- defaultdocdir = "/usr/share/doc";
-+ defaultdocdir = strdup("/usr/share/doc");
-
- if (strncmp(fn, defaultdocdir, strlen(defaultdocdir))) {
- if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)
diff --git a/rpm-db5.2.patch b/rpm-db5.2.patch
index 7ed49e4..4530ba8 100644
--- a/rpm-db5.2.patch
+++ b/rpm-db5.2.patch
@@ -4,18 +4,16 @@
MYPATH=$PATH
fi
--DBXY=db53
+-DBXY=db60
+DBXY=db5.2
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
---- rpm-5.4.10/configure.ac~ 2012-10-24 23:26:28.650695811 +0200
-+++ rpm-5.4.10/configure.ac 2012-10-24 23:35:55.777342472 +0200
@@ -1582,7 +1582,7 @@
CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
-- [db-5.3], [db_create], [db.h],
+- [db-6.0], [db_create], [db.h],
+ [db-5.2], [db_create], [db.h],
[yes,external], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
@@ -24,7 +22,7 @@
dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS.
RPM_CHECK_LIB(
[Berkeley-DB (+SQLite3)], [dbsql],
-- [db_sql-5.3], [sqlite3_open], [dbsql.h],
+- [db_sql-6.0], [sqlite3_open], [dbsql.h],
+ [db_sql-5.2], [sqlite3_open], [dbsql.h],
[yes,external], [db3/sql],
[
diff --git a/rpm-fix-missing-types-in-headers.patch b/rpm-fix-missing-types-in-headers.patch
index a84bd99..3c9b399 100644
--- a/rpm-fix-missing-types-in-headers.patch
+++ b/rpm-fix-missing-types-in-headers.patch
@@ -315,17 +315,6 @@ diff -ur rpm-5.4.10.orig/lib/rpmversion.h rpm-5.4.10/lib/rpmversion.h
#ifdef __cplusplus
extern "C" {
#endif
-diff -ur rpm-5.4.10.orig/rpmio/rpmzlog.h rpm-5.4.10/rpmio/rpmzlog.h
---- rpm-5.4.10.orig/rpmio/rpmzlog.h 2012-09-09 13:54:22.000000000 +0200
-+++ rpm-5.4.10/rpmio/rpmzlog.h 2012-09-09 14:29:32.625963694 +0200
-@@ -4,6 +4,7 @@
- /** \ingroup rpmio
- * \file rpmio/rpmzlog.h
- */
-+#include <stdio.h> /* XXX FILE * typedef */
- #include <sys/time.h>
-
- /** trace log pointer */
diff -ur rpm-5.4.10.orig/rpmio/yarn.h rpm-5.4.10/rpmio/yarn.h
--- rpm-5.4.10.orig/rpmio/yarn.h 2012-09-09 13:54:22.000000000 +0200
+++ rpm-5.4.10/rpmio/yarn.h 2012-09-09 15:37:09.928349906 +0200
diff --git a/rpm-query-always-noisy.patch b/rpm-query-always-noisy.patch
index a5b954e..4b82476 100644
--- a/rpm-query-always-noisy.patch
+++ b/rpm-query-always-noisy.patch
@@ -14,7 +14,7 @@
@@ -593,6 +597,10 @@
tag = (qva->qva_source == RPMQV_PKGID
? RPMTAG_SOURCEPKGID : RPMTAG_PKGID);
- qva->qva_mi = rpmtsInitIterator(ts, (rpmTag) tag, MD5, sizeof(MD5));
+ qva->qva_mi = rpmtsInitIterator(ts, (rpmTag) tag, MD5, MD5len);
+#if defined(RPM_VENDOR_PLD)
+ if(rpmmiCount(qva->qva_mi) == 0)
+ qva->qva_mi = rpmmiFree(qva->qva_mi);
diff --git a/rpm-triggerin-compat.patch b/rpm-triggerin-compat.patch
deleted file mode 100644
index 6d4320c..0000000
--- a/rpm-triggerin-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-More detailed explanation:
-
-http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2012-December/023356.html
-
-On Dec 1, 2012, at 10:55 AM, Jeffrey Johnson <n3npq at me.com> wrote:
-
->
-> I'm inclined atm to prefer the above actual behavior to "fudging" an
-> extra +1 for "legacy compatible" behavior; I'm sure we disagree here.
->
-> Short answer: patch in an extra +1 (there will be two code paths in need
-> of patching, check for symmetry as above) if you wish "legacy compatible" behavior.
->
-
-This is likely all that is needed (untested):
-
-cvs diff rpm/lib/psm.c
-Index: rpm/lib/psm.c
-===================================================================
-RCS file: /v/rpm/cvs/rpm/lib/psm.c,v
-retrieving revision 2.399.2.5
-diff -p -u -w -r2.399.2.5 rpm/lib/psm.c
---- rpm/lib/psm.c 19 Apr 2012 17:26:06 -0000 2.399.2.5
-+++ rpm/lib/psm.c 1 Dec 2012 16:02:48 -0000
-@@ -2755,7 +2755,7 @@ assert(psm->te != NULL);
- psm->scriptTag = RPMTAG_POSTIN;
- psm->progTag = RPMTAG_POSTINPROG;
- psm->sense = RPMSENSE_TRIGGERIN;
-- psm->countCorrection = 0;
-+ psm->countCorrection = 1;
-
- if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOST)) {
- rc = (rpmRC) rpmpsmNext(psm, PSM_SCRIPT);
-
-_______________________________________________
-pld-devel-en mailing list
-pld-devel-en at lists.pld-linux.org
-http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/2d012bd744f0e2c7ec5bc9cc05230607f4b6a42c
More information about the pld-cvs-commit
mailing list