[Pkg-fedora-ds-maintainers] libapache2-mod-nss: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog                                |    2 ++
 debian/patches/mod_nss-overlapping_memcpy.patch |   24 ++++++++++++++++++++++++
 debian/patches/series                           |    1 +
 3 files changed, 27 insertions(+)

New commits:
commit bda13cef7f7c1f390572de961d06a944c6865adb
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Feb 8 23:16:45 2013 +0200

    mod_nss-overlapping_memcpy.patch: Patch from Fedora to use memmove instead of memcpy. (LP: #1093974)

diff --git a/debian/changelog b/debian/changelog
index 35e58d5..4723152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libapache2-mod-nss (1.0.8-3) UNRELEASED; urgency=low
 
   * watch: Add a comment about the upstream git tree.
+  * mod_nss-overlapping_memcpy.patch: Patch from Fedora to use memmove
+    instead of memcpy. (LP: #1093974)
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Sat, 01 Dec 2012 13:54:48 +0200
 
diff --git a/debian/patches/mod_nss-overlapping_memcpy.patch b/debian/patches/mod_nss-overlapping_memcpy.patch
new file mode 100644
index 0000000..c60e435
--- /dev/null
+++ b/debian/patches/mod_nss-overlapping_memcpy.patch
@@ -0,0 +1,24 @@
+Bug 669118
+
+memcpy of overlapping memory is no longer allowed by glibc.
+
+This is mod_ssl bug https://issues.apache.org/bugzilla/show_bug.cgi?id=45444
+
+--- mod_nss-1.0.8.orig/nss_engine_io.c	2011-01-12 12:31:27.339425702 -0500
++++ mod_nss-1.0.8/nss_engine_io.c	2011-01-12 12:31:35.507405595 -0500
+@@ -123,13 +123,13 @@
+ 
+     if (buffer->length > inl) {
+         /* we have have enough to fill the caller's buffer */
+-        memcpy(in, buffer->value, inl);
++        memmove(in, buffer->value, inl);
+         buffer->value += inl;
+         buffer->length -= inl;
+     }
+     else {
+         /* swallow remainder of the buffer */
+-        memcpy(in, buffer->value, buffer->length);
++        memmove(in, buffer->value, buffer->length);
+         inl = buffer->length;
+         buffer->value = NULL;
+         buffer->length = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 329b832..2207cc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ mod_nss-reverseproxy.patch
 mod_nss-pcachesignal.patch
 mod_nss-reseterror.patch
 mod_nss-lockpcache.patch
+mod_nss-overlapping_memcpy.patch