From e3ce4eba285f834795d7c83324b0a3edfbc47969 Mon Sep 17 00:00:00 2001
From: Florian Festi <ffesti@redhat.com>
Date: Aug 03 2022 15:42:27 +0000
Subject: Make rpm2cpio.sh more robust


Also reduce bytes read for checking the magic header to 4 as the zero
bytes read break on aarch64 for some reason.

Resolves: #1983015

---

diff --git a/rpm-4.16.1.3-Make-rpm2cpio.sh-more-robust.patch b/rpm-4.16.1.3-Make-rpm2cpio.sh-more-robust.patch
index f2a0989..38b2f5a 100644
--- a/rpm-4.16.1.3-Make-rpm2cpio.sh-more-robust.patch
+++ b/rpm-4.16.1.3-Make-rpm2cpio.sh-more-robust.patch
@@ -32,7 +32,7 @@ index 4531271cc..74aeed851 100755
  }
  
 -case "$(_dd 0 bs=8 count=1)" in
-+case "$(_dd 0 bs=8 count=1 | tr -d '\0')" in
++case "$(_dd 0 bs=4 count=1 | tr -d '\0')" in
  	"$(printf '\355\253\356\333')"*) ;; # '\xed\xab\xee\xdb'
  	*) fatal "File doesn't look like rpm: $pkg" ;;
  esac
diff --git a/rpm.spec b/rpm.spec
index 491f2f1..d21d853 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -32,7 +32,7 @@
 
 %global rpmver 4.16.1.3
 #global snapver rc1
-%global rel 16
+%global rel 17
 %global sover 9
 
 %global srcver %{rpmver}%{?snapver:-%{snapver}}
@@ -614,7 +614,7 @@ fi
 %doc doc/librpm/html/*
 
 %changelog
-* Fri Jul 22 2022 Florian Festi <ffesti@redhat.com> - 4.16.1.3-16
+* Wed Aug 03 2022 Florian Festi <ffesti@redhat.com> - 4.16.1.3-17
 - Make rpm2cpio.sh more robust (#1983015)
 
 * Thu Jun 30 2022 Nick Clifton  <nickc@redhat.com> - 4.16.1.3-15