gentoo resync : 21.10.2017

4 files changed, 51 insertions, 2 deletions

diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index b48ffa51f2c0..015c4a9326bb 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,5 +1,7 @@
+AUX vzctl-4.9.4-glibc225-2.patch 1196 SHA256 ffea11b66944b6ed0835c73dae4a8976c285d36bb2a8099b16236728e34d24f9 SHA512 70ec27c9067bdd7fa1e3e2aa32b32649aca8a2d357ffa583c29132d7339f52bbc19195fc9be304f977ee82d96978f3a51bc9cca23d124ce4946c48b6129bd714 WHIRLPOOL aa711e8b26d0050b165c2048c54ea1aec5f9675de17178f900ae614c4f6e41ca3a73a710d8a7505982306e4b919cdafd026f9979c51464808f6cd9aaf84fad83
+AUX vzctl-4.9.4-glibc225.patch 406 SHA256 d791c41c0588ed5344f9a77c6f395eeced4517ff64e466f38f4c5eeb268b4ef0 SHA512 db7778a15785e6d9d22d1102cb341647834b6b9eeb4fc26b6cbaa86af7317931d3571a2b7f03a3b419338e11427482dd831374144a67dda2f2f4fe11ff020f45 WHIRLPOOL ba56a39953171b3a83acf77cef32a5e4de4700d10ed107715fb714f4d207a1a436734ec355628f24143a91878026c585a1cdb170011d0c0a95a63b79ec6487fc
 DIST vzctl-4.9.4.tar.bz2 550370 SHA256 bc3c63841b5244181e71bd1daf7c9aca6df3d42ed886a161fa5ba4b1b4520420 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706 WHIRLPOOL ed3c2531919b68fc2ae8acd9ac7b582b91f0eb6976155f12e2b35dbb236044c538e6499129aca579f9bc7697379c323bc6b32d0796a74a28b816a2dfb188c84f
-EBUILD vzctl-4.9.4.ebuild 2116 SHA256 e1ca4b31f54d458c2598fab656261f6b02a842b612e2546c0620173f5ec91aa0 SHA512 a1af0a7f1dcf5cbdc4ada93c648387de74ddaf0f2c3908ba5ba4950324c1e8855fe6be3d56944271bf646935c7c62866866cef34f49c362fbe9d62047b2940e6 WHIRLPOOL adb5bbaa16542041cbcb9d9413c1634ff47ad5b87742b7507e6e7f4001f61bc99dc9aae0e3be919b9f896df9ecbb1553d7c068801eb6d4ef520652751404fda3
+EBUILD vzctl-4.9.4.ebuild 2215 SHA256 5ace2efeb04ef50dea5ef6421faef9caf539c63458133b0ad1ffb3b7e5d38080 SHA512 784fbb6e3366432da9ba518c02731e80a7af3165aeef27ecc9281a5ee83b08563dafc457c45dbac7c2ccec551e774ef025f211853126224ae0dba4466c0621a9 WHIRLPOOL 0a4238d13efac127c6e4e2ef20f44713795b8d0240f3a1cc9d1885bea828af67481771978a6fc3364ed21bb2971fc1f967c2afd88da674ae8439f6c7b3afca59
 MISC ChangeLog 3310 SHA256 575b30ede9e0121adc781dcb6e593bbb9539b82ccfb62810489649bf5d1c8591 SHA512 47fd9b3b5edd103ecc3a069222ab6b2267ea522c0ecf09a404be5ce2e11d9c87cd594f432d344234b79fb4b1059fb8bf08630765b6c7ea1cad4244aff3ab1672 WHIRLPOOL ffbc5379c1eb4b04d5df9e7c71176ebd9f9b7c5cacbf817b1ee539fbef80327edc2508bbf01bc5c565f34f779d6c61568f874cd278043b4cf0ad6b02678391bd
 MISC ChangeLog-2015 26509 SHA256 654eed1c50e25106e50861b84db3bf8d5493a86675a04d5762590516581f38d8 SHA512 ae61904b6824173f90f79bc9dbc43921b50c8456be1d04ee7f9dcbcefd5747ea6cc564733d87dc7ee814e0ed1118d5ba4449d7196140105199ab08e03d323c46 WHIRLPOOL 6601849e4ee597ff988f3944f736003fb31273a34b8b782135a5a6642cbf199587ecfd773ace91da0c4c8e4e35362db6f3054fbcb39f03a1cd3e25d84e957681
 MISC metadata.xml 476 SHA256 36378f13330379a93f3e73359e04d71ed8bdaefbadcb802a4f96eabaedd96100 SHA512 0530fde605015304c81e13ae82da0fcd230a97766dcd775632515d7368d701b3ecae16988ad6447d0e77a1ae9d08f31bd28a3e0e3f5ce0f03b915ff2ad453389 WHIRLPOOL eec1dd7c7cc89fdf650309b1e974ea6ade5d84853b95783af0f4e99a029422853f868e8c129185c59762d4623e117c15dd2dedd6101847be470ee371d1da8e76
