[Pkg-gnutls-commits] r1715 - in /packages/libgcrypt11/branches/branch1.5: ./ debian/ debian/patches/

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Mon Mar 18 17:58:27 2013
New Revision: 1715

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1715
Log:
Merge trunk to branch

Added:
    packages/libgcrypt11/branches/branch1.5/debian/patches/29_Fix-a-problem-with-select-and-high-fds.patch
      - copied unchanged from r1714, packages/libgcrypt11/trunk/debian/patches/29_Fix-a-problem-with-select-and-high-fds.patch
    packages/libgcrypt11/branches/branch1.5/debian/patches/30_Avoid-dereferencing-pointer-right-after-the-end.patch
      - copied unchanged from r1714, packages/libgcrypt11/trunk/debian/patches/30_Avoid-dereferencing-pointer-right-after-the-end.patch
    packages/libgcrypt11/branches/branch1.5/debian/patches/31_Fix-segv-with-AES-NI-on-some-platforms.patch
      - copied unchanged from r1714, packages/libgcrypt11/trunk/debian/patches/31_Fix-segv-with-AES-NI-on-some-platforms.patch
    packages/libgcrypt11/branches/branch1.5/debian/patches/32_libgcrypt-1.5-rinjdael-Fix-use-of-SSE2-outside-USE_A.patch
      - copied unchanged from r1714, packages/libgcrypt11/trunk/debian/patches/32_libgcrypt-1.5-rinjdael-Fix-use-of-SSE2-outside-USE_A.patch
Modified:
    packages/libgcrypt11/branches/branch1.5/   (props changed)
    packages/libgcrypt11/branches/branch1.5/debian/changelog
    packages/libgcrypt11/branches/branch1.5/debian/patches/series

Propchange: packages/libgcrypt11/branches/branch1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 18 17:58:27 2013
@@ -1,1 +1,1 @@
-/packages/libgcrypt11/trunk:1235-1245
+/packages/libgcrypt11/trunk:1235-1714

Modified: packages/libgcrypt11/branches/branch1.5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/changelog?rev=1715&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/changelog (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/changelog Mon Mar 18 17:58:27 2013
@@ -1,8 +1,27 @@
-libgcrypt11 (1.5.0-4) UNRELEASED; urgency=low
+libgcrypt11 (1.5.0-6) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
- -- Andreas Metzler <ametzler at debian.org>  Thu, 01 Sep 2011 19:19:49 +0200
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 24 Feb 2013 18:49:17 +0100
+
+libgcrypt11 (1.5.0-5) unstable; urgency=low
+
+  * While we are at it also pick
+    29_Fix-a-problem-with-select-and-high-fds.patch
+    LP: #1084279
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 24 Feb 2013 18:38:55 +0100
+
+libgcrypt11 (1.5.0-4) unstable; urgency=low
+
+  * Pull patches from upstream LIBGCRYPT-1-5-BRANCH:
+      30_Avoid-dereferencing-pointer-right-after-the-end.patch
+      31_Fix-segv-with-AES-NI-on-some-platforms.patch
+         <https://bugs.g10code.com/gnupg/issue1452> LP: #1105758
+      32_libgcrypt-1.5-rinjdael-Fix-use-of-SSE2-outside-USE_A.patch
+    Closes: #699034
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 24 Feb 2013 17:43:09 +0100
 
 libgcrypt11 (1.5.0-3) unstable; urgency=low
 

Modified: packages/libgcrypt11/branches/branch1.5/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/patches/series?rev=1715&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/patches/series (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/patches/series Mon Mar 18 17:58:27 2013
@@ -1,1 +1,5 @@
 12_lessdeps_libgcrypt-config.diff
+29_Fix-a-problem-with-select-and-high-fds.patch
+30_Avoid-dereferencing-pointer-right-after-the-end.patch
+31_Fix-segv-with-AES-NI-on-some-platforms.patch
+32_libgcrypt-1.5-rinjdael-Fix-use-of-SSE2-outside-USE_A.patch