commit 85771a72b1e8e2eceb7df161d81b8f985c418f30
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Tue Oct 9 22:53:53 2012 +0200
- closer to fixing double-free without neon
....10-fix-neon-saving-error-pages-as-target-file.patch | 17 -----------------
rpm.spec | 7 +------
2 files changed, 1 insertion(+), 23 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index d282765..5a97d02 100644
--- 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}" \
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 2f4602d..300a350 100644
--- 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/85771a72b1e8e2eceb7df161d81b8f985c418f30
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
