Bug#396631: NMU uploaded
Hi,
I uploaded an NMU of your package.
Please see this as help to get the package into a releaseable condition for
etch.
Please find the used diff below.
Cheers,
Andi
diff -Nur ../apr-1.2.7~~/debian/changelog ../apr-1.2.7/debian/changelog
--- ../apr-1.2.7~~/debian/changelog 2006-12-09 20:46:15.000000000 +0000
+++ ../apr-1.2.7/debian/changelog 2006-12-20 08:19:55.000000000 +0000
@@ -1,3 +1,11 @@
+apr (1.2.7-8.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Apply better working 015_sendfile_lfs.dpatch this time.
+ Again Closes: #396631
+
+ -- Andreas Barth <aba@not.so.argh.org> Wed, 20 Dec 2006 08:19:19 +0000
+
apr (1.2.7-8.1) unstable; urgency=high
* Non-maintainer upload.
diff -Nur ../apr-1.2.7~~/debian/patches/015_sendfile_lfs.dpatch ../apr-1.2.7/debian/patches/015_sendfile_lfs.dpatch
--- ../apr-1.2.7~~/debian/patches/015_sendfile_lfs.dpatch 2006-12-09 20:45:01.000000000 +0000
+++ ../apr-1.2.7/debian/patches/015_sendfile_lfs.dpatch 2006-12-15 21:08:05.000000000 +0000
@@ -10,7 +10,7 @@
Index: network_io/unix/sendrecv.c
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
-@@ -240,31 +240,74 @@
+@@ -240,31 +240,77 @@
#if defined(__linux__) && defined(HAVE_WRITEV)
@@ -59,13 +59,16 @@
+ ret = sendfile64(out, in, off, len);
+ while (ret == -1 && errno == EINTR);
+
-+ if (ret == -1 && errno == ENOSYS) {
-+ sendfile64_enosys = 1;
-+ errno = EINVAL;
-+ }
-+ return ret;
++ if (ret != -1 || errno != ENOSYS)
++ return ret;
++
++ sendfile64_enosys = 1;
+ }
+#endif
++ if (*off > INT_MAX) {
++ errno = EINVAL;
++ return -1;
++ }
+ offtmp = *off;
+ do
+ ret = sendfile(out, in, &offtmp, len);
@@ -103,7 +106,7 @@
if (!hdtr) {
hdtr = &no_hdtr;
-@@ -310,12 +353,10 @@
+@@ -310,12 +356,10 @@
goto do_select;
}
@@ -117,7 +120,7 @@
while ((rv == -1) && (errno == EAGAIN || errno == EWOULDBLOCK)
&& (sock->timeout > 0)) {
-@@ -326,12 +367,10 @@
+@@ -326,12 +370,10 @@
return arv;
}
else {
--
http://home.arcor.de/andreas-barth/
Reply to: