Fixed strict-aliasing qa issue, bug#161370

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 871598eeae0b2f8e865d7fd7bd514be770b09f56..f928cb111b9e5663e92cd1a47b4e9ae4176f38ee 100644 (file)
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.85 2007/01/05 09:34:30 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.86 2007/01/10 20:18:09 alonbl Exp $
+
+  10 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/libgcrypt-1.2.3-strict-aliasing.patch, libgcrypt-1.2.3-r1.ebuild:
+  Fixed strict-aliasing qa issue, bug#161370
 
   05 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> libgcrypt-1.2.3-r1.ebuild:
   Added autotools variables, bug#160135, thanks to jacub

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 473c95acce8328989e367cfb094c1c6da3ea2e62..514499985e3f79ec13d064e74aeecfe21626a230 100644 (file)
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,3 +1,7 @@
+AUX libgcrypt-1.2.3-strict-aliasing.patch 756 RMD160 82fb7d364389a6f559036a4b1d963ff2f2e379a3 SHA1 b785b375c7d3fc38d46012f76f5af02a1bd4bd43 SHA256 caed94b7cebebc288c64a3484f1c3213b38c71699f9f06149ab5c8672db1c9b4
+MD5 9bd2da270cbfd86d419a2a0d5c24b29f files/libgcrypt-1.2.3-strict-aliasing.patch 756
+RMD160 82fb7d364389a6f559036a4b1d963ff2f2e379a3 files/libgcrypt-1.2.3-strict-aliasing.patch 756
+SHA256 caed94b7cebebc288c64a3484f1c3213b38c71699f9f06149ab5c8672db1c9b4 files/libgcrypt-1.2.3-strict-aliasing.patch 756
 DIST libgcrypt-1.1.12.tar.gz 741606 RMD160 94031639fe9d5cbf7225e689d5ce241a4aa0d226 SHA256 08a6fc304ca096277543ad64aec9109a317766e6cae5a97f1fd3c300cc9cbf67
 DIST libgcrypt-1.1.94.tar.gz 847472 RMD160 752792930cbac5e750930cb860508eb2b9592824 SHA1 96a46ae79983c6c60e36d89fa439b9d45f900921 SHA256 8e91099ee939bd3185e07b2a9dd5e6b89d1ff1866f9ef8cfaee40dcd3fabdce0
 DIST libgcrypt-1.2.0.tar.gz 949159 RMD160 bb198eb9dfa4c9e1466b905f1c412bdb3eb493c5 SHA1 3785a47abcb1c15079b18c5df47a474dfe647ec2 SHA256 75eb60ff711496c7e367f32344e832607034de3bd381bcb5600b2f48ee32390f
@@ -34,18 +38,18 @@ EBUILD libgcrypt-1.2.2.ebuild 1199 RMD160 b762d64849a29046da8b40536affd2f589f785
 MD5 8aec8a75710c7648847d3ad432dbcab1 libgcrypt-1.2.2.ebuild 1199
 RMD160 b762d64849a29046da8b40536affd2f589f785e5 libgcrypt-1.2.2.ebuild 1199
 SHA256 da730dd74a519c248f1bc9d67a8447fe7396a8dac4b0316bc6f3174baa6e92f6 libgcrypt-1.2.2.ebuild 1199
-EBUILD libgcrypt-1.2.3-r1.ebuild 2641 RMD160 a2a98b4ef0197c63beee5dfe56d2fb820019f5ac SHA1 a0046427bc7185efaf12370ca6100bc0170995c5 SHA256 c30cacf9f2ce056af376f5dcfe35a0b13e45d57b9ba6ba8d85a8c965db9e888f
-MD5 99208122cbfe976e6e2efb1164422f18 libgcrypt-1.2.3-r1.ebuild 2641
-RMD160 a2a98b4ef0197c63beee5dfe56d2fb820019f5ac libgcrypt-1.2.3-r1.ebuild 2641
-SHA256 c30cacf9f2ce056af376f5dcfe35a0b13e45d57b9ba6ba8d85a8c965db9e888f libgcrypt-1.2.3-r1.ebuild 2641
+EBUILD libgcrypt-1.2.3-r1.ebuild 2690 RMD160 111e072c14fa91e8f8370659aafe09d9cc227b1e SHA1 912295a9bfae9164a191bc64c60e6f68bd4e9b1e SHA256 2476f18032526a3992f71a2659f33912ed8527ca0237eae77bcb2e570523a6f7
+MD5 58871780a3e4fd7ff4fcefce55e52d50 libgcrypt-1.2.3-r1.ebuild 2690
+RMD160 111e072c14fa91e8f8370659aafe09d9cc227b1e libgcrypt-1.2.3-r1.ebuild 2690
+SHA256 2476f18032526a3992f71a2659f33912ed8527ca0237eae77bcb2e570523a6f7 libgcrypt-1.2.3-r1.ebuild 2690
 EBUILD libgcrypt-1.2.3.ebuild 1326 RMD160 33c2a487a2b18d12c8b8c94be138de1305b2d269 SHA1 84871df6178df63ec245ed9d6c40d854fa641648 SHA256 1ba1fde24ab8b62cbff98488c95485db49ab430957cbcb110a3e1e968c9a9fe1
 MD5 90f0cc623dc93094d88f73683f5ac19a libgcrypt-1.2.3.ebuild 1326
 RMD160 33c2a487a2b18d12c8b8c94be138de1305b2d269 libgcrypt-1.2.3.ebuild 1326
 SHA256 1ba1fde24ab8b62cbff98488c95485db49ab430957cbcb110a3e1e968c9a9fe1 libgcrypt-1.2.3.ebuild 1326
