gentoo resync : 18.11.2018

6 files changed, 94 insertions, 2 deletions

diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index abc0746bf2b3..9d09a61b2968 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -2,9 +2,13 @@ AUX jail-1.9-gentoo.patch 3186 BLAKE2B 289f102f6041e4352b0ae1bb1548ae2c4b6c2a2d8
 AUX jail-1.9-ldflags.patch 328 BLAKE2B f6965d1b43af4b16ec8db30add8b1c448557ad00d6ba0c0793b3b00898fa0decbe42c77822c6361183314c5cd2197e52366e6cb3d5e2197448b7d21a853a380b SHA512 8b92e834a447f5fb916ff4cfb3fa1ca89d048e954ffc2a8cd8889e21a8037b54ee14d241f1a988d2c686d3ce844205354a5763f0f44cef8b2413e1ba05ff405b
 AUX jail-1.9-multiuser-rsa.patch 856 BLAKE2B 4974cf19df37b5a9f5c75fdb31c65e3556a22ec7bfe9b7a1d385d3286615f95571d95887826f72bc09202c77fef03f0158f385db15bc60a67cd29c635637d37a SHA512 b6cc3018faf06346c747242b8b721554438dd4db11621411142a50e7ed41ee009af8387fb2742a44c8fe243f5201f58da77d48a54a83d709ed5e8e8172f50541
 AUX jail-1.9-wrongshell.patch 330 BLAKE2B 5d707238febc3fa77daabdd39f74644873fbd7971d8e609b2112fe5b319dbd133bd6f75e291c92cb683f6552b06605249232f675f2217b5d42564d13b78e8a8d SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd
+AUX jail-2.0-duplicate-jail.patch 543 BLAKE2B 2e52f6ea3aac4c30ccd347aea66b00a866feb0920227a15a90615cde7793c79b8308fb66b58b60e78aad32fe691acae77f55509747fdfbf786505a8193260329 SHA512 e1b36f0eb326b6ea4f243a1ec523b991cad3c7b753365b16d54faabd2c5d57971eadb205859874aa0c6ed8fac34c2b6616ac79c6e5cbee042d5e16cfa3d2dc82
+AUX jail-2.0-fix-paths.patch 568 BLAKE2B dee607234d1a243cf769ddaaa9480efe704b8c51963133f338ba9df17894c0316375ea77963d6d67beb461d1b7837993147b94b36a6c644210cad88c04ebb09d SHA512 3263b23ceca63c54fc1cbe923ed13cdf638094f1c59fadddd0d831e6c52dd4d7ea2daf8c882dcf87375f89d716c6bf74f6f4c86b719feea92490a04f6d44ffe1
+AUX jail-2.0-ldd-call.patch 586 BLAKE2B 97ad24ed99d8ab22e4ecbc5ac93eb54f018233dcc393a48dc8b2b81894673caee64ae6f7ba1263398542795bd01e098c8e89c26673ee81c87d048d19e4c54bd8 SHA512 cef02e2c6a5a9950b500ac1f80be39801485f31b70f240dbd162e2ef49d1e100b3f5e221f23f7eefd19923f2027bbd7913bfeb055d9733f7e2487de9fc1fedf8
+AUX jail-2.0-openat-syscall.patch 645 BLAKE2B db200b5969f031059a749283d5ee0945ab34f0769506eb897f34393ca38677df6fabfde3f5facd29d24fcf7e550ada06894509af47ae895fc26c0c58318c8007 SHA512 ea2278df96b2d52eb61c370ce9b22d05871eb479fd89ae117ef97289955ebede21e04378cdd979f78d5b6ec518fafbc4160fe8595510e99546048bf452c22e08
 AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f
 AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
 EBUILD jail-2.0-r1.ebuild 1991 BLAKE2B a0e0ba8b3d16324cf15199cb27f87e39a7df73f5d7d67a19b0806d7fc32c7b032a88b93876c2669d9a02702ecb5263f759b706763cf6ff41c5c5a4787a0cf388 SHA512 fe7787da5600a14444902560c8de142c237585b9ac006d96081ab0736ae9a09816d2e59158a76cb80efac867404c3aa09aee4e9ad899eb4b90de77982dd1a56f
-EBUILD jail-2.0-r2.ebuild 1932 BLAKE2B 67e57ab57efe111166d9b01f7029e26f4ca6d5961c2e120721da18731c0235131c268210e9e397a750bd2a9c05853699a7722ac7b68f9a7a062b27c6947bb114 SHA512 6efe7c5ce0f9ef53fdc86dbd2fe81758cf28015c1d69c9a1c3bddb139f975de17f8392c9873ca01a67959f1598d70c3588287f43ad7b6fa959b356d8ad7b4692
+EBUILD jail-2.0-r4.ebuild 2212 BLAKE2B cd01439177e25004b8d772e6ae0af33c645f76dbbd994b50bfbd9bb81920e5de9ed44262ac22547909b7bc19cdd352ebd7e11cbc3aaa2b045116a0493a98bfa4 SHA512 238a11d7df549581d56fa29d83aca319c2356ef8d4bf1b6a9cb2cbda4c45d2a4e0c3813095991f96185ff714787eb250a5952ec3d2b04c6f4eb1cd77a5159d76
 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
