Apply patch to handle FTP timeouts better. Bug #147054, reported by Bernd Wurst <bugzilla-gentoo at bwurst.org>. Fix behavior for scp:// URLs when /bin/sh is in fact bash. Bug #151938, reported by Steve Haeck <gentoo_steve at shic.co.uk>.

(Portage version: 2.1.2_pre2-r8)
 (Signed Manifest commit)

1 files changed, 30 insertions, 9 deletions

diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 3c360aafaa62..4e424b1d1280 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,18 +1,29 @@
-DIST duplicity-0.4.1.tar.gz 101626 RMD160 192ce5111fbe408d5927292ae8b5eb8bc21319bd SHA256 b46ff5fe7c89283c635e2a94294d28ec8a501a9d58c41f5672943fb0e5daa725 size 101626
-DIST duplicity-0.4.2.tar.gz 103183 RMD160 c6c86f397e43b7d5f63965d69f3328daa601d00b SHA256 5fdf8aeb32bb4c09e3c9d5c4150245a71d757d31d9bb341524de75e06421e176 size 103183
-EBUILD duplicity-0.4.1.ebuild 703 RMD160 a52bcc6a407764788cb039999284fe7c6cb6370b SHA1 2991533ae94bb5f257ba733d8987af447bcbc3cd SHA256 4053ca1afcfe01cb93467a5682d1edbc855b27dc288f790be28ac65224b37058 size 703
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.4.2-ftp-retry.patch 10110 RMD160 b93407b5ccee6931cb30c792c76905d2ce07b0e5 SHA1 266eac4ecb0b6439158761efe09611bb68c93ee9 SHA256 3ddca744fa09d0ec3f0662a681fe27288062c095fbb1f54a7c0893681a0f3af6
+MD5 a70b087a0328fcf92aed58cf4c138521 files/0.4.2-ftp-retry.patch 10110
+RMD160 b93407b5ccee6931cb30c792c76905d2ce07b0e5 files/0.4.2-ftp-retry.patch 10110
+SHA256 3ddca744fa09d0ec3f0662a681fe27288062c095fbb1f54a7c0893681a0f3af6 files/0.4.2-ftp-retry.patch 10110
+DIST duplicity-0.4.1.tar.gz 101626 RMD160 192ce5111fbe408d5927292ae8b5eb8bc21319bd SHA1 0968a812ae9eae0e4dad0b1da5c103224906150a SHA256 b46ff5fe7c89283c635e2a94294d28ec8a501a9d58c41f5672943fb0e5daa725
+DIST duplicity-0.4.2.tar.gz 103183 RMD160 c6c86f397e43b7d5f63965d69f3328daa601d00b SHA1 37e861218800910fab7590f45520e0f1d8b318d4 SHA256 5fdf8aeb32bb4c09e3c9d5c4150245a71d757d31d9bb341524de75e06421e176
+EBUILD duplicity-0.4.1.ebuild 703 RMD160 a52bcc6a407764788cb039999284fe7c6cb6370b SHA1 2991533ae94bb5f257ba733d8987af447bcbc3cd SHA256 4053ca1afcfe01cb93467a5682d1edbc855b27dc288f790be28ac65224b37058
 MD5 ed7b72a8780e38926badaa0bf866ac8d duplicity-0.4.1.ebuild 703
 RMD160 a52bcc6a407764788cb039999284fe7c6cb6370b duplicity-0.4.1.ebuild 703
 SHA256 4053ca1afcfe01cb93467a5682d1edbc855b27dc288f790be28ac65224b37058 duplicity-0.4.1.ebuild 703
