diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2012-12-22 20:51:09 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2012-12-22 20:51:09 +0000 |
| commit | d6039a77f95506bb7d5c409092ee2bfb97835f41 (patch) | |
| tree | b64a6429e0cdb2dc596ab0fee06f40e829500bec /app-crypt/mcrypt | |
| parent | Removed old. (diff) | |
| download | historical-d6039a77f95506bb7d5c409092ee2bfb97835f41.tar.gz historical-d6039a77f95506bb7d5c409092ee2bfb97835f41.tar.bz2 historical-d6039a77f95506bb7d5c409092ee2bfb97835f41.zip | |
Rework sprintf patch to remove RCS substitution in patch, as it invalidate it
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Diffstat (limited to 'app-crypt/mcrypt')
| -rw-r--r-- | app-crypt/mcrypt/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/mcrypt/Manifest | 4 | ||||
| -rw-r--r-- | app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/app-crypt/mcrypt/ChangeLog b/app-crypt/mcrypt/ChangeLog index 880d2d6c776f..1ed8d28d9446 100644 --- a/app-crypt/mcrypt/ChangeLog +++ b/app-crypt/mcrypt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/mcrypt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/ChangeLog,v 1.36 2012/12/22 20:31:00 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/ChangeLog,v 1.37 2012/12/22 20:51:04 alonbl Exp $ + + 22 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> + files/mcrypt-2.6.8-sprintf.patch, mcrypt-2.6.8-r2.ebuild: + Rework sprintf patch to remove RCS substitution in patch, as it invalidate it 22 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> +files/mcrypt-2.6.8-format-string.patch, +files/mcrypt-2.6.8-sprintf.patch, diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest index cd073823ee05..0ce0b6314b85 100644 --- a/app-crypt/mcrypt/Manifest +++ b/app-crypt/mcrypt/Manifest @@ -1,10 +1,10 @@ AUX mcrypt-2.6.7-qa.patch 736 SHA256 8cf4a65124e6354797e7c37f54a182758d3b24f1789c04948ab71dde6309c643 SHA512 f50e2db738583b5dbca80e7458cc341787b94bd475b699de1333e4839b1bc448c0a6d7c759a71849c60fc97d45dbb0f075ad6c5d67d312865eea26118bba4dee WHIRLPOOL f02ecd9a785d2edd1eb28553f714ff93063d64704f04a522323a7e731264e500b845e7bf314b902265b130849760526f99f72d0b15030f3d14f026043d08aa11 AUX mcrypt-2.6.8-format-string.patch 514 SHA256 9502a5a66a9e4fe834391e1f94153db60bb4dab7f79a2bc82c49e653e48175df SHA512 6e01e4bf75cf04e2d37a1689259f86858a50bb26901e47369ec1e7e71c01e9315e42daee78319e45ef23fd44b0034d6f804659c5eaf988bd9e3bf6636c56ea0c WHIRLPOOL 3a619452a408a3dd71b40936bdb8105d264674e8957a5a9734360aab2a57cfef38c79153303ae8e70b66980e48f4b138dbcdd859f0f34d182b5b2d278313e719 AUX mcrypt-2.6.8-segv.patch 1330 SHA256 3d93cbb71c9148fbf01a5ce2fe57bd78c33e93acb6fa2d79b756f4d1132436e9 SHA512 7bea9f7731f39d2fed3920cbf6efaf006681e59eaa5dc3a0e50ac0cd3166c959e1ebd06c449329865501bd525a22c49380c4f72b27693f8bc0b0c0c4141a5af2 WHIRLPOOL 5a2e0f71b5237da83fe15556daa9a109ae0b74d63cce5220a1167e1030da92c3b4a8c80beece96e77974391bb34d262887d8bea4725fbe26a2e7a7981359cf01 -AUX mcrypt-2.6.8-sprintf.patch 3753 SHA256 81b7e9ece6bfafb3a81e52d7eb80a6f421d7ece40ac6da434dc36d609e05e901 SHA512 2b210c8f62314bc5e61b58ba57713c5363df60b7209c8d9ab7e596992a91231a9a25206c69e77090bceb42dc5b1fc725c1c08ec8cfc1eed463cf87bff4b6fad6 WHIRLPOOL 89bdedc3d19edddeda29253b9e9dfa4d35f7bc2ed6552a1ba5a331bac0cd7e818940baa15a81bc11fb97473023b8a62d5c4382bfdfd535f9c340eb7309766c6d +AUX mcrypt-2.6.8-sprintf.patch 3617 SHA256 d1cc7f8768afb0cee2fc84fef4a2e9265edce92935050a055a11fc61658dee9f SHA512 36163d3c782a29ab70527d0389e9ee4fc0fdb6d92300a5a576f3702c4b6a63f598e3832fd704570cd3c8da79182e2c57473b84932c26b08d3c8bd509f475a7d8 WHIRLPOOL 6603699756fa5033993177f5e7dda4f3bfa7e96a57e640f484e1cc92b3eb4fd573ce246dbc28d616a90b9dc683caf4f0135789bf38a7f7a62b24100b4988eac0 AUX mcrypt-2.6.8-stdlib.h.patch 258 SHA256 367c47727919f3142893eef897b66b9d38e81d20a49de11b421dc40965683b6f SHA512 fdf9334c72bdd5b1e93fbd3abd893f1850505e7d10c568700acdd14c70c277661a760ade2395370e359b88514df0bd6bb7217f78e2222781cab2eecdf4917bff WHIRLPOOL 7eb6f0057fe00684dff84dee7562bf5e39a425e250af291b7a78faa860a3089698fe8fea214f9894f7906186d2348a0d6cca26c0078f84764010174f91eb224c DIST mcrypt-2.6.8.tar.gz 471915 SHA256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098 SHA512 eae5f831e950df69eb93efc8314100b4b5dc8a535b1d00f500e6b25382efcec321346776a92dadf101b878ef46a47de2e9e81f5ddf5c73563ece4741f169c8d1 WHIRLPOOL f0853fd1d244de6310a4236fc0922a7d19e8c418b8d4b9cd0a66c4571843ffaf421dca7064c82ae0fde5f3aae4806fe27aa9dc05a705768f52a80586f941b538 EBUILD mcrypt-2.6.8-r1.ebuild 838 SHA256 338451edde89983166cc7cb613b313c92a11273161b0317f7da8166a1f7b0503 SHA512 ee5ca0a8a399608e59f1c3826ab9fadc7914cb165bbee9f87bb73b04029e75de73537d0b28c284178c5d49618b91d7c672c4bf47d587e780e778690ab9d70150 WHIRLPOOL 58f3d469578a6c7a25fb3739a0988dcc6fea27926722e81606fadbceda624946577a139b1862ceb44393552c3b49f5b0d9d7df59f96e4f195d0ee5a4404906bc EBUILD mcrypt-2.6.8-r2.ebuild 965 SHA256 a54f30de8245f14d27dfdb01e7b56edc256ed224f3a71285e4da259dc5ec57d1 SHA512 cc1d2d9a9214bf30132573b06b00327e49fd3a05ebcf3813dcff4c09bc5812e6bf22524332ffee558a120a913ce195fdf6b25a905bb09b2fda67e42549770900 WHIRLPOOL 691d4ba8e767369518a4d01579e3e2857e1fa844bb6114fc446b634cfada04a271dceb30d3e6ec54d5d189ff663fc99eea81b22ae8c54f242a194c3b7bd2e947 -MISC ChangeLog 4503 SHA256 734d737ac68fc15fbf4e66bcd90ec13d11c1cfe2becfc3c307c1deae799e2d6d SHA512 36d8d01121937bd319e9397b738eda6b4b87cbd49901598f2d808e0f957f5387f07ce616c2177c01d91785ef14fd0f7fc94feb5212fd7d205deec7e0cfb3781f WHIRLPOOL d852d4534d22cf4f372dff1addc42b26b527fea470a1c3211dac2f895c89a93aa8aed946cae34308e5cc3c7bf5d4cc8c7ef2363510f3a3e5e681d0331553955d +MISC ChangeLog 4692 SHA256 145cd05f916064c5434ab9c8a207420c00dc750651f00f012b41eff0ab80ab11 SHA512 0a691dc3d902fb7defaac7594c08ac7e5cb6060dff4ded4d42badb09979b5312b84d0eec634330990f37b612b5ee102b6e0280dce23ccff91dbe16f692d3db25 WHIRLPOOL df0fd5ccec5afde01e9fe5d9d61cf7ee9dee7a4f09e9d5a4e493e19fd58b85f253ef485212f1daf7d6aa94caae35d6cc7a5a381c9e1bfad83058bf3ad01501e1 MISC metadata.xml 278 SHA256 cdf12b5eab3aa2d9fc1e9fc4bb81ad42131e7d5e25483b7672a03fc3e486cda6 SHA512 176f10a7e71c131ae1360892e6caa9fdfcde541991e1e335e0db633ae3dc548ae18e5533ee1240eecfc237133f7e2839ceac094ba699e1d88490c1dedceccb20 WHIRLPOOL a2c01f8ae67af811103c9c5c2ff65f87b8c52bca1477423b1beeee95e9ee0ce88aed5544423eeda389c3b2974be441d54f8ace5fb50447ff37be078a52733312 diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch index 9678192b6108..a287680958bb 100644 --- a/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch +++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch @@ -17,16 +17,10 @@ Index: mcrypt-2.6.8/src/mcrypt.c =================================================================== --- mcrypt-2.6.8.orig/src/mcrypt.c +++ mcrypt-2.6.8/src/mcrypt.c -@@ -41,10 +41,13 @@ - # include <time.h> - #endif +@@ -41,4 +41,6 @@ +/* Temporary error message can contain one file name and 1k of text */ +#define ERRWIDTH ((PATH_MAX)+1024) -+ - static char rcsid[] = - "$Id: mcrypt-2.6.8-sprintf.patch,v 1.1 2012/12/22 20:31:00 alonbl Exp $"; - -char tmperr[128]; +char tmperr[ERRWIDTH]; unsigned int stream_flag = FALSE; |