tweak to be like upstreams fix

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 7a070d2debce838b1fe60fb620fabec0a26fad0e..0788abfacf81f9ba209ea01a7a82939805ce5253 100644 (file)
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -21,10 +21,14 @@ AUX strace-4.5.12-superh-update.patch 540 RMD160 4a021623687f0bbb6dc1e102ab5e304
 MD5 d35971fd734b9597cc50db1060fd2b8f files/strace-4.5.12-superh-update.patch 540
 RMD160 4a021623687f0bbb6dc1e102ab5e304fea123857 files/strace-4.5.12-superh-update.patch 540
 SHA256 267d553bec04725e3d723b3afe825c8307774d75c9f9424c6801048fc85712b9 files/strace-4.5.12-superh-update.patch 540
-AUX strace-4.5.14-PT_GETSIGINFO.patch 607 RMD160 fae2f625c1cf071324cd02e97b88879d973e5c1e SHA1 c9a5902adeaf6d58ca5dd3e91f0ee60823532e39 SHA256 92ebb64a491dc1788300391c517f9e15abe2d346c24c7ceca1b8eb57b40e7ace
-MD5 054b98bfa95f919fa0221f1b0d83345c files/strace-4.5.14-PT_GETSIGINFO.patch 607
-RMD160 fae2f625c1cf071324cd02e97b88879d973e5c1e files/strace-4.5.14-PT_GETSIGINFO.patch 607
-SHA256 92ebb64a491dc1788300391c517f9e15abe2d346c24c7ceca1b8eb57b40e7ace files/strace-4.5.14-PT_GETSIGINFO.patch 607
+AUX strace-4.5.14-CTL_PROC.patch 353 RMD160 5a0c556334991b9b6855fed33942377e6c0e3278 SHA1 745fadf652a51b509f53a742e153e7c923a33c75 SHA256 f00b59ec7a93ac1b3c6fa786e03611e387f9235b187122602b8f439eab3c13b5
+MD5 9bba6568be37f6b0179eb9fdbde37ee0 files/strace-4.5.14-CTL_PROC.patch 353
+RMD160 5a0c556334991b9b6855fed33942377e6c0e3278 files/strace-4.5.14-CTL_PROC.patch 353
+SHA256 f00b59ec7a93ac1b3c6fa786e03611e387f9235b187122602b8f439eab3c13b5 files/strace-4.5.14-CTL_PROC.patch 353
+AUX strace-4.5.14-PT_GETSIGINFO.patch 766 RMD160 c44f89db60f0eaf8c9f37f2579dfc82cc0aff1ff SHA1 a870fc6d5fce4289cd4167c6534e38673919f72e SHA256 8b58a9ba6e917e4f6bf3f3821271364511d3dfaa2e6cdd96d461da9c63af2b8a
+MD5 f3397466058b002f3641219f3fad9b60 files/strace-4.5.14-PT_GETSIGINFO.patch 766
+RMD160 c44f89db60f0eaf8c9f37f2579dfc82cc0aff1ff files/strace-4.5.14-PT_GETSIGINFO.patch 766
+SHA256 8b58a9ba6e917e4f6bf3f3821271364511d3dfaa2e6cdd96d461da9c63af2b8a files/strace-4.5.14-PT_GETSIGINFO.patch 766
 AUX strace-4.5.8-ia64.patch 2271 RMD160 8a26565e9286deb508a2b1626b41e9856d81c385 SHA1 848a4f32b9b6f75fdebfae4de0e907221022354b SHA256 7882ae9504c1ff1446d7b0df3a27642a8703b3065adf2df1e66b83dd9a13b0f3
 MD5 335622a1648a690be4e5eddba97f3034 files/strace-4.5.8-ia64.patch 2271
 RMD160 8a26565e9286deb508a2b1626b41e9856d81c385 files/strace-4.5.8-ia64.patch 2271
@@ -45,32 +49,24 @@ AUX strace-undef-syscall.patch 656 RMD160 d487e514648b51fa6d40b27736c1d1c4141677
 MD5 661ca5a1974846c6f778c6c47d8b382e files/strace-undef-syscall.patch 656
 RMD160 d487e514648b51fa6d40b27736c1d1c41416770f files/strace-undef-syscall.patch 656
 SHA256 fbda53ace470c2bdb28cfee7acca2568f6242504adef4b731f60eaf57df915f7 files/strace-undef-syscall.patch 656