diff --git a/app-misc/jail/files/jail-2.0-duplicate-jail.patch b/app-misc/jail/files/jail-2.0-duplicate-jail.patch
new file mode 100644
index 000000000000..1522f3aa99ec
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-duplicate-jail.patch
@@ -0,0 +1,19 @@
+commit 984f62591b264aa8ed5c17f4033ec96dbba4bf5f
+Author: Alexander Zubkov <green@qrator.net>
+Date:   Wed Oct 17 22:47:50 2018 +0200
+
+    do not duplicate jail in shells file
+
+diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions
+index b1fdbc8..89cd607 100755
+--- a/lib/arch/generic/functions
++++ b/lib/arch/generic/functions
+@@ -823,7 +823,7 @@ sub add_jail_to_shells {
+   close(F);
+ 
+   for $k (@elem) {
+-    if ($k =~ /^$INSTALL_DIR\/jail/) {
++    if ($k =~ /^$INSTALL_DIR\/bin\/jail/) {
+       $found = 1;
+       last;
+     }
diff --git a/app-misc/jail/files/jail-2.0-fix-paths.patch b/app-misc/jail/files/jail-2.0-fix-paths.patch
new file mode 100644
index 000000000000..e522828e286c
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-fix-paths.patch
@@ -0,0 +1,21 @@
+commit 762cca3fd4aa754b266f928ec3fa2ad2261a831e
+Author: Alexander Zubkov <green@qrator.net>
+Date:   Mon Oct 22 20:31:04 2018 +0200
+
+    honor standalone '.' in path, split jail dir on "/./" pattern
+
+diff --git a/src/jail.c b/src/jail.c
+index 74f3eb1..3d649c4 100644
+--- a/src/jail.c
++++ b/src/jail.c
+@@ -121,8 +121,9 @@ void make_jail_dir( char*  dir )
+ {
+     for( ; *dir != '\0'; ++dir )
+     {
+-        if( *dir == '.' )
++        if( dir[0] == '/' && dir[1] == '.' && dir[2] == '/' )
+         {
++            ++dir;
+             *dir = '\0';
+             break;
+ 	}
diff --git a/app-misc/jail/files/jail-2.0-ldd-call.patch b/app-misc/jail/files/jail-2.0-ldd-call.patch
new file mode 100644
index 000000000000..22b2152066e7
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-ldd-call.patch
@@ -0,0 +1,19 @@
+commit 87867b2a117eef19500600a1f88b9caf260cfe3b
+Author: Alexander Zubkov <green@qrator.net>
+Date:   Wed Oct 17 22:38:13 2018 +0200
+
+    do not pass program parameters to ldd call
+
+diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions
+index 66653c3..b0c6572 100755
+--- a/lib/arch/generic/functions
++++ b/lib/arch/generic/functions
+@@ -704,7 +704,7 @@ sub generate_dep {
+       return();
+     }
+     
+-    $query = "($ldd_cmd $p_name $p_args </dev/null 2>&1)";
++    $query = "($ldd_cmd $p_name </dev/null 2>&1)";
+     local @res_a = `$query`;
+     
+     local @items = ();
diff --git a/app-misc/jail/files/jail-2.0-openat-syscall.patch b/app-misc/jail/files/jail-2.0-openat-syscall.patch
new file mode 100644
index 000000000000..37f2a59b14b9
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-openat-syscall.patch
@@ -0,0 +1,23 @@
+commit 0894cc54b5b385201cdcf7ce227c6ea03d765ef9
+Author: Alexander Zubkov <green@qrator.net>
+Date:   Wed Oct 17 22:45:24 2018 +0200
+
+    support openat() syscall too
+
+diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions
+index b0c6572..b1fdbc8 100755
+--- a/lib/arch/generic/functions
++++ b/lib/arch/generic/functions
+@@ -647,9 +647,9 @@ sub extract_open_from_ldd {
+ 
+   local $file;
+   local $val;
+-  if ($line =~ /^open\(\"(.+)\".+\)\s*=\s*([-]?\d+)/) {
+-    $file = $1;
+-    $val = $2;
++  if ($line =~ /^open(at)?\([^\"]*\"(.+)\".+\)\s*=\s*([-]?\d+)/) {
++    $file = $2;
++    $val = $3;
+     return($file,$val);
+   }
+   return();
\ No newline at end of file
diff --git a/app-misc/jail/jail-2.0-r2.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index 8243ee0dfd3c..fc4cdee1bb55 100644
--- a/app-misc/jail/jail-2.0-r2.ebuild
+++ b/app-misc/jail/jail-2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9-ldflags.patch
 	"${FILESDIR}"/${PN}-2.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.0-symlinks.patch #659094
+	"${FILESDIR}"/${PN}-2.0-fix-paths.patch #646116
+	# https://github.com/spiculator/jail/issues/2
+	"${FILESDIR}"/${PN}-2.0-openat-syscall.patch
+	# https://github.com/spiculator/jail/issues/3
+	"${FILESDIR}"/${PN}-2.0-ldd-call.patch
+	"${FILESDIR}"/${PN}-2.0-duplicate-jail.patch #668898
 )
 
 src_compile() {