From b8c54dbb9b84da640ca5551f2110463d909726dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 19 Aug 2018 13:43:07 +0200 Subject: [PATCH] - enable extension-based-compression-detection in prep (rpm is misdetecting plain .tar as lzma) - rel 44 --- extension-based-compression-detection.patch | 29 +++++++++++++++++++++ rpm.spec | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 extension-based-compression-detection.patch diff --git a/extension-based-compression-detection.patch b/extension-based-compression-detection.patch new file mode 100644 index 0000000..112b161 --- /dev/null +++ b/extension-based-compression-detection.patch @@ -0,0 +1,29 @@ +--- rpm-5.4.15/rpmio/macro.c~ 2018-08-19 13:11:28.000000000 +0200 ++++ rpm-5.4.15/rpmio/macro.c 2018-08-19 13:18:39.102655981 +0200 +@@ -3122,7 +3122,7 @@ + ssize_t nb; + int rc = -1; + unsigned char magic[13]; +-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) /* extension-based-compression-detection */ ++#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* extension-based-compression-detection */ + size_t file_len; + #endif + +@@ -3139,7 +3139,7 @@ + return 0; + #endif + +-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) /* extension-based-compression-detection */ ++#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* extension-based-compression-detection */ + file_len = strlen(file); + if ((file_len > 4 && strcasecmp(file+file_len-4, ".tbz") == 0) + || (file_len > 4 && strcasecmp(file+file_len-4, ".bz2") == 0)) { +@@ -3208,7 +3208,7 @@ + && magic[2] == 'Z' && magic[3] == 'O') /* lzop */ + *compressed = COMPRESSED_LZOP; + else +-#if !defined(RPM_VENDOR_OPENPKG) && !defined(RPM_VENDOR_FEDORA) && !defined(RPM_VENDOR_MANDRIVA) /* extension-based-compression-detection */ ++#if !defined(RPM_VENDOR_OPENPKG) && !defined(RPM_VENDOR_FEDORA) && !defined(RPM_VENDOR_MANDRIVA) && !defined(RPM_VENDOR_PLD) /* extension-based-compression-detection */ + /* XXX Ick, LZMA has no magic. See http://lkml.org/lkml/2005/6/13/285 */ + if (magic[ 9] == (unsigned char) 0x00 && magic[10] == (unsigned char) 0x00 && + magic[11] == (unsigned char) 0x00 && magic[12] == (unsigned char) 0x00) /* lzmash */ diff --git a/rpm.spec b/rpm.spec index 769a504..84568cc 100644 --- a/rpm.spec +++ b/rpm.spec @@ -47,7 +47,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.15 -Release: 43 +Release: 44 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm @@ -182,6 +182,7 @@ Patch94: do_not_write_before_macro_buffer.patch Patch95: rpm-python-spec-header.patch Patch96: skip-ldconfig-optimization.patch Patch97: glibc.patch +Patch98: extension-based-compression-detection.patch # Patches imported from Mandriva @@ -1015,6 +1016,7 @@ cd - %patch95 -p1 %patch96 -p1 %patch97 -p1 +%patch98 -p1 %patch1050 -p1 -- 2.43.0