diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-07-06 14:43:36 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-07-06 14:43:36 +0000 |
| commit | e74f3bc3ff288a5e0547cacc53f8565c367831b5 (patch) | |
| tree | d12dbf2b9c4dc544dd6a7f552034a3ca7ac5ff31 /net-ftp | |
| parent | fix build with ffmpeg 0.11 and git master (diff) | |
| download | historical-e74f3bc3ff288a5e0547cacc53f8565c367831b5.tar.gz historical-e74f3bc3ff288a5e0547cacc53f8565c367831b5.tar.bz2 historical-e74f3bc3ff288a5e0547cacc53f8565c367831b5.zip | |
Move the #endif so it applies where it counts.
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/lftp/ChangeLog | 5 | ||||
| -rw-r--r-- | net-ftp/lftp/Manifest | 10 | ||||
| -rw-r--r-- | net-ftp/lftp/files/lftp-4.3.8-gets.patch | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog index 307f219bbcd1..705f365f9888 100644 --- a/net-ftp/lftp/ChangeLog +++ b/net-ftp/lftp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-ftp/lftp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.367 2012/07/06 13:58:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.368 2012/07/06 14:43:36 jer Exp $ + + 06 Jul 2012; Jeroen Roovers <jer@gentoo.org> files/lftp-4.3.8-gets.patch: + Move the #endif so it applies where it counts. 06 Jul 2012; Jeroen Roovers <jer@gentoo.org> lftp-4.3.8.ebuild, +files/lftp-4.3.8-gets.patch: diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index 031e6d3462be..00e46629da63 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -4,19 +4,19 @@ Hash: SHA1 AUX lftp-4.0.2.91-lafile.patch 976 SHA256 b54aac35c297657290a2d9571c38bdc4bf51548f826b4ec958a768c398c0cd0b SHA512 5da906b19e2f2eeb46292e4b406656e851072fcba431c3fc771baf3825f09e577550cab079991625cb96b1547a6ba15938b6c67c4e89ee9e11fb9ccd21509bf2 WHIRLPOOL 9348707606cc0772d76666167425196b79cb3c9509cb037c61f28bdd8f023593f78b16e0c970b8520f58aa9c0c193cb15314b715f4840f2afd3044e43729c828 AUX lftp-4.0.3-autoconf-2.64.patch 582 SHA256 f8e6e1d4e114d7e122b1762f9382027541357c39f129f9d2aad9edd93659f53e SHA512 36dad6f0ad5016b6b7f7048d9620330fa3ba414114a6afd4622f0cb06919b12a45457e778eae7bd1d8a1ed1ede04b0c5d664571e510fbd4f756cf675b10d1ff1 WHIRLPOOL 85b5afce5b6914bf502cf4fc5e28b242d41917b948d88ca10074ed4d1abe08bef0aee903e037ce6f08a3f5d167115003fdd2dddd923585fbf2faad394d2b3990 AUX lftp-4.3.5-autopoint.patch 330 SHA256 5aa4d9b739ffcc9a500988a7c80ca6a192d4ef440bea27278d87a27da50bf909 SHA512 7d7f0628bfe817fb9fb10d36f85f729f2e0b8ae3a6b6c9e719469a109b08b65a465c6d313cbe8a8115e9bc036e07347b6f5df0aa3067f905690b221d4bdf3318 WHIRLPOOL 91a8be4feed34ffd3f9d6ea2eb44968420d8cb57c494520b0ce8fb3f40cce85d136e8b2124eac7fcadbb8c9e1187b9fa6c9256f360079ac41eeb693cc5298c3a -AUX lftp-4.3.8-gets.patch 362 SHA256 5e7dd34c4c6d34fc63cffec46b74abf50b3164923cd603facd169f9147e7f7f6 SHA512 9e85cd3dee150b5699c21ef681b6d3b0cfde36df67c91dbc8b44f10b91ed429ad2aa0c2581ea1bc4995b1f88b57a9d753f4c3551be443b2ce58a6660b6dd9df7 WHIRLPOOL e43fcfd9621bcb9e350f3cf219b6dce1d5fa911ef9e81fac28c8ba755b99cc172c17b9b9d0d32244d292d3df5560749b178cb77743eaf17bcce0549400702f97 +AUX lftp-4.3.8-gets.patch 430 SHA256 20f3f931132aae70c6dc8b03368419951bb4ec9f0d4cfcaf5966db3c6689da35 SHA512 24e61ec6784fdf95b5df75ed29680465e9fac87f9b79eaf4a9156a32c66afd4db5b905c7e29789a8a0e0d7c6b4c782b1f749e52d4c9547c96c1b79834c2a750a WHIRLPOOL 399f1a0714ada86a47a567d49a1d093b4900847fb38994e9adbc95c82d879e061d057945d66a0f26a6015c3737f586e6b83da8d1d5b30f7f103fc4d2e2ee523e DIST lftp-4.3.6.tar.xz 1401712 SHA256 89821cf38428f01ce20d646654bd4352a9a037664f7068f2aa82cf1984e45473 SHA512 10c123707e62bc41d0d92d648364015feeb3182dbd59b7bbdb2a3873dfc9c1702e7c86f1b479fa87123caa57af59446756e0462dc954ee6f362f4ddb761d5e84 WHIRLPOOL 5529973ec00fb749c111fd4526a62ceaf8c3fa211af87d92ce6920a785de9bf38f1e8eddb7fd2e1afabd77f653d18d8e238cbe0755fde33e6c3a18f8d20adbe2 DIST lftp-4.3.7.tar.xz 1404336 SHA256 b77589f7274ef391f58ac683d93930b2d9a44f35e29b07e4f9d3f02ffe6185f6 SHA512 31188161aadd47308db8aaf1057176acf43f0d77264e72cd3bb7ba5fe595ed7aed649570ed9c323afd99ecf29e4976c9383fe78c9bddf99e65e6075c84d8fc03 WHIRLPOOL 6ca8f671be416fe22bf76aeadf3f6f8593e3c0ab3bd57c2a27bf94cbaa5bd480b56c1c743fc962204e5fc3d544790f6d1a46adfc1d795854244d4a43decf33a2 DIST lftp-4.3.8.tar.xz 1407936 SHA256 38951359b3dbec562de8f6b22b3434fb04ace67e7a91023da141474912951962 SHA512 347f3daaaa2dd9955b2c825327f64a40c905a178a91612363f2eec122dc3c48f19ee6baa34268c5aff64dea49e50e23e0525f5f62c85e4a82fe8f0eefe5c7b94 WHIRLPOOL 9d45deb092a9d490f9713bb2dd586690f7e5ac89d6b116d93fdddfef788259d9a3f59543e5618d486b82f77cd9c065aad47673607dd5d9c093d4713fb4aeb31d EBUILD lftp-4.3.6.ebuild 1861 SHA256 ca1f8cc535ac810bab46cdafd65218fe36bbb8b6a2cfe389c9a64f010dbb07f5 SHA512 6d88d2f2a01b660ed5f7879c56cc6c81e1ccf8dc5aa8f6f16e45e533889ce870cd53b96a6c6de7dcf907e5675092f6e5fd6cebbef8dd07beccf18f8ee2538974 WHIRLPOOL d8724f04303bdade09d7b025fd930ac545cc25d961f1f6a5434a6d95b50b197a7cedde89603d6490d9ba72384eedc22308865877cea0938188b4702b88674952 EBUILD lftp-4.3.7.ebuild 1867 SHA256 4e3ece241c5ba9e1be1e8cf437512f669d2a43ae5742199c25fc683cf3250b1e SHA512 76b1adfb30b9f2bd30e8a92d8278a3b667f0d5c691c86eb345c7ab5b6e6b7ae907c507eed33ae2f0ced2a67543c172fc0befd6989e8f64d1d8c064771ec2fac6 WHIRLPOOL 7d7d9f54df349934dc116f2549247fd7eb21749689fd0b446e82e69d6efe213902027772a9ccb1661de2919b748109e44a19d981d4d33df157d8cb3406899a78 EBUILD lftp-4.3.8.ebuild 1904 SHA256 6b02a56bf8aecbf146db63675103b58a373e4aacc645fe97ea552e86ada5e4c1 SHA512 2b57be709449137b6846a5d9e35ebfa796e0f7fc929b38623dd000badd9cdd1170a78503584d3d1d78cf3b66fb2497cd2efec8347efb32b8636fbb2cff7a1694 WHIRLPOOL dbd02d8e53492777fc0018325c67075d7a7960e07cc1af9031e2d61f6a953c76d3a19e8f623f5c8fb460ffce3353a94b78e335f6443d8991a11d06883f391944 -MISC ChangeLog 47251 SHA256 fac821ae6177d933134af14ea8888d9aa2af4ba3505d737d0571cad411eecb22 SHA512 5ee824f79e97ca867a9f52fa2597417ba9ec99b0d9f9a434bdcd657ad6149adc5f01748f6e238753629b2864d7510f62f2e24c2b28e5a8e3a749f89668c10a78 WHIRLPOOL c3a5820a301faedc440bb5d5b292b37bd0664ca9e50192201e69d249bcc621a5c6251c388222d7dfeb09b092dd2142f6ab74f4237a4fbb49ff32b6e1340f1455 +MISC ChangeLog 47377 SHA256 342f8076b79b7e7b93c6d914b20c348027587dfa2ed2ee43b2381c810e1a1c8e SHA512 c238e9b2feae6cbdd4875e11245afa43af28ffa44bf0d67cc7d50ed7548230589e5eb18fc6e0f1f18b1ae9f6e3defe9e2b5590fa85815a46505081c22f7008e1 WHIRLPOOL 3b37702d1c6a374ab7547f08b788d58beae713fbb185dc8983f07aed01dd187c9414b0458a63d38f9fcf97273518260575f47fc3cfe23e35a3755f2c1412b8c2 MISC metadata.xml 228 SHA256 766b4854103b92707706451db11bd895a0f63036677fdcbff2bccb8de5d6d289 SHA512 d89006995b1adc962506fb900d44c5dd7af2db67a40518bb5ea3325afe7a35d028c3c2eee71b5ad9dc2ab26c7802c14d715a88a7f3fc61449e4418b8b13e42b8 WHIRLPOOL 44d158838e0a1a6b2858a3d463fb6d07b7e18d1446b86013cf50184b3de695a39afde03b51bd27d5fd57ad29e015992af78cdbfb7c60eb8043be750acfd65a15 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk/27xcACgkQVWmRsqeSphMnqwCeOpSog7uz/VuBebiBX7EKVkzN -y80An33x8AKIQmlvV5dgeabtv0whm7re -=iNY9 +iEYEARECAAYFAk/2+Z0ACgkQVWmRsqeSphM4HgCfQYRd/DsvXginejzKfBycCqto +e5YAn3t2D82pW9S5X5Vl6f7/Aot86NqV +=P4XX -----END PGP SIGNATURE----- diff --git a/net-ftp/lftp/files/lftp-4.3.8-gets.patch b/net-ftp/lftp/files/lftp-4.3.8-gets.patch index d5aa369cefeb..0c2cb7c8ae6c 100644 --- a/net-ftp/lftp/files/lftp-4.3.8-gets.patch +++ b/net-ftp/lftp/files/lftp-4.3.8-gets.patch @@ -1,12 +1,15 @@ --- a/lib/stdio.in.h +++ b/lib/stdio.in.h -@@ -702,7 +702,9 @@ +@@ -702,10 +702,12 @@ /* It is very rare that the developer ever has full control of stdin, so any use of gets warrants an unconditional warning; besides, C11 removed it. */ +#ifdef gets #undef gets -+#endif #if HAVE_RAW_DECL_GETS _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif ++#endif + + + #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ |