gentoo resync : 12.10.2017

3 files changed, 39 insertions, 1 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index dcaf1cb3fb41..0ee6d3d96e30 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -13,6 +13,7 @@ AUX xorg-server-1.17-cve-2015-0255-1.patch 4715 SHA256 dbd9f973ef3fab04f3889cd8a
 AUX xorg-server-1.17.2-uninit-clientsWritable.patch 2752 SHA256 e832ec502522c1153e3032386958ff462562227a74760a72d96b1a906b14aded SHA512 667c0330426a63ecfd790c922f5e892f24a4644d46bd621e39798db42f47835f80f3512f6910bab88a50a2138f76d9b5ca35b680143266ed3c9cba788d02fbdb WHIRLPOOL 042e4e6ae9de07dcbd8161e0023b236f54303918644cc713dd7d02bac39eb63b662177af0bd19274137880d698dcb6469f6b4485b006c652efd2761143c11a98
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 SHA256 07ef91cb5da75d5165d10d5bc29c58a8b003e743092c1e290453bd6f82a2cf63 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 WHIRLPOOL 08fa76e82278cc103ba91555d679413409fd70c29609950e9c1fdd7cfc1e13d5d5b76dc2891465b8faa0fca37c89a32556d0c4cb644a131a7abd332a91fc6cad
 AUX xorg-server-1.18-sysmacros.patch 1698 SHA256 bcd9aa80cd37d05aa4c09bb60e72eab47c14165cc479fd8cb743dca47f1b72b8 SHA512 e92300d9e965ebed7dc6f90d6d58b616e589f3df57efc954280a5eba65fa098bb6069f9b06c81cda169d46051f51a707e5ca659f820fc64948431bbc80e3e5a0 WHIRLPOOL dcb9469c22bc0b6478b0891bf88dcebc214990d12cb7387d1e6f86d8ebd12a5be71c4f0449a10d39034b7e34eef4b1a8846c7f406f1184e19f8e00f8f4c5e69b
+AUX xorg-server-1.19.4-sysmacros.patch 986 SHA256 3094af5316a14e4c03140b138471890a00a61d63444d833fa0c803f2179f3f82 SHA512 858676058779363741901ffbf79666f723f917b49f8627ddd2f31768873adfb416a70bc298e2356861cb5abca8be54a6c64f8fa4fd11a91cce072b93857ad168 WHIRLPOOL 59892e673b70b51d0d3be153f73e81aeb4b6af5e589940b8cb63865f391a7b3dc738440e0195db368904e9195cd7edb523af8215cde3389a86e65ebc196e27bc
 AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 SHA256 a98fd1589ef92d6f8a633326d387f2f203df72452788a6aaa2bcd4242700fe7f SHA512 2ac18d36cd8b6d9fcaf98a32e3e6b9107e420476e066a4ac9581f12e9afb7e397614761373a20d96c8fa840886b81ee0ec5cfc812e16876b4922bf6c5fe3f736 WHIRLPOOL 5c3ddd654fdecf3285d865b4b864bcaa3de87cd6005f8d500da4250b5b659db69e103743109ec3c72cb79abf24910b6de4ac05c0a7b7bcb2656d5a95c9703d38
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
@@ -27,7 +28,7 @@ EBUILD xorg-server-1.15.2-r4.ebuild 6422 SHA256 8241831f37e51808a28c5b1e0b6cc674
 EBUILD xorg-server-1.18.4.ebuild 6269 SHA256 7e3b05dc5b6e07ccbe18050ea12105339c7046be62900fc76d6a8973f3376e94 SHA512 2e903d0be445154fee0aa0a6f8a5598ddbdc2bc2625a5f0e623125b52ae1d828d9f97af044a45565163c92230cccffb3d9b77f2c0c69f95bb6ef8278d36bd15a WHIRLPOOL a262e7e6aedb7f0c063af59cf5c2d158097c5b46403449a25dcd5276b556e93f8f32f21442aa796e56f04d1150a8c63fe2b5c80d04ef90daa2bd4b961d7950dd
 EBUILD xorg-server-1.19.2.ebuild 6495 SHA256 78089c6a548396c89095fc6beec071f94689c3fb2bfa4f1156cf330fccac400a SHA512 db296b198e270909aa86aa10749031f63d906ebff0bb1f69893a41bb96c9a5b73b929a55815ab23ad0927c7a28d9a2e64e1c5c2ccb09a8f7cb8e340e270ca4a8 WHIRLPOOL f48f9b9d36708b482ddb9c8e9334dc727f5c2759a8ce0305704efe789a2156ce871bb5700648f7b4ba37b60dd9bbcaab0fc39fde615fca57c6ba684071b266a4
 EBUILD xorg-server-1.19.3.ebuild 6512 SHA256 2e83c66c00a67d4e9d9fcf34ec762519f3c9ada917b5762088675b5d0f0cc0fa SHA512 cffa1e80ce0c8f4435384a5f92d2bf2849e2118273ac13d1e7a9eb66bb679bb122861f2ad329f1fc92f9e3ba22dda3b2eb3b91f2f8ab1783ca8f2294d61b9f4e WHIRLPOOL ad0ae175db020297a0cf3d2f9e94402c08ba93265e746e16b9e7efc80b02898db3e628a9c3b8d82f1db3f840f490305cd5ad286fbf23d6d38d8703c6bddf1641
