- closer to fixing double-free without neon

diff --git a/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch b/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
index 2f4602d4e705bb7292692eaa4c48b825298dee25..300a35097d1a80aa05c6c03e28a34ac576aa270c 100644 (file)
--- a/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
+++ b/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
@@ -37,20 +37,3 @@
  
      if (rc)
        goto errxit;
---- rpm-5.4.10/rpmio/rpmio.c.dl_error~ 2012-07-06 17:39:19.000000000 +0200
-+++ rpm-5.4.10/rpmio/rpmio.c   2012-07-11 19:47:59.396732322 +0200
-@@ -2306,9 +2306,12 @@ fprintf(stderr, "*** ufdOpen(%s,0x%x,0%o
-       u->openError = httpReq(fd, cmd, path);
- #endif
-       if (u->openError < 0) {
-+          /* XXX rpmdav doesn't behave consistently with the rest...*/
-+#ifndef WITH_NEON
-           /* XXX make sure that we can exit through ufdClose */
--          fd = fdLink(fd, "error ctrl (ufdOpen HTTP)");
--          fd = fdLink(fd, "error data (ufdOpen HTTP)");
-+          fd = u->ctrl = fdLink(fd, "error ctrl (ufdOpen HTTP)");
-+          fd = u->data = fdLink(fd, "error data (ufdOpen HTTP)");
-+#endif
-       } else {
-           fd->bytesRemain = ((!strcmp(cmd, "GET"))
-               ?  fd->contentLength : -1);

diff --git a/rpm.spec b/rpm.spec
index d282765bed406586a7481c0bc025cc5fb6e2586b..5a97d027966ee1de683f05070f5f6fcdfac9ea64 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -868,7 +868,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1034 -p1
 %patch1035 -p1
 %patch1036 -p1
-#patch1037 -p1
+%patch1037 -p1
 %patch1038 -p1
 %patch1039 -p1
 %patch1040 -p1
@@ -937,11 +937,6 @@ sed -i \
        --with-bugreport="http://bugs.pld-linux.org/" \
        --with-vendor=pld
 
-#if %{without neon}
-#{__mv} tests/probes-test-1-0.src.rpm{,-no-neon}
-#{__mv} tests/triggers-D-1.0-1.src.rpm{,-no-neon}
-#endif
-
 %{__make} -j1 \
        CC="%{__cc}" \
        CXX="%{__cxx}" \