Fix builds on uClibc and musl. Bug #546086.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 169 insertions, 17 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 86307023d18c..37f9382174a2 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.387 2015/04/09 20:51:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.388 2015/04/10 21:54:14 blueness Exp $
+
+  10 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/sudo-1.8.12-include-sys-types-h.patch, sudo-1.8.12.ebuild:
+  Fix builds on uClibc and musl.  Bug #546086.
 
 *sudo-9999 (09 Apr 2015)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 2c242b9ce5b7..742e3cf88eef 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sudo-1.8.12-include-sys-types-h.patch 5838 SHA256 c86bd2e0cee16ccda405cf2888097e60f9cc489c43e71482057a4049b6b2dd4a SHA512 d230420b04bd7a8335f67450bcb638caccb5ebba1ee7c96b43343df0ada867095fa931a8743d5b8f78d7cc96a3eb855863de1cfa4723315e705cbed1dc9bd51c WHIRLPOOL adb64000d54d9c7f1c35474feebc0333354b8207740abea2e3f9c6bd6d3f21d80489dcafcd47f4358e6133b8be8062341be30b1d59abb34ba2ae96fe7a10fbe1
 DIST sudo-1.8.11p1.tar.gz 2402012 SHA256 44c275772595a119185336164bb76b6e08f23d38aa0fe0d6bab48812e75d6a43 SHA512 47e49c854698268733d5a79e2ddcb8a23d6cf032fc5f79621318eddda6caac400d9db54b9239b605a1c2b11935e366177b0adadee5fbf1872ffbdc9b16c67cf2 WHIRLPOOL 451a86cf5046440ef7c5ee2640e2bf7d434c9f78748ae1ca2ac8433acb367f6148949b4b9ff4fbf22e5c9d6f834d45c525d749ee2cdc50bb3f5f7f1eb1c776be
 DIST sudo-1.8.11p2.tar.gz 2402235 SHA256 8133849418fa18cf6b6bb6893d1855ff7afe21db8923234a00bf045c90fba1ad SHA512 fdd6c14c3738cb7bafec9873c49f96270fdd36c72d14d3fc7e1ef3651275961bf17550ac1f56ed445b394985cbbf602b88f52cda1226e9007bed14a4d4fadbaa WHIRLPOOL a00fcdd34247f1efce2f22e98dea0be7b3109c7448ce749781ed9fe54c8d5f61a0fa922f09a5cda9c962eec230aa8e087b1fa118af6ff29d0f5db8929ccc1d34
 DIST sudo-1.8.12.tar.gz 2493373 SHA256 163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0 SHA512 1815343eceb7cfa6e37c961ce1c68cf96fc290356b92078d6d24a2c85d8b7a7236df78d3ff7f5e30eba492dc8407346d884e01c0b989eef4414156cfec80b67b WHIRLPOOL 0d9e618937a08b9bf74aaebf12f5b9f96afd827728f90fa95b6a2a4f932cc84240d56674aa903062247068ec5aa3369b14bad64130caeb313330286510c2d3f6
 DIST sudo-1.8.13.tar.gz 2515307 SHA256 e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25 SHA512 d5498ce8136e903a5ee9e6b1e9b69149b2268798f0678bf7fa82d56947c60d0dec1d7ee25df382e2ee05ecb660720af6b6bc24ad1b6493834e158ee3b186d03c WHIRLPOOL b06256020e5c21159f1b7ff7a9849053f89e95c58fce850653e60d625ad71f8cf9caf9421765398ed73d2ca4756483dcd9535dc856e681dc3b8d7c1206ae5553
 EBUILD sudo-1.8.11_p1.ebuild 5619 SHA256 7fe3889f35f4d05dcfb225444a07ee3febecdb17500ddf748a49679412b4808b SHA512 281274e107ac2d171a5c3806c1c69d858378aa1bc49d92ea83ff11d320f25c47c019b45d56bf260cb00193a5c2e225e410ca42b74fef70300bdb71595b11d2fc WHIRLPOOL 0fcdf075445d6d8302c23d1e8d51d6a2153fe5d80d9fb5c496807e1a2606c43a2a5c0058c847ba432b93c48f8e5886be7879cc2a557fc7b41ba802dd74502761
 EBUILD sudo-1.8.11_p2.ebuild 5637 SHA256 323373903e9c1dfe7ca033bad8ea257f50d34fb8dd0e03e277ad1a91e3b5b685 SHA512 8baa6413d284acc8ebde0e3c695451fd55b853870192c394f6175a99274edb6840aca318b3741476f195f98680b84e5de7824cd1a5a9f246795591b283389dc1 WHIRLPOOL 593ae254cb03a27a2480bf084f6d82a3247cf0c1c69437e1d63aed2ace76ad554c435e9e647baf55b060978a75f7d71cb5eac4704439cfa001ccbb4d39c21e30
