Fix build error with gcc-4.8 and libbsd, bug #474686.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

5 files changed, 70 insertions, 26 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index ca877a7811ce..2c8a0fd0e6ea 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xdm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.156 2013/10/08 05:03:26 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.157 2014/01/06 16:00:50 chithanh Exp $
+
+  06 Jan 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xdm-1.1.11-arc4random-include.patch,
+  +files/xdm-1.1.11-setproctitle-include.patch, xdm-1.1.11-r3.ebuild:
+  Fix build error with gcc-4.8 and libbsd, bug #474686.
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xdm-1.1.11-r3.ebuild:
   Stable for x86, wrt bug #475480
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index ae2d75f10fb0..fcd6a503c7ec 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX Xsession 1521 SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555 WHIRLPOOL 079887cd7f29fe11e3306da145d4279e99d93c131850a03d49c35befd6d001d8c69a53b9b528a7808ff5913f8787adc90d6fb0f041234462d8f6204a9be0d127
+AUX xdm-1.1.11-arc4random-include.patch 360 SHA256 01a1d04642b04e75ffc6d2433200a3dbe3970b853ab1fbea19add6fa59f3adae SHA512 2da1c4972c7edcd6c3fc42f29c15ce875888cc582a18e1932a60c3d0881a5a96991129bf5bb8c6649f0731e2102c0a163928c089d7ff9fe19ef82d470f86882f WHIRLPOOL d6b41c6f64ba1a7de3725c4737331d419a3eddeeb325c9e13f540443f5c178f08eed73f685b0714e64914ba416a3d3b44a864d207cf3d991500ee6e757b55980
 AUX xdm-1.1.11-cve-2013-2179.patch 1519 SHA256 92307af6fe30116f520798425a7356c8690e837430a5d1b4674243ac16cad6cd SHA512 5890051b134f1ed8f68846ee47d38375fbd0b4c639b9ae834b27d5b1749456aba4e1000a16a16d387072845887685375b1d87c4ce3870cc2acda58c4f17d45ae WHIRLPOOL fdc7a9e75afe5690f3b37e94385afe780185363e7923a5b5fba66a9f272146bc82a690a0b853d10ec614168791a69dded862518d879546ebc9582a7a14efd1be
+AUX xdm-1.1.11-setproctitle-include.patch 849 SHA256 d00a803b87bdc4e84a17d2f9a3e4f147355cc0eb9bc71a860f2396fd1c642b34 SHA512 496ad42ee35ce6d25f87b349330394f65cc8979b388759d7e03636f96bc2272068a999a9f7ac3b2e0486099b7678ef1c0e30505c3e0a08cc3041121936f1abb0 WHIRLPOOL d206fc35eb18458f17aaad9938994a157adfd92f5357ef74e00003bdef9edcd7aa135fa1bd5b7b36dfeb9d0b56ea4b169ec5280c37c180538a01568840f57835
 AUX xdm-consolekit.patch 5712 SHA256 902bf08f10244325897bc410e7fb81178e47dcae9d96c115992ece860c1b211d SHA512 d87ec56e4b7d067709679f222d3bd9009f1496d66c3c4335458b54e2a468200e3c7ac99843330c23bad7049995c93e8f3c74f3161529c6fb488e94e9fcd4752a WHIRLPOOL 89d80047bf95de606a0fd87cb6ce26b6aad755c8ea1e83db7adf0d3751e655be271ae4db5dd2097226e79359a3d85e7b485d4bedcf5bf800c2add4552429ec23
 DIST xdm-1.1.11.tar.bz2 446612 SHA256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 SHA512 fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5 WHIRLPOOL e505cfc5615d93ce8911f30b10b99698b38fa71dd468770616b95d34a0da2212f080f12a1457c715fc58beea56f4d9adc2f41dd63e3bf431b8d85182f0c250d8
 EBUILD xdm-1.1.11-r1.ebuild 1518 SHA256 1b317316e20e217c0dd99fbdd5a106af94ede1d9bc4b14cbf58c47238f8623dc SHA512 49922b14700a129ecdccb53eda891f5bcb2dd34c3016f47749e66284db49586321f6e46376db6f49ccbf31ec344426ad373b280be4c916a42192846ebbb65db1 WHIRLPOOL 5e6549d32d2e9c71ca73b431c27fe406c4348e5eb4ec8a59c84f0a1c40eb4dc8a99a3d35ae65f98862395c88aa488dee70ebc2293f8af3cc74caea97c00f8f3d
 EBUILD xdm-1.1.11-r2.ebuild 1747 SHA256 8d16b66733fd348658808c225de6976207e7610d2af0f425722d54205296e054 SHA512 92df9dcaa42d67567efe277f06cc323289d18562090a0b6a3a5c66ebf8987c0a4b568b66496efa961f07f8cc1cd04b3f0e30242570282594a01512b3f27c972f WHIRLPOOL d3a030b11e188dbc3d6678e54cdb02a53ade266226a6d8a90bd54837d83ff988cdc8f88d4178a568c832486e27918bab5fb8bdd92fd93a22cf4489a208ef112a