-DIST strace-4.5.11.tar.bz2 422458 RMD160 f86e775e04f08e0ac4c611ea7b9b0fa598960863 SHA1 13d09ca492c8a68eccfe7490d4663638e7e9777e SHA256 9de428477d4d3f383d58c2f16b2544da2a5ec0acc50ee90ecb81dfe38f56edb8
 DIST strace-4.5.12.tar.bz2 421723 RMD160 c64f812eef31e027d841212a1c68df523ab1aecd SHA1 1f7754e9b992a147f5313bae9125424e5b4b48a6 SHA256 d8d9d62f0ebab71fab62b5ba7eaddd8bb8df9b7f4988b4a8e0d0724662702acf
 DIST strace-4.5.14.tar.bz2 445134 RMD160 cb42cac34d1624dd24842ada0dbb9dfff67e8e93 SHA1 72c17d1dd6786d22ca0aaaa7292b8edcd70a27de SHA256 a6808914cbfead2595dfd061a0f14dcbb0a8bb645e3cfdfa5c247d7ded9e0e7d
-EBUILD strace-4.5.11.ebuild 1675 RMD160 0363ba90a1dc3295539570748984b0723d4a7149 SHA1 766be2086f4ffe777ef37dcfa7778872caec14f5 SHA256 5b62d2c93537f3b3bbb7fbb24eb52a509a61ab188926d60d1a5e04a75f3bd8f0
-MD5 0ad191371a52a40b85dfb14db954593a strace-4.5.11.ebuild 1675
-RMD160 0363ba90a1dc3295539570748984b0723d4a7149 strace-4.5.11.ebuild 1675
-SHA256 5b62d2c93537f3b3bbb7fbb24eb52a509a61ab188926d60d1a5e04a75f3bd8f0 strace-4.5.11.ebuild 1675
 EBUILD strace-4.5.12.ebuild 2112 RMD160 b7ac0c3ffbf7d87c790c295651167214e13287c7 SHA1 4dea21d7251d58217025d0ef94ecd6e0f74417cf SHA256 4fdbbd42beec0a7629b84d94439ddf593fdb6a03c44ba04335fbf65dd4d4cec2
 MD5 57477518cfaec5dfa5beff57a2398631 strace-4.5.12.ebuild 2112
 RMD160 b7ac0c3ffbf7d87c790c295651167214e13287c7 strace-4.5.12.ebuild 2112
 SHA256 4fdbbd42beec0a7629b84d94439ddf593fdb6a03c44ba04335fbf65dd4d4cec2 strace-4.5.12.ebuild 2112
