perl-bindings-do-not-use-xmalloc.patch applied upstream

diff --git a/rpm-5.4.13-perl-bindings-do-not-use-xmalloc.patch b/rpm-5.4.13-perl-bindings-do-not-use-xmalloc.patch
deleted file mode 100644 (file)
index 9eff10f..0000000
--- a/rpm-5.4.13-perl-bindings-do-not-use-xmalloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rpm-5.4.13/perl/RPM_Spec.xs.xmalloc~       2013-09-13 06:20:58.102257264 +0200
-+++ rpm-5.4.13/perl/RPM_Spec.xs        2013-09-13 06:21:28.680226625 +0200
-@@ -234,7 +234,7 @@ icon(spec)
-         char * dest = NULL;
-         int len;
-         len = strlen(spec->sources->source);
--        dest = xmalloc(len+1);
-+        dest = malloc(len+1);
-       dest[len] = '\0';
-         memcpy(dest, spec->sources->source, len);
-         XPUSHs(sv_2mortal(newSVpv(dest, len)));
-@@ -249,7 +249,7 @@ icon_url(spec)
-         char * dest = NULL;
-         int len;
-         len = strlen(spec->sources->fullSource);
--        dest = xmalloc(len+1);
-+        dest = malloc(len+1);
-         memcpy(dest, spec->sources->fullSource, len);
-       dest[len] = '\0';
-         XPUSHs(sv_2mortal(newSVpv(dest, len)));

diff --git a/rpm.spec b/rpm.spec
index 6f6f3c782d535b802cfaf7a822a02c2ff5d79b97..14c7b33e6d63dafd25ca5a4370cf213aeb604387 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -286,7 +286,6 @@ Patch1042:  %{name}-5.4.9-fix-rpm_qa-pattern.patch
 Patch1044:     %{name}-5.4.12-fix-rpmlua-print.patch
 Patch1045:     %{name}-5.4.12-fix-rpmpython-module-import-init.patch
 
-Patch1047:     %{name}-5.4.13-perl-bindings-do-not-use-xmalloc.patch
 # proyvind:
 # there's a rpmdbchk tool I wrote a while back, which might help you. although
 # the incidents it's able to deal with is rather limited ATM... it might help
@@ -1009,7 +1008,6 @@ cd -
 #%patch1044 -p1 RECHECK
 %patch1045 -p1
 
-%patch1047 -p1
 %patch1048 -p1
 %patch1049 -p1