Fix endianness bug #436640 by Anthony Basile.

Package-Manager: portage-2.2.0_alpha149_p86/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 63 insertions, 7 deletions

diff --git a/dev-haskell/network/ChangeLog b/dev-haskell/network/ChangeLog
index 39518fca3864..2119c9eb65e5 100644
--- a/dev-haskell/network/ChangeLog
+++ b/dev-haskell/network/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/network
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.70 2012/12/30 13:55:55 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.71 2013/01/13 20:59:18 slyfox Exp $
+
+  13 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/network-2.4.0.1-fix-ppc64.patch, network-2.4.0.1.ebuild:
+  Fix endianness bug #436640 by Anthony Basile.
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> network-2.3.0.14.ebuild:
   Stable for sparc, wrt bug #428936
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index a8444a0b1ab4..682f85b8940f 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX network-2.2.0.0-eat-configure-opts.patch 747 SHA256 33f46b0bdcd63ea98fcd401409732f57c06c6421b92620ad7da49e75e2f62779 SHA512 835263a81de3348078a6d1a6832759afee04a2c557310202fca23506ca63090a06f194d36b7399e8d3a3a6ab18c0127ac53b7f4fecccf787a0bbf17d6e6a7cc4 WHIRLPOOL d914b7e43502b9236323f8d2ee4978c969b9a2ce4a2997bd7f6518bb965010498a01a6a6ba03362d83923faec7fb3bc75ae4b45c387445dc8e5828724b087d38
 AUX network-2.3.0.14-ghc-7.5.patch 2009 SHA256 4dcc6501ea32df0f4b47fe193d933e9f28af2684bc358aaab50685ca02c2eb97 SHA512 f8f12f42fd9bec6442ff4949ca238bb88820ce51fe5fe4bbf30e0df3ffab7e6cc995e1f6c727c209ff34155176393e6005334c3594d99e940807649e66eec65c WHIRLPOOL 581c1701ea12002670cfd6a7ed206dd79541084738a58ad0e4770bfc2265eeab102108cfe24ed3b8436e22ad36029ffdbd90d33357a35f4b1f2ae29cd8cfff5f
+AUX network-2.4.0.1-fix-ppc64.patch 1417 SHA256 67c8d559567f85911d002bd048525e8f50db24ca3c97c1c5785e07f7b3aaffa6 SHA512 163a4086d3762cfab69c618ab6754696279ee15a335d96001bead2d80f9cb1196c1a5e5959b05505c3124430e9d00c146e1470648e97596d1d485d52cd6d5623 WHIRLPOOL 9d58b816c65655664f8d7f83619f49e49e8ab9c3a80f06a242e30f48c8fd35c02eacb4702425d36aab6e600e232b1a5025e125739c05d2f3f574a0f5e38203b6
 DIST network-2.2.1.7.tar.gz 112028 SHA256 0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58 SHA512 32e8c5fda93b92000acd27a11578772d2ac15b9e229439ef02ebfb32838abc66dc9193a913eecc7f7e69034720c93d45fc51aeeabdc16c202e916b2285c48fdf WHIRLPOOL 4a048cb739fae58a5252bebcec91d3b88860f099eeba7deb722745a80b3b8daba82b0b25bcf1a7836df9c6ec9f219330841cd7f3b10093805b6a11e391e006ed
 DIST network-2.3.0.11.tar.gz 133563 SHA256 b3f50ae3f1554c4df5f4e4439a6b5d08fa9464aabfae66ed0da78f0a784615be SHA512 11f775d729a6619f3bdd685fbd73ccfe5ffe1d3ad325d3b4b43ab717a333c28cdf8c5732c149463f480e13b70a7530613ecc9ca71ea177f19abe54e30b44ebce WHIRLPOOL d1ef53196c8b3996d71d49ebcf0ea35dc6033edaf0e589cbb5b5117703086482866d51e29beefbd528faf9f0f3d60d1047d47abb7665f3b8b74bea51240a4734
 DIST network-2.3.0.13.tar.gz 133948 SHA256 0747e9091dd5ba220c31f77116c9edfe9ac6726090d58e55221371b63f1b8577 SHA512 ed722324b032916080642b5cd45afcb85d8f8c30e9bfbabe711cc89530ca2362c62f4ab0d6aab0044c51b03607f3dd2d1cdaed68fd5a357f80260e7ada8a176a WHIRLPOOL ff36d0cc0bcb78a37dc14bb221931a534d5f84e04e26739a28ed7852e5d6191907f649949fdb410c8923b6c1fbcf80b8a7b16e57b1480b6f0095b4aac43ea157
