[Pkg-apache-commits] r1023 - in /tags/1.2.7-8.2: ./ changelog patches/00list patches/016_sendfile_hurd.dpatch

[peters at alioth.debian.org]

Author: peters
Date: Thu Aug  6 13:34:59 2009
New Revision: 1023

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1023
Log:
Tag the NMU of apr 1.2.7-8.2.

Added:
    tags/1.2.7-8.2/
      - copied from r292, trunk/apr/
Modified:
    tags/1.2.7-8.2/changelog
    tags/1.2.7-8.2/patches/00list
    tags/1.2.7-8.2/patches/016_sendfile_hurd.dpatch

Modified: tags/1.2.7-8.2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/tags/1.2.7-8.2/changelog?rev=1023&op=diff
==============================================================================
--- tags/1.2.7-8.2/changelog (original)
+++ tags/1.2.7-8.2/changelog Thu Aug  6 13:34:59 2009
@@ -1,12 +1,18 @@
-apr (1.2.7-9) UNRELEASED; urgency=low
+apr (1.2.7-8.2) unstable; urgency=high
 
-  [ Peter Samuelson ]
-  * patches/015sendfile-amd64:
-    - Rename to 015_sendfile_lfs
-    - Refactor apr_socket_sendfile a little, to make it possible to:
-    - Add logic to detect sendfile64() at runtime (Closes: #396631)
+  * Non-maintainer upload.
+  * Apply better working 015_sendfile_lfs.dpatch this time.
+    Again Closes: #396631
 
- -- Peter Samuelson <peter at p12n.org>  Wed, 15 Nov 2006 05:58:38 -0600
+ -- Andreas Barth <aba at not.so.argh.org>  Wed, 20 Dec 2006 08:19:19 +0000
+
+apr (1.2.7-8.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix 0-lenght files. Take 015_sendfile_lfs.dpatch from svn for this.
+    Closes: #396631
+
+ -- Andreas Barth <aba at not.so.argh.org>  Sat,  9 Dec 2006 20:39:59 +0000
 
 apr (1.2.7-8) unstable; urgency=low
 

Modified: tags/1.2.7-8.2/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/tags/1.2.7-8.2/patches/00list?rev=1023&op=diff
==============================================================================
--- tags/1.2.7-8.2/patches/00list (original)
+++ tags/1.2.7-8.2/patches/00list Thu Aug  6 13:34:59 2009
@@ -1,7 +1,7 @@
 011_fix_apr-config
 013_ship_find_apr.m4
 014_fix-apr.pc
-015_sendfile_lfs
+015_sendfile_lfs.dpatch
 016_sendfile_hurd
 020_lfs_ino_t
 099_config_guess_sub_update

Modified: tags/1.2.7-8.2/patches/016_sendfile_hurd.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/tags/1.2.7-8.2/patches/016_sendfile_hurd.dpatch?rev=1023&op=diff
==============================================================================
--- tags/1.2.7-8.2/patches/016_sendfile_hurd.dpatch (original)
+++ tags/1.2.7-8.2/patches/016_sendfile_hurd.dpatch Thu Aug  6 13:34:59 2009
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-Index: network_io/unix/sendrecv.c
---- a/network_io/unix/sendrecv.c
-+++ b/network_io/unix/sendrecv.c
+diff -urNad apr-1.2.7~/network_io/unix/sendrecv.c apr-1.2.7/network_io/unix/sendrecv.c
+--- apr-1.2.7~/network_io/unix/sendrecv.c	2006-09-27 19:33:16.000000000 +0200
++++ apr-1.2.7/network_io/unix/sendrecv.c	2006-09-27 19:34:29.000000000 +0200
 @@ -238,7 +238,7 @@
  /* Define a structure to pass in when we have a NULL header value */
  static apr_hdtr_t no_hdtr;
@@ -15,5 +15,5 @@
 -#if defined(__linux__) && defined(HAVE_WRITEV)
 +#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
  
- /* Helper function for apr_socket_sendfile.
-  * Takes care of sendfile vs. sendfile64 (must be detected at runtime),
+ apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
+                                  apr_hdtr_t *hdtr, apr_off_t *offset,