-EBUILD duplicity-0.4.2.ebuild 861 RMD160 93f78f0097abf8682ef3896406e58fe163595532 SHA1 d5673e7b819ae932e83b95b451cf09ed3a84fc71 SHA256 1657255f94e204a0c30f0dd3a7aa5af162926e5d51e81f83205d512f64e14542 size 861
+EBUILD duplicity-0.4.2-r1.ebuild 1102 RMD160 3ffe9b4a43cb416e44747a3e7b676a4a697b77a9 SHA1 142ea7cd833b7a173108d2c1f4d87378df4a9b83 SHA256 b53ae05664225c78db8bc2f1b6e71b73d00cc829d9fe181925ffec9e3c33a73e
+MD5 203c8dcd8baadf832b6e483036df8a93 duplicity-0.4.2-r1.ebuild 1102
+RMD160 3ffe9b4a43cb416e44747a3e7b676a4a697b77a9 duplicity-0.4.2-r1.ebuild 1102
+SHA256 b53ae05664225c78db8bc2f1b6e71b73d00cc829d9fe181925ffec9e3c33a73e duplicity-0.4.2-r1.ebuild 1102
+EBUILD duplicity-0.4.2.ebuild 861 RMD160 93f78f0097abf8682ef3896406e58fe163595532 SHA1 d5673e7b819ae932e83b95b451cf09ed3a84fc71 SHA256 1657255f94e204a0c30f0dd3a7aa5af162926e5d51e81f83205d512f64e14542
 MD5 9bf8c5cb2731b44747ca9a2c603238ab duplicity-0.4.2.ebuild 861
 RMD160 93f78f0097abf8682ef3896406e58fe163595532 duplicity-0.4.2.ebuild 861
 SHA256 1657255f94e204a0c30f0dd3a7aa5af162926e5d51e81f83205d512f64e14542 duplicity-0.4.2.ebuild 861
-MISC ChangeLog 2376 RMD160 e07cb927b91de7a24214867724478ae7cd0c72bc SHA1 59d1f6d02f22eb398bd38acb7edd2901b605dff6 SHA256 6871437952da46a60888f349516b959be9da053b8c75b9142216c59166b13fdf size 2376
-MD5 48cff4f1ce16bc800cc7869e57fb0e53 ChangeLog 2376
-RMD160 e07cb927b91de7a24214867724478ae7cd0c72bc ChangeLog 2376
-SHA256 6871437952da46a60888f349516b959be9da053b8c75b9142216c59166b13fdf ChangeLog 2376
-MISC metadata.xml 250 RMD160 b80f36e207a57583a06b1ddb538793eac15397fe SHA1 7aa5562e71958d16a80076a7cdd0e4002eeb99a0 SHA256 5e1a7d2736303cec3dc620e1951c9a809be04bfe07760d89741f824b7760bfaf size 250
+MISC ChangeLog 2748 RMD160 9b2a8d514bc4069bb924e18712c19db3d8b3329c SHA1 f024d94dd9c365c5bbb9ff510be215c402095f6b SHA256 13e8abdf72eae99af2a7a9f91edb6356d13749553f77e770fffd7f8c8457a44e
+MD5 69476db5516c8bbd65603ed69300cdae ChangeLog 2748
+RMD160 9b2a8d514bc4069bb924e18712c19db3d8b3329c ChangeLog 2748
+SHA256 13e8abdf72eae99af2a7a9f91edb6356d13749553f77e770fffd7f8c8457a44e ChangeLog 2748
+MISC metadata.xml 250 RMD160 b80f36e207a57583a06b1ddb538793eac15397fe SHA1 7aa5562e71958d16a80076a7cdd0e4002eeb99a0 SHA256 5e1a7d2736303cec3dc620e1951c9a809be04bfe07760d89741f824b7760bfaf
 MD5 bd9e210457c22384582e7c1394314d3f metadata.xml 250
 RMD160 b80f36e207a57583a06b1ddb538793eac15397fe metadata.xml 250
 SHA256 5e1a7d2736303cec3dc620e1951c9a809be04bfe07760d89741f824b7760bfaf metadata.xml 250
@@ -22,3 +33,13 @@ SHA256 c547e600067221be62b903f26b628cb244acf5f3ca4c71b3bc8591b585a0c484 files/di
 MD5 6d9ae5885e91f1ad9c46ecab2e4ae8c8 files/digest-duplicity-0.4.2 247
 RMD160 3ff2413e0aa240285377c4c987043995968edca2 files/digest-duplicity-0.4.2 247
 SHA256 3abc53cada3b4e46dba6de362adf476af57166107f8055b2aa29c0bebf8008fd files/digest-duplicity-0.4.2 247
+MD5 6d9ae5885e91f1ad9c46ecab2e4ae8c8 files/digest-duplicity-0.4.2-r1 247
+RMD160 3ff2413e0aa240285377c4c987043995968edca2 files/digest-duplicity-0.4.2-r1 247
+SHA256 3abc53cada3b4e46dba6de362adf476af57166107f8055b2aa29c0bebf8008fd files/digest-duplicity-0.4.2-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN7M8QlM6RnzZP+IRAgQsAKC9OfhfYAj03zTQF5nAEt2PgTa9CwCfZPoR
+TYa+B/Ftytwox4U0eCr7oO0=
+=94w+
+-----END PGP SIGNATURE-----