-EBUILD sudo-1.8.12.ebuild 5624 SHA256 3f83c8384ac31445c60516caa5633e79408a7191bb3dd58b9f38702b5cc1947b SHA512 b12385227245319896cd4566204c4106e34f4a897c2480295ec3be794bdc60f3ac35ffe8b9e8dbe33ecd6d1d2c09d72c0aef29a87c3256a6a4f80ec93a02d97b WHIRLPOOL 480ee60f77bcd1fa14ea4b67347a973d8d3932062aea55a97a46445fad5db305d235bcbf1aa837e20de32343fe6b8857cf67d8cb62735add1369aa0f90fe199f
+EBUILD sudo-1.8.12.ebuild 5679 SHA256 69198d83cf4d68ecbc09285380123f51c3b61d3e32a725dd8309e1f18c63d046 SHA512 1837303d903970291de770a41bca7928104f13faf41af94b3f20ed496b99baadbab3c25506a9d6a3c1082c3e89a516a30551099c1b16929ad65084f91f6aa48c WHIRLPOOL 12fd69b8e2e2657bdd8194fa1cc3fc48e336e2a4618e7cd22b26403cf8139c69691aa329b2d8c4b79f1bdb380f62fdb87e274c34d9bdd3bcf8dce5826a39595a
 EBUILD sudo-1.8.13.ebuild 5637 SHA256 e1451074e1055d96a8d3862a681a509e5085d7de809b12f7195f99fd2f3163ec SHA512 a80e61868555083f9453104bad3fbc6e2bfd1af641a07429c676c1e9c804cebe8cb080a0614aaf8ef13927644e59f8330f24b74b17d7b75e4700a247533d8330 WHIRLPOOL 6b0a641ccb091a03c673f0f4adfc4634d0877b862b6391b03bfb784e9cd722d0aa890ffc752175c3e7ec0556729332cfb4e2ef23f3a2701007086fc93f34a7e4
 EBUILD sudo-9999.ebuild 5769 SHA256 be272172f9631e9ad20879566907704ad71d3278b1309ac1bb88048737de98de SHA512 cb34bd3f056bb7e605fe2f357b52ef68ab63e0b98551aef0f34b06c78df8f045746aaf6956ac130c0966725ac25f5afcfe695098940a765d4993b15fb666b621 WHIRLPOOL 6d71be1cbfffb94939f36366d3386b809d0932edae0e2dbcc68e0cf1192a4fa247f44600d9d53e0eb0e6a1724ce6c2853ff6b6de041dead9b923d40e72573db2
