systemtap/systemtap-3.2-modern-rpm-api.patch
2017-08-10 21:25:37 +02:00

34 lines
1.1 KiB
Diff

diff -up systemtap-3.2/rpm_finder.cxx.newrpm systemtap-3.2/rpm_finder.cxx
--- systemtap-3.2/rpm_finder.cxx.newrpm 2017-08-10 22:13:10.283393224 +0300
+++ systemtap-3.2/rpm_finder.cxx 2017-08-10 22:13:28.320385642 +0300
@@ -22,7 +22,6 @@ using namespace std;
extern "C" {
-#define _RPM_4_4_COMPAT
#include <string.h>
#include <rpm/rpmlib.h>
#include <rpm/rpmts.h>
@@ -100,8 +99,7 @@ missing_rpm_enlist (systemtap_session& s
break;
/* Verify the kernel file is not already installed. */
- rpminfo = headerSprintf(h, header,
- rpmTagTable, rpmHeaderFormats, &err);
+ rpminfo = headerFormat(h, header, &err);
if (!rpminfo)
{
@@ -154,9 +152,8 @@ missing_rpm_enlist (systemtap_session& s
/* The allocated memory gets utilized below for MISSING_RPM_HASH. */
if(strcmp(rpm_type,"-debuginfo")==0){
xfree(rpminfo);
- rpminfo = headerSprintf(h,
- "%{name}-%{version}-%{release}.%{arch}",
- rpmTagTable, rpmHeaderFormats, &err);
+ rpminfo = headerFormat(h,
+ "%{name}-%{version}-%{release}.%{arch}", &err);
}
if (!rpminfo)
{