-EBUILD xorg-server-1.19.4.ebuild 6470 SHA256 93774f4c5bb8a96c5dc0691e138408eb2472e979a80bd75f8156e34ee7a198d3 SHA512 1b14cf05e265a6905121648602fe255f64e6ce90e76420639d344785ee47354b730f66559fa0baf74d5a594e0202b0ee15d2596dfc67b5103fff30383d3bcbf1 WHIRLPOOL 4091ab008663e78eb046a478661fa75571aff266879dbb7adb465e12fc8b66e777cc8cecfdd64e3e53f040f4ba870951634aa819ff178e4392f0593bf7c35301
+EBUILD xorg-server-1.19.4.ebuild 6514 SHA256 0a6638933f7b055ea7a364f88a560ca8e4ad9fd94a35d27cd0bbdb001c4c83b7 SHA512 b67e1f8ac55ef434b5fffd8202efdd6827928f0017dda74dbc7eb3e6ddecc3ec9fcb25508607f42bc84dbb20a583d87dbb8e71730f1b39a61a5984a427f43feb WHIRLPOOL a42659ae0ab8b1ceaded31b073808e81e6e5786cfbc7ce4514eb1009ee34afeda1b0a606c9eeca0f5bb47c36f7b0f70e2db0cb3ab38025a0221a7519e10ec44b
 EBUILD xorg-server-9999.ebuild 6169 SHA256 182dba1e70540b652a44aae356d12c1c26064ed11b508ab540ad41b97d4d3817 SHA512 23d99ad15a01a4d36b0e25869f4c742d2c8138d54e166f46194901315e79953f61da89abfd130459dd18dd7a6a3fd37775fcf4edf429702b33d0989fb31d52c2 WHIRLPOOL c05149abc68024f65edec18f04ea0d78acc50c35737a3ff221862f54737f8ead8b3d245b9a0549d5d9e8a2b68a63b64a18c9147c59fb4e73a33ad74104c3e599
 MISC ChangeLog 13297 SHA256 1977bc55d2059999337eb7da74854d87df14c185e4385d94996bee3b873acde9 SHA512 71cec7ec907faed0cd6c6d17a1cfe7e239d3ab232886b283ba5d4e96d14ec4f72dab46aae948112cd9df86e5abe7db09ebca8b975dacc0576deff3be2f07c6a0 WHIRLPOOL 35bafac5f84bbb743de840b3019eb6e665925e001af2f8ae8086f9e715e868d554a99e91ed595edd648b4eba84c3ce8a31a1fe6bb8a659606b941ea548671a27
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
new file mode 100644
index 000000000000..8a3cb7692922
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
@@ -0,0 +1,36 @@
+From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 11 Oct 2017 16:11:49 +0300
+Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor
+ functions for new glibc
+
+Commits d732c36597fa and 84e3b96b5313 added the include to some files, but
+missed config/udev.c, where the major and minor functions are used as well.
+This should be Linux-only, so we don't need the sys/mkdev.h case here for
+Solaris.
+
+Signed-off-by: Mart Raudsepp <leio@gentoo.org>
+---
+https://bugs.gentoo.org/633530
+https://patchwork.freedesktop.org/patch/181800/
+
+ config/udev.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/config/udev.c b/config/udev.c
+index 932f230..b3b8d0f 100644
+--- a/config/udev.c
++++ b/config/udev.c
+@@ -30,6 +30,9 @@
+ #include <libudev.h>
+ #include <ctype.h>
+ #include <unistd.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "input.h"
+ #include "inputstr.h"
+-- 
+2.10.2
+
diff --git a/x11-base/xorg-server/xorg-server-1.19.4.ebuild b/x11-base/xorg-server/xorg-server-1.19.4.ebuild
index bf4762405c48..0a04c0610878 100644
--- a/x11-base/xorg-server/xorg-server-1.19.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.4.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 	# needed for new eselect-opengl, bug #541232
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+	"${FILESDIR}"/${P}-sysmacros.patch #633530
 )
 
 pkg_pretend() {