diff --git a/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225-2.patch b/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225-2.patch
new file mode 100644
index 000000000000..de8eca658c0a
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225-2.patch
@@ -0,0 +1,33 @@
+diff -ruN vzctl-4.9.4.orig/src/lib/dev.c vzctl-4.9.4/src/lib/dev.c
+--- vzctl-4.9.4.orig/src/lib/dev.c	2017-10-20 23:22:14.689240049 +0200
++++ vzctl-4.9.4/src/lib/dev.c	2017-10-20 23:24:28.972830730 +0200
+@@ -19,6 +19,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <errno.h>
+diff -ruN vzctl-4.9.4.orig/src/lib/hooks_ct.c vzctl-4.9.4/src/lib/hooks_ct.c
+--- vzctl-4.9.4.orig/src/lib/hooks_ct.c	2015-08-27 01:41:24.000000000 +0200
++++ vzctl-4.9.4/src/lib/hooks_ct.c	2017-10-20 23:24:14.508659254 +0200
+@@ -5,6 +5,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/wait.h>
+ #include <sys/mount.h>
+ #include <fcntl.h>
+diff -ruN vzctl-4.9.4.orig/src/lib/vps_configure.c vzctl-4.9.4/src/lib/vps_configure.c
+--- vzctl-4.9.4.orig/src/lib/vps_configure.c	2015-08-27 01:41:24.000000000 +0200
++++ vzctl-4.9.4/src/lib/vps_configure.c	2017-10-20 23:26:01.848931798 +0200
+@@ -24,6 +24,7 @@
+ #include <sys/stat.h>
+ #include <netinet/in.h>
+ #include <linux/vzcalluser.h>
++#include <sys/sysmacros.h>
+ 
+ #include "vzerror.h"
+ #include "logger.h"
diff --git a/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225.patch b/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225.patch
new file mode 100644
index 000000000000..87f86270bdd9
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-4.9.4-glibc225.patch
@@ -0,0 +1,11 @@
+diff -ruN vzctl-4.9.4.orig/src/lib/config.c vzctl-4.9.4/src/lib/config.c
+--- vzctl-4.9.4.orig/src/lib/config.c	2015-08-27 01:41:24.000000000 +0200
++++ vzctl-4.9.4/src/lib/config.c	2017-10-20 23:19:14.651115558 +0200
+@@ -25,6 +25,7 @@
+ #include <arpa/inet.h>
+ #include <getopt.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <linux/vzcalluser.h>
+ #include <unistd.h>
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index 5623e9d70c87..c3aab29cb491 100644
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
@@ -41,11 +41,14 @@ DEPEND="${RDEPEND}
 	"
 
 src_prepare() {
-
 	# Set default OSTEMPLATE on gentoo
 	sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
 	# Set proper udev directory
 	sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
+
+	epatch "${FILESDIR}/${P}-glibc225.patch"
+	epatch "${FILESDIR}/${P}-glibc225-2.patch"
+	epatch_user
 }
 
 src_configure() {