@@ -13,6 +17,13 @@ EBUILD network-2.3.0.13.ebuild 1233 SHA256 a69e8fff47e8102aabc8bb3a2579f9b4649b2
 EBUILD network-2.3.0.14.ebuild 1110 SHA256 269a67d6ef5e77a8849f92aeb40dd22adc791fc4827b9b324c61d10c3c64afda SHA512 52a6ea97b3c98ef9a2803605a5d31c3f8c9c971f82db5f3c44488c39faf312c2591d6ec29665fc93a5d8c533d8715c6e8e7312fa773b05741124babb193b9dff WHIRLPOOL 29e364c9ab5e740c861ee326d3a5ed84d8b662f4b9bbe8fd9f46acaade88280071a6818ace95c342d593baf5bc9af9cad84fb56dbf6d6e944695cab3d145e29f
 EBUILD network-2.3.0.2.ebuild 814 SHA256 97a730c595e13705760daf6e69e7bef3e9000a8c6c79960bfb6bb77f5f35e76c SHA512 b2b87f8f554c82a558353f0ab8b704e801cdab6c58958601cf1b7950ca2673d99884e4470b4b6852ae400143b93fb98592da3c50f0f8e9244f865d1432c509ea WHIRLPOOL 3bba3f71491a463d880c322884ef3152275393b5bb5bcdb18aab871388350364fd944719191875fb3569170eeb1385dbefe99ac9f04c83e6e92571de39dd9010
 EBUILD network-2.3.0.7.ebuild 1025 SHA256 84ec4960c57adab600aa5f98567a1944759ac3db0f2c453a6f49155538cd8b47 SHA512 0bd9d5be7a7ab9f9958d7c151500d53eee978fa5ec6eec0ce3876d455971685bdc269709922b25c3ab0ec45f0fdaec7fe85ce0c0900fe1ed1aa8a76b0c74ca7f WHIRLPOOL 12ec703a5e13602a6c0ccda3c93ba76c23b90ce598ab40c6cd4b181cb56c380e6649bf7e2d80481da365385fb797dd4c79351fec0fff0d5863171015e6265ed8
-EBUILD network-2.4.0.1.ebuild 887 SHA256 5b3e2fd51fdb0db16559f2d3597f4c16a095a0d27b7b87d9bd37d1aa6d949698 SHA512 0f5cdfa647fdba393ced14a985cc0e2f8cc91614185468d3c4e7627f4f8e225ba23b71e3c1f881f5f993983d1362ea4186b4615801da79aba4bc375266a5705d WHIRLPOOL d18dd4f4789ac5fdbff0f806bb8e58f767f2e9589a2a3a3524e17b1d25850d2284f65236abf67a717765828f89c7d18f535f5ded216cdc86e709610d350f1fd1
-MISC ChangeLog 9165 SHA256 a71536e7158503df6148fa4cf0290913f08c9cbe8a02fd582d1b5c9914a3f8a6 SHA512 631207d0ba6951b318a3afb7a9e712066024b63757506de2f53bf40f6e9b64e3d6dea295d3124f713db37e291c50daeb4ed42f552bb7a480b2df2dd245453d09 WHIRLPOOL 3f73e0cca9a048a95933d2009e070ee19ffb7c2ba145dec25687d027e9d7190f46805c46cad86f413289975e3751ce0007d2171701216a84dc0a9c56b8938e44
+EBUILD network-2.4.0.1.ebuild 938 SHA256 00249533e024522ac472aed5daa8699f9d1a39e422c6305ac5ca6a4375d3d300 SHA512 4d3f744addc0a4b1cfe7654b674b3424ce6684692c3bcfe3f615596175237da75fc18c631a606897de72e38dffeb71e15aaa842898be7b62741a18eb8f8abc10 WHIRLPOOL 9d80f7fcfcc5ac3c2af7cd141ef81b7e70e61a059ffdfb699a8f4058dd6b7bbe92d481afa1962a5185459e517bf0552b472ef1fcc65c3f48b60fdf46c071ae03
+MISC ChangeLog 9337 SHA256 f3906a06e371cc4ba0553ca516cdd0d37687757f84ba3b01ba2cb44aba0f4343 SHA512 9671be98785cfb3e5123918805a8948ab6bf0d8c4109728793bcfa65ae9621d499b72a294310a25464d5b5385d954ed70bc76880aea590dd7c7053dc95665c22 WHIRLPOOL 2d3309d3c020a45e276afef7879279d717a2d83ac73cace355dad70089350920897e9daa13d7d2071f7dfad0ad45800d1a393294148813eeeeded8b78cdd826e
 MISC metadata.xml 226 SHA256 e5dc2b6b77ac9bf27c18c122bdce1f2e766bbe26979d753337459c3fe807b851 SHA512 ab01f2a59cef0c84d5ec40bf54b03cfe070c9fb14f4d86fd7577aae2f893f2a51a3524f3afb55b31ba9dff9e2d168a516bc65b5e729df196298969268770a632 WHIRLPOOL 93426518ef4d789da504d28e1346f50b3961b3d7950ec2fd9958d443585d8dfbb65662a12b134163b6aa6ba1ada80bc0056542b2a6907ad2dcc7624dad051567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDzIBUACgkQcaHudmEf86qb3gCfeFwFAG0ZQnfw14D+ocDtHdAT