-EBUILD xdm-1.1.11-r3.ebuild 1818 SHA256 dbc3186034ad2129cc7cb9405543a4d3e483da8090bc1d7c53432aeee9e57279 SHA512 e762054de6f601d191739365d4542bd344f783ca952fa2d2cc20aaeeee9756da72b60963db2a57852d79fff38c1f2138095ea84f65ba35dd5609abfda87ec1a6 WHIRLPOOL 8a346a6eb39ca27cc97f3640acf19caa144c35359b0dfa132b13fc8926485ff6e3249145b5854e4bb4161adf7b73b87d81b32b7d884ef373a71755b3ef3494e7
-MISC ChangeLog 22278 SHA256 10c0a67e0798126a97869645cc06b0b5397e772365729515be5b5177a0e54073 SHA512 8c500a2bee0b293e18951f35f240fbc1d5550e00858f24e7e80411e1e700cf360502bae2b2f9afbda12110b4365fb8a97c993d8e3aef4048353d35a34aec63e1 WHIRLPOOL 3c49d86e35bd589c8ef4c62d319a5fcfaa205dda37d025ebdbe39a706242996c1399be8cf836a69ff389e7b88529c57c2a4bb397af3ae20755822d2779c06014
+EBUILD xdm-1.1.11-r3.ebuild 1933 SHA256 b6811bb04b504b0aeb3e5045d7efb25349216622a682bd6c1f68df27f2bf2d53 SHA512 aef9f9b288648017bd053edb82d8f785ef364a68bcd116e49b28d990702ffb3594e0080d63d808a5ef8cba505575a744c8e6a477bbb8a2b3e2c7ffe6cc044963 WHIRLPOOL 29c277dd5a85c482b5d85274e466aedb9e0124087db0efd4038727369705a974d6e25a9445582809146ba9c3f51683cdd50379be83c00d481b9deac9df2ba2cf
+MISC ChangeLog 22525 SHA256 967b79df91d125227e791830a5dda299a93456f03c0ec54ed571937aa6338ba8 SHA512 55736b1ccea0833ddb5b5641ab4452b8a2855120713509d9dd41eb2dcc9756e4df568da7ad93ad8744322d22fdf5b0639ff3bf6fc1b6e1043b17ff02b7c92ef9 WHIRLPOOL 85635f540201d505f9de4e75ee596629c968e618189a2ea00ba4e41e75f362e65e40921cc4163593734d95495305a94b017cc4efbda0ae8e0e6bc39d59987d4f
 MISC metadata.xml 332 SHA256 28cc5576b4a0c4c3afc6d261bef5cf94f96150650d7b3ed1258ef4c6c62d8975 SHA512 eb24594ed388e7558468139aec0d4a83bce4484a2a4bcc43a3e4deacf6572949342d5367858c512d85afdebbd5d52ecfe04c9b07c8a2dac617ad986d68543de2 WHIRLPOOL 10c7506d7a9a09f66c616438728bbe8b4ceb71c1cf65c99cd80ca20149c10da1c2ce781082d2eb263ddf6d867a157b8b819fe101b571ebe06149fff62693eb5b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSU5IZAAoJELp701BxlEWfrygP+gIUnXtlFB15QGwqYVUZUkV5
