diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/ChangeLog b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/ChangeLog index b2da310d44..074d4bded9 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/ChangeLog @@ -1,6 +1,55 @@ # ChangeLog for app-crypt/pinentry # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.173 2015/05/14 15:18:15 k_f Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.182 2015/07/18 08:18:39 alonbl Exp $ + + 18 Jul 2015; Alon Bar-Lev pinentry-0.9.5.ebuild: + Add emacs USE + + 18 Jul 2015; Alon Bar-Lev + files/pinentry-0.9.5-build.patch: + Even better pkg-config resolution, bug#554686 + + 18 Jul 2015; Alon Bar-Lev + files/pinentry-0.9.5-build.patch: + Add pkg-config detection instead of initialization as pinentry does not use it + correctly, bug#554686 + + 18 Jul 2015; Alon Bar-Lev + +files/pinentry-0.9.5-build.patch, pinentry-0.9.5.ebuild: + Add pkg-config initialization, add pkg-config as DEPEND as most need it + anyway, bug#554686 + +*pinentry-0.9.5 (01 Jul 2015) + + 01 Jul 2015; Kristian Fiskerstrand +pinentry-0.9.5.ebuild, + -pinentry-0.9.4-r1.ebuild: + Version bump to pinentry 0.9.5 + + 07 Jun 2015; Kristian Fiskerstrand + -files/pinentry-0.9.1-memleak.patch: + Remove a redundant patch file after previous cleanup + + 07 Jun 2015; Kristian Fiskerstrand + -files/pinentry-0.9.2-cmd_confirm.patch, -files/pinentry-0.9.2-gnome3.patch, + -files/pinentry-0.9.2-handlers-return.patch, + -files/pinentry-0.9.2-linking-order.patch, + -files/pinentry-0.9.2-management.patch, -files/pinentry-0.9.2-memory.patch, + -files/pinentry-0.9.2-simplify.patch, -pinentry-0.9.1.ebuild, + -pinentry-0.9.2-r1.ebuild, -pinentry-0.9.4.ebuild: + Remove old versions + +*pinentry-0.9.4-r1 (07 Jun 2015) + + 07 Jun 2015; Kristian Fiskerstrand + +files/pinentry-0.9.4-actually_respect_users_pm.patch, + +pinentry-0.9.4-r1.ebuild: + Add a patch from upstream master to actually respect the user's choice of + using an external password manager for the gnome3 pinentry + +*pinentry-0.9.4 (07 Jun 2015) + + 07 Jun 2015; Kristian Fiskerstrand +pinentry-0.9.4.ebuild: + New upstream version 0.9.4 14 May 2015; Kristian Fiskerstrand -pinentry-0.9.0-r1.ebuild, -pinentry-0.9.0-r2.ebuild: diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest index e0950813a6..dbe43a88c2 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest @@ -1,33 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX pinentry-0.8.2-ncurses.patch 824 SHA256 7d5e485e2c6dcce80ab63055d24761f53ae28e19b5ab2dacc424ebc7677805e8 SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901 WHIRLPOOL 5483ccb6041e769387685ce987a19a2aa50835781a391169abbe7a838325149b81ce186692dbdc588858f74ef912a80f1eca6efb0f3421ace57925ca9c6f9ca5 AUX pinentry-0.8.2-texi.patch 688 SHA256 47c5280fb82d0ba15338c60765c1ee37b368baf774a821f7afe85a7bf16dcbbc SHA512 4cd0b58a8719d0569d9a3c7c8258e609ccd6239436e3b981afcfb95859f8f4b898a8c29db3b310fb3611b285e58f89b09c9c9f8607a9168ee26ffc054ed9f680 WHIRLPOOL fd574ed478dcd9ff1a9306da1122f20d6f894ca055ed4f368f6796c5b41bfcff9c7842c8ed9a9b8a235ccd4031a153d9f0cf43e60e0cec16e482bcc021a21388 AUX pinentry-0.9.0-accessibility.patch 2587 SHA256 80adf350a7fa17ab7d60b36d1d373f629c85424de96950c4156fe44e0c2691ae SHA512 2c337e71aad65af0fae7d82bacb08304e1c276cbc0cb318442669a3c711ea0be7b909a5ff9c6a5e846464d1e91645ec5a2c57d9deb5eaaa8b16ce3c5244684a8 WHIRLPOOL 02bf8215210b81f48a16a519b9207356fd32c42a42acd1eaeae9faf81e5f8b500c006a3491948b48df855b7a44cde4976753a71494ff1a1b1b407d2ed653af56 -AUX pinentry-0.9.1-memleak.patch 732 SHA256 53643494cdef3d0f9e1261c5c364e6eb42e2fc5e15259018572869f5c3bf4377 SHA512 2fd2d94a0894ef0ac895176ddc034d381a696cf8c4a5a9824d40ed0723953e85d561a9f03f8aef2ba2141eb71c1dc0b352f81346fd838b4fdff09f11f275a881 WHIRLPOOL 3525bee3c00718f19b6c30fbef1e98a19e105367150a3a9b9470900494d7eeb58128f19903917fe0878f7c5f7a67a9cb75cda464bc14b0b1a766c7d871733cf9 -AUX pinentry-0.9.2-cmd_confirm.patch 1341 SHA256 695557bdf9e3c7c206d07229665a79f7dbe5dde74694f602514c4fd2403b4d4e SHA512 c5c1417732f3d07a5f04e0fdfd2fc469e38bd03ddac7d9d269e1635674a4a8a7b7431e92e8a5da0c0d83d4ab040f79b6cb79fe5597a239f07c36f6839a51ed74 WHIRLPOOL 95a8a73478be25bf747d315c96a8d456e4482f6c89fd36893cb4244bff5c0b65721e9fdaf28110063c05fa1c77314113c014f5725efdfb60fc9e4c315ef2a324 -AUX pinentry-0.9.2-gnome3.patch 13855 SHA256 01fcec036a2eb9d56e156387a023594855ad27ba203ce06883cee32e8e6b51bb SHA512 9cfbdb66cb10b76f9f2fead8ff1c641ea2998748f74a8515e4f5dd1f8de99e4a601d07fa72ecfa73486631790dc8197c5f0942e1b0e2e648136d93cb22711975 WHIRLPOOL 40da7fafc4613278ad29dd6d8e322434f6e732a8205183f73a12d05622bd05f2cd6affec7d583ee49874872c0b1914036b9b185f2d44620d0df58d3da22b5192 -AUX pinentry-0.9.2-handlers-return.patch 953 SHA256 14f4295211550e64ee9797999e7bf87bd3b68092577c586358fc43e38d27b377 SHA512 c2acacc7244eb4fae7863b867913e2819e10e8aacde294e2528de0a35de0c4b7c23676720bbbd70d0e5aef8e8f6e03ceb499dd58d799e4e0b2bee087b80103bf WHIRLPOOL aa83879b5497f2507eae0d34f2538ef45182695e1bd2995be7d8cc9bf58ec2eec5732b49bee61ea4a18b9e73e08982268aa8aa124326851939c9ad5faab4b08f -AUX pinentry-0.9.2-linking-order.patch 3866 SHA256 6937de3e176de2fb3425ba449fb4caab61cf1382135fa4ca2a5f9d4f0b500aac SHA512 50665ae47e955991f588cacd753ed4ec8e071e779cf016c25958e944da44aa6bbdbd911070f49d3431277619d242e3ee34e1d9c7747ce36d0f3018a52b7f9e3a WHIRLPOOL 44013aa6785a70e3564d1847c1d2205776461e093fab64503f7c69bc57c9e0d0ecc5f652cb6cbab28a16c65c6163d1b3f0cf9efa26add48950f502560644c93b -AUX pinentry-0.9.2-management.patch 3590 SHA256 7890e73e0e5545ce817f96f0ab89fbb6626cb7166f03a9338f80bd0f26bfc03f SHA512 fba43beaed1f5856cc7fe20cc985d782fef9b75eb9464c0b8f82b426af6922a9da298a9461a251aba26c5cf1410ffdd2f09657bd73dedbc7b338e8f673a50a04 WHIRLPOOL 47bf4c3b30a329cc79580626e89b0fbbc78d91e466f2b5c7ba79b1f96f5a24b016ef912833bbb43cabaa47084061cc554b4222a76d7d0bedf574f3ac247b803d -AUX pinentry-0.9.2-memory.patch 919 SHA256 788f73e7817b27adb5a0d2befb95da3c653291c2151bcbe493b2ec65f72eabf0 SHA512 2aa4e68b6d2c1100652c9a007381b5c181f761cd6cc30e5769a8fe02aa05933294841131815ea5706e010ab1e083da28094a3b1d61ebd393c084eff040330fc6 WHIRLPOOL 87f0c639ed5a61404c34b80bbe0d30e52c27fd407dfe4f938720953c76dcc15c024688252da0d9107fab7daecb04b565df202a723436b0bafda02d48e3ef56cf -AUX pinentry-0.9.2-simplify.patch 1431 SHA256 093d623379ff571b23ceddd71f62e4792f1a004517bd43212ab1534efff46382 SHA512 2a541abfa8529050d6bba6381e852e8c1d66ae9c7dc07f25b0e4b313cbc6ec4a87cc44f19cc400de23a094b994d17871a2a9471e18a3fcba187968334e5524c7 WHIRLPOOL 312fb2d8fadab742a6af449b59a2319e5e1b7bc27fdef131f2e77480c1b916d131bae5a28456c1f09ce7a531e2d8862d9424a9a87b3877d246aaac67bacaf18d +AUX pinentry-0.9.5-build.patch 1632 SHA256 e78b4299eafd4cf90914f11882a19c2f26eac37efc6ffd0c639ea6a79c2e7927 SHA512 9d4f5dea925710da263546f52c685e82ddce66a52c3d2e16e52411b27a4adba07d28502af174217f138660eb8b016beb17a2e23a45edb757f49f80854f56a699 WHIRLPOOL 5fada469994b8fc155401d733a6a0f1ba226f6c4caeece77885b19608bf5649db4137ab584485965c439da8249598d1e0591e1934bf3748a0d8e1384a79f02bd +AUX pinentry-0.9.6-Remove-detection-of-Qt5.patch 2083 SHA256 f3ebd3d660875443472a28a6ed0b3c0859daf9db3bdc6aab7e4653e44a865247 SHA512 af432702dfd67fdef643bdc6be7a0cd6d94d13094073e6ddb29df891b4c63fa459481beee2b0e4060e9153f383cd55c658eb8d61c960114154f37c99e604d3e3 WHIRLPOOL 0fe5c9d47d8d2b1d19ef523446d630730c12db6cccb038f531e4327627814e0c432f8baa5c1a9f426c24241fce5dfd52c80cf5c6d57ac79a207ec5a944a96ec8 +AUX pinentry-0.9.6-add-disable-pinentry-qt5-option.patch 1810 SHA256 f19a155be0632ce3dbfa5dd17c01b9d54aa8abd130d411a82152b48ca35daf7a SHA512 e336403faf12e6deadd33fd7c87fbd45ba8fe0173b328881bca43b021170f523c5459d3e62651ef1d47a0bb8d5dc194125b29cbd09934653f98fbd5ece21f1b5 WHIRLPOOL 6d577042df3b8ce5c4729b761940ed95785c788a1e754d20d3a465f531ab63fb2c4c457193c2ad70ac2a302f344b17e457718f4e3480474a1f0366501dbf4986 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac -DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5 -DIST pinentry-0.9.2.tar.bz2 495742 SHA256 fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1 SHA512 68ba5643b9dc4e71b28f964172c7f37a67d1b22914c649c612e001c7c5ca0c40a0a2ec0974f50dbdc8dd98cc6266688c71d67e922db4334536797d331b0203cf WHIRLPOOL 457c8408ed04b2b5f72761d0b24cf1f07b1b81bb431cc666ee88015fda5a868a4ad296ac82fc98c79d5af5c1fdfdc597cb38914088143fb08e7838c9b572a090 -EBUILD pinentry-0.9.0-r3.ebuild 3136 SHA256 fbd8f91d0c28a92bc6923d19d0414f3c1b4035e6ce59eb7fdb153e5fe63f4551 SHA512 40c06d484b680507b18fdfdbbe17da15c1f41b9b7c87e8a3435b88d363f26d7ac8ec8d045c8e9f9988d110fe8ae826c249d5549974fe5bd60544718efadc4671 WHIRLPOOL 4053c9edbb0c036790166ba62ba25017eee419e43d5fadc2f561913d0a584fcb7d0b72e4da5e6a529316e06b23314bd88c17099e2fafe6c2b71a101129b7010f -EBUILD pinentry-0.9.0.ebuild 2901 SHA256 e890a9acc471f6252fe4658e7f5b54a99525c06d5cf96681c3d0483dd9735829 SHA512 cfcd1733d69eebcf8e1c01d275edf7e50be76ddfe1fb439ebde80d7ae3f188d1f4feafa4fe471beb59a6d82aab4edf681a122f4acf74083b0e7816605faf0c7a WHIRLPOOL 5502e3e32b46d1aec265eeac5467772c95d7d404b5afe3e1a4b56333e8d581b4e8270b5cad44c66db99949229cbf6d3a38c12c7ca43174a87da6f3bc090775ff -EBUILD pinentry-0.9.1.ebuild 2721 SHA256 97ba93a30e757ab11988a9f1ed9ece1175d61d0c353063a4372105dc6a37037f SHA512 a123d2bfea94b23b70ecee4c7f52ba8fe0cc163850f8dcad8952e137067c0717a089ef880f16454e296e86af983cb132b618ad3e750590cc891f741351b1651b WHIRLPOOL dbc1dca7cc2a7a98b27481f0eca034dc1ac73e80b3d5c94be8176564aff4e921704059ca510f6fc3fbaf485e714511231bc035177e40903b35bf701273b3f4ab -EBUILD pinentry-0.9.2-r1.ebuild 3131 SHA256 2d498e346d2d422bb9d455e057ec4862afa0081f62371245984627f969f358f2 SHA512 92a39f12d2ca574e8f5358a60f7b62b81d0ac2306faaa52bf1118dc16a2d1e9e1115af682d3aaa55f63af4d0f9d849102005b60853dc366480442730194a1ff6 WHIRLPOOL fcf2c42bb9a7cd7324ae635088e313b20b10e6689274b4c7ce35f22b9a571c7ea2056e55d2b29e1eaf6f9cc3e275743a4face1b918f031a569e9d4556226e8e8 -MISC ChangeLog 23654 SHA256 80c43debd66f2fdb1f27590fd09c175e4a3321307658b5b26abb9a21c479e475 SHA512 e009debc609d71fdd6cfb8f1e0badbd201a853b7114cdd7d90e8262151c196badb16b5aaef06ee5cc9c7142627e2210f6158fb0768dd22f81216b027dad079ea WHIRLPOOL af8a8649adc3516e14564c038debdfba6e666192256d025ec16c27d9a5d3a4b222a81024339af6a298cb0786b3906598f76bfb10c2b2d2a6394cb214fd1222e5 -MISC metadata.xml 232 SHA256 0f9362f8e4539dec9b2feb1bd93d34e4dff44290f4dac44dd50f9d44de62360e SHA512 79b3d9679dd2d61479a24ef159f6a23758dad2b77679824bae7758c8f47375b4548e0adf135b3dae5c6d6eff23d134f9477a06fd29789d4fb98670431670bb01 WHIRLPOOL 2ac86da5a1d1512f358400d0616ca3baba6ad55d68ad68296975192cf4f60ed55a3faefe0c3290720d61f117e6c8b24b37cd017e8b8c21c77f977dda8d3212fa ------BEGIN PGP SIGNATURE----- - -iQEcBAEBCAAGBQJVVLy5AAoJEP7VAChXwav6j/YH/A14DfR6901qyl1VtfYlLJfW -tsJgsEXrU+T781NG5fu/73Y+CFVLBU4p2/6b1xjKTskncADW4DhdtIc2zS8GvjXV -uvLXFOrdAS+bC4R/hQO7mIkQxqWIkpSEpu42YHZAMMzTOfNa83JCY8R6YHUBfbVh -6FrzjGB6llrOKFq/nvU05R7XC9MoKV9sRvzBBoGDVckwrsIzuPBnH5x1lw0Z9i2u -l4O68D0wFxwwJP6tfH8xLP79vrbXsHAVXdM3Z9AJS+wq/pLOGiS4XLlSMN3t7dW/ -D8S6HjuTI2Sc0LPj53IJy7o0UExuzlfkGiOG9FMRDmuucAZUSTXigVf45J0GA9g= -=nZKb ------END PGP SIGNATURE----- +DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 +DIST pinentry-0.9.6.tar.bz2 432889 SHA256 2a1124e9097f24f866cab7982610677e222cea71be0a71a5566f223177e01e66 SHA512 c9f94e5ce5baf6779f6effc13f82c8c7f99d426dc232114fc4e11a8684eaefbaf4f60363db78cdb9f4c8e91ba7af40779ec1c5d7e01ee15b84c7de77ccf46e72 WHIRLPOOL 954d185ce60eeb28717dd5986c4bdfda0472944b99d52caa213919b4dd1368b2d2b4cff27bfc4158a0fd7f70f7f6549b3415de7ba33239ec9305a2e0e0bdcbc0 +EBUILD pinentry-0.9.0-r3.ebuild 3031 SHA256 0c0ecf8b1cfcd961b5707f86dd671fc318318183ab26d8fcfc057c844bd4972f SHA512 c00d23ab91d4b7f17c60d6b185b4e5efb07ca272c8462c9980f021646d8650f1f0f527ea6cca2a00f3c516539a8f62e5fe281ae656f1f91f659803867528cddc WHIRLPOOL b0fc56776ccf6c17ba77298938e43293ea7fb2ae301430bb6aad8acb758209924f7834440f7965e9ff0944888e981a811c6d47fc37ac0cb3f41e3db6f7143f2b +EBUILD pinentry-0.9.0.ebuild 2801 SHA256 3d0e728992ad56c7fd10d14b6ca5c02792b269fdc4d4c3beabad59422a453fbe SHA512 a9fc226f3f803ac9c55b92e7124d233391a4069d6feca5d45bad4986864dc55babca2812f0a077f219d25c891171bc3f8da803d5b54fdbf0018e1e7ca1cc2999 WHIRLPOOL 6e2699f0dbdbca9f5cdc9e78b09fc27daddcb391f446291e0651945bf9327631e5626833810cb8de74b35c4d0c93d410b56af70c69a6695fe52f0d07d5c3133f +EBUILD pinentry-0.9.5.ebuild 2816 SHA256 be453f73d4ffe81596f03d3177721b787cd9e7537556bb598cdd0bbade8bff42 SHA512 2a9670afe3204f968a6e8fd537219742b257bf37130bdc88420674a7e18e3431428b265258fd0505c7d941a86dd1053fcca136d723ee7ba61afc970b6a92600f WHIRLPOOL f53777b17c8f9ef82dadfb6e6eb0533e8a4e4e8413ea9cfc59d23215fc51159d9f9c106ddcbafe9c9ddc912f1b0dccbfad669c1bfaaa5882702b1de4ea001f23 +EBUILD pinentry-0.9.6-r4.ebuild 2930 SHA256 a67e0ad50418d64d25927f5a2169e89387c646039f93d86a061ec3c94ff231b0 SHA512 588e3c0d231f0b3c0156a3e7f220c94578458e063809e1b00e56593e6865578807872a78a449e9a9f4522aafb49f57143b596ef4987686b11900da9b2c374a4e WHIRLPOOL 7e286141ec004930b6a95ce4b6ab571973529929cc0c0e507bba7c6dfa3f91710d20ac758f14651129486142974652b6ff07d2b098d24cd25eeae8748fd8bb82 +EBUILD pinentry-0.9.6-r5.ebuild 3340 SHA256 4ab5b69793c7de56abd9375f4d5a3bdf6d2f74ef703afcf06e26670ea677f231 SHA512 2f9a3f43559e64b8b4fa3811c5909663db654edef3d8231dcdb1d7286dda9ee5bdb2fd7482e8e8b00bee41b4fbf100e29c7bde508831e2dad25e3bc75fcaaa5c WHIRLPOOL c6f756891ab3f5b6b69270eb44fcf4c2b89893f78646a5b4398c9174d9cb21c2a645a265762873886501f450fa13a20f0722ae7fca553e0fa88ef01e4f374c50 +MISC ChangeLog 25487 SHA256 599f868331443fbdf95c4b9ef073517aeb355df82a2878199d311310891ebaa1 SHA512 b6cbb7b6abb7ba7e70094d334d18da227aec8b0e7654af58736fd6a5626dd178c23ac7524abddaf2dbf67037f117e98d6bf4a3757f0c2bb9428e55f0154c8f96 WHIRLPOOL 7683a728f4a93c78d60061a1a85785a3a7271e5854a81e7485fae2760190d49edd1d43e68db525ffc785a1ae45cb52b7df7af9a47d77b84c8a5c397ee4a29d56 +MISC metadata.xml 236 SHA256 d926f71333bc45e735e50db563489053874a47d7d824480fe54ce05196fd1810 SHA512 dc13d49189ed786d0329b8064a927885fa24b63569b4fca61eced1b23c69f14666ad9cd6388a184056840dfcc89ef3fce0e146cff535fd187473507e97482c80 WHIRLPOOL ec75eba8888caece4ecc5536381693120bb42f1c25ec460476c4c99a65d19d1eb114fec23606cd8ec7d0c66bf596daacfee30fe548f9161ed0f274eb54059c5f diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.1-memleak.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.1-memleak.patch deleted file mode 100644 index fcdd88b4c3..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.1-memleak.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 03e4207f11e228a4c079af991f82507539793bae Mon Sep 17 00:00:00 2001 -From: Daniel Kahn Gillmor -Date: Tue, 28 Apr 2015 13:01:16 -0400 -Subject: [PATCH] fix small memory leak in pinentry-curses - -* pinentry/pinentry-curses.c: free internally allocated local string. ---- - pinentry/pinentry-curses.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c -index 4b7080e..043f8a9 100644 ---- a/pinentry/pinentry-curses.c -+++ b/pinentry/pinentry-curses.c -@@ -199,6 +199,8 @@ utf8_to_local (char *lc_ctype, char *string) - memset (&ps, 0, sizeof(mbstate_t)); - mbsrtowcs (wcs, &p, len, &ps); - -+ free (local); -+ - leave: - if (old_ctype) - { --- -2.1.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-cmd_confirm.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-cmd_confirm.patch deleted file mode 100644 index 8724d337f0..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-cmd_confirm.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 29236f84aca64be72c97a9b5513457a4e45afbc6 Mon Sep 17 00:00:00 2001 -From: "Neal H. Walfield" -Date: Mon, 11 May 2015 16:14:58 +0200 -Subject: [PATCH] Implement cmd_confirm in terms of cmd_message. - -* pinentry/pinentry.c (cmd_confirm): Implement cmd_confirm in terms of -cmd_message. ---- - pinentry/pinentry.c | 22 +--------------------- - 1 file changed, 1 insertion(+), 21 deletions(-) - -diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c -index f28c576..11a8027 100644 ---- a/pinentry/pinentry.c -+++ b/pinentry/pinentry.c -@@ -1146,27 +1146,7 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line) - static int - cmd_message (ASSUAN_CONTEXT ctx, char *line) - { -- int result; -- -- pinentry.one_button = 1; -- pinentry.quality_bar = 0; -- pinentry.close_button = 0; -- pinentry.locale_err = 0; -- pinentry.specific_err = 0; -- result = (*pinentry_cmd_handler) (&pinentry); -- if (pinentry.error) -- { -- free (pinentry.error); -- pinentry.error = NULL; -- } -- -- if (pinentry.close_button) -- assuan_write_status (ctx, "BUTTON_INFO", "close"); -- -- return result ? 0 -- : (pinentry.specific_err? pinentry.specific_err : -- pinentry.locale_err? ASSUAN_Locale_Problem -- : 0); -+ return cmd_confirm (ctx, "--one-button"); - } - - /* GETINFO --- -2.1.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-gnome3.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-gnome3.patch deleted file mode 100644 index 040bc50eeb..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-gnome3.patch +++ /dev/null @@ -1,518 +0,0 @@ -From be87785005d256b7f3dacc607ba5ea0a14de8593 Mon Sep 17 00:00:00 2001 -From: "Neal H. Walfield" -Date: Tue, 12 May 2015 17:07:49 +0200 -Subject: [PATCH] Add a GNOME3 pinentry based on gcr. - -* configure.ac (--enable-pinentry-gnome3): Option to enable the GNOME3 -pinentry. -(pinentry_gnome_3): Set to yes if enabled and gcr-3 and gcr-base-3 gcr -is available. -(GNOME3CFLAGS): Define and AC_SUBST. -(GNOME3LIBS): Define and AC_SUBST. -(GCR_API_SUBJECT_TO_CHANGE): Define. -(BUILD_PINENTRY_GNOME_3): Define. -* Makefile.am (pinentry_gnome_3): Define. -(SUBDIRS): Add ${pinentry_gnome_3}. -* gnome3/Makefile.am: New file. -* gnome3/pinentry-gnome3.c: New file. ---- - Makefile.am | 11 +- - configure.ac | 62 +++++++++-- - gnome3/Makefile.am | 39 +++++++ - gnome3/pinentry-gnome3.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 370 insertions(+), 13 deletions(-) - create mode 100644 gnome3/Makefile.am - create mode 100644 gnome3/pinentry-gnome3.c - -diff --git a/Makefile.am b/Makefile.am -index f8f7aac..177f37e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,5 @@ - # Makefile.am --# Copyright (C) 2002, 2012 g10 Code GmbH -+# Copyright (C) 2002, 2012, 2015 g10 Code GmbH - # - # This file is part of PINENTRY. - # -@@ -46,6 +46,12 @@ else - pinentry_gtk_2 = - endif - -+if BUILD_PINENTRY_GNOME_3 -+pinentry_gnome_3 = gnome3 -+else -+pinentry_gnome_3 = -+endif -+ - if BUILD_PINENTRY_QT4 - pinentry_qt4 = qt4 - else -@@ -59,7 +65,8 @@ pinentry_w32 = - endif - - SUBDIRS = assuan secmem pinentry ${pinentry_curses} ${pinentry_tty} \ -- ${pinentry_gtk_2} ${pinentry_qt4} ${pinentry_w32} doc -+ ${pinentry_gtk_2} ${pinentry_gnome_3} ${pinentry_qt4} \ -+ ${pinentry_w32} doc - - - install-exec-local: -diff --git a/configure.ac b/configure.ac -index c50ce68..9948d1f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -274,28 +274,34 @@ fi - - - dnl --dnl Check for GTK+-2 pinentry program. -+dnl Check for GTK+-2 / GNOME3 pinentry programs. - dnl - AC_ARG_ENABLE(pinentry-gtk2, - AC_HELP_STRING([--enable-pinentry-gtk2], [build GTK+-2 pinentry]), - pinentry_gtk_2=$enableval, pinentry_gtk_2=maybe) - -+AC_ARG_ENABLE(pinentry-gnome3, -+ AC_HELP_STRING([--enable-pinentry-gnome3], [build GNOME 3 pinentry]), -+ pinentry_gnome_3=$enableval, pinentry_gnome_3=maybe) -+ - dnl check for pkg-config --if test "$pinentry_gtk_2" != "no"; then -+if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - if test x"${PKG_CONFIG}" = xno ; then - pinentry_gtk_2=no -+ pinentry_gnome_3=no - fi - fi - - dnl check if the module gtk+-2.0 exists --if test "$pinentry_gtk_2" != "no"; then -+if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then - AC_MSG_CHECKING([for gtk+-2]) - "${PKG_CONFIG}" --exists gtk+-2.0 - if test $? -ne 0 ; then - AC_MSG_RESULT([no]) - AC_MSG_WARN([pkg-config could not find the module gtk+-2.0]) - pinentry_gtk_2=no -+ pinentry_gnome_3=no - else - AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([gtk+-2 version >= 2.4.0]) -@@ -305,17 +311,45 @@ if test "$pinentry_gtk_2" != "no"; then - if test $? -ne 0 ; then - AC_MSG_WARN([building GTK+-2 pinentry disabled]) - pinentry_gtk_2=no -+ pinentry_gnome_3=no - else - GTK2CFLAGS=`"${PKG_CONFIG}" --cflags gtk+-2.0` - GTK2LIBS=`"${PKG_CONFIG}" --libs gtk+-2.0` - AC_SUBST(GTK2CFLAGS) - AC_SUBST(GTK2LIBS) -- pinentry_gtk_2=yes -+ if test "$pinentry_gtk_2" != "no" -+ then -+ pinentry_gtk_2=yes -+ fi -+ if test "$pinentry_gnome_3" != "no" -+ then -+ pinentry_gnome_3=yes -+ fi - fi - fi - fi - AM_CONDITIONAL(BUILD_PINENTRY_GTK_2, test "$pinentry_gtk_2" = "yes") - -+if test "$pinentry_gnome_3" != "no"; then -+ AC_MSG_CHECKING([for gcr]) -+ "${PKG_CONFIG}" --exists gcr-3,gcr-base-3 -+ if test $? -ne 0 ; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_WARN([pkg-config could not find the module gcr-3,gcr-base-3]) -+ pinentry_gnome_3=no -+ else -+ AC_MSG_RESULT([yes]) -+ GNOME3CFLAGS=`"${PKG_CONFIG}" --cflags gcr-3,gcr-base-3` -+ GNOME3LIBS=`"${PKG_CONFIG}" --libs gcr-3,gcr-base-3` -+ AC_SUBST(GNOME3CFLAGS) -+ AC_SUBST(GNOME3LIBS) -+ AC_DEFINE(GCR_API_SUBJECT_TO_CHANGE, 1, [Nod nod]) -+ pinentry_gnome_3=yes -+ fi -+fi -+ -+AM_CONDITIONAL(BUILD_PINENTRY_GNOME_3, test "$pinentry_gnome_3" = "yes") -+ - dnl - dnl Check for libsecret. - dnl -@@ -450,16 +484,20 @@ else - if test "$pinentry_qt4" = "yes"; then - PINENTRY_DEFAULT=pinentry-qt4 - else -- if test "$pinentry_curses" = "yes"; then -- PINENTRY_DEFAULT=pinentry-curses -+ if test "$pinentry_gnome_3" = "yes"; then -+ PINENTRY_DEFAULT=pinentry-gnome3 - else -- if test "$pinentry_tty" = "yes"; then -- PINENTRY_DEFAULT=pinentry-tty -+ if test "$pinentry_curses" = "yes"; then -+ PINENTRY_DEFAULT=pinentry-curses - else -- if test "$pinentry_w32" = "yes"; then -- PINENTRY_DEFAULT=pinentry-w32 -+ if test "$pinentry_tty" = "yes"; then -+ PINENTRY_DEFAULT=pinentry-tty - else -- AC_MSG_ERROR([[No pinentry enabled.]]) -+ if test "$pinentry_w32" = "yes"; then -+ PINENTRY_DEFAULT=pinentry-w32 -+ else -+ AC_MSG_ERROR([[No pinentry enabled.]]) -+ fi - fi - fi - fi -@@ -475,6 +513,7 @@ pinentry/Makefile - curses/Makefile - tty/Makefile - gtk+-2/Makefile -+gnome3/Makefile - qt4/Makefile - w32/Makefile - doc/Makefile -@@ -493,6 +532,7 @@ AC_MSG_NOTICE([ - Curses Pinentry ..: $pinentry_curses - TTY Pinentry .....: $pinentry_tty - GTK+-2 Pinentry ..: $pinentry_gtk_2 -+ GNOME 3 Pinentry .: $pinentry_gnome_3 - Qt4 Pinentry .....: $pinentry_qt4 $pinentry_qt4_clip_msg - W32 Pinentry .....: $pinentry_w32 - -diff --git a/gnome3/Makefile.am b/gnome3/Makefile.am -new file mode 100644 -index 0000000..78df706 ---- /dev/null -+++ b/gnome3/Makefile.am -@@ -0,0 +1,39 @@ -+# Makefile.am - PIN entry GTK+ frontend. -+# Copyright (C) 2002, 2015 g10 Code GmbH -+# -+# This file is part of PINENTRY. -+# -+# PINENTRY is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# PINENTRY is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -+ -+## Process this file with automake to produce Makefile.in -+ -+bin_PROGRAMS = pinentry-gnome3 -+ -+if FALLBACK_CURSES -+ncurses_include = $(NCURSES_INCLUDE) -+libcurses = ../pinentry/libpinentry-curses.a $(LIBCURSES) $(LIBICONV) -+else -+ncurses_include = -+libcurses = -+endif -+ -+AM_CPPFLAGS = $(COMMON_CFLAGS) $(GNOME3CFLAGS) \ -+ $(ncurses_include) -I$(top_srcdir)/assuan \ -+ -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry -+LDADD = $(COMMON_LIBS) \ -+ ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \ -+ $(LIBCAP) $(GNOME3LIBS) $(libcurses) -+ -+pinentry_gnome3_SOURCES = pinentry-gnome3.c -diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c -new file mode 100644 -index 0000000..74ec89c ---- /dev/null -+++ b/gnome3/pinentry-gnome3.c -@@ -0,0 +1,271 @@ -+/* pinentry-gnome3.c -+ Copyright (C) 2015 g10 Code GmbH -+ -+ pinentry-gnome-3 is a pinentry application for GNOME 3. It tries -+ to follow the Gnome Human Interface Guide as close as possible. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include -+#include -+ -+#include -+ -+#include "assuan.h" -+ -+#include "memory.h" -+ -+#include "pinentry.h" -+ -+#ifdef FALLBACK_CURSES -+#include "pinentry-curses.h" -+#endif -+ -+ -+#define PGMNAME "pinentry-gnome3" -+ -+#ifndef VERSION -+# define VERSION -+#endif -+ -+static gchar * -+pinentry_utf8_validate (gchar *text) -+{ -+ gchar *result; -+ -+ if (!text) -+ return NULL; -+ -+ if (g_utf8_validate (text, -1, NULL)) -+ return g_strdup (text); -+ -+ /* Failure: Assume that it was encoded in the current locale and -+ convert it to utf-8. */ -+ result = g_locale_to_utf8 (text, -1, NULL, NULL, NULL); -+ if (!result) -+ { -+ gchar *p; -+ -+ result = p = g_strdup (text); -+ while (!g_utf8_validate (p, -1, (const gchar **) &p)) -+ *p = '?'; -+ } -+ return result; -+} -+ -+static GcrPrompt * -+create_prompt (pinentry_t pe, int confirm) -+{ -+ GcrPrompt *prompt; -+ GError *error = NULL; -+ char *msg; -+ -+ /* Create the prompt. */ -+ prompt = GCR_PROMPT (gcr_system_prompt_open (-1, NULL, &error)); -+ if (! prompt) -+ { -+ g_warning ("couldn't create prompt for gnupg passphrase: %s", -+ error->message); -+ g_error_free (error); -+ return NULL; -+ } -+ -+ /* Set the messages for the various buttons, etc. */ -+ if (pe->title) -+ { -+ msg = pinentry_utf8_validate (pe->title); -+ gcr_prompt_set_title (prompt, msg); -+ g_free (msg); -+ } -+ -+ if (pe->description) -+ { -+ msg = pinentry_utf8_validate (pe->description); -+ gcr_prompt_set_description (prompt, msg); -+ g_free (msg); -+ } -+ -+ /* An error occured during the last prompt. */ -+ if (pe->error) -+ { -+ msg = pinentry_utf8_validate (pe->error); -+ gcr_prompt_set_warning (prompt, msg); -+ g_free (msg); -+ } -+ -+ if (! pe->prompt && confirm) -+ gcr_prompt_set_message (prompt, "Message"); -+ else if (! pe->prompt && ! confirm) -+ gcr_prompt_set_message (prompt, "Enter Passphrase"); -+ else -+ { -+ msg = pinentry_utf8_validate (pe->prompt); -+ gcr_prompt_set_message (prompt, msg); -+ g_free (msg); -+ } -+ -+ if (! confirm) -+ gcr_prompt_set_password_new (prompt, !!pe->repeat_passphrase); -+ -+ if (pe->ok || pe->default_ok) -+ { -+ msg = pinentry_utf8_validate (pe->ok ?: pe->default_ok); -+ gcr_prompt_set_continue_label (prompt, msg); -+ g_free (msg); -+ } -+ /* XXX: Disable this button if pe->one_button is set. */ -+ if (pe->cancel || pe->default_cancel) -+ { -+ msg = pinentry_utf8_validate (pe->cancel ?: pe->default_cancel); -+ gcr_prompt_set_cancel_label (prompt, msg); -+ g_free (msg); -+ } -+ -+ if (confirm && pe->notok) -+ { -+ /* XXX: Add support for the third option. */ -+ } -+ -+ /* XXX: gcr expects a string; we have a int. */ -+ // gcr_prompt_set_caller_window (prompt, pe->parent_wid); -+ -+ if (! confirm && pe->allow_external_password_cache && pe->keyinfo) -+ { -+ if (pe->default_pwmngr) -+ { -+ msg = pinentry_utf8_validate (pe->default_pwmngr); -+ gcr_prompt_set_choice_label (prompt, msg); -+ g_free (msg); -+ } -+ else -+ gcr_prompt_set_choice_label -+ (prompt, "Automatically unlock this key, whenever I'm logged in"); -+ } -+ -+ return prompt; -+} -+ -+static int -+gnome3_cmd_handler (pinentry_t pe) -+{ -+ GcrPrompt *prompt = NULL; -+ GError *error = NULL; -+ int ret = -1; -+ -+ if (pe->pin) -+ /* Passphrase mode. */ -+ { -+ const char *password; -+ -+ prompt = create_prompt (pe, 0); -+ if (! prompt) -+ /* Something went wrong. */ -+ { -+ pe->canceled = 1; -+ return -1; -+ } -+ -+ /* "The returned password is valid until the next time a method -+ is called to display another prompt." */ -+ password = gcr_prompt_password_run (prompt, NULL, &error); -+ if (error) -+ /* Error. */ -+ { -+ pe->specific_err = ASSUAN_General_Error; -+ g_error_free (error); -+ ret = -1; -+ } -+ else if (! password && ! error) -+ /* User cancelled the operation. */ -+ ret = -1; -+ else -+ { -+ pinentry_setbufferlen (pe, strlen (password) + 1); -+ if (pe->pin) -+ strcpy (pe->pin, password); -+ -+ if (pe->repeat_passphrase) -+ pe->repeat_okay = 1; -+ -+ ret = 1; -+ } -+ } -+ else -+ /* Message box mode. */ -+ { -+ GcrPromptReply reply; -+ -+ prompt = create_prompt (pe, 1); -+ if (! prompt) -+ /* Something went wrong. */ -+ { -+ pe->canceled = 1; -+ return -1; -+ } -+ -+ /* XXX: We don't support a third button! */ -+ -+ reply = gcr_prompt_confirm_run (prompt, NULL, &error); -+ if (error) -+ { -+ pe->specific_err = ASSUAN_General_Error; -+ ret = 0; -+ } -+ else if (reply == GCR_PROMPT_REPLY_CONTINUE -+ /* XXX: Hack since gcr doesn't yet support one button -+ message boxes treat cancel the same as okay. */ -+ || pe->one_button) -+ /* Confirmation. */ -+ ret = 1; -+ else -+ /* GCR_PROMPT_REPLY_CANCEL */ -+ { -+ pe->canceled = 1; -+ ret = 0; -+ } -+ } -+ -+ if (prompt) -+ g_clear_object (&prompt); -+ return ret; -+} -+ -+pinentry_cmd_handler_t pinentry_cmd_handler = gnome3_cmd_handler; -+ -+int -+main (int argc, char *argv[]) -+{ -+ pinentry_init (PGMNAME); -+ -+#ifdef FALLBACK_CURSES -+ if (pinentry_have_display (argc, argv)) -+ gtk_init (&argc, &argv); -+ else -+ pinentry_cmd_handler = curses_cmd_handler; -+#else -+ gtk_init (&argc, &argv); -+#endif -+ -+ pinentry_parse_opts (argc, argv); -+ -+ if (pinentry_loop ()) -+ return 1; -+ -+ return 0; -+} --- -2.1.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-handlers-return.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-handlers-return.patch deleted file mode 100644 index 43a84d96c3..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-handlers-return.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3062742b945f95d72001896f8ba5468b9e63aa9b Mon Sep 17 00:00:00 2001 -From: "Neal H. Walfield" -Date: Wed, 13 May 2015 14:20:23 +0200 -Subject: [PATCH 1/1] Don't interpret the handler's return value as the - passphrase's length. - -* pinentry/pinentry.c (cmd_getpin): Don't interpret the return value -as the passphrase length. Use strlen instead. ---- - pinentry/pinentry.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c -index 53216fc..836ee14 100644 ---- a/pinentry/pinentry.c -+++ b/pinentry/pinentry.c -@@ -1109,7 +1109,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line) - { - if (pinentry.repeat_okay) - assuan_write_status (ctx, "PIN_REPEATED", ""); -- result = assuan_send_data (ctx, pinentry.pin, result); -+ result = assuan_send_data (ctx, pinentry.pin, strlen(pinentry.pin)); - if (!result) - result = assuan_send_data (ctx, NULL, 0); - --- -2.1.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-linking-order.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-linking-order.patch deleted file mode 100644 index 2006a8ccc6..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-linking-order.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 496235af8dfd373b54e5610f86bf1cada175ac23 Mon Sep 17 00:00:00 2001 -From: "Neal H. Walfield" -Date: Wed, 13 May 2015 21:47:11 +0200 -Subject: [PATCH 1/1] Fix linking order to work when linked with --as-needed. - -* curses/Makefile.am (LDADD): Add $(COMMON_LIBS) after all of the -local objects and object archives. -* gnome3/Makefile.am (LDADD): Likewise. -* gtk+-2/Makefile.am (LDADD): Likewise. -* qt4/Makefile.am (pinentry_qt4_LDADD): Likewise. -* tty/Makefile.am (LDADD): Likewise. - -Reported-by: Daniel Kahn Gillmor ---- - curses/Makefile.am | 5 ++--- - gnome3/Makefile.am | 5 ++--- - gtk+-2/Makefile.am | 5 ++--- - qt4/Makefile.am | 6 +++--- - tty/Makefile.am | 4 ++-- - 5 files changed, 11 insertions(+), 14 deletions(-) - -diff --git a/curses/Makefile.am b/curses/Makefile.am -index e8ea031..4d764c7 100644 ---- a/curses/Makefile.am -+++ b/curses/Makefile.am -@@ -22,9 +22,8 @@ - bin_PROGRAMS = pinentry-curses - - AM_CPPFLAGS = $(COMMON_CFLAGS) $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry --LDADD = $(COMMON_LIBS) \ -- ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \ -+LDADD = ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \ - ../assuan/libassuan.a ../secmem/libsecmem.a \ -- $(LIBCAP) $(LIBCURSES) $(LIBICONV) -+ $(COMMON_LIBS) $(LIBCAP) $(LIBCURSES) $(LIBICONV) - - pinentry_curses_SOURCES = pinentry-curses.c -diff --git a/gnome3/Makefile.am b/gnome3/Makefile.am -index 78df706..46639de 100644 ---- a/gnome3/Makefile.am -+++ b/gnome3/Makefile.am -@@ -32,8 +32,7 @@ endif - AM_CPPFLAGS = $(COMMON_CFLAGS) $(GNOME3CFLAGS) \ - $(ncurses_include) -I$(top_srcdir)/assuan \ - -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry --LDADD = $(COMMON_LIBS) \ -- ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \ -- $(LIBCAP) $(GNOME3LIBS) $(libcurses) -+LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \ -+ $(COMMON_LIBS) $(LIBCAP) $(GNOME3LIBS) $(libcurses) - - pinentry_gnome3_SOURCES = pinentry-gnome3.c -diff --git a/gtk+-2/Makefile.am b/gtk+-2/Makefile.am -index c98139f..7e37469 100644 ---- a/gtk+-2/Makefile.am -+++ b/gtk+-2/Makefile.am -@@ -31,9 +31,8 @@ endif - - AM_CPPFLAGS = $(COMMON_CFLAGS) $(GTK2CFLAGS) $(ncurses_include) \ - -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry --LDADD = $(COMMON_LIBS) \ -- ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \ -- $(LIBCAP) $(GTK2LIBS) $(libcurses) -+LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \ -+ $(COMMON_LIBS) $(LIBCAP) $(GTK2LIBS) $(libcurses) - - pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \ - gtksecentry.c gtksecentry.h gseal-gtk-compat.h -diff --git a/qt4/Makefile.am b/qt4/Makefile.am -index 31274bb..816aade 100644 ---- a/qt4/Makefile.am -+++ b/qt4/Makefile.am -@@ -38,10 +38,10 @@ AM_CPPFLAGS = $(COMMON_CFLAGS) \ - -I$(top_srcdir) -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem \ - $(ncurses_include) -I$(top_srcdir)/pinentry - AM_CXXFLAGS = $(QT4_CORE_CFLAGS) $(QT4_GUI_CFLAGS) --pinentry_qt4_LDADD = $(COMMON_LIBS) \ -- $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \ -+pinentry_qt4_LDADD = \ - ../pinentry/libpinentry.a $(top_builddir)/assuan/libassuan.a \ -- $(top_builddir)/secmem/libsecmem.a $(LIBCAP) -+ $(top_builddir)/secmem/libsecmem.a \ -+ $(COMMON_LIBS) $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) $(LIBCAP) - - BUILT_SOURCES = \ - pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc -diff --git a/tty/Makefile.am b/tty/Makefile.am -index 798c08f..aa805b2 100644 ---- a/tty/Makefile.am -+++ b/tty/Makefile.am -@@ -21,8 +21,8 @@ - bin_PROGRAMS = pinentry-tty - - AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(top_srcdir)/pinentry --LDADD = $(COMMON_LIBS) ../pinentry/libpinentry.a \ -+LDADD = ../pinentry/libpinentry.a \ - ../assuan/libassuan.a ../secmem/libsecmem.a \ -- $(LIBCAP) $(LIBICONV) -+ $(COMMON_LIBS) $(LIBCAP) $(LIBICONV) - - pinentry_tty_SOURCES = pinentry-tty.c --- -2.1.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-management.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-management.patch deleted file mode 100644 index 04b2bafe46..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-management.patch +++ /dev/null @@ -1,136 +0,0 @@ -From bdd81974633f8e31d582b62999ef9b004bc3b95e Mon Sep 17 00:00:00 2001 -From: "Neal H. Walfield" -Date: Wed, 13 May 2015 13:52:03 +0200 -Subject: [PATCH 1/1] Make the management of pinentry.pin more explicit. - -* pinentry/pinentry.c: Include . -(pinentry): Set pin_len to 0. -(pinentry_setbufferlen): If len is less than 2048, set it to 2048. -Add an assertion. -(pinentry_setbuffer_clear): New function that releases the pin buffer. -(pinentry_setbuffer_init): New function that initializes the pin -buffer. -(cmd_getpin): Use pinentry_setbuffer_init and pinentry_setbuffer_clear -instead of manual memory management. -(cmd_confirm): Use pinentry_setbuffer_clear instead of manual memory -management. ---- - pinentry/pinentry.c | 52 +++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 39 insertions(+), 13 deletions(-) - -diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c -index 3a44851..53216fc 100644 ---- a/pinentry/pinentry.c -+++ b/pinentry/pinentry.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #ifndef HAVE_W32CE_SYSTEM - # include - #endif -@@ -67,7 +68,7 @@ struct pinentry pinentry = - NULL, /* Not-Ok button. */ - NULL, /* Cancel button. */ - NULL, /* PIN. */ -- 2048, /* PIN length. */ -+ 0, /* PIN length. */ - 0, /* pin_from_cache. */ - 0, /* Display. */ - 0, /* TTY name. */ -@@ -354,8 +355,18 @@ char * - pinentry_setbufferlen (pinentry_t pin, int len) - { - char *newp; -- if (len < pinentry.pin_len) -+ -+ if (pin->pin_len) -+ assert (pin->pin); -+ else -+ assert (!pin->pin); -+ -+ if (len < 2048) -+ len = 2048; -+ -+ if (len <= pin->pin_len) - return NULL; -+ - newp = secmem_realloc (pin->pin, len); - if (newp) - { -@@ -371,6 +382,28 @@ pinentry_setbufferlen (pinentry_t pin, int len) - return newp; - } - -+static void -+pinentry_setbuffer_clear (pinentry_t pin) -+{ -+ if (! pin->pin) -+ { -+ assert (pin->pin_len == 0); -+ return; -+ } -+ -+ assert (pin->pin_len > 0); -+ -+ secmem_free (pin->pin); -+ pin->pin = NULL; -+ pin->pin_len = 0; -+} -+ -+static void -+pinentry_setbuffer_init (pinentry_t pin) -+{ -+ pinentry_setbuffer_clear (pin); -+ pinentry_setbufferlen (pin, 0); -+} - - /* Initialize the secure memory subsystem, drop privileges and return. - Must be called early. */ -@@ -983,7 +1016,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line) - int set_prompt = 0; - int just_read_password_from_cache = 0; - -- pinentry.pin = secmem_malloc (pinentry.pin_len); -+ pinentry_setbuffer_init (&pinentry); - if (!pinentry.pin) - return ASSUAN_Out_Of_Core; - -@@ -1065,11 +1098,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line) - - if (result < 0) - { -- if (pinentry.pin) -- { -- secmem_free (pinentry.pin); -- pinentry.pin = NULL; -- } -+ pinentry_setbuffer_clear (&pinentry); - if (pinentry.specific_err) - return pinentry.specific_err; - return pinentry.locale_err? ASSUAN_Locale_Problem: ASSUAN_Canceled; -@@ -1094,11 +1123,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line) - password_cache_save (pinentry.keyinfo, pinentry.pin); - } - -- if (pinentry.pin) -- { -- secmem_free (pinentry.pin); -- pinentry.pin = NULL; -- } -+ pinentry_setbuffer_clear (&pinentry); - - return result; - } -@@ -1122,6 +1147,7 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line) - pinentry.locale_err = 0; - pinentry.specific_err = 0; - pinentry.canceled = 0; -+ pinentry_setbuffer_clear (&pinentry); - result = (*pinentry_cmd_handler) (&pinentry); - if (pinentry.error) - { --- -2.1.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-memory.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-memory.patch deleted file mode 100644 index 08cb274c0c..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-memory.patch +++ /dev/null @@ -1,32 +0,0 @@ -From aa04dac66f2ee949e8789a3c91090b01646f2e57 Mon Sep 17 00:00:00 2001 -From: "Neal H. Walfield" -Date: Mon, 11 May 2015 16:14:18 +0200 -Subject: [PATCH] Fix memory allocation in pinentry_setbufferlen. - -* pinentry/pinentry.c (pinentry_setbufferlen): Set PIN->PIN to a -buffer that is LEN bytes large, not 2 * PIN->PIN_LENGTH. ---- - pinentry/pinentry.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c -index 51c873c..f28c576 100644 ---- a/pinentry/pinentry.c -+++ b/pinentry/pinentry.c -@@ -356,11 +356,11 @@ pinentry_setbufferlen (pinentry_t pin, int len) - char *newp; - if (len < pinentry.pin_len) - return NULL; -- newp = secmem_realloc (pin->pin, 2 * pin->pin_len); -+ newp = secmem_realloc (pin->pin, len); - if (newp) - { - pin->pin = newp; -- pin->pin_len *= 2; -+ pin->pin_len = len; - } - else - { --- -2.1.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-simplify.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-simplify.patch deleted file mode 100644 index 8249849bce..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-simplify.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 831782b3b625ca81624fae0ee184da0d2fc46d96 Mon Sep 17 00:00:00 2001 -From: "Neal H. Walfield" -Date: Mon, 11 May 2015 16:35:12 +0200 -Subject: [PATCH 1/1] Simplify code. - -* pinentry/pinentry.c (cmd_confirm): Don't use nested ternary -expressions. ---- - pinentry/pinentry.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c -index 11a8027..3a44851 100644 ---- a/pinentry/pinentry.c -+++ b/pinentry/pinentry.c -@@ -1132,14 +1132,21 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line) - if (pinentry.close_button) - assuan_write_status (ctx, "BUTTON_INFO", "close"); - -- return result ? 0 -- : (pinentry.specific_err? pinentry.specific_err : -- pinentry.locale_err? ASSUAN_Locale_Problem -- : (pinentry.one_button -- ? 0 -- : (pinentry.canceled -- ? ASSUAN_Canceled -- : ASSUAN_Not_Confirmed))); -+ if (result) -+ return 0; -+ -+ if (pinentry.specific_err) -+ return pinentry.specific_err; -+ -+ if (pinentry.locale_err) -+ return ASSUAN_Locale_Problem; -+ -+ if (pinentry.one_button) -+ return 0; -+ -+ if (pinentry.canceled) -+ return ASSUAN_Canceled; -+ return ASSUAN_Not_Confirmed; - } - - --- -2.1.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.5-build.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.5-build.patch new file mode 100644 index 0000000000..2ef9a6779e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.5-build.patch @@ -0,0 +1,52 @@ +From 29384a828ad83644df9093bb292194d1ac6e689b Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +Date: Sat, 18 Jul 2015 10:14:49 +0300 +Subject: [PATCH] build: add pkg-config initialization and modify detection + +add PKG_PROG_PKG_CONFIG as the qt4 detection and curses detection are +already using pkg.m4 which require proper initialization. + +modify the manual detection of pkg-config based on the error value of +the PKG_PROG_PKG_CONFIG and not the manual one as there is a conflict +between empty and 'no'. + +Signed-off-by: Alon Bar-Lev +--- + configure.ac | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b71cb17..7afa318 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -85,6 +85,7 @@ AC_PROG_RANLIB + # for Qt and autoconf does does not allow that. + AC_PROG_CXX + AC_PROG_LN_S ++PKG_PROG_PKG_CONFIG + AC_CHECK_TOOL(WINDRES, windres, :) + AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog, + [build-aux/gitlog-to-changelog]) +@@ -430,8 +431,7 @@ AC_ARG_ENABLE(pinentry-gnome3, + + dnl check for pkg-config + if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- if test x"${PKG_CONFIG}" = xno ; then ++ if test -z "${PKG_CONFIG}"; then + pinentry_gtk_2=no + pinentry_gnome_3=no + fi +@@ -504,8 +504,7 @@ AC_ARG_ENABLE(libsecret, + + dnl check for pkg-config + if test "$libsecret" != "no"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- if test x"${PKG_CONFIG}" = xno ; then ++ if test -z "${PKG_CONFIG}" ; then + libsecret=no + fi + fi +-- +2.3.6 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch new file mode 100644 index 0000000000..0ab9160764 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch @@ -0,0 +1,60 @@ +From eb2cd9487749be01a1ad34ce6036366208147290 Mon Sep 17 00:00:00 2001 +From: Kristian Fiskerstrand +Date: Mon, 21 Sep 2015 19:09:04 +0200 +Subject: [PATCH] m4/qt.m4: Remove detection of Qt5 + +--- + m4/qt.m4 | 36 +----------------------------------- + 1 file changed, 1 insertion(+), 35 deletions(-) + +diff --git a/m4/qt.m4 b/m4/qt.m4 +index 0a7ea99..2982bb8 100644 +--- a/m4/qt.m4 ++++ b/m4/qt.m4 +@@ -28,42 +28,8 @@ dnl The moc lookup code is based on libpoppler (rev. d821207) + + AC_DEFUN([FIND_QT], + [ +- PKG_CHECK_MODULES(PINENTRY_QT, +- Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0, +- [have_qt5_libs="yes"], +- [have_qt5_libs="no"]) ++ have_qt5_libs="no" + +- if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then +- PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic" +- fi +- +- if test "$have_qt5_libs" = "yes"; then +- AC_CHECK_TOOL(MOC, moc) +- AC_MSG_CHECKING([moc version]) +- mocversion=`$MOC -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` +- if test x"$mocversiongrep" != x"$mocversion"; then +- AC_MSG_RESULT([no]) +- # moc was not the qt5 one, try with moc-qt5 +- AC_CHECK_TOOL(MOC2, moc-qt5) +- mocversion=`$MOC2 -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` +- if test x"$mocversiongrep" != x"$mocversion"; then +- AC_CHECK_TOOL(QTCHOOSER, qtchooser) +- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` +- mocversion=`$qt5tooldir/moc -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` +- if test x"$mocversiongrep" != x"$mocversion"; then +- # no valid moc found +- have_qt5_libs="no"; +- else +- MOC=$qt5tooldir/moc +- fi +- else +- MOC=$MOC2 +- fi +- fi +- fi + if test "$have_qt5_libs" != "yes"; then + PKG_CHECK_MODULES(PINENTRY_QT, + QtCore >= 4.4.0 QtGui >= 4.4.0, +-- +2.4.6 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch new file mode 100644 index 0000000000..9522c2f4bf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch @@ -0,0 +1,55 @@ +From 08ec9556c8a384ea7bb5d42d3f6aab6c2f6a8786 Mon Sep 17 00:00:00 2001 +From: Andre Heinecke +Date: Fri, 25 Sep 2015 15:56:55 +0200 +Subject: [PATCH] Add option to disable looking for qt5 + +* m4/qt.m4 (FIND_QT): Add --disable-pinentry-qt5 option to +disable qt5 support even if it is available. + +-- +As requested by Kristan F. + +GnuPG-bug-id: 2105 +--- + m4/qt.m4 | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +diff --git a/m4/qt.m4 b/m4/qt.m4 +index 0a7ea99..0e47ec6 100644 +--- a/m4/qt.m4 ++++ b/m4/qt.m4 +@@ -28,15 +28,24 @@ dnl The moc lookup code is based on libpoppler (rev. d821207) + + AC_DEFUN([FIND_QT], + [ +- PKG_CHECK_MODULES(PINENTRY_QT, +- Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0, +- [have_qt5_libs="yes"], +- [have_qt5_libs="no"]) ++ AC_ARG_ENABLE(pinentry-qt5, ++ AC_HELP_STRING([--disable-pinentry-qt5], ++ [Don't use qt5 even if it is available.]), ++ enable_pinentry_qt5=$enableval, ++ enable_pinentry_qt5="try") + +- if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then +- PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic" +- fi ++ have_qt5_libs="no"; ++ ++ if test "$enable_pinentry_qt5" != "no"; then ++ PKG_CHECK_MODULES(PINENTRY_QT, ++ Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0, ++ [have_qt5_libs="yes"], ++ [have_qt5_libs="no"]) + ++ if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then ++ PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic" ++ fi ++ fi + if test "$have_qt5_libs" = "yes"; then + AC_CHECK_TOOL(MOC, moc) + AC_MSG_CHECKING([moc version]) +-- +2.1.4 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml index 3c50ec9eb9..d187040305 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml @@ -1,8 +1,8 @@ -crypto - - Enable clipboard integration - + crypto + + Enable clipboard integration + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild index c0b153bf3f..fae56984ea 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0-r3.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-crypt/pinentry/pinentry-0.9.0-r3.ebuild,v 1.3 2015/04/30 19:51:33 alonbl Exp $ +# $Id$ EAPI=5 @@ -19,9 +19,9 @@ RDEPEND=" app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) " DEPEND="${RDEPEND} sys-devel/gettext diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0.ebuild index 389c84037b..fe2c6afe60 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0.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-crypt/pinentry/pinentry-0.9.0.ebuild,v 1.11 2015/03/31 17:18:11 ulm Exp $ +# $Id$ EAPI=5 @@ -19,9 +19,9 @@ RDEPEND=" app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) " DEPEND="${RDEPEND} sys-devel/gettext diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.5.ebuild similarity index 68% rename from sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.5.ebuild index 95d39c6ba4..2dff58e254 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.2-r1.ebuild,v 1.1 2015/05/14 08:12:20 k_f Exp $ +# $Id$ EAPI=5 -inherit qmake-utils autotools multilib eutils flag-o-matic toolchain-funcs +inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" HOMEPAGE="http://gnupg.org/aegypten2/index.html" @@ -12,21 +12,22 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="clipboard gtk ncurses qt4 caps gnome-keyring static" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="clipboard emacs gtk ncurses qt4 caps gnome-keyring static" RDEPEND=" + >=dev-libs/libgpg-error-1.17 + >=dev-libs/libassuan-2 app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) " DEPEND="${RDEPEND} sys-devel/gettext - gtk? ( virtual/pkgconfig ) - qt4? ( virtual/pkgconfig ) + virtual/pkgconfig gnome-keyring? ( app-crypt/libsecret ) " REQUIRED_USE=" @@ -40,13 +41,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) src_prepare() { epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - epatch "${FILESDIR}/${P}-handlers-return.patch" - epatch "${FILESDIR}/${P}-gnome3.patch" - epatch "${FILESDIR}/${P}-simplify.patch" - epatch "${FILESDIR}/${P}-cmd_confirm.patch" - epatch "${FILESDIR}/${P}-memory.patch" - epatch "${FILESDIR}/${P}-management.patch" - epatch "${FILESDIR}/${P}-linking-order.patch" + epatch "${FILESDIR}/${P}-build.patch" eautoreconf } @@ -59,6 +54,7 @@ src_configure() { econf \ --enable-pinentry-tty \ + $(use_enable emacs pinentry-emacs) \ $(use_enable gtk pinentry-gtk2) \ $(use_enable ncurses pinentry-curses) \ $(use_enable ncurses fallback-curses) \ diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild similarity index 74% rename from sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild index 79933fe22f..20fc85fd68 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.1.ebuild,v 1.2 2015/05/05 16:24:05 alonbl Exp $ +# $Id$ EAPI=5 -inherit qmake-utils autotools multilib eutils flag-o-matic toolchain-funcs +inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" HOMEPAGE="http://gnupg.org/aegypten2/index.html" @@ -13,21 +13,31 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="clipboard gtk ncurses qt4 caps static" +IUSE="emacs gtk ncurses qt4 caps gnome-keyring static" + +CDEPEND=" + >=dev-libs/libgpg-error-1.17 + >=dev-libs/libassuan-2 + >=dev-libs/libgcrypt-1.6.3 + ncurses? ( sys-libs/ncurses:0= ) + gtk? ( x11-libs/gtk+:2 ) + qt4? ( >=dev-qt/qtgui-4.4.1:4 ) + caps? ( sys-libs/libcap ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) + app-eselect/eselect-pinentry + gnome-keyring? ( app-crypt/libsecret ) +" + +DEPEND="${CDEPEND} + sys-devel/gettext + virtual/pkgconfig +" RDEPEND=" - app-eselect/eselect-pinentry - caps? ( sys-libs/libcap ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses ) - qt4? ( >=dev-qt/qtgui-4.4.1:4 ) - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) -" -DEPEND="${RDEPEND} - sys-devel/gettext - gtk? ( virtual/pkgconfig ) - qt4? ( virtual/pkgconfig ) + ${CDEPEND} + gnome-keyring? ( app-crypt/gcr ) " + REQUIRED_USE=" || ( ncurses gtk qt4 ) gtk? ( !static ) @@ -39,7 +49,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) src_prepare() { epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - epatch "${FILESDIR}/${P}-memleak.patch" + epatch "${FILESDIR}/${P}-Remove-detection-of-Qt5.patch" eautoreconf } @@ -52,18 +62,24 @@ src_configure() { econf \ --enable-pinentry-tty \ + $(use_enable emacs pinentry-emacs) \ $(use_enable gtk pinentry-gtk2) \ $(use_enable ncurses pinentry-curses) \ $(use_enable ncurses fallback-curses) \ - $(use_enable qt4 pinentry-qt4) \ - $(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \ + $(use_enable qt4 pinentry-qt) \ $(use_with caps libcap) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ MOC="$(qt4_get_bindir)"/moc } src_install() { default rm -f "${ED}"/usr/bin/pinentry || die + + if use_enable qt4; then + dosym pinentry-qt /usr/bin/pinentry-qt4 + fi } pkg_postinst() { @@ -76,6 +92,7 @@ pkg_postinst() { elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" elog "your users." fi + eselect pinentry update ifunset } diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.6-r5.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.6-r5.ebuild new file mode 100644 index 0000000000..6e10cf89fa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.6-r5.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="http://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static" + +CDEPEND=" + >=dev-libs/libgpg-error-1.17 + >=dev-libs/libassuan-2 + >=dev-libs/libgcrypt-1.6.3 + ncurses? ( sys-libs/ncurses:0= ) + gtk? ( x11-libs/gtk+:2 ) + qt4? ( + >=dev-qt/qtgui-4.4.1:4 + ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + caps? ( sys-libs/libcap ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) + app-eselect/eselect-pinentry + gnome-keyring? ( app-crypt/libsecret ) +" + +DEPEND="${CDEPEND} + sys-devel/gettext + virtual/pkgconfig +" + +RDEPEND=" + ${CDEPEND} + gnome-keyring? ( app-crypt/gcr ) +" + +REQUIRED_USE=" + || ( ncurses gtk qt4 ) + gtk? ( !static ) + qt4? ( !static ) + qt5? ( !static ) + static? ( ncurses ) + ?? ( qt4 qt5 ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" + epatch "${FILESDIR}/${P}-add-disable-pinentry-qt5-option.patch" + eautoreconf +} + +src_configure() { + local myconf=() + use static && append-ldflags -static + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + QT_MOC="" + if use qt4; then + myconf+=( --enable-pinentry-qt + --disable-pinentry-qt5 + ) + QT_MOC="$(qt4_get_bindir)"/moc + # Issues finding qt on multilib systems + export QTLIB="$(qt4_get_libdir)" + elif use qt5; then + myconf+=( --enable-pinentry-qt ) + QT_MOC="$(qt5_get_bindir)"/moc + export QTLIB="$(qt5_get_libdir)" + else + myconf+=( --disable-pinentry-qt ) + fi + + econf \ + --enable-pinentry-tty \ + $(use_enable emacs pinentry-emacs) \ + $(use_enable gtk pinentry-gtk2) \ + $(use_enable ncurses pinentry-curses) \ + $(use_enable ncurses fallback-curses) \ + $(use_with caps libcap) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ + "${myconf[@]}" \ + MOC="${QT_MOC}" +} + +src_install() { + default + rm -f "${ED}"/usr/bin/pinentry || die + + if use_enable qt4 || use_enable qt5; then + dosym pinentry-qt /usr/bin/pinentry-qt4 + fi +} + +pkg_postinst() { + if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." + elog "The soft resource limit for memory locking specifies the limit an" + elog "unprivileged process may lock into memory. You can also use POSIX" + elog "capabilities to allow pinentry to lock memory. To do so activate the caps" + elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" + elog "your users." + fi + + eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.0 index 8b4c47597a..e7ea8f5520 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.0 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.0 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst postrm prepare -DEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) ppc-aix? ( dev-libs/gnulib ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) ppc-aix? ( dev-libs/gnulib ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol EAPI=5 HOMEPAGE=http://gnupg.org/aegypten2/index.html IUSE=gtk ncurses qt4 caps static KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 -RDEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) +RDEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses ) SLOT=0 SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.0.tar.bz2 _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=457e0df545609087372c8effa5135891 +_md5_=b8c0dd1313000147b847b4b7d5bc7483 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.0-r3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.0-r3 index 032e75ba02..5e6ee1573f 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.0-r3 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.0-r3 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst postrm prepare -DEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) ppc-aix? ( dev-libs/gnulib ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) ppc-aix? ( dev-libs/gnulib ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol EAPI=5 HOMEPAGE=http://gnupg.org/aegypten2/index.html IUSE=clipboard gtk ncurses qt4 caps static KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 -RDEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) +RDEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses ) SLOT=0 SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.0.tar.bz2 _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 8557b23f27697843c242ff27aaa99448 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=07481c8f2bf1528d0fd4638893baad60 +_md5_=a43916023614851f25739021d1581dd5 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.1 deleted file mode 100644 index a2a4973acb..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst postrm prepare -DEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol -EAPI=5 -HOMEPAGE=http://gnupg.org/aegypten2/index.html -IUSE=clipboard gtk ncurses qt4 caps static -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) -REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses ) -SLOT=0 -SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.1.tar.bz2 -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 8557b23f27697843c242ff27aaa99448 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=56b68c8a34c7bf64d1bc14b7b25dc065 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.2-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.2-r1 deleted file mode 100644 index f3de38a928..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.2-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst postrm prepare -DEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) gnome-keyring? ( app-crypt/libsecret ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol -EAPI=5 -HOMEPAGE=http://gnupg.org/aegypten2/index.html -IUSE=clipboard gtk ncurses qt4 caps gnome-keyring static -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) -REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses ) -SLOT=0 -SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.2.tar.bz2 -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 8557b23f27697843c242ff27aaa99448 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=270a3a55c0073c524694893b08184ec8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.5 new file mode 100644 index 0000000000..c6a386028e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.5 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst postrm prepare +DEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2 app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext virtual/pkgconfig gnome-keyring? ( app-crypt/libsecret ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol +EAPI=5 +HOMEPAGE=http://gnupg.org/aegypten2/index.html +IUSE=clipboard emacs gtk ncurses qt4 caps gnome-keyring static +KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2 app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) +REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses ) +SLOT=0 +SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.5.tar.bz2 +_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 8557b23f27697843c242ff27aaa99448 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=a198117c18c9a1190ebfff88ce8d635b diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.6-r4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.6-r4 new file mode 100644 index 0000000000..48afb61bbe --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.6-r4 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst postrm prepare +DEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) sys-devel/gettext virtual/pkgconfig !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol +EAPI=5 +HOMEPAGE=http://gnupg.org/aegypten2/index.html +IUSE=emacs gtk ncurses qt4 caps gnome-keyring static +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) gnome-keyring? ( app-crypt/gcr ) +REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses ) +SLOT=0 +SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.6.tar.bz2 +_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 8557b23f27697843c242ff27aaa99448 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=0e9bb3df3b8fa79e50fd0f39ea05c311 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.6-r5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.6-r5 new file mode 100644 index 0000000000..ea8716b250 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.6-r5 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst postrm prepare +DEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) sys-devel/gettext virtual/pkgconfig !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol +EAPI=5 +HOMEPAGE=http://gnupg.org/aegypten2/index.html +IUSE=emacs gtk ncurses qt4 qt5 caps gnome-keyring static +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) gnome-keyring? ( app-crypt/gcr ) +REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) qt5? ( !static ) static? ( ncurses ) ?? ( qt4 qt5 ) +SLOT=0 +SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.6.tar.bz2 +_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 8557b23f27697843c242ff27aaa99448 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=9e1ad4d34e563605e28be4146907a662