diff --git a/.gitignore b/.gitignore
index c69abb2..8681c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/rpm-4.12.0.1.tar.bz2
/rpm-4.12.90.tar.bz2
/rpm-4.13.0-rc1.tar.bz2
+/rpm-4.13.0.tar.bz2
diff --git a/rpm-4.10.0-dwz-debuginfo.patch b/rpm-4.10.0-dwz-debuginfo.patch
deleted file mode 100644
index 41d783b..0000000
--- a/rpm-4.10.0-dwz-debuginfo.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- rpm-4.10.0/scripts/find-debuginfo.sh 2012-03-20 09:07:25.000000000 +0100
-+++ rpm-4.10.0/scripts/find-debuginfo.sh.jj 2012-06-19 12:32:33.147503858 +0200
-@@ -4,6 +4,8 @@
- #
- # Usage: find-debuginfo.sh [--strict-build-id] [-g] [-r]
- # [-o debugfiles.list]
-+# [--run-dwz] [--dwz-low-mem-die-limit N]
-+# [--dwz-max-die-limit N]
- # [[-l filelist]... [-p 'pattern'] -o debuginfo.list]
- # [builddir]
- #
-@@ -20,6 +22,10 @@
- # The -p argument is an grep -E -style regexp matching the a file name,
- # and must not use anchors (^ or $).
- #
-+# The --run-dwz flag instructs find-debuginfo.sh to run the dwz utility
-+# if available, and --dwz-low-mem-die-limit and --dwz-max-die-limit
-+# provide detailed limits. See dwz(1) -l and -L option for details.
-+#
- # All file names in switches are relative to builddir (. if not given).
- #
-
-@@ -32,6 +38,11 @@ strip_r=false
- # Barf on missing build IDs.
- strict=false
-
-+# DWZ parameters.
-+run_dwz=false
-+dwz_low_mem_die_limit=
-+dwz_max_die_limit=
-+
- BUILDDIR=.
- out=debugfiles.list
- nout=0
-@@ -40,6 +51,17 @@ while [ $# -gt 0 ]; do
- --strict-build-id)
- strict=true
- ;;
-+ --run-dwz)
-+ run_dwz=true
-+ ;;
-+ --dwz-low-mem-die-limit)
-+ dwz_low_mem_die_limit=$2
-+ shift
-+ ;;
-+ --dwz-max-die-limit)
-+ dwz_max_die_limit=$2
-+ shift
-+ ;;
- -g)
- strip_g=true
- ;;
-@@ -266,6 +288,37 @@ while read nlinks inum f; do
- fi
- done || exit
-
-+# Invoke the DWARF Compressor utility.
-+if $run_dwz && type dwz >/dev/null 2>&1 \
-+ && [ -d "${RPM_BUILD_ROOT}/usr/lib/debug" ]; then
-+ dwz_files="`cd "${RPM_BUILD_ROOT}/usr/lib/debug"; find -type f -name \*.debug`"
-+ if [ -n "${dwz_files}" ]; then
-+ dwz_multifile_name="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}.${RPM_ARCH}"
-+ dwz_multifile_suffix=
-+ dwz_multifile_idx=0
-+ while [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}${dwz_multifile_suffix}" ]; do
-+ let ++dwz_multifile_idx
-+ dwz_multifile_suffix=".${dwz_multifile_idx}"
-+ done
-+ dwz_multfile_name="${dwz_multifile_name}${dwz_multifile_suffix}"
-+ dwz_opts="-h -q -r -m .dwz/${dwz_multifile_name}"
-+ mkdir -p "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz"
-+ [ -n "${dwz_low_mem_die_limit}" ] \
-+ && dwz_opts="${dwz_opts} -l ${dwz_low_mem_die_limit}"
-+ [ -n "${dwz_max_die_limit}" ] \
-+ && dwz_opts="${dwz_opts} -L ${dwz_max_die_limit}"
-+ ( cd "${RPM_BUILD_ROOT}/usr/lib/debug" && dwz $dwz_opts $dwz_files )
-+ # Remove .dwz directory if empty
-+ rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null
-+ if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ]; then
-+ id="`readelf -Wn "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" \
-+ 2>/dev/null | sed -n 's/^ Build ID: \([0-9a-f]\+\)/\1/p'`"
-+ [ -n "$id" ] \
-+ && make_id_link "$id" "/usr/lib/debug/.dwz/${dwz_multifile_name}" .debug
-+ fi
-+ fi
-+fi
-+
- # For each symlink whose target has a .debug file,
- # make a .debug symlink to that file.
- find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print |
---- rpm-4.10.0/macros.in 2012-03-20 09:07:25.000000000 +0100
-+++ rpm-4.10.0/macros.in.jj 2012-06-19 12:32:33.147503858 +0200
-@@ -176,7 +176,7 @@
- # the script. See the script for details.
- #
- %__debug_install_post \
-- %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
-+ %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
- %{nil}
-
- # Template for debug information sub-package.
diff --git a/rpm-4.10.0-minidebuginfo.patch b/rpm-4.10.0-minidebuginfo.patch
deleted file mode 100644
index 324fb81..0000000
--- a/rpm-4.10.0-minidebuginfo.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- rpm-4.10.0/macros.in 2012-06-11 11:16:21.216952339 +0200
-+++ rpm-4.10.0/macros.in.minidebug 2012-06-11 11:16:23.686912455 +0200
-@@ -175,7 +175,7 @@
- # the script. See the script for details.
- #
- %__debug_install_post \
-- %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
-+ %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
- %{nil}
-
- # Template for debug information sub-package.
-@@ -418,6 +418,12 @@ package or when debugging this package.\
- #%_missing_build_ids_terminate_build 1
-
- #
-+# Include minimal debug information in build binaries.
-+# Requires _enable_debug_packages.
-+#
-+#%_include_minidebuginfo 1
-+
-+#
- # Use internal dependency generator rather than external helpers?
- %_use_internal_dependency_generator 1
-
---- rpm-4.10.0/scripts/find-debuginfo.sh 2012-06-11 11:16:09.698138273 +0200
-+++ rpm-4.10.0/scripts/find-debuginfo.sh.minidebug 2012-06-11 11:16:13.399078526 +0200
-@@ -2,7 +2,7 @@
- #find-debuginfo.sh - automagically generate debug info and file list
- #for inclusion in an rpm spec file.
- #
--# Usage: find-debuginfo.sh [--strict-build-id] [-g] [-r]
-+# Usage: find-debuginfo.sh [--strict-build-id] [-g] [-r] [-m]
- # [-o debugfiles.list]
- # [--run-dwz] [--dwz-low-mem-die-limit N]
- # [--dwz-max-die-limit N]
-@@ -29,6 +29,9 @@ strip_g=false
- # with -r arg, pass --reloc-debug-sections to eu-strip.
- strip_r=false
-
-+# with -m arg, add minimal debuginfo to binary.
-+include_minidebug=false
-+
- # Barf on missing build IDs.
- strict=false
-
-@@ -43,6 +46,9 @@ while [ $# -gt 0 ]; do
- -g)
- strip_g=true
- ;;
-+ -m)
-+ include_minidebug=true
-+ ;;
- -o)
- if [ -z "${lists[$nout]}" -a -z "${ptns[$nout]}" ]; then
- out=$2
-@@ -105,6 +111,32 @@ strip_to_debug()
- chmod 444 "$1" || exit
- }
-
-+add_minidebug()
-+{
-+ local debuginfo="$1"
-+ local binary="$2"
-+
-+ local dynsyms=`mktemp`
-+ local funcsyms=`mktemp`
-+ local keep_symbols=`mktemp`
-+ local mini_debuginfo=`mktemp`
-+
-+ # Extract the dynamic symbols from the main binary, there is no need to also have these
-+ # in the normal symbol table
-+ nm -D "$binary" --format=posix --defined-only | awk '{ print $1 }' | sort > "$dynsyms"
-+ # Extract all the text (i.e. function) symbols from the debuginfo
-+ nm "$debuginfo" --format=posix --defined-only | awk '{ if ($2 == "T" || $2 == "t") print $1 }' | sort > "$funcsyms"
-+ # Keep all the function symbols not already in the dynamic symbol table
-+ comm -13 "$dynsyms" "$funcsyms" > "$keep_symbols"
-+ # Copy the full debuginfo, keeping only a minumal set of symbols and removing some unnecessary sections
-+ objcopy -S --remove-section .gdb_index --remove-section .comment --keep-symbols="$keep_symbols" "$debuginfo" "$mini_debuginfo" &> /dev/null
-+ #Inject the compressed data into the .gnu_debugdata section of the original binary
-+ xz "$mini_debuginfo"
-+ mini_debuginfo="${mini_debuginfo}.xz"
-+ objcopy --add-section .gnu_debugdata="$mini_debuginfo" "$binary"
-+ rm -f "$dynsyms" "$funcsyms" "$keep_symbols" "$mini_debuginfo"
-+}
-+
- # Make a relative symlink to $1 called $3$2
- shopt -s extglob
- link_relative()
-@@ -260,6 +292,9 @@ while read nlinks inum f; do
- chmod u-w "$f"
- fi
-
-+ # strip -g implies we have full symtab, don't add mini symtab in that case.
-+ $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f")
-+
- if [ -n "$id" ]; then
- make_id_link "$id" "$dn/$(basename $f)"
- make_id_link "$id" "/usr/lib/debug$dn/$bn" .debug
diff --git a/rpm-4.11.1-sepdebugcrcfix.patch b/rpm-4.11.1-sepdebugcrcfix.patch
deleted file mode 100644
index 4ea5168..0000000
--- a/rpm-4.11.1-sepdebugcrcfix.patch
+++ /dev/null
@@ -1,395 +0,0 @@
---- rpm-4.11.1-rc1-orig/Makefile.am 2013-06-07 12:19:21.000000000 +0200
-+++ rpm-4.11.1-rc1/Makefile.am 2013-06-24 18:34:06.342894002 +0200
-@@ -162,6 +162,10 @@ rpmlibexec_PROGRAMS += elfdeps
- elfdeps_SOURCES = tools/elfdeps.c
- elfdeps_LDADD = rpmio/librpmio.la
- elfdeps_LDADD += @WITH_LIBELF_LIB@ @WITH_POPT_LIB@
-+
-+rpmlibexec_PROGRAMS += sepdebugcrcfix
-+sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c
-+sepdebugcrcfix_LDADD = @WITH_LIBELF_LIB@
- endif
- endif
-
---- rpm-4.11.1-rc1-orig/scripts/find-debuginfo.sh 2013-06-24 17:20:55.407538301 +0200
-+++ rpm-4.11.1-rc1/scripts/find-debuginfo.sh 2013-06-24 18:34:41.270897302 +0200
-@@ -114,10 +114,12 @@ done
- LISTFILE="$BUILDDIR/$out"
- SOURCEFILE="$BUILDDIR/debugsources.list"
- LINKSFILE="$BUILDDIR/debuglinks.list"
-+ELFBINSFILE="$BUILDDIR/elfbins.list"
-
- > "$SOURCEFILE"
- > "$LISTFILE"
- > "$LINKSFILE"
-+> "$ELFBINSFILE"
-
- debugdir="${RPM_BUILD_ROOT}/usr/lib/debug"
-
-@@ -316,6 +318,8 @@
-
- # strip -g implies we have full symtab, don't add mini symtab in that case.
- $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f")
-+
-+ echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE"
-
- if [ -n "$id" ]; then
- make_id_link "$id" "$dn/$(basename $f)"
-@@ -354,6 +357,10 @@ if $run_dwz && type dwz >/dev/null 2>&1
- fi
- fi
-
-+# dwz invalidates .gnu_debuglink CRC32 in the main files.
-+cat "$ELFBINSFILE" |
-+(cd "$RPM_BUILD_ROOT"; xargs -d '\n' /usr/lib/rpm/sepdebugcrcfix usr/lib/debug)
-+
- # For each symlink whose target has a .debug file,
- # make a .debug symlink to that file.
- find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print |
---- rpm-4.11.1-rc1-orig/tools/sepdebugcrcfix.c 1970-01-01 01:00:00.000000000 +0100
-+++ rpm-4.11.1-rc1/tools/sepdebugcrcfix.c 2013-06-24 18:31:54.927881439 +0200
-@@ -0,0 +1,344 @@
-+/* Copyright (C) 2013 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 3 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program. If not, see . */
-+
-+/* Version 2013-06-24. */
-+
-+#define _GNU_SOURCE
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+
-+#define _(x) x
-+#define static_assert(expr) \
-+ extern int never_defined_just_used_for_checking[(expr) ? 1 : -1]
-+#ifndef min
-+# define min(a, b) ((a) < (b) ? (a) : (b))
-+#endif
-+
-+static_assert (sizeof (unsigned long) >= sizeof (uint32_t));
-+
-+typedef int bool;
-+static const bool false = 0, true = 1;
-+
-+/* This is bfd_calc_gnu_debuglink_crc32 from bfd/opncls.c. */
-+static unsigned long
-+ calc_gnu_debuglink_crc32 (unsigned long crc,
-+ const unsigned char *buf,
-+ bfd_size_type len)
-+{
-+ static const unsigned long crc32_table[256] =
-+ {
-+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
-+ 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
-+ 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
-+ 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-+ 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
-+ 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
-+ 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
-+ 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
-+ 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
-+ 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
-+ 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
-+ 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
-+ 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-+ 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
-+ 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-+ 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
-+ 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-+ 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
-+ 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
-+ 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
-+ 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
-+ 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
-+ 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
-+ 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-+ 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
-+ 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-+ 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
-+ 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-+ 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
-+ 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
-+ 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
-+ 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
-+ 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
-+ 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
-+ 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-+ 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
-+ 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-+ 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
-+ 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-+ 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
-+ 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
-+ 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
-+ 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
-+ 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
-+ 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
-+ 0x2d02ef8d
-+ };
-+ const unsigned char *end;
-+
-+ crc = ~crc & 0xffffffff;
-+ for (end = buf + len; buf < end; ++ buf)
-+ crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
-+ return ~crc & 0xffffffff;
-+}
-+
-+static size_t updated_count, matched_count, failed_count;
-+
-+static const char *usr_lib_debug;
-+
-+static bool
-+crc32 (const char *fname, const char *base_fname, uint32_t *crcp)
-+{
-+ char *reldir = strdup (base_fname);
-+ if (reldir == NULL)
-+ error (1, 0, _("out of memory"));
-+ char *s = reldir + strlen (reldir);
-+ while (s > reldir && s[-1] != '/')
-+ *--s = '\0';
-+ char *debugname;
-+ if (asprintf (&debugname, "%s/%s/%s", usr_lib_debug, reldir, fname) <= 0)
-+ error (1, 0, _("out of memory"));
-+ free (reldir);
-+ int fd = open (debugname, O_RDONLY);
-+ if (fd == -1)
-+ {
-+ error (0, errno, _("cannot open \"%s\""), debugname);
-+ return false;
-+ }
-+ off64_t size = lseek64 (fd, 0, SEEK_END);
-+ if (size == -1)
-+ {
-+ error (0, errno, _("cannot get size of \"%s\""), debugname);
-+ return false;
-+ }
-+ off_t offset = 0;
-+ uint32_t crc = 0;
-+ void *buf = NULL;
-+ while (offset < size)
-+ {
-+ const size_t maplen = min (0x10000, size - offset);
-+ void *map = NULL;
-+ if (buf == NULL)
-+ {
-+ map = mmap (NULL, maplen, PROT_READ, MAP_PRIVATE | MAP_POPULATE,
-+ fd, offset);
-+ if (map == MAP_FAILED)
-+ {
-+ error (0, errno, _("cannot map 0x%llx bytes at offset 0x%llx "
-+ "of file \"%s\""),
-+ (unsigned long long) maplen, (unsigned long long) offset,
-+ debugname);
-+ map = NULL;
-+ }
-+ }
-+ if (map == NULL)
-+ {
-+ if (buf == NULL)
-+ {
-+ buf = malloc (maplen);
-+ if (buf == NULL)
-+ error (1, 0, _("out of memory"));
-+ }
-+ ssize_t got = pread (fd, buf, maplen, offset);
-+ if (got != maplen)
-+ {
-+ error (0, errno, _("cannot read 0x%llx bytes at offset 0x%llx "
-+ "of file \"%s\""),
-+ (unsigned long long) maplen, (unsigned long long) offset,
-+ debugname);
-+ free (buf);
-+ free (debugname);
-+ return false;
-+ }
-+ }
-+ crc = calc_gnu_debuglink_crc32 (crc, map ?: buf, maplen);
-+ if (map && munmap (map, maplen) != 0)
-+ error (1, errno, _("cannot unmap 0x%llx bytes at offset 0x%llx "
-+ "of file \"%s\""),
-+ (unsigned long long) maplen, (unsigned long long) offset,
-+ debugname);
-+ offset += maplen;
-+ }
-+ free (buf);
-+ if (close (fd) != 0)
-+ {
-+ error (0, errno, _("cannot close \"%s\""), debugname);
-+ free (debugname);
-+ return false;
-+ }
-+ free (debugname);
-+ *crcp = crc;
-+ return true;
-+}
-+
-+static bool
-+process (Elf *elf, int fd, const char *fname)
-+{
-+ GElf_Ehdr ehdr_mem, *ehdr = gelf_getehdr (elf, &ehdr_mem);
-+ if (ehdr == NULL)
-+ {
-+ error (0, 0, _("cannot get ELF header of \"%s\""), fname);
-+ return false;
-+ }
-+ if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB
-+ && ehdr->e_ident[EI_DATA] != ELFDATA2MSB)
-+ {
-+ error (0, 0, _("invalid ELF endianity of \"%s\""), fname);
-+ return false;
-+ }
-+ Elf_Scn *scn = NULL;
-+ const char scnname[] = ".gnu_debuglink";
-+ while ((scn = elf_nextscn (elf, scn)) != NULL)
-+ {
-+ GElf_Shdr shdr_mem, *shdr = gelf_getshdr (scn, &shdr_mem);
-+ if (shdr == NULL)
-+ {
-+ error (0, 0, _("cannot get section # %zu in \"%s\""),
-+ elf_ndxscn (scn), fname);
-+ continue;
-+ }
-+ const char *sname = elf_strptr (elf, ehdr->e_shstrndx, shdr->sh_name);
-+ if (sname == NULL)
-+ {
-+ error (0, 0, _("cannot get name of section # %zu in \"%s\""),
-+ elf_ndxscn (scn), fname);
-+ continue;
-+ }
-+ if (strcmp (sname, scnname) != 0)
-+ continue;
-+ Elf_Data *data = elf_getdata (scn, NULL);
-+ if (data == NULL)
-+ {
-+ error (0, 0, _("cannot get data of section \"%s\" # %zu in \"%s\""),
-+ scnname, elf_ndxscn (scn), fname);
-+ continue;
-+ }
-+ if ((data->d_size & 3) != 0)
-+ {
-+ error (0, 0, _("invalid size of section \"%s\" # %zu in \"%s\""),
-+ scnname, elf_ndxscn (scn), fname);
-+ continue;
-+ }
-+ const uint8_t *zerop = memchr (data->d_buf, '\0', data->d_size);
-+ const uint8_t *crcp = (zerop == NULL
-+ ? NULL
-+ : (const uint8_t *) ((uintptr_t) (zerop + 1 + 3)
-+ & -4));
-+ if (crcp + 4 != (uint8_t *) data->d_buf + data->d_size)
-+ {
-+ error (0, 0, _("invalid format of section \"%s\" # %zu in \"%s\""),
-+ scnname, elf_ndxscn (scn), fname);
-+ continue;
-+ }
-+ uint32_t had_crc_targetendian = *(const uint32_t *) crcp;
-+ uint32_t had_crc = (ehdr->e_ident[EI_DATA] == ELFDATA2LSB
-+ ? le32toh (had_crc_targetendian)
-+ : be32toh (had_crc_targetendian));
-+ uint32_t crc;
-+ if (! crc32 (data->d_buf, fname, &crc))
-+ return false;
-+ if (crc == had_crc)
-+ {
-+ matched_count++;
-+ return true;
-+ }
-+ updated_count++;
-+ off64_t seekto = (shdr->sh_offset + data->d_off
-+ + (crcp - (const uint8_t *) data->d_buf));
-+ uint32_t crc_targetendian = (ehdr->e_ident[EI_DATA] == ELFDATA2LSB
-+ ? htole32 (crc) : htobe32 (crc));
-+ ssize_t wrote = pwrite (fd, &crc_targetendian, sizeof (crc_targetendian),
-+ seekto);
-+ if (wrote != sizeof (crc_targetendian))
-+ {
-+ error (0, 0, _("cannot write new CRC to 0x%llx "
-+ "inside section \"%s\" # %zu in \"%s\""),
-+ (unsigned long long) seekto, scnname, elf_ndxscn (scn), fname);
-+ return false;
-+ }
-+ return true;
-+ }
-+ error (0, 0, _("cannot find section \"%s\" in \"%s\""), scnname, fname);
-+ return false;
-+}
-+
-+int
-+main (int argc, char **argv)
-+{
-+ if (argc < 2)
-+ error (1, 0, _("usr/lib/debug [...]"));
-+ usr_lib_debug = argv[1];
-+ if (elf_version (EV_CURRENT) == EV_NONE)
-+ error (1, 0, _("error initializing libelf: %s"), elf_errmsg (-1));
-+ for (int argi = 2; argi < argc; argi++)
-+ {
-+ const char *fname = argv[argi];
-+ int fd = open64 (fname, O_RDWR);
-+ if (fd == -1)
-+ {
-+ error (0, errno, _("cannot open \"%s\""), fname);
-+ failed_count++;
-+ continue;
-+ }
-+ bool failed = false;
-+ Elf *elf = elf_begin (fd, ELF_C_READ_MMAP, NULL);
-+ if (elf == NULL)
-+ {
-+ error (0, 0, _("cannot open \"%s\" as ELF: %s"), fname,
-+ elf_errmsg (-1));
-+ failed = true;
-+ }
-+ else
-+ {
-+ if (! process (elf, fd, fname))
-+ failed = true;
-+ if (elf_end (elf) != 0)
-+ {
-+ error (0, 0, _("cannot close \"%s\" as ELF: %s"), fname,
-+ elf_errmsg (-1));
-+ failed = true;
-+ }
-+ }
-+ if (close (fd) != 0)
-+ {
-+ error (0, errno, _("cannot close \"%s\""), fname);
-+ failed = true;
-+ }
-+ if (failed)
-+ failed_count++;
-+ }
-+ printf ("%s: Updated %zu CRC32s, %zu CRC32s did match.\n", argv[0],
-+ updated_count, matched_count);
-+ if (failed_count)
-+ printf ("%s: Failed for %zu files.\n", argv[0], failed_count);
-+ return failed_count == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-+}
diff --git a/rpm-4.12.0.x-CVE-2013-6435.patch b/rpm-4.12.0.x-CVE-2013-6435.patch
deleted file mode 100644
index c093352..0000000
--- a/rpm-4.12.0.x-CVE-2013-6435.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- rpm-4.12.0.1/lib/fsm.c.orig 2014-12-12 16:05:51.683430313 +0100
-+++ rpm-4.12.0.1/lib/fsm.c 2014-12-12 16:08:28.046025597 +0100
-@@ -215,7 +215,12 @@ static int expandRegular(rpmfi fi, const
- FD_t wfd = NULL;
- int rc = 0;
-
-- wfd = Fopen(dest, "w.ufdio");
-+ /* Create the file with 000 permissions. */
-+ {
-+ mode_t old_umask = umask(0777);
-+ wfd = Fopen(dest, "w.ufdio");
-+ umask(old_umask);
-+ }
- if (Ferror(wfd)) {
- rc = RPMERR_OPEN_FAILED;
- goto exit;
diff --git a/rpm-4.12.0.x-CVE-2014-8118.patch b/rpm-4.12.0.x-CVE-2014-8118.patch
deleted file mode 100644
index cabdb33..0000000
--- a/rpm-4.12.0.x-CVE-2014-8118.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/lib/cpio.c b/lib/cpio.c
-index 253ff0f..600633a 100644
---- a/lib/cpio.c
-+++ b/lib/cpio.c
-@@ -399,6 +399,9 @@ int rpmcpioHeaderRead(rpmcpio_t cpio, char ** path, int * fx)
-
- GET_NUM_FIELD(hdr.filesize, fsize);
- GET_NUM_FIELD(hdr.namesize, nameSize);
-+ if (nameSize <= 0 || nameSize > 4096) {
-+ return RPMERR_BAD_HEADER;
-+ }
-
- char name[nameSize + 1];
- read = Fread(name, nameSize, 1, cpio->fd);
diff --git a/rpm-4.13.0-chroot-file-triggers.patch b/rpm-4.13.0-chroot-file-triggers.patch
deleted file mode 100644
index a5645b6..0000000
--- a/rpm-4.13.0-chroot-file-triggers.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 9aff39d0d530332e8cae376f2390b6546239a20e Mon Sep 17 00:00:00 2001
-From: Lubos Kardos
-Date: Thu, 14 Jan 2016 13:35:28 +0100
-Subject: [PATCH] Fix not chrooting transaction file triggers
-
-previously those filetriggers would call tools out of the chroot, which
-breaks installers such as DrakX or Anaconda.
-
-See https://bugs.mageia.org/show_bug.cgi?id=17217
-
-Thanks Thierry Vignaud for finding and helping to solve this.
----
- lib/rpmtriggers.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/lib/rpmtriggers.c b/lib/rpmtriggers.c
-index 211e62f..4c6e821 100644
---- a/lib/rpmtriggers.c
-+++ b/lib/rpmtriggers.c
-@@ -11,6 +11,7 @@
- #include "lib/rpmdb_internal.h"
- #include "lib/rpmds_internal.h"
- #include "lib/rpmfi_internal.h"
-+#include "lib/rpmchroot.h"
-
- #define TRIGGER_PRIORITY_BOUND 10000
-
-@@ -157,6 +158,9 @@ int runPostUnTransFileTrigs(rpmts ts)
- rpmtriggers trigs = ts->trigs2run;
- int nerrors = 0;
-
-+ if (rpmChrootIn() != 0)
-+ return -1;
-+
- rpmtriggersSortAndUniq(trigs);
- /* Iterate over stored triggers */
- for (i = 0; i < trigs->count; i++) {
-@@ -180,6 +184,9 @@ int runPostUnTransFileTrigs(rpmts ts)
- rpmScriptFree(script);
- headerFree(trigH);
- }
-+
-+ rpmChrootOut();
-+
- return nerrors;
- }
-
-@@ -530,6 +537,11 @@ rpmRC runFileTriggers(rpmts ts, rpmte te, rpmsenseFlags sense,
- /* Sort triggers by priority, offset, trigger index */
- rpmtriggersSortAndUniq(triggers);
-
-+ if (rpmChrootIn() != 0) {
-+ rpmtriggersFree(triggers);
-+ return RPMRC_FAIL;
-+ }
-+
- /* Handle stored triggers */
- for (i = 0; i < triggers->count; i++) {
- if (priorityClass == 1) {
-@@ -550,6 +562,8 @@ rpmRC runFileTriggers(rpmts ts, rpmte te, rpmsenseFlags sense,
- headerFree(trigH);
- }
- rpmtriggersFree(triggers);
-+ /* XXX an error here would require a full abort */
-+ (void) rpmChrootOut();
-
- return (nerrors == 0) ? RPMRC_OK : RPMRC_FAIL;
- }
---
-1.9.3
-
diff --git a/rpm-4.13.0-fix-crash-on-corrupted.patch b/rpm-4.13.0-fix-crash-on-corrupted.patch
deleted file mode 100644
index fd93a54..0000000
--- a/rpm-4.13.0-fix-crash-on-corrupted.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9c36ca411332d2718eca339e867561c39abc256b Mon Sep 17 00:00:00 2001
-From: Lubos Kardos
-Date: Fri, 6 Nov 2015 14:49:59 +0100
-Subject: [PATCH] Fix crash when parsing corrupted RPM file (rhbz:1273360)
-
----
- lib/legacy.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/lib/legacy.c b/lib/legacy.c
-index 422c2b0..8ba7bbd 100644
---- a/lib/legacy.c
-+++ b/lib/legacy.c
-@@ -25,7 +25,7 @@ static void compressFilelist(Header h)
- char ** dirNames;
- const char ** baseNames;
- uint32_t * dirIndexes;
-- rpm_count_t count;
-+ rpm_count_t count, realCount = 0;
- int i;
- int dirIndex = -1;
-
-@@ -58,6 +58,7 @@ static void compressFilelist(Header h)
- while ((i = rpmtdNext(&fileNames)) >= 0) {
- dirIndexes[i] = dirIndex;
- baseNames[i] = rpmtdGetString(&fileNames);
-+ realCount++;
- }
- goto exit;
- }
-@@ -87,19 +88,20 @@ static void compressFilelist(Header h)
- (needle = bsearch(&filename, dirNames, dirIndex + 1, sizeof(dirNames[0]), dncmp)) == NULL) {
- char *s = xmalloc(len + 1);
- rstrlcpy(s, filename, len + 1);
-- dirIndexes[i] = ++dirIndex;
-+ dirIndexes[realCount] = ++dirIndex;
- dirNames[dirIndex] = s;
- } else
-- dirIndexes[i] = needle - dirNames;
-+ dirIndexes[realCount] = needle - dirNames;
-
- *baseName = savechar;
-- baseNames[i] = baseName;
-+ baseNames[realCount] = baseName;
-+ realCount++;
- }
-
- exit:
- if (count > 0) {
-- headerPutUint32(h, RPMTAG_DIRINDEXES, dirIndexes, count);
-- headerPutStringArray(h, RPMTAG_BASENAMES, baseNames, count);
-+ headerPutUint32(h, RPMTAG_DIRINDEXES, dirIndexes, realCount);
-+ headerPutStringArray(h, RPMTAG_BASENAMES, baseNames, realCount);
- headerPutStringArray(h, RPMTAG_DIRNAMES,
- (const char **) dirNames, dirIndex + 1);
- }
---
-1.9.3
-
diff --git a/rpm-4.13.0-ignore-sigpipe.patch b/rpm-4.13.0-ignore-sigpipe.patch
deleted file mode 100644
index fbf9423..0000000
--- a/rpm-4.13.0-ignore-sigpipe.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 90d8cc16486479441477e89c2e09bd4f9f7604bb Mon Sep 17 00:00:00 2001
-From: Lubos Kardos
-Date: Fri, 30 Oct 2015 14:42:32 +0100
-Subject: [PATCH] Ignore SIGPIPE signals during execucton of scriptlets
- (rhbz:1264198)
-
----
- lib/rpmscript.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/lib/rpmscript.c b/lib/rpmscript.c
-index 493f4f2..98d3f42 100644
---- a/lib/rpmscript.c
-+++ b/lib/rpmscript.c
-@@ -271,6 +271,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
- const char *line;
- char *mline = NULL;
- rpmRC rc = RPMRC_FAIL;
-+ struct sigaction newact, oldact;
-
- rpmlog(RPMLOG_DEBUG, "%s: scriptlet start\n", sname);
-
-@@ -318,6 +319,12 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
- goto exit;
- }
-
-+ /* Ignore SIGPIPE during execution of scriptlets */
-+ sigemptyset(&newact.sa_mask);
-+ newact.sa_flags = 0;
-+ newact.sa_handler = SIG_IGN;
-+ sigaction(SIGPIPE, &newact, &oldact);
-+
- pid = fork();
- if (pid == (pid_t) -1) {
- rpmlog(RPMLOG_ERR, _("Couldn't fork %s: %s\n"),
-@@ -428,6 +435,10 @@ exit:
- free(fn);
- }
- free(mline);
-+
-+ /* Restore SIGPIPE handler */
-+ sigaction(SIGPIPE, &oldact, NULL);
-+
- return rc;
- }
-
---
-1.9.3
-
diff --git a/rpm-4.13.0-rc1-Fix-new-richdep-syntax.patch b/rpm-4.13.0-rc1-Fix-new-richdep-syntax.patch
deleted file mode 100644
index 72dea5c..0000000
--- a/rpm-4.13.0-rc1-Fix-new-richdep-syntax.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d20b7d2b00e349610f3cf08d9ff3723cc7c56e32 Mon Sep 17 00:00:00 2001
-From: Florian Festi
-Date: Mon, 7 Sep 2015 11:39:36 +0200
-Subject: [PATCH] Fix rpmrichOpStr to use the new syntax
-
-You need to rebuild all packages using rich deps build with previous versions of rpm as the richdeps are converted to the old syntax.
----
- lib/rpmds.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/rpmds.c b/lib/rpmds.c
-index 77733bc..ba6e244 100644
---- a/lib/rpmds.c
-+++ b/lib/rpmds.c
-@@ -1390,13 +1390,13 @@ const char *rpmrichOpStr(rpmrichOp op)
- if (op == RPMRICHOP_SINGLE)
- return "SINGLE";
- if (op == RPMRICHOP_AND)
-- return "&";
-+ return "and";
- if (op == RPMRICHOP_OR)
-- return "|";
-+ return "or";
- if (op == RPMRICHOP_IF)
-- return "IF";
-+ return "if";
- if (op == RPMRICHOP_ELSE)
-- return "ELSE";
-+ return "else";
- return NULL;
- }
-
---
-2.1.0
-
diff --git a/rpm-4.13.0-recursing-rpmdeps.patch b/rpm-4.13.0-recursing-rpmdeps.patch
deleted file mode 100644
index 77d58f0..0000000
--- a/rpm-4.13.0-recursing-rpmdeps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 33158b3b009e830036d05c138a6b308c1574effe Mon Sep 17 00:00:00 2001
-From: Lubos Kardos
-Date: Fri, 15 Jan 2016 15:41:52 +0100
-Subject: [PATCH] Fix recursive calling of rpmdeps tool (rhbz:1297557)
-
----
- scripts/find-provides | 2 +-
- scripts/find-requires | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/find-provides b/scripts/find-provides
-index c5cf93b..817f5ee 100755
---- a/scripts/find-provides
-+++ b/scripts/find-provides
-@@ -1,3 +1,3 @@
- #!/bin/sh
-
--/usr/lib/rpm/rpmdeps --provides
-+/usr/lib/rpm/rpmdeps --define="_use_internal_dependency_generator 1" --provides
-diff --git a/scripts/find-requires b/scripts/find-requires
-index 9d192dd..fa5bc88 100755
---- a/scripts/find-requires
-+++ b/scripts/find-requires
-@@ -1,3 +1,3 @@
- #!/bin/sh
-
--/usr/lib/rpm/rpmdeps --requires
-+/usr/lib/rpm/rpmdeps --define="_use_internal_dependency_generator 1" --requires
---
-1.9.3
-
diff --git a/rpm-4.13.0-rpmtd-out-of-bounds.patch b/rpm-4.13.0-rpmtd-out-of-bounds.patch
deleted file mode 100644
index 9d3cad5..0000000
--- a/rpm-4.13.0-rpmtd-out-of-bounds.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b722cf86200505b3e3fcbb2095c4ff61f1f5a2ab Mon Sep 17 00:00:00 2001
-From: Lubos Kardos
-Date: Mon, 25 Apr 2016 13:31:08 +0200
-Subject: [PATCH 1/2] Fix reading rpmtd behind its size in formatValue()
- (rhbz:1316896)
-
-When it is read from index higher than size of rpmtd, return "(none)".
----
- lib/headerfmt.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/headerfmt.c b/lib/headerfmt.c
-index fb29d6f..f6fd707 100644
---- a/lib/headerfmt.c
-+++ b/lib/headerfmt.c
-@@ -623,7 +623,7 @@ static char * formatValue(headerSprintfArgs hsa, sprintfTag tag, int element)
- char * t, * te;
- rpmtd td;
-
-- if ((td = getData(hsa, tag->tag))) {
-+ if ((td = getData(hsa, tag->tag)) && td->count > element) {
- td->ix = element; /* Ick, use iterators instead */
- val = tag->fmt(td);
- } else {
---
-1.9.3
-
diff --git a/rpm-4.13.0-selinux--permissive-scriptlets.patch b/rpm-4.13.0-selinux--permissive-scriptlets.patch
deleted file mode 100644
index ddc0f5d..0000000
--- a/rpm-4.13.0-selinux--permissive-scriptlets.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0d214a17e412bffa00cfede2d884f02ac78b8434 Mon Sep 17 00:00:00 2001
-From: Florian Festi
-Date: Mon, 12 Oct 2015 12:47:45 +0200
-Subject: [PATCH] Permit scriptlet exec context setting to fail in
- non-enforcing modes
-
-for new code path, too.
-
-See also 9c082fb8689efdaa5a595d3043e67ccec4ed930c
----
- plugins/selinux.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/selinux.c b/plugins/selinux.c
-index ea6853b..2751815 100644
---- a/plugins/selinux.c
-+++ b/plugins/selinux.c
-@@ -134,9 +134,6 @@ exit:
- freecon(fcon);
- freecon(mycon);
-
-- /* If selinux is not enforcing, we don't care either */
-- if (rc && security_getenforce() < 1)
-- rc = RPMRC_OK;
- #else
- if (sehandle == NULL)
- return RPMRC_OK;
-@@ -149,6 +146,9 @@ exit:
- path, (xx < 0 ? strerror(errno) : ""));
- }
- #endif
-+ /* If selinux is not enforcing, we don't care either */
-+ if (rc && security_getenforce() < 1)
-+ rc = RPMRC_OK;
-
- return rc;
- }
---
-2.1.0
-
diff --git a/rpm-4.13.0-stringFormat-sigsegv.patch b/rpm-4.13.0-stringFormat-sigsegv.patch
deleted file mode 100644
index d2010d0..0000000
--- a/rpm-4.13.0-stringFormat-sigsegv.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cddf43a56f19711866371f02f378dc4095b0fadd Mon Sep 17 00:00:00 2001
-From: Lubos Kardos
-Date: Mon, 25 Apr 2016 14:38:47 +0200
-Subject: [PATCH 2/2] Fix sigsegv in stringFormat() (rhbz:1316903)
-
-Just skip duping of NULL and return it. Returned NULL is handled in
-upper layer.
----
- lib/formats.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/lib/formats.c b/lib/formats.c
-index e3626ed..bad0b2d 100644
---- a/lib/formats.c
-+++ b/lib/formats.c
-@@ -44,9 +44,12 @@ static char * stringFormat(rpmtd td)
- case RPM_NUMERIC_CLASS:
- rasprintf(&val, "%" PRIu64, rpmtdGetNumber(td));
- break;
-- case RPM_STRING_CLASS:
-- val = xstrdup(rpmtdGetString(td));
-+ case RPM_STRING_CLASS: {
-+ const char *str = rpmtdGetString(td);
-+ if (str)
-+ val = xstrdup(str);
- break;
-+ }
- case RPM_BINARY_CLASS:
- val = pgpHexStr(td->data, td->count);
- break;
---
-1.9.3
-
diff --git a/rpm-4.13.0-unlimited-macro-expand.patch b/rpm-4.13.0-unlimited-macro-expand.patch
deleted file mode 100644
index 4f1a1a7..0000000
--- a/rpm-4.13.0-unlimited-macro-expand.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From 61838b0fdacb71a881baac164043b8e40ddfbec5 Mon Sep 17 00:00:00 2001
-From: Tom Hughes
-Date: Tue, 17 Nov 2015 17:36:16 +0000
-Subject: [PATCH] Remove size limit when expanding macros
-
-This removes a seemingly undocumented, and not even well defined, limit
-on the size of a macro expansion when parsing a spec file.
-
-[lkardos@redhat.com: created new funtion expandMacrosU() (Unlimited)
-instead of modifying expandMacros() in order not to change API/ABI]
-
-Signed-off-by: Lubos Kardos
----
- build/files.c | 6 ++++--
- build/pack.c | 6 ++++--
- build/parseSpec.c | 10 ++++++----
- rpmio/macro.c | 17 +++++++++++++++++
- rpmio/rpmmacro.h | 12 ++++++++++++
- 5 files changed, 43 insertions(+), 8 deletions(-)
-
-diff --git a/build/files.c b/build/files.c
-index ea595b9..2fc434e 100644
---- a/build/files.c
-+++ b/build/files.c
-@@ -1631,11 +1631,13 @@ static rpmRC readFilesManifest(rpmSpec spec, Package pkg, const char *path)
- while (fgets(buf, sizeof(buf), fd)) {
- if (handleComments(buf))
- continue;
-- if (expandMacros(spec, spec->macros, buf, sizeof(buf))) {
-+ char *expanded = expandMacrosU(spec, spec->macros, buf);
-+ if (expanded == NULL) {
- rpmlog(RPMLOG_ERR, _("line: %s\n"), buf);
- goto exit;
- }
-- argvAdd(&(pkg->fileList), buf);
-+ argvAdd(&(pkg->fileList), expanded);
-+ free(expanded);
- nlines++;
- }
-
-diff --git a/build/pack.c b/build/pack.c
-index 213d85e..6ffe450 100644
---- a/build/pack.c
-+++ b/build/pack.c
-@@ -132,11 +132,13 @@ static rpmRC addFileToTag(rpmSpec spec, const char * file,
- }
-
- while (fgets(buf, sizeof(buf), f)) {
-- if (expandMacros(spec, spec->macros, buf, sizeof(buf))) {
-+ char *expanded = expandMacrosU(spec, spec->macros, buf);
-+ if (expanded == NULL) {
- rpmlog(RPMLOG_ERR, _("%s: line: %s\n"), fn, buf);
- goto exit;
- }
-- appendStringBuf(sb, buf);
-+ appendStringBuf(sb, expanded);
-+ free(expanded);
- }
- headerPutString(h, tag, getStringBuf(sb));
- rc = RPMRC_OK;
-diff --git a/build/parseSpec.c b/build/parseSpec.c
-index edc3d00..610e371 100644
---- a/build/parseSpec.c
-+++ b/build/parseSpec.c
-@@ -180,13 +180,15 @@ static int expandMacrosInSpecBuf(rpmSpec spec, int strip)
- if (lbuf[0] == '#')
- isComment = 1;
-
-- lbuf = xstrdup(spec->lbuf);
-+ lbuf = spec->lbuf;
-
-- rc = expandMacros(spec, spec->macros, spec->lbuf, spec->lbufSize);
-- if (rc) {
-+ spec->lbuf = expandMacrosU(spec, spec->macros, lbuf);
-+ if (spec->lbuf == NULL) {
- rpmlog(RPMLOG_ERR, _("line %d: %s\n"),
-- spec->lineNum, spec->lbuf);
-+ spec->lineNum, lbuf);
- goto exit;
-+ } else {
-+ spec->lbufSize = strlen(spec->lbuf) + 1;
- }
-
- if (strip & STRIP_COMMENTS && isComment) {
-diff --git a/rpmio/macro.c b/rpmio/macro.c
-index 4b3c41b..4c8934e 100644
---- a/rpmio/macro.c
-+++ b/rpmio/macro.c
-@@ -1471,6 +1471,23 @@ int expandMacros(void * spec, rpmMacroContext mc, char * sbuf, size_t slen)
- return rc;
- }
-
-+char *expandMacrosU(void * spec, rpmMacroContext mc, char * sbuf)
-+{
-+ char *target = NULL;
-+ int rc;
-+
-+ mc = rpmmctxAcquire(mc);
-+ rc = doExpandMacros(mc, sbuf, &target);
-+ rpmmctxRelease(mc);
-+
-+ if (rc) {
-+ free(target);
-+ target = NULL;
-+ }
-+
-+ return target;
-+}
-+
- void
- rpmDumpMacroTable(rpmMacroContext mc, FILE * fp)
- {
-diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
-index 765c78c..a4884b0 100644
---- a/rpmio/rpmmacro.h
-+++ b/rpmio/rpmmacro.h
-@@ -66,6 +66,18 @@ int expandMacros (void * spec, rpmMacroContext mc,
- size_t slen);
-
- /** \ingroup rpmmacro
-+ * Expand macro into buffer.
-+ * @deprecated Use rpmExpand().
-+ * @todo Eliminate from API.
-+ * @param spec cookie (unused)
-+ * @param mc macro context (NULL uses global context).
-+ * @retval sbuf input macro to expand
-+ * @return macro expansion (malloc'ed) or NULL on failure
-+ */
-+char *expandMacrosU (void * spec, rpmMacroContext mc,
-+ char * sbuf);
-+
-+/** \ingroup rpmmacro
- * Add macro to context.
- * @deprecated Use rpmDefineMacro().
- * @param mc macro context (NULL uses global context).
---
-1.9.3
-
-From aee8446eb498fec7bfd7a2848ab97440b7bb7226 Mon Sep 17 00:00:00 2001
-From: Tom Hughes
-Date: Mon, 23 Nov 2015 09:38:37 +0000
-Subject: [PATCH 1/2] Rename expandMacrosU to rpmExpandMacros
-
-Address review issues from #32 by renaming the function and
-cleaning up the comment and parameter list.
----
- build/files.c | 2 +-
- build/pack.c | 2 +-
- build/parseSpec.c | 2 +-
- rpmio/macro.c | 2 +-
- rpmio/rpmmacro.h | 10 ++++------
- 5 files changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/build/files.c b/build/files.c
-index 4d49449..0bc4acc 100644
---- a/build/files.c
-+++ b/build/files.c
-@@ -1624,7 +1624,7 @@ static rpmRC readFilesManifest(rpmSpec spec, Package pkg, const char *path)
- while (fgets(buf, sizeof(buf), fd)) {
- if (handleComments(buf))
- continue;
-- char *expanded = expandMacrosU(spec, spec->macros, buf);
-+ char *expanded = rpmExpandMacros(spec->macros, buf, 0);
- if (expanded == NULL) {
- rpmlog(RPMLOG_ERR, _("line: %s\n"), buf);
- goto exit;
-diff --git a/build/pack.c b/build/pack.c
-index 6ffe450..ec06bc8 100644
---- a/build/pack.c
-+++ b/build/pack.c
-@@ -132,7 +132,7 @@ static rpmRC addFileToTag(rpmSpec spec, const char * file,
- }
-
- while (fgets(buf, sizeof(buf), f)) {
-- char *expanded = expandMacrosU(spec, spec->macros, buf);
-+ char *expanded = rpmExpandMacros(spec->macros, buf, 0);
- if (expanded == NULL) {
- rpmlog(RPMLOG_ERR, _("%s: line: %s\n"), fn, buf);
- goto exit;
-diff --git a/build/parseSpec.c b/build/parseSpec.c
-index 610e371..6171bb0 100644
---- a/build/parseSpec.c
-+++ b/build/parseSpec.c
-@@ -182,7 +182,7 @@ static int expandMacrosInSpecBuf(rpmSpec spec, int strip)
-
- lbuf = spec->lbuf;
-
-- spec->lbuf = expandMacrosU(spec, spec->macros, lbuf);
-+ spec->lbuf = rpmExpandMacros(spec->macros, lbuf, 0);
- if (spec->lbuf == NULL) {
- rpmlog(RPMLOG_ERR, _("line %d: %s\n"),
- spec->lineNum, lbuf);
-diff --git a/rpmio/macro.c b/rpmio/macro.c
-index 4c8934e..f9ca027 100644
---- a/rpmio/macro.c
-+++ b/rpmio/macro.c
-@@ -1471,7 +1471,7 @@ int expandMacros(void * spec, rpmMacroContext mc, char * sbuf, size_t slen)
- return rc;
- }
-
--char *expandMacrosU(void * spec, rpmMacroContext mc, char * sbuf)
-+char *rpmExpandMacros(rpmMacroContext mc, const char * sbuf, int flags)
- {
- char *target = NULL;
- int rc;
-diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
-index a4884b0..f5ddcac 100644
---- a/rpmio/rpmmacro.h
-+++ b/rpmio/rpmmacro.h
-@@ -67,15 +67,13 @@ int expandMacros (void * spec, rpmMacroContext mc,
-
- /** \ingroup rpmmacro
- * Expand macro into buffer.
-- * @deprecated Use rpmExpand().
-- * @todo Eliminate from API.
-- * @param spec cookie (unused)
- * @param mc macro context (NULL uses global context).
-- * @retval sbuf input macro to expand
-+ * @param sbuf input macro to expand
-+ * @param flags flags (currently unused)
- * @return macro expansion (malloc'ed) or NULL on failure
- */
--char *expandMacrosU (void * spec, rpmMacroContext mc,
-- char * sbuf);
-+char *rpmExpandMacros (rpmMacroContext mc, const char * sbuf,
-+ int flags);
-
- /** \ingroup rpmmacro
- * Add macro to context.
---
-1.9.3
-
-From ddf9ec7befe83ba1a12453a56e4e471aa9bcf4d3 Mon Sep 17 00:00:00 2001
-From: Lubos Kardos
-Date: Thu, 26 Nov 2015 15:20:05 +0100
-Subject: [PATCH 2/2] rpmExpandMacros() is modified to be able to return more
- return codes
-
-Now rpmExpandMacros() returns integer as a return value. Negative return
-value implies failure. Return values can be more utilized in the future.
-E. g. return value could specify how many macros were expanded in given
-string.
----
- build/files.c | 4 ++--
- build/pack.c | 4 ++--
- build/parseSpec.c | 21 +++++++++------------
- rpmio/macro.c | 9 +++++----
- rpmio/rpmmacro.h | 7 ++++---
- 5 files changed, 22 insertions(+), 23 deletions(-)
-
-diff --git a/build/files.c b/build/files.c
-index 0bc4acc..d00a785 100644
---- a/build/files.c
-+++ b/build/files.c
-@@ -1604,6 +1604,7 @@ static rpmRC readFilesManifest(rpmSpec spec, Package pkg, const char *path)
- FILE *fd = NULL;
- rpmRC rc = RPMRC_FAIL;
- unsigned int nlines = 0;
-+ char *expanded;
-
- if (*path == '/') {
- fn = rpmGetPath(path, NULL);
-@@ -1624,8 +1625,7 @@ static rpmRC readFilesManifest(rpmSpec spec, Package pkg, const char *path)
- while (fgets(buf, sizeof(buf), fd)) {
- if (handleComments(buf))
- continue;
-- char *expanded = rpmExpandMacros(spec->macros, buf, 0);
-- if (expanded == NULL) {
-+ if(rpmExpandMacros(spec->macros, buf, &expanded, 0) < 0) {
- rpmlog(RPMLOG_ERR, _("line: %s\n"), buf);
- goto exit;
- }
-diff --git a/build/pack.c b/build/pack.c
-index ec06bc8..bfb4c73 100644
---- a/build/pack.c
-+++ b/build/pack.c
-@@ -132,8 +132,8 @@ static rpmRC addFileToTag(rpmSpec spec, const char * file,
- }
-
- while (fgets(buf, sizeof(buf), f)) {
-- char *expanded = rpmExpandMacros(spec->macros, buf, 0);
-- if (expanded == NULL) {
-+ char *expanded;
-+ if(rpmExpandMacros(spec->macros, buf, &expanded, 0) < 0) {
- rpmlog(RPMLOG_ERR, _("%s: line: %s\n"), fn, buf);
- goto exit;
- }
-diff --git a/build/parseSpec.c b/build/parseSpec.c
-index 6171bb0..9fff0e2 100644
---- a/build/parseSpec.c
-+++ b/build/parseSpec.c
-@@ -169,7 +169,7 @@ static int restoreFirstChar(rpmSpec spec)
- static int expandMacrosInSpecBuf(rpmSpec spec, int strip)
- {
- char *lbuf = NULL;
-- int rc = 0, isComment = 0;
-+ int isComment = 0;
-
- /* Don't expand macros (eg. %define) in false branch of %if clause */
- if (!spec->readStack->reading)
-@@ -180,17 +180,17 @@ static int expandMacrosInSpecBuf(rpmSpec spec, int strip)
- if (lbuf[0] == '#')
- isComment = 1;
-
-- lbuf = spec->lbuf;
-
-- spec->lbuf = rpmExpandMacros(spec->macros, lbuf, 0);
-- if (spec->lbuf == NULL) {
-+ if(rpmExpandMacros(spec->macros, spec->lbuf, &lbuf, 0) < 0) {
- rpmlog(RPMLOG_ERR, _("line %d: %s\n"),
-- spec->lineNum, lbuf);
-- goto exit;
-- } else {
-- spec->lbufSize = strlen(spec->lbuf) + 1;
-+ spec->lineNum, spec->lbuf);
-+ return 1;
- }
-
-+ free(spec->lbuf);
-+ spec->lbuf = lbuf;
-+ spec->lbufSize = strlen(spec->lbuf) + 1;
-+
- if (strip & STRIP_COMMENTS && isComment) {
- char *bufA = lbuf;
- char *bufB = spec->lbuf;
-@@ -212,10 +212,7 @@ static int expandMacrosInSpecBuf(rpmSpec spec, int strip)
- spec->lineNum, lbuf);
- }
-
--exit:
-- free(lbuf);
--
-- return rc;
-+ return 0;
- }
-
- /* Return zero on success, 1 if we need to read more and -1 on errors. */
-diff --git a/rpmio/macro.c b/rpmio/macro.c
-index f9ca027..0c009ea 100644
---- a/rpmio/macro.c
-+++ b/rpmio/macro.c
-@@ -1471,7 +1471,7 @@ int expandMacros(void * spec, rpmMacroContext mc, char * sbuf, size_t slen)
- return rc;
- }
-
--char *rpmExpandMacros(rpmMacroContext mc, const char * sbuf, int flags)
-+int rpmExpandMacros(rpmMacroContext mc, const char * sbuf, char ** obuf, int flags)
- {
- char *target = NULL;
- int rc;
-@@ -1482,10 +1482,11 @@ char *rpmExpandMacros(rpmMacroContext mc, const char * sbuf, int flags)
-
- if (rc) {
- free(target);
-- target = NULL;
-+ return -1;
-+ } else {
-+ *obuf = target;
-+ return 1;
- }
--
-- return target;
- }
-
- void
-diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
-index f5ddcac..8027f98 100644
---- a/rpmio/rpmmacro.h
-+++ b/rpmio/rpmmacro.h
-@@ -69,11 +69,12 @@ int expandMacros (void * spec, rpmMacroContext mc,
- * Expand macro into buffer.
- * @param mc macro context (NULL uses global context).
- * @param sbuf input macro to expand
-+ * @param obuf macro expansion (malloc'ed)
- * @param flags flags (currently unused)
-- * @return macro expansion (malloc'ed) or NULL on failure
-+ * @return negative on failure
- */
--char *rpmExpandMacros (rpmMacroContext mc, const char * sbuf,
-- int flags);
-+int rpmExpandMacros (rpmMacroContext mc, const char * sbuf,
-+ char ** obuf, int flags);
-
- /** \ingroup rpmmacro
- * Add macro to context.
---
-1.9.3
-
diff --git a/rpm-4.13.0-unsupported-keys.patch b/rpm-4.13.0-unsupported-keys.patch
deleted file mode 100644
index 6603bbb..0000000
--- a/rpm-4.13.0-unsupported-keys.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2dd06933726cf5191e05264901789f8e1da6e51d Mon Sep 17 00:00:00 2001
-From: Lubos Kardos
-Date: Fri, 6 Nov 2015 12:45:32 +0100
-Subject: [PATCH] Fix SIGSEGV in case of old unsupported gpg keys
- (rhbz:1277464)
-
-Regression from: a173d781a631a92524ce5be364c679ba19b3e321
-Adds also warning that gpg key is not supported.
----
- rpmio/rpmkeyring.c | 5 ++---
- rpmio/rpmpgp.c | 5 +++++
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/rpmio/rpmkeyring.c b/rpmio/rpmkeyring.c
-index b6b5703..c3d2c19 100644
---- a/rpmio/rpmkeyring.c
-+++ b/rpmio/rpmkeyring.c
-@@ -159,9 +159,8 @@ rpmPubkey *rpmGetSubkeys(rpmPubkey mainkey, int *count)
- int pgpsubkeysCount = 0;
- int i;
-
-- if (!pgpPrtParamsSubkeys(mainkey->pkt, mainkey->pktlen, mainkey->pgpkey,
-- &pgpsubkeys, &pgpsubkeysCount)) {
--
-+ if (mainkey && !pgpPrtParamsSubkeys(mainkey->pkt, mainkey->pktlen,
-+ mainkey->pgpkey, &pgpsubkeys, &pgpsubkeysCount)) {
-
- subkeys = xmalloc(pgpsubkeysCount * sizeof(*subkeys));
-
-diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
-index f020650..6f8d77b 100644
---- a/rpmio/rpmpgp.c
-+++ b/rpmio/rpmpgp.c
-@@ -624,6 +624,7 @@ static int pgpPrtSig(pgpTag tag, const uint8_t *h, size_t hlen,
- rc = pgpPrtSigParams(tag, v->pubkey_algo, v->sigtype, p, h, hlen, _digp);
- } break;
- default:
-+ rpmlog(RPMLOG_WARNING, _("Unsupported version of key: V%d\n"), h[0]);
- rc = 1;
- break;
- }
-@@ -710,6 +711,8 @@ static int pgpPrtKey(pgpTag tag, const uint8_t *h, size_t hlen,
- rc = pgpPrtPubkeyParams(v->pubkey_algo, p, h, hlen, _digp);
- }
- } break;
-+ default:
-+ rpmlog(RPMLOG_WARNING, _("Unsupported version of key: V%d\n"), h[0]);
- }
- return rc;
- }
-@@ -775,6 +778,8 @@ static int getFingerprint(const uint8_t *h, size_t hlen, pgpKeyID_t keyid)
- }
-
- } break;
-+ default:
-+ rpmlog(RPMLOG_WARNING, _("Unsupported version of key: V%d\n"), h[0]);
- }
- return rc;
- }
---
-1.9.3
-
diff --git a/rpm.spec b/rpm.spec
index aa08864..42c36c2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -18,7 +18,7 @@
%define rpmhome /usr/lib/rpm
%define rpmver 4.13.0
-%define snapver rc1
+#define snapver rc1
%define srcver %{rpmver}%{?snapver:-%{snapver}}
%define eggver %{rpmver}%{?snapver:_%{snapver}}
@@ -29,7 +29,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}13%{?dist}
+Release: %{?snapver:0.%{snapver}.}1%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
@@ -52,31 +52,11 @@ Patch4: rpm-4.8.1-use-gpg2.patch
Patch5: rpm-4.12.0-rpm2cpio-hack.patch
# Patches already upstream:
-Patch100: rpm-4.13.0-rc1-Fix-new-richdep-syntax.patch
-Patch101: rpm-4.13.0-selinux--permissive-scriptlets.patch
-Patch102: rpm-4.13.0-unsupported-keys.patch
-Patch103: rpm-4.13.0-ignore-sigpipe.patch
-Patch104: rpm-4.13.0-fix-crash-on-corrupted.patch
-Patch105: rpm-4.13.0-chroot-file-triggers.patch
-Patch106: rpm-4.13.0-recursing-rpmdeps.patch
-Patch107: rpm-4.13.0-unlimited-macro-expand.patch
-Patch108: rpm-4.13.0-rpmtd-out-of-bounds.patch
-Patch109: rpm-4.13.0-stringFormat-sigsegv.patch
# These are not yet upstream
Patch302: rpm-4.7.1-geode-i686.patch
# Probably to be upstreamed in slightly different form
Patch304: rpm-4.9.1.1-ld-flags.patch
-# Compressed debuginfo support (#833311)
-Patch305: rpm-4.10.0-dwz-debuginfo.patch
-# Minidebuginfo support (#834073)
-Patch306: rpm-4.10.0-minidebuginfo.patch
-# Fix CRC32 after dwz (#971119)
-Patch307: rpm-4.11.1-sepdebugcrcfix.patch
-# Fix race condidition where unchecked data is exposed in the file system
-Patch308: rpm-4.12.0.x-CVE-2013-6435.patch
-# Add check against malicious CPIO file name size
-Patch309: rpm-4.12.0.x-CVE-2014-8118.patch
# Partially GPL/LGPL dual-licensed and some bits with BSD
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
@@ -574,6 +554,9 @@ exit 0
%doc doc/librpm/html/*
%changelog
+* Thu Nov 03 2016 Panu Matilainen - 4.13.0-1
+- Rebase to 4.13.0 (http://rpm.org/wiki/Releases/4.13.0)
+
* Mon Apr 25 2016 Lubos Kardos - 4.13.0-0.rc1.13
- Fix sigsegv in stringFormat() (#1316903)
- Fix reading rpmtd behind its size in formatValue() (#1316896)
diff --git a/sources b/sources
index be9b46c..ff2961f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9be5490f187bc4d9710c9fdae529e7b rpm-4.13.0-rc1.tar.bz2
+f64e70c7548911da51a11651a789e30e rpm-4.13.0.tar.bz2