-MISC ChangeLog 55664 SHA256 409387529369fce0eb1f4f708d709734884659bfa7c83b8d4c2e4696d6e624fb SHA512 8f839dacad643fabe1429484ee2775523cdb9f15c909f7367816e82815f3c359f55d66a79955b254542d1b772f1c1c32dce841062daa61778842892f76ff7391 WHIRLPOOL 5e4427e700f5808315b19a871ca081c50e1917082d0fc6b0d20cea4fa6c93bd8ecf76bafd5fe610d1ce17a159d0760bf38e95c3ebe2b3f3152ac3d20f6f633e0
+MISC ChangeLog 55835 SHA256 77ce1dac3c406b54046352ec8f61f633d004dd8539d0547f35245436ea195fc0 SHA512 c0d9bc0077e85504d3b25f7e0b15070f134e2ec6c213930b17069621896036aabce0e691ffbd811386a5d989a9aae0d006b8102ccba8c5bc7924e789814d7a42 WHIRLPOOL 327f6dd8e256400778b9fc30e746e0251312202500eab67c0bb77cf155ab758dac6847546a085d8905be717154242b0be9cf4186a7b748a5ef5247d9d4691604
 MISC metadata.xml 726 SHA256 242e8a573d76b2163a928259e5226fff2c237b3e9c244860a1430fa79c5b390e SHA512 d0a7e5f53ec823d84e3c38c2bd64ba566d7cbd08c12ebf3e9b9fed10b77ce2e3e951e262f1a307aa8f0819a662559ca6f9bcf86cf05088480413e4534ce299d3 WHIRLPOOL b919b1825e68eb3285523f057fc42b5fde9e59a738ecdb1de0835af827db6284fc66848a10517a215389c4466f21b70e376f3fffc993aa338e47fca971d0af83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVJubOAAoJEJOE+m71LUu6lpoP/2W3UNojKnnGxJ91lmxKJGeh