+Vd8An3tK05oyu6SsUiQjT5G1YeM+GCaP
+=zbr3
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/network/files/network-2.4.0.1-fix-ppc64.patch b/dev-haskell/network/files/network-2.4.0.1-fix-ppc64.patch
new file mode 100644
index 000000000000..e891831aeef4
--- /dev/null
+++ b/dev-haskell/network/files/network-2.4.0.1-fix-ppc64.patch
@@ -0,0 +1,39 @@
+commit 6bc6b666ba2a87001a825bd81088062307a51bae
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Jan 13 23:50:21 2013 +0300
+
+    MsgHdr.hsc: fix field 'struct msghdr::msg_namelen' size
+    
+    msg_namelen has a 'socklen_t' type on linux (always 32 bits).
+    Using CSize there breaks 64-bit BE platforms.
+    
+      testSendManyTo: [Failed]
+           ERROR: sendmsg: invalid argument (Destination address required)
+    
+    Caught by testSendManyTo test on ppc64:
+    
+    Gentoo-bug: http://bugs.gentoo.org/436640
+    Reported-by: Anthony Basile <blueness@gentoo.org>
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/Network/Socket/ByteString/MsgHdr.hsc b/Network/Socket/ByteString/MsgHdr.hsc
+index 24d7eb0..227e5ee 100644
+--- a/Network/Socket/ByteString/MsgHdr.hsc
++++ b/Network/Socket/ByteString/MsgHdr.hsc
+@@ -8,6 +8,7 @@ module Network.Socket.ByteString.MsgHdr
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ 
++import Data.Word -- for used '#type's
+ import Foreign.C.Types (CInt, CSize)
+ import Foreign.Ptr (Ptr)
+ import Foreign.Storable (Storable(..))
+@@ -20,7 +21,7 @@ import Network.Socket.ByteString.IOVec (IOVec)
+ -- don't exist on OpenSolaris.
+ data MsgHdr = MsgHdr
+     { msgName    :: Ptr SockAddr
+-    , msgNameLen :: CSize
++    , msgNameLen :: (#type socklen_t) {- 32 bits even on amd64 and ppc64 -}
+     , msgIov     :: Ptr IOVec
+     , msgIovLen  :: CSize
+     }
diff --git a/dev-haskell/network/network-2.4.0.1.ebuild b/dev-haskell/network/network-2.4.0.1.ebuild
index ec5b990e3f45..14986aa2b032 100644
--- a/dev-haskell/network/network-2.4.0.1.ebuild
+++ b/dev-haskell/network/network-2.4.0.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.4.0.1.ebuild,v 1.1 2012/11/18 11:50:08 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.4.0.1.ebuild,v 1.2 2013/01/13 20:59:18 slyfox Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.3.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Low-level networking interface"
 HOMEPAGE="https://github.com/haskell/network"
@@ -26,3 +26,5 @@ DEPEND="${RDEPEND}
 			dev-haskell/test-framework-hunit
 		)
 		>=dev-haskell/cabal-1.8"
+
+PATCHES=("${FILESDIR}"/${P}-fix-ppc64.patch)