[packages/rpm/dev-5.4.16: 2/2] updated (some) patches
glen
glen at pld-linux.org
Tue Mar 15 23:31:21 CET 2016
commit fe4a55c2240ba171f6741d5e3be3c0567077d125
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Mar 16 00:25:14 2016 +0200
updated (some) patches
silence-RPM_CHAR_TYPE.patch variant applied upstream
rpm-builddir-readlink.patch | 8 ++---
rpm-file-magic-can-be-mixed-case.patch | 6 ++--
rpm-installbeforeerase.patch | 10 +++----
rpm-libtool-deps.patch | 53 +++++++++++++++++-----------------
rpm-lua-enable-extra-libs.patch | 12 ++++----
rpm-macros.patch | 13 ++++++---
rpm-python-sitescriptdir.patch | 8 ++---
rpm-silence-RPM_CHAR_TYPE.patch | 10 -------
rpm.spec | 6 ++--
9 files changed, 60 insertions(+), 66 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 275048e..559dce9 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -130,7 +130,7 @@ Patch34: %{name}-libmagic-locale.patch
Patch35: %{name}-namespace-compare.patch
Patch36: %{name}-popt-coreutils.patch
Patch37: %{name}-postun-nofail.patch
-Patch38: %{name}-silence-RPM_CHAR_TYPE.patch
+
Patch39: %{name}-fix-missing-types-in-headers.patch
Patch40: %{name}-fix--p-interpreter-and-empty-script.patch
Patch41: %{name}-db_buffer_small.patch
@@ -920,7 +920,7 @@ cd -
%patch35 -p1
%patch36 -p1
%patch37 -p1
-%patch38 -p1
+
%patch39 -p1
%patch40 -p1
%{?with_db61:%patch41 -p1}
@@ -931,7 +931,7 @@ cd -
%patch46 -p1
%patch47 -p1
%patch48 -p1
-%patch49 -p1
+#%patch49 -p1 # REDIFF
%patch50 -p1
%patch51 -p1
%patch52 -p0
diff --git a/rpm-builddir-readlink.patch b/rpm-builddir-readlink.patch
index 0453045..fb3bd7e 100644
--- a/rpm-builddir-readlink.patch
+++ b/rpm-builddir-readlink.patch
@@ -1,9 +1,9 @@
---- rpm-4.5/scripts/find-debuginfo.sh~ 2010-01-27 19:25:48.000000000 +0200
-+++ rpm-4.5/scripts/find-debuginfo.sh 2010-01-27 20:23:37.279516094 +0200
-@@ -24,6 +24,11 @@
+--- rpm-5.4.16/scripts/find-debuginfo.sh~ 2016-03-16 00:18:58.000000000 +0200
++++ rpm-5.4.16/scripts/find-debuginfo.sh 2016-03-16 00:19:29.577542080 +0200
+@@ -29,6 +29,11 @@
strict=false
- RPM_BUILD_DIR="`pwd`"
+ RPM_BUILD_DIR="$(pwd)"
+# canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path
+# and debugedit will ignore them as they are out of build dir.
+RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR")
diff --git a/rpm-file-magic-can-be-mixed-case.patch b/rpm-file-magic-can-be-mixed-case.patch
index 9536124..0d566a4 100644
--- a/rpm-file-magic-can-be-mixed-case.patch
+++ b/rpm-file-magic-can-be-mixed-case.patch
@@ -1,9 +1,9 @@
---- rpm-5.4.10/scripts/rpm2cpio~ 2009-03-19 02:01:24.000000000 +0100
-+++ rpm-5.4.10/scripts/rpm2cpio 2012-09-18 23:49:28.261438724 +0200
+--- rpm-5.4.16/scripts/rpm2cpio~ 2015-04-20 19:42:37.000000000 +0300
++++ rpm-5.4.16/scripts/rpm2cpio 2016-03-16 00:23:31.243396707 +0200
@@ -25,13 +25,13 @@
EXTRACTOR="dd if=$pkg ibs=$o skip=1"
- COMPRESSION=`($EXTRACTOR |file -) 2>/dev/null`
+ COMPRESSION=$(($EXTRACTOR |file -) 2>/dev/null)
-if echo $COMPRESSION |grep -q gzip; then
+if echo $COMPRESSION |grep -qi gzip; then
DECOMPRESSOR=gunzip
diff --git a/rpm-installbeforeerase.patch b/rpm-installbeforeerase.patch
index 8939bfa..1bf1f93 100644
--- a/rpm-installbeforeerase.patch
+++ b/rpm-installbeforeerase.patch
@@ -4,8 +4,8 @@
- glen: do not skip %clean from spec file
- robert: install rpmdeps and debugedit to pkglibdir as on HEAD
- jbj: fix: python ts.hdrFromFdno(fdno) segfault.
---- rpm-5.4.10/lib/order.c~ 2012-07-06 17:39:16.000000000 +0200
-+++ rpm-5.4.10/lib/order.c 2012-09-03 23:09:03.706487979 +0200
+--- rpm-5.4.16/lib/order.c~ 2016-03-16 00:20:19.000000000 +0200
++++ rpm-5.4.16/lib/order.c 2016-03-16 00:20:57.082078559 +0200
@@ -1631,7 +1631,7 @@
(void) orgrpmAddRelation(ts, al, p, requires);
}
@@ -24,12 +24,12 @@
#ifdef NOTYET
/* Order by requiring parent directories as prerequisites. */
-@@ -2175,7 +2175,7 @@
+@@ -2182,7 +2182,7 @@
const char * dp;
rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
? RPMLOG_WARNING : RPMLOG_ERR;
--#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* loop-detection-optional-loglevel */
+-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) /* loop-detection-optional-loglevel */
++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) || defined(RPM_VENDOR_PLD) /* loop-detection-optional-loglevel */
// Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable
msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}");
#endif
diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch
index 4dc62f4..7b08c13 100644
--- a/rpm-libtool-deps.patch
+++ b/rpm-libtool-deps.patch
@@ -1,6 +1,6 @@
---- rpm-4.4.8.org/scripts/libtooldeps.sh 2005-11-12 22:20:42.000000000 +0100
-+++ rpm-4.4.8/scripts/libtooldeps.sh 2006-11-26 20:06:49.254008750 +0100
-@@ -5,15 +5,17 @@
+--- rpm-5.4.16/scripts/libtooldeps.sh~ 2015-04-20 19:42:37.000000000 +0300
++++ rpm-5.4.16/scripts/libtooldeps.sh 2016-03-16 00:18:07.723298527 +0200
+@@ -5,6 +5,8 @@
exit 0
}
@@ -9,15 +9,13 @@
case $1 in
-P|--provides)
shift
-- RPM_BUILD_ROOT="$1"
-+ RPM_BUILD_ROOT="$1"
- while read possible
+@@ -13,7 +15,7 @@
do
case "$possible" in
*.la)
- if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ; then
+ if file -L "$possible" | grep -iq 'libtool library file' 2> /dev/null ; then
- possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`"
+ possible="$(echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,)"
echo "libtool($possible)"
fi
@@ -22,21 +24,28 @@
@@ -27,38 +25,39 @@
- while read possible ; do
- case "$possible" in
- *.la)
-- for dep in `grep '^dependency_libs='"$possible" 2> /dev/null | \
-- sed -e "s,^dependency_libs='\(.*\)',\1,g"`
+- for dep in $(grep '^dependency_libs='"$possible" 2> /dev/null | \
+- sed -e "s,^dependency_libs='\(.*\)',\1,g")
- do
- case "$dep" in
- /*.la)
- echo "libtool($dep)"
-+ case $pkgname in
-+ *-devel)
-+ while read possible ; do
+- ;;
++ case $pkgname in
++ *-devel)
++ while read possible; do
+ case "$possible" in
+ *.la)
-+ for dep in `grep '^dependency_libs=' "$possible" 2> /dev/null | \
-+ sed -e "s,^dependency_libs='\(.*\)',\1,g"`
-+ do
++ for dep in $(grep '^dependency_libs=' "$possible" 2> /dev/null | \
++ sed -e "s,^dependency_libs='\(.*\)',\1,g")
++ do
+ case "$dep" in
+ /*.la)
-+ dep="`readlink -f "$dep" 2> /dev/null || echo "$dep"`"
-+ echo "libtool($dep)"
-+ ;;
++ dep="$(readlink -f "$dep" 2> /dev/null || echo "$dep")"
++ echo "libtool($dep)"
++ ;;
+ esac
-+ done
- ;;
++ done
++ ;;
esac
- done
+- done
- ;;
-- esac
++ done
++ ;;
++ *)
++ cat > /dev/null
++ ;;
+ esac
- done
- ;;
-+ ;;
-+ *)
-+ cat > /dev/null
-+ ;;
-+ esac
esac
exit 0
diff --git a/rpm-lua-enable-extra-libs.patch b/rpm-lua-enable-extra-libs.patch
index 33f6524..2ad0fc0 100644
--- a/rpm-lua-enable-extra-libs.patch
+++ b/rpm-lua-enable-extra-libs.patch
@@ -1,5 +1,5 @@
---- rpm-5.4.10/lua/linit.c~ 2012-10-03 14:46:45.303935753 +0200
-+++ rpm-5.4.10/lua/linit.c 2012-10-03 14:48:19.503932430 +0200
+--- rpm-5.4.16/lua/linit.c~ 2016-03-16 00:26:03.000000000 +0200
++++ rpm-5.4.16/lua/linit.c 2016-03-16 00:26:42.479945350 +0200
@@ -13,6 +13,8 @@
#include "lualib.h"
#include "lauxlib.h"
@@ -9,10 +9,10 @@
static const luaL_Reg lualibs[] = {
{"", luaopen_base},
-@@ -26,6 +26,9 @@
- {LUA_STRLIBNAME, luaopen_string},
- {LUA_MATHLIBNAME, luaopen_math},
- {LUA_DBLIBNAME, luaopen_debug},
+@@ -55,6 +55,9 @@
+ #if defined(LUA_COMPAT_BITLIB)
+ {LUA_BITLIBNAME, luaopen_bit32},
+ #endif
+ {"rex_posix", luaopen_rex_posix},
+ {"rex_pcre", luaopen_rex_pcre},
+ {"posix", luaopen_posix},
diff --git a/rpm-macros.patch b/rpm-macros.patch
index 3565601..8ea2bec 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,5 +1,5 @@
---- rpm-5.4.10/macros/macros.in~ 2012-11-17 00:38:23.000000000 +0200
-+++ rpm-5.4.10/macros/macros.in 2012-11-17 00:38:55.871401871 +0200
+--- rpm-5.4.16/macros/macros.in~ 2016-03-16 00:27:05.000000000 +0200
++++ rpm-5.4.16/macros/macros.in 2016-03-16 00:27:42.513047506 +0200
@@ -561,9 +561,10 @@
# Horowitz Key Protocol server configuration
@@ -12,7 +12,7 @@
%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
-@@ -670,18 +670,7 @@
+@@ -698,23 +698,7 @@
# XXX Note: that there cannot be any whitespace within the string "p>q",
# and that both p and q are package names (i.e. no version/release).
#
@@ -24,8 +24,13 @@
- glibc>nscd \
- filesystem>setup
-
+-%_dependency_whiteout_OWL31 \
+- dhcp-server>dhcp \
+- which>bash \
+-
+-
-%_dependency_whiteout \
-- %{?_dependency_whiteout_caos_core} \
+- %{?_dependency_whiteout_OWL31} \
- %{?_dependency_whiteout_system} \
- %{nil}
+%_dependency_whiteout %{nil}
diff --git a/rpm-python-sitescriptdir.patch b/rpm-python-sitescriptdir.patch
index a2ffddc..f753d48 100644
--- a/rpm-python-sitescriptdir.patch
+++ b/rpm-python-sitescriptdir.patch
@@ -1,12 +1,12 @@
---- rpm-5.4.10/lib/rpmfc.c~ 2012-12-01 21:13:39.985319735 +0100
-+++ rpm-5.4.10/lib/rpmfc.c 2013-01-24 12:21:26.379891972 +0100
-@@ -1142,7 +1142,7 @@
+--- rpm-5.4.16/lib/rpmfc.c~ 2016-03-16 00:28:12.000000000 +0200
++++ rpm-5.4.16/lib/rpmfc.c 2016-03-16 00:29:01.267117051 +0200
+@@ -1139,7 +1139,7 @@
/* Generate package and per-file dependencies. */
for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
- /* XXX Insure that /usr/lib{,64}/python files are marked RPMFC_PYTHON */
+ /* XXX Insure that /usr/{share,lib{,64}}/python files are marked RPMFC_PYTHON */
- /* XXX HACK: classification by path is intrinsically stupid. */
+ /* XXX HACK: classification by path is intrinsically non-portable. */
{ fn = strstr(fc->fn[fc->ix], "/usr/lib");
if (fn) {
@@ -1166,6 +1166,13 @@
diff --git a/rpm-silence-RPM_CHAR_TYPE.patch b/rpm-silence-RPM_CHAR_TYPE.patch
deleted file mode 100644
index f7213ce..0000000
--- a/rpm-silence-RPM_CHAR_TYPE.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rpm-5.4.10/rpmdb/tagname.c~ 2012-04-25 22:34:49.000000000 +0200
-+++ rpm-5.4.10/rpmdb/tagname.c 2012-09-07 23:10:04.768327450 +0200
-@@ -508,6 +508,7 @@
- if (!(he->tag == 62))
- if (!(he->tag == 261 || he->tag == 269))
- if (!(he->tag == 1000 || he->tag == 1004 || he->tag == 1007))
-+if (!(he->tag == 1029))
- if (!(he->tag == 1086 || he->tag == 1087))
- if (he->t != (tagType(he->tag) & 0xffff))
- fprintf(stderr, "==> warning: tag %u type(0x%x) != implicit type(0x%x)\n", (unsigned) he->tag, he->t, tagType(he->tag));
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/fe4a55c2240ba171f6741d5e3be3c0567077d125
More information about the pld-cvs-commit
mailing list