-rpPTapD+5yf4nmLjClEd+CvpPZp2CAzWwtivDT0tJKSEb0axW3dyqfwHYDM5Wfx4
-KfgMj4ldRowMVL5IJk0IUUby3qbGWo9KxnxQA3x4mmlXwljR+rUsu3hs0kPags6m
-cnhpErJRyCgWz7f5kocIgTcnEcncwC7D1L1BA/1ZkExT1HlWOrRz4NdA0yJX+TvL
-JV0CJuy/ynPuv9n540ng1XbORS+vkDm1vVwXp76XCC4IJYV6t/vN26mQ+xgVwdB4
-3fa5nhty4DF9dmOpx27c41ena90YX0noGGH8NbdIQD+3iylcCbdxB6VYGcXs9NRL
-hq6zHD5ulRc0dTpRcJRsZHh6wcpCzZtAqsbH4WfLcGwlgJ3BhgvvFlFx6TDaKQEz
-gjXFkoR4OK1iOdD2iuTvn3pN9JM08Z+Qfg17CTlBu4UcOR8mGFbYl4HR4xTeu7BK
-nEIU4rkP79gZ1BIAiDKSyorX0SEL65eSBbS568jVruloMLuPVAh4e0Zvx033WXQy
-NScpjzFhAvoMmxNsid1z2x1AY977AJXzBnbOO7Hj++SVbYwfkEyNT3/vmFmPJirG
-uJpuTyWvFNg2rzsKdieVx67mdhJz8BZYko6KSlyzY1laohuYWSi7c1CB9vud5EfZ
-Gr6qPMLs96lvEtilbi7i
-=fCT4
------END PGP SIGNATURE-----
diff --git a/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch b/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch
new file mode 100644
index 000000000000..db948094b755
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch
@@ -0,0 +1,18 @@
+diff -ur a/xdm/genauth.c b/xdm/genauth.c
+--- a/xdm/genauth.c	2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/genauth.c	2014-01-06 16:28:09.664060603 +0100
+@@ -40,6 +40,14 @@
+ 
+ #include <errno.h>
+ 
++#ifdef HAVE_ARC4RANDOM
++# ifdef __linux__
++#  include <bsd/stdlib.h>
++# else
++#  include <stdlib.h>
++# endif
++#endif
++
+ #include <time.h>
+ #define Time_t time_t
+ 
diff --git a/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch b/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch
new file mode 100644
index 000000000000..0a3f32bbea02
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch
@@ -0,0 +1,37 @@
+diff -ur a/xdm/choose.c b/xdm/choose.c
+--- a/xdm/choose.c	2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/choose.c	2014-01-06 16:33:09.628065364 +0100
+@@ -54,6 +54,14 @@
+ #  include       <tiuser.h>
+ # endif
+ 
++# ifdef HAVE_SETPROCTITLE
++#  ifdef __linux__
++#   include <bsd/unistd.h>
++#  else
++#   include <unistd.h>
++#  endif
++# endif
++
+ # include <time.h>
+ # define Time_t time_t
+ 
+diff -ur a/xdm/session.c b/xdm/session.c
+--- a/xdm/session.c	2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/session.c	2014-01-06 16:40:57.508072789 +0100
+@@ -54,6 +54,15 @@
+ # include <usersec.h>
+ #endif
+ 
++# ifdef HAVE_SETPROCTITLE
++#  include <sys/types.h>
++#  ifdef __linux__
++#   include <bsd/unistd.h>
++#  else
++#   include <unistd.h>
++#  endif
++# endif
++
+ #ifndef USE_PAM        /* PAM modules should handle these */
+ # ifdef SECURE_RPC
+ #  include <rpc/rpc.h>
diff --git a/x11-apps/xdm/xdm-1.1.11-r3.ebuild b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
index 0d36d6d42fea..300b5e471524 100644
--- a/x11-apps/xdm/xdm-1.1.11-r3.ebuild
+++ b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r3.ebuild,v 1.10 2013/10/08 05:03:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r3.ebuild,v 1.11 2014/01/06 16:00:50 chithanh Exp $
 
 EAPI=5
 
@@ -37,6 +37,8 @@ pkg_setup() {
 	PATCHES=(
 		"${FILESDIR}"/${PN}-consolekit.patch
 		"${FILESDIR}"/${P}-cve-2013-2179.patch
+		"${FILESDIR}"/${PN}-1.1.11-arc4random-include.patch
+		"${FILESDIR}"/${PN}-1.1.11-setproctitle-include.patch
 	)
 
 	XORG_CONFIGURE_OPTIONS=(