Add backport of AF_LOCAL/AF_UNIX fix from upstream to fix compilation on e.g. Solaris.

Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386

4 files changed, 53 insertions, 12 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 707cd91d0f46..0999f24cf5ec 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.371 2012/06/15 19:17:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.372 2012/06/17 08:54:09 grobian Exp $
+
+  17 Jun 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/gnutls-2.12.20-AF_UNIX.patch, gnutls-2.12.20.ebuild:
+  Add backport of AF_LOCAL/AF_UNIX fix from upstream to fix compilation on e.g.
+  Solaris.
 
   15 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/gnutls-3.0.20-parallelmake.patch, gnutls-3.0.20.ebuild:
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index c256c35d68e9..bfc0076d4521 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnutls-2.12.20-AF_UNIX.patch 1041 RMD160 37d9ca100f3c7356bf318dea8f56f8d7755c09f8 SHA1 79a18230953fd7dc65a8d26b14f15cc03dd55509 SHA256 bd56d19bd1713ef3ddfca7768c2528aacb0c7425cd21f87d69b3d674504562a1
 AUX gnutls-3.0.20-parallelmake.patch 1126 RMD160 b572681466e9a244b5410937551ee657af5077c6 SHA1 1977eba23faf0a83549b21c5a04a760a3cbefbe1 SHA256 00acad9ae1420d2d9179ecdf8af22ffc19175a147420305e60e9c8b21e996608
 DIST gnutls-2.12.18.tar.bz2 7207965 RMD160 c5c5bb91f374edd7bfa63c2b2b19ea7606353d17 SHA1 cd5cf0932575b758ad3ee89952763a8395ea4af0 SHA256 780b12e3f05191316390611a3d9d982d29ca3f3abc234517b2fc542064b6f07a
 DIST gnutls-2.12.19.tar.bz2 7208159 RMD160 077d62ab00780a6798cee92e80d542f1e74891f2 SHA1 643620216ba54b195e41e29abfdcc31125f92d25 SHA256 8f167b39de4e2fddd83f7e29c98ce2e7fc76f4d79ccf4d3d66d1379b971160ec
@@ -8,18 +9,14 @@ DIST gnutls-2.12.20.tar.bz2 7231438 RMD160 8b9fca72136113f250296e7399644b8aaa350
 DIST gnutls-3.0.20.tar.xz 4426520 RMD160 a775877a7dec4e10a5612dc0ebb71d59f78ead39 SHA1 0c65f6a1e669c0fe85ddb2d645078b3bce9d1518 SHA256 7e3f431a43e5366ff5a9b7646d2a79892a905237ef18cb147b945ec99012686d
 EBUILD gnutls-2.12.18.ebuild 3267 RMD160 2c3ae21f47d7d4fc590fc580d2cd67e1bbc26266 SHA1 154468c7f58ae4ba0c7d1048f9131ee013d1adf2 SHA256 3cca5cf44ad3420d8450403849d6336ea1d43909474412d9402a9f74d13ce99a
 EBUILD gnutls-2.12.19.ebuild 3394 RMD160 6bc593c18d208a76e739db5455f705b83c6bb3ca SHA1 911367bdb9195f29fe3cee8a95765b570e75531e SHA256 ece8494fee1cb0b224605603f2c336fa4d6b000b52fc5cce57b4395e74925bcf
-EBUILD gnutls-2.12.20.ebuild 3394 RMD160 1785fd58a74e2b02808f5f83b06c3df9dd9d11a6 SHA1 c3f9397db3eb6284ba3185cf73e0b2451f2fde8b SHA256 68e5c2504fa5915b8b2260575c0d56aca77808f718d4a41186f4628a8f973732
+EBUILD gnutls-2.12.20.ebuild 3434 RMD160 5db83b595fbfa9905e9556befc20353a839e8486 SHA1 73f6a2e545f87cd6b1c439542e7d83fc9b300906 SHA256 8febcd494d6a2cc49472a818511a47f4988e6a615cc5d6038de169f4ba10d182
 EBUILD gnutls-3.0.20.ebuild 3023 RMD160 499cf5ecdd59b4e1782b31ae349133fa5ca23180 SHA1 ae6848593952c1b50f278706dd6995500294b497 SHA256 201c0be0eb6e403dfc4640e3f353ffb151c6b565a123358ae0e0ebcfd928eabc