-MISC ChangeLog 12657 RMD160 ffa940da53e985087f734d4af5793b1c500dd8ff SHA1 7a0422cf7357e650ae5b6257d0cea73033d0fb95 SHA256 dac62b8f62650c486aeb09189d115df49ed0f9d843f8f3af0c8668f3fea58652
-MD5 51e4cd87c7e4c799e3a5a780644cf131 ChangeLog 12657
-RMD160 ffa940da53e985087f734d4af5793b1c500dd8ff ChangeLog 12657
-SHA256 dac62b8f62650c486aeb09189d115df49ed0f9d843f8f3af0c8668f3fea58652 ChangeLog 12657
+MISC ChangeLog 12826 RMD160 63915484c8fffb4327531f2e128b3066447d0dee SHA1 f4c70105d43b095ab982db65b61027638bfebf06 SHA256 5f0e269ded8d44cfe09dc099b8ee7b8919a26d95dd9086b3bf54188c154e5ec8
+MD5 0e1da51ed1dd56330969875645130e03 ChangeLog 12826
+RMD160 63915484c8fffb4327531f2e128b3066447d0dee ChangeLog 12826
+SHA256 5f0e269ded8d44cfe09dc099b8ee7b8919a26d95dd9086b3bf54188c154e5ec8 ChangeLog 12826
 MISC metadata.xml 276 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c SHA1 1f70a3ead5de1eb0d62a59c084b3a06147256e2f SHA256 abd952a77edadf769a821e7210a01f38850cada9a7677a1561f6aa0ce954f480
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c metadata.xml 276

diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.2.3-strict-aliasing.patch b/dev-libs/libgcrypt/files/libgcrypt-1.2.3-strict-aliasing.patch
new file mode 100644 (file)
index 0000000..e9dc7a0
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.2.3-strict-aliasing.patch
@@ -0,0 +1,19 @@
+diff -urNp libgcrypt-1.2.3.org/cipher/ac.c libgcrypt-1.2.3/cipher/ac.c
+--- libgcrypt-1.2.3.org/cipher/ac.c    2005-07-29 16:45:48.000000000 +0300
++++ libgcrypt-1.2.3/cipher/ac.c        2007-01-10 22:13:05.000000000 +0200
+@@ -137,9 +137,11 @@ gcry_ac_data_copy_internal (gcry_ac_data
+     data_new->data_n = data->data_n;
+ 
+   if (! err)
+-    /* Allocate space for named MPIs.  */
+-    err = _gcry_malloc (sizeof (gcry_ac_mpi_t) * data->data_n, 0,
+-                      (void **) &data_new->data);
++    {
++      /* Allocate space for named MPIs.  */
++      err = _gcry_malloc (sizeof (gcry_ac_mpi_t) * data->data_n, 0, &p);
++      data_new->data = (gcry_ac_mpi_t *)p;
++    }
+ 
+   if (! err)
+     {
+Files libgcrypt-1.2.3.org/cipher/.ac.c.swp and libgcrypt-1.2.3/cipher/.ac.c.swp differ

diff --git a/dev-libs/libgcrypt/libgcrypt-1.2.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.2.3-r1.ebuild
index 19abdce6295caeda221a6de8845bcaaea5adb4e8..17fc93b764a6929afa8f7f4c5b986a3928c5a0d6 100644 (file)
--- a/dev-libs/libgcrypt/libgcrypt-1.2.3-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.3-r1.ebuild,v 1.4 2007/01/05 09:34:30 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.3-r1.ebuild,v 1.5 2007/01/10 20:18:09 alonbl Exp $
 
 WANT_AUTOMAKE='latest'
 WANT_AUTOCONF='latest'
@@ -29,7 +29,8 @@ src_unpack() {
 
        # fix for miss detection of 32 bit ppc
        cd "${S}"
-       epatch "${WORKDIR}"/${PN}-1.2.1-ppc64-fix.patch
+       epatch "${WORKDIR}/${PN}-1.2.1-ppc64-fix.patch"
+       epatch "${FILESDIR}/${P}-strict-aliasing.patch"
 
        if use idea; then
                if use bindist; then