-HDAQslEE1w40qMKzhqD2arq7ts7NaQNvYqeklv4d+V0KkFvFkfnIGimcN0MfiC9R
-uYdZbstz4FeYkfkrH3K4MBONo/6zPgvrcT9WAQVfJvYGJMhurmrF3HeTjXH7rhmQ
-9Adk7MW3mwCnaXkhrt5+LKzuScTct/qXM2nZftK+YKI3r2SMa4fzxU/oK+u7Yu0R
-p0sgzOebaPOEhdmgTVGoaHgj4u9fVz8dZH8pyxcfRaa6rmv5IiYkWWZNK9O9J38X
-oBZ7sSJvdi3wTyeyfcifljKmFnes1HjzAp4G30pjN97dYCtbAKxglREWejB+WcgS
-jrqgfTdjG19ivSoxtmn/gLK2xqMp9ZQM3QhECgh7E8aBJU2bDzAf4dEsbhbneYhR
-yoNUTqSF4uJYjZKDvgExV5ItOnO5Gf61m8b5a3Gef6xT1C5Pos7FZbOTaNg2sUKK
-QMrtyyEN3QIM0dh+gbJDXHCq6tqBY96sePZIiChuazVn+wECpT3jIuP/s1r+u+f0
-nxgu1h5tzeYXXjXMx4ruN+p3wmDw7zhG0gLGNmH0ADqeVRboB+EmDs2gbVw7sop7
-CGKIOBGHnrtayXI5S0alcRYKu42DKn8KUNxVpvs271wXJygszqJ/oxjh4rWrGyr4
-NG747vwyvGvGasO5GKxb
-=P1pM
+iQIcBAEBCAAGBQJVKEcLAAoJEJOE+m71LUu6XWwQAJ6sW6TYMd5NgnNuzy1qOyiq
+51+EBlt/BMCBwHLUSawEPr7rFMGTRG4QTeO5Y8thOExSeuD+4K9KR93qdSVZmvm9
+xXEWLWYtHPDSpaJz/+apw7D/mRqkbvhHQLRK13lVezuCeY9d2+tEOdO+Of7UTh5H
+9hdSri/1iw8Unn3xvneH6EA+OtT2f47sQo9dkkNUI2/jBY/6Iu4u7veW0G2nUl25
+dXHgNcIY9BPJHrkTA6tQuZ04VIBP7J+iBekNcWoTKOXUUPRAJkVdM1p8VgHqfQj+
+5k86n/SShiFOy0/o4QA5K5qtk1q9U8U2Z/6taVrcyesDdKSxPsblAh5qbbYh0Wix
+EORtYUOfY7LbhluImcXel3tQukTAIF0W2z6XuBatORDEWSexYL4HYSjtchvLQchK
+7iqgsPN9LOT+cS8QitsPSZmMasqNL8MNrIgeuKTAQHNZGADPitUV+yo3qN02wo47
+VaSjm2DnyzbjJCow2QdvPYGNFV90ZL1dhHgg5ZGKd/gMsnzf9x4w/bXypnU5W96e
+tyNSCP8DKd+JMy+AtrHZ3vS9VFdIBILpHVrPNptD1rjPGD+8trkMlAMPuwnzqFNO
+hB87T0T8o2XhFb66pxc4Ub8XLZtT+NlfJtMsuFEk/g67qIXT3b+HCL+RXlJzR4mN
+uaIqRilNceERSkT3YMZl
+=ea0n
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-1.8.12-include-sys-types-h.patch b/app-admin/sudo/files/sudo-1.8.12-include-sys-types-h.patch
new file mode 100644
index 000000000000..f33748669e97
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.8.12-include-sys-types-h.patch
@@ -0,0 +1,146 @@
+This fixes builds on uClibc and musl.  See
+https://bugs.gentoo.org/show_bug.cgi?id=544756
+
+This patch is a slight modification of uptream commits:
+http://www.sudo.ws/repos/sudo/rev/86eb67f3c41a
+http://www.sudo.ws/repos/sudo/rev/e0794f05e95c
+
+diff -Naur sudo-1.8.12.orig/lib/util/getopt_long.c sudo-1.8.12/lib/util/getopt_long.c
+--- sudo-1.8.12.orig/lib/util/getopt_long.c	2015-02-09 18:40:10.000000000 +0000
++++ sudo-1.8.12/lib/util/getopt_long.c	2015-04-10 19:21:20.337032782 +0000
+@@ -52,6 +52,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+diff -Naur sudo-1.8.12.orig/lib/util/mksiglist.c sudo-1.8.12/lib/util/mksiglist.c
+--- sudo-1.8.12.orig/lib/util/mksiglist.c	2015-02-09 18:40:10.000000000 +0000
++++ sudo-1.8.12/lib/util/mksiglist.c	2015-04-10 19:22:38.719856268 +0000
+@@ -43,6 +43,7 @@
+ #include "mksiglist.h"
+ 
+     printf("#include <config.h>\n");
++    printf("#include <sys/types.h>\n");
+     printf("#include <signal.h>\n");
+     printf("#include \"sudo_compat.h\"\n\n");
+     printf("const char *const sudo_sys_siglist[NSIG] = {\n");
+diff -Naur sudo-1.8.12.orig/lib/util/mksigname.c sudo-1.8.12/lib/util/mksigname.c
+--- sudo-1.8.12.orig/lib/util/mksigname.c	2015-02-09 18:40:10.000000000 +0000
++++ sudo-1.8.12/lib/util/mksigname.c	2015-04-10 19:22:10.738491394 +0000
+@@ -43,6 +43,7 @@
+ #include "mksigname.h"
+ 
+     printf("#include <config.h>\n");
++    printf("#include <sys/types.h>\n");
+     printf("#include <signal.h>\n");
+     printf("#include \"sudo_compat.h\"\n\n");
+     printf("const char *const sudo_sys_signame[NSIG] = {\n");
+diff -Naur sudo-1.8.12.orig/lib/util/regress/fnmatch/fnm_test.c sudo-1.8.12/lib/util/regress/fnmatch/fnm_test.c
+--- sudo-1.8.12.orig/lib/util/regress/fnmatch/fnm_test.c	2015-02-09 18:40:10.000000000 +0000
++++ sudo-1.8.12/lib/util/regress/fnmatch/fnm_test.c	2015-04-10 19:21:20.340032928 +0000
+@@ -6,6 +6,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #ifdef HAVE_STRING_H
+diff -Naur sudo-1.8.12.orig/lib/util/regress/glob/globtest.c sudo-1.8.12/lib/util/regress/glob/globtest.c
+--- sudo-1.8.12.orig/lib/util/regress/glob/globtest.c	2015-02-09 18:40:10.000000000 +0000
++++ sudo-1.8.12/lib/util/regress/glob/globtest.c	2015-04-10 19:21:20.341032977 +0000
+@@ -6,6 +6,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #ifdef HAVE_STRING_H
+diff -Naur sudo-1.8.12.orig/lib/util/sha2.c sudo-1.8.12/lib/util/sha2.c
+--- sudo-1.8.12.orig/lib/util/sha2.c	2015-02-09 18:40:09.000000000 +0000
++++ sudo-1.8.12/lib/util/sha2.c	2015-04-10 19:21:20.342033026 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013 Todd C. Miller <Todd.Miller@courtesan.com>
++ * Copyright (c) 2013-2015 Todd C. Miller <Todd.Miller@courtesan.com>
+  *
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -25,6 +25,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+diff -Naur sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_base64.c sudo-1.8.12/plugins/sudoers/regress/parser/check_base64.c
+--- sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_base64.c	2015-02-09 18:40:10.000000000 +0000
++++ sudo-1.8.12/plugins/sudoers/regress/parser/check_base64.c	2015-04-10 19:21:20.342033026 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013 Todd C. Miller <Todd.Miller@courtesan.com>
++ * Copyright (c) 2013-2015 Todd C. Miller <Todd.Miller@courtesan.com>
+  *
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -16,6 +16,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+diff -Naur sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_digest.c sudo-1.8.12/plugins/sudoers/regress/parser/check_digest.c
+--- sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_digest.c	2015-02-09 18:40:10.000000000 +0000
++++ sudo-1.8.12/plugins/sudoers/regress/parser/check_digest.c	2015-04-10 19:21:20.343033075 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013 Todd C. Miller <Todd.Miller@courtesan.com>
++ * Copyright (c) 2013-2015 Todd C. Miller <Todd.Miller@courtesan.com>
+  *
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -16,6 +16,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+diff -Naur sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_hexchar.c sudo-1.8.12/plugins/sudoers/regress/parser/check_hexchar.c
+--- sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_hexchar.c	2015-02-09 18:40:10.000000000 +0000
++++ sudo-1.8.12/plugins/sudoers/regress/parser/check_hexchar.c	2015-04-10 19:21:20.344033124 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2014 Todd C. Miller <Todd.Miller@courtesan.com>
++ * Copyright (c) 2014-2015 Todd C. Miller <Todd.Miller@courtesan.com>
+  *
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -16,6 +16,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+diff -Naur sudo-1.8.12.orig/plugins/sudoers/solaris_audit.c sudo-1.8.12/plugins/sudoers/solaris_audit.c
+--- sudo-1.8.12.orig/plugins/sudoers/solaris_audit.c	2015-02-09 18:53:54.000000000 +0000
++++ sudo-1.8.12/plugins/sudoers/solaris_audit.c	2015-04-10 19:21:20.345033172 +0000
+@@ -15,6 +15,8 @@
+  */
+ 
+ #include <config.h>
++
++#include <sys/types.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/app-admin/sudo/sudo-1.8.12.ebuild b/app-admin/sudo/sudo-1.8.12.ebuild
index f096cb93e951..ec6d6771d944 100644
--- a/app-admin/sudo/sudo-1.8.12.ebuild
+++ b/app-admin/sudo/sudo-1.8.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.12.ebuild,v 1.8 2015/04/02 19:55:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.12.ebuild,v 1.9 2015/04/10 21:54:14 blueness Exp $
 
 EAPI=5
 
@@ -50,6 +50,7 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-include-sys-types-h.patch
 	elibtoolize
 }