-MISC ChangeLog 54651 RMD160 fba8e7cb12f3fcfb2e01fea18b2fb64af3f1f7f2 SHA1 c3b2ac8f7c83232f33dd4e95765e0485c135f71d SHA256 0c407ac2e5bb70e585bd8f3d68cbdc6c7e21e1dd8a02635e47d329e706713b7e
+MISC ChangeLog 54854 RMD160 c788ac3aeb672a1490f50eca296da33ac5b96fa4 SHA1 9c04ba839e6f8e5f163fed92b4d8b8a9e53d3b76 SHA256 954fe87a5b48c5f2a68be36a3ad14f6dc4d17ab44fdae5fb070edafc81ba2e7f
 MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.19 (SunOS)
 
-iQEcBAEBAgAGBQJP24pAAAoJEBzRPIrUMBNC5uAH/2vvkuim/qUdjBXFtRNFSGth
-qV2F45sYvZ9CHPETa9K6Xj5wzTVVef8wDTV9lVyjQFjzbD03Yh5WcxefFPf+wW42
-BsVd12+yBsfqmedWycdPyLRgu4V9R+rH+ZwgTNfH+fJZO1adkOlHlMwcwdlw77T7
-Xc6pFflFrDF8eWc2eKjq0pwjpYauH2CWc5CW5aA8LYCguaWK5zi8y0WqcMPSL47h
-G7NmiIDr2JzwrC2bY5MuHdFd4Kc/7il/WUVTtav3zSqOE5pisd8DiDaKbt+m/cMs
-n3sZsQoehcjES0Pi51z25Ulzw8Bv7VP/FH2kgt5OujxD4uPn9HXt87TWWjGVTZI=
-=P3x7
+iEYEARECAAYFAk/dmzcACgkQX3X2B8XHTomcDACfSBVFCN2HQXf1swhiVkZDlG7m
+pl4An0NuDJkdb2vujw59jA2uo8r9/KJH
+=aErm
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-2.12.20-AF_UNIX.patch b/net-libs/gnutls/files/gnutls-2.12.20-AF_UNIX.patch
new file mode 100644
index 000000000000..719baf37b210
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.20-AF_UNIX.patch
@@ -0,0 +1,37 @@
+Backport of commit 60a13b98e9f410c3b1019252f271d3c0f20b2e61 for 2.12.20
+
+From 60a13b98e9f410c3b1019252f271d3c0f20b2e61 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Fri, 23 Sep 2011 14:39:29 +0000
+Subject: a hack to allow compilation on systems without AF_LOCAL.
+
+--- lib/nettle/egd.c
++++ lib/nettle/egd.c
+@@ -33,6 +33,12 @@
+ 
+ #include <gnutls_errors.h>
+ 
++#ifdef AF_UNIX
++# define LOCAL_SOCKET_TYPE AF_UNIX
++#else
++# define LOCAL_SOCKET_TYPE AF_LOCAL
++#endif
++
+ #ifndef offsetof
+ #define offsetof(type, member) ((size_t) &((type *)0)->member)
+ #endif
+@@ -141,12 +147,12 @@
+     }
+ 
+   memset (&addr, 0, sizeof addr);
+-  addr.sun_family = AF_LOCAL;
++  addr.sun_family = LOCAL_SOCKET_TYPE;
+   strcpy (addr.sun_path, name);
+   addr_len = (offsetof (struct sockaddr_un, sun_path)
+               + strlen (addr.sun_path));
+ 
+-  fd = socket (AF_LOCAL, SOCK_STREAM, 0);
++  fd = socket (LOCAL_SOCKET_TYPE, SOCK_STREAM, 0);
+   if (fd == -1)
+     {
+       _gnutls_debug_log ("can't create unix domain socket: %s\n",
diff --git a/net-libs/gnutls/gnutls-2.12.20.ebuild b/net-libs/gnutls/gnutls-2.12.20.ebuild
index 03346df4eb24..15351e9da2a4 100644
--- a/net-libs/gnutls/gnutls-2.12.20.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.20.ebuild,v 1.1 2012/06/11 03:47:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.20.ebuild,v 1.2 2012/06/17 08:54:09 grobian Exp $
 
 EAPI=4
 
@@ -68,6 +68,8 @@ src_prepare() {
 	done
 	find . -name ltmain.sh -exec rm {} \;
 
+	epatch "${FILESDIR}"/${P}-AF_UNIX.patch
+
 	# support user patches
 	epatch_user