-EBUILD strace-4.5.14.ebuild 1861 RMD160 6be5d9cd782fcce8eed8338b34bf6e793834363b SHA1 3da4fad7e623e9766b22083377f04a239cb0d14f SHA256 d8b0d05f21cfb1a10659c7c728b93ad726e79775d567c99ee07b50c52547d68f
-MD5 684bfb5a3c0e019e764db3ef205f69fd strace-4.5.14.ebuild 1861
-RMD160 6be5d9cd782fcce8eed8338b34bf6e793834363b strace-4.5.14.ebuild 1861
-SHA256 d8b0d05f21cfb1a10659c7c728b93ad726e79775d567c99ee07b50c52547d68f strace-4.5.14.ebuild 1861
-MISC ChangeLog 10813 RMD160 54462c8ef8088d7405db2e1d940fb8224b8bfb3a SHA1 14a09c52cc32410878922a849ae7cc9760976cab SHA256 0513717027e9e88e625d3b01a63d156dc864e3d8a406cf547d23697fb673a2be
-MD5 c5d09f9553a8b74ffc06af1b0226fbea ChangeLog 10813
-RMD160 54462c8ef8088d7405db2e1d940fb8224b8bfb3a ChangeLog 10813
-SHA256 0513717027e9e88e625d3b01a63d156dc864e3d8a406cf547d23697fb673a2be ChangeLog 10813
+EBUILD strace-4.5.14.ebuild 1912 RMD160 32f9f3a252a597cb571ac9b493e83701dbd95e46 SHA1 f97a45b561631b5af607a148f1a7eed1257fd74f SHA256 c18a34ab990d1ba0766d23d79a8240808713b70ab2fece5e3061cdf9fe4e729d
+MD5 9599b3e493e02af55352419578f20e1b strace-4.5.14.ebuild 1912
+RMD160 32f9f3a252a597cb571ac9b493e83701dbd95e46 strace-4.5.14.ebuild 1912
+SHA256 c18a34ab990d1ba0766d23d79a8240808713b70ab2fece5e3061cdf9fe4e729d strace-4.5.14.ebuild 1912
+MISC ChangeLog 10985 RMD160 b185becf8df7f08b4790b493888a9a98ca7bfc79 SHA1 5e3e4cdd993a7dd15b78025d5a840a8837242626 SHA256 7045a0c8b84b1c02384c79e298b7d63d3824b84c6b70a36098ecb23e57c348ab
+MD5 b95951980e9b03570ba88ef2e532ad34 ChangeLog 10985
+RMD160 b185becf8df7f08b4790b493888a9a98ca7bfc79 ChangeLog 10985
+SHA256 7045a0c8b84b1c02384c79e298b7d63d3824b84c6b70a36098ecb23e57c348ab ChangeLog 10985
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 e54021b3ee0a65776b66dd04a33b5013 files/digest-strace-4.5.11 244
-RMD160 60a6a5b2eece388d387f1dd9e2d7fbd8cbece744 files/digest-strace-4.5.11 244
-SHA256 e132275ab608d8798f9c753294039f001691b26b41cf5551c8e86cc4959fa385 files/digest-strace-4.5.11 244
 MD5 bc0e241dc2e0a817e72b6351cc95bbc8 files/digest-strace-4.5.12 244
 RMD160 d9b19223c079fa0b545a5432b4bf991ae610587b files/digest-strace-4.5.12 244
 SHA256 796b8ccab880098bf5f8534a7f263ed641b07d15ea3b2ca0d736ada2ea72abf1 files/digest-strace-4.5.12 244
@@ -80,7 +76,7 @@ SHA256 5cb98f7afe26e3f97f31d956155dce922df6334d7ce8f6d4c09c176dd1faeec0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJGhramhnQswr0vIRAuQSAJwK5et7xbXtPHkXIu0r8/siG3MyyQCfWhWI
-1fRFg9vPp0n/Hh8Z8B4RNx0=
-=m2Uq
+iD4DBQFFceO2amhnQswr0vIRArakAJdtWAWf8ctOrBHApAumhZXj7wHsAJ0XpEic
+xp7x4smeTzWLtUTbJYPk9Q==
+=5kU8
 -----END PGP SIGNATURE-----

diff --git a/dev-util/strace/files/strace-4.5.14-PT_GETSIGINFO.patch b/dev-util/strace/files/strace-4.5.14-PT_GETSIGINFO.patch
index 194b9d1ff540d136d783e6dd38a5e3f731f6584f..3e2ba7e3b182f179fb1a1233531908ee59240d3f 100644 (file)
--- a/dev-util/strace/files/strace-4.5.14-PT_GETSIGINFO.patch
+++ b/dev-util/strace/files/strace-4.5.14-PT_GETSIGINFO.patch
@@ -5,14 +5,14 @@ linux architectures so we can no longer assume PT_GETSIGINFO == ia64.
 
 http://bugs.gentoo.org/149945
 
---- strace.c
-+++ strace.c
-@@ -2251,7 +2251,7 @@
+--- strace.c   11 Oct 2006 22:55:25 -0000      1.71
++++ strace.c   11 Oct 2006 23:11:44 -0000      1.72
+@@ -2261,7 +2261,7 @@ Process %d attached (waiting for parent)
                        if (!cflag
                            && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
                                unsigned long addr = 0, pc = 0;
 -#ifdef PT_GETSIGINFO
-+#ifdef PT_CR_IPSR
++#if defined(PT_CR_IPSR) && defined(PT_CR_IIP) && defined(PT_GETSIGINFO)
  #                             define PSR_RI   41
                                struct siginfo si;
                                unsigned long psr;