4 files changed, 169 insertions, 0 deletions
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 680d9c92ae57..f0fbd044b76f 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -14,11 +14,13 @@ AUX burp2.initd 1091 SHA256 ad6b87328cf8fca548684fee1450bc49ac622887fc08df8a5431
 DIST burp-1.4.40.tar.bz2 712937 SHA256 4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e SHA512 b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c WHIRLPOOL 636120b3fa2d4a3217567177f3c8abbdeb562d298043fd6bd685842287964d835f2a369e36db0bc32ce908ce8f96e4e2677569e6ca4bac80f8d9958a2364a62d
 DIST burp-2.0.54.tar.gz 558845 SHA256 26130da9791c57b1e194973ef1ea292dec57468bf4291a4d0eae880d192c1fd1 SHA512 dccc4d3679dd759028cd6b71d09ae4e49a511e5d94b4df2f112ad974abb507bbc8fffaf63ef85c847b0f9363b20a9e817179ab556c5a788acacb7a25e7600fa4 WHIRLPOOL 60e9bec56c08bc7ebc4700824eab34cf8cefdc5871140471eec5e05dbff4f4b83c2f7c6d5554d33dbb918f46e2c60159ba99a5da599938acd40b9d5b7b582978
 DIST burp-2.1.20.tar.gz 579488 SHA256 225f8ac0ad80ef4fa19c77c2d397d6829086a29dd8ab3d762820b9862d8b8f5c SHA512 5937187e0c93e21b4e3f4ab92f05589f8da56c774cf86644f095a0bff93c127911b2d513c04e380188956c2a97fb01ce471bb746d630baa5d30e6a70b53a0389 WHIRLPOOL b1253df69e20c9448249e14c898cdabc40ba5cbe5e5da5e20c8c4d7e161bf498b9f8a7ead80175d1bf00ad4b0bc893436abde27e37b61b1fad1792de04f16e99
+DIST burp-2.1.22.tar.gz 582938 SHA256 052eaa3d30392e00ec63d30587d4748d468ebb78f40f6c9612355e93f8add093 SHA512 028b48c585cdc607eb00af5f60e01541a54885b8084e0353d01b1e01744848967011cd330a443ae143884852c2dbc18fb25f364ce129a31ccbcf0f8d25ccb730 WHIRLPOOL 0cb271fc384fbb407e8cfb69c8baa1bbf42f5d2539a14c6db1787fafec9ecb8c72f8b8013093176c868fab98c32e99cd8b6a6c259dc71244f13fb6d9638107e1
 EBUILD burp-1.4.40-r5.ebuild 2852 SHA256 39d3384f224f3fd54753a859f430772f02b49b61d5fed4e794dbc33282f1f356 SHA512 63210b7bfb11033633f167ee49ff8d4eb6402c9517d12b8e5e000f62d39a7fcfd742b13e41bd3d19fef63fdb508257c0bf16878abd509863f678a9bfc5ec2c4a WHIRLPOOL df4af8ad3360adc823e9aaab782aeeba477034a8911c64af925128c15dd3b97760ea3ead921562ab2d9bfcb275fe313d9e07d159729da962dea89fa22b532532
 EBUILD burp-2.0.54-r1.ebuild 2925 SHA256 2e0b49712881710598e049472b530768ba4a7a3f4e841ecf60394fe5592d9f12 SHA512 cbf286ec00a6db919dc1aaa0673cc6ee51fdc6c4605c84727024d155a0c3af239e3c7af0cf51f0aea9b8f2a6955b20aa410fae9f14ff4ce61676fd961beacf7b WHIRLPOOL 397e6374273583cbff81750fead2fcd4eb85ac9db8b25609bd792c2df1bf1177dc444ee631906cb5b30d1a76ad6104839b23d025a7008b9ded0192accb23eeea
 EBUILD burp-2.0.54-r2.ebuild 2997 SHA256 ef7c8b26cabb932e4d8ec95087e8650f0cacc2ee108460c17461f679d5283896 SHA512 e46d39437a830437ef6fa32e7406cb32c738514e22fffaee722523df4973b9e90ca8d2d1247b9c70b12e0068fb420016d2cdbe1522ea1d75622471feed0e6f3e WHIRLPOOL 9a03fd5899464ddc92736774bfbe02fb0903701cc98caab3426654f714b3402c44ced3f3b54565bc06a56711b788a5efbb084be838ecf68a3cbbf71d17ed4bec
 EBUILD burp-2.0.54.ebuild 2888 SHA256 aafb707244feb151011a2e21b3d65c9228d5513d5f16d445e18fe1fe5992d6a7 SHA512 25cbf3277f4d8a1ff6f897c06cd3205d9e2acf312cb9117120c3803ef1db97d0b0705b533dfb57b702cfc6ed4d4cfaad76a63d4a594b5853ff54a2b49b4b4be3 WHIRLPOOL e00b54c83700f95a316f1585b752d004e31917ee0d6486178068a5e394a5b2a45b481fdca7ebd929b621a4faf789fbb50f77154823e9c38e033f762cd140d16f
 EBUILD burp-2.1.20.ebuild 2944 SHA256 c554c7d74b26782757d60ebafef5b0ac5d128e731235ef835475bdb02ffbd022 SHA512 afb696b8d45e7cd98f8db4a2c647a6c74b20e0ed5fa72010e45c594b56bbe8b340d434352733f50d6d368ad0f3534ccd5f40400021120230474c951263acab71 WHIRLPOOL 84f638e6a765ccdd0a570ded82eafa066588cd016c42e42e2dbeed9655f6077735b308ca1889859f62c2f92ef1701fc2c3bea900fe5a65e2f5d6cb3708724f7d
+EBUILD burp-2.1.22.ebuild 2944 SHA256 c554c7d74b26782757d60ebafef5b0ac5d128e731235ef835475bdb02ffbd022 SHA512 afb696b8d45e7cd98f8db4a2c647a6c74b20e0ed5fa72010e45c594b56bbe8b340d434352733f50d6d368ad0f3534ccd5f40400021120230474c951263acab71 WHIRLPOOL 84f638e6a765ccdd0a570ded82eafa066588cd016c42e42e2dbeed9655f6077735b308ca1889859f62c2f92ef1701fc2c3bea900fe5a65e2f5d6cb3708724f7d
 MISC ChangeLog 10104 SHA256 552c019805ee1e4755e4664f42be74855d814c07e2aee1d8fc6e83f5907040bb SHA512 c0b2ec70e96501bd5fee5ae166fe544c2bb0bcc4bf07648c591014c68840c08075f0e00ddd2ae3aecc4fdc821191f4da60bc2762bf4e593937ed427a7b6f9c48 WHIRLPOOL fce81ea70cb8c766ab06269059b4c7686635598af06bcbd673ecc2d99da9153b2d5bb20ac21b10a5bc08768f339bf54935e5b326f42541bdf59c90b010afa36f
 MISC ChangeLog-2015 2905 SHA256 c565b278d85dabb20721a04664fc3e04e1ea1b76c6877b2fd4e329491dc8a7c7 SHA512 a2fcf2df1fd47bab040ba6d29bb5d0bbe169e5846694765cecade311c0c1f4730638bab9adb09ceeaa2503a7b5320468282958028953b1ff2955baef76a44a77 WHIRLPOOL 46d9603bc20c6c11229d575e5ded0eb057fd0081f6007d4f3339ecf1820e021fbb1f0f12003ba8fb9016befe6f5bcc6dbeb0635b8a7bc41cfa4083301ff2e62a
 MISC metadata.xml 684 SHA256 b041b5ae55ee9ffb22bcc7f8c0221290720f0f395c7ba63f246e262693544e47 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f WHIRLPOOL 5203e7910fbfe28c9e451f3d8d9e45a2b7ee1f0a21dbf96e40ef485791ecb9a064e41ca240835425251f7be4f686085523a6edf049a042abc505b24f709cce73
diff --git a/app-backup/burp/burp-2.1.22.ebuild b/app-backup/burp/burp-2.1.22.ebuild
new file mode 100644
index 000000000000..ca210f89c0ff
--- /dev/null
+++ b/app-backup/burp/burp-2.1.22.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd tmpfiles user versionator
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="http://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl ipv6 libressl test xattr"
+
+CDEPEND="dev-libs/uthash
+	net-libs/librsync
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	virtual/logger"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
+	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
+)
+
+pkg_setup() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 "" "" "${PN}"
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		$(use_enable acl)
+		$(use_enable ipv6)
+		$(use_enable xattr)
+	)
+	# --runstatedir option will only work from autoconf-2.70 onwards
+	runstatedir='/run/burp' \
+		econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	fowners -R root:${PN} /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:${PN} /etc/burp
+	fperms 0775 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/${PN}2.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	elog "Burp ebuilds now support the autoupgrade mechanism in both"
+	elog "client and server mode. In both cases it is disabled by"
+	elog "default. You almost certainly do NOT want to enable it in"
+	elog "client mode because upgrades obtained this way will not be"
+	elog "managed by Portage."
+
+	if [[ ! -e /etc/burp/CA/index.txt ]]; then
+		elog ""
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  /etc/burp/burp-server.conf"
+		elog ""
+	fi
+
+	# According to PMS this can be a space-separated list of version
+	# numbers, even though in practice it is typically just one.
+	local oldver
+	for oldver in ${REPLACING_VERSIONS}; do
+		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
+			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+			ewarn "the server config file by default. If you use bedup, please"
+			ewarn "update your scripts to invoke it as"
+			ewarn ""
+			ewarn "  bedup -c /etc/burp/burp-server.conf"
+			ewarn ""
+			ewarn "Otherwise deduplication will not work!"
+			break
+		fi
+	done
+}
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index b9546f041c3f..fc1ce921164c 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -4,11 +4,13 @@ DIST duplicity-0.7.11.tar.gz 1550197 SHA256 b047a1590a1f5bb3974643ad2cc9dfdd32f6
 DIST duplicity-0.7.12.tar.gz 1552442 SHA256 11cbad44a90891af1bf9e294260ba7c21a1660ccd3ab2c6e736ba74ac5cf0fe6 SHA512 8a532e7bb548c170184666a0ba2b41a15f3002c14edd64b1b1eb4df862647fc6dfde797d6ecf38e326d7c160c31ff521baf351e520835495e1d0e2ddbdb19f0f WHIRLPOOL 872d0b52a0f73507849d585fd5888d4754d5711ab5cc48d72b571cfb14fd1278093022f52238facf608c8b26aa0149f2e614a4819c85aeb9ee94305e81824147
 DIST duplicity-0.7.13.1.tar.gz 1553736 SHA256 adb8668fb10e0b0f91cb77f758d02c02bf5c02e6c4835904a82cbdab6db4bef2 SHA512 08672910e61a089086992a1106ffc1e161ae3173514d35ae854eac719a095e48efaf7e298c1329ba3b439c0e97236644e88c615a013bd0e8ea9d956b38346ca6 WHIRLPOOL 2a9fddd1c41cadaa713c83805bce5d3e2de01540de29a47c7d545236e9e713b2004abfbae9977a115727db5fc661904f679cae7d0c9fb01ece04bdce212fb08c
 DIST duplicity-0.7.14.tar.gz 1556110 SHA256 7a3eb74a2a36b004b10add2970b37cfbac0bd693d79513e6311c8e4b8c3dd73e SHA512 d814a4da2b23fb586bf2a7a29532ba082756470786f883d9b8cfcd856eabf0db0cdd8e9af5557fe861e439ab058e7586652f91c82c9b99c123cd14c7598b8fc2 WHIRLPOOL 94cf54460e5187a3b2d009eb8cff95c98400e112cc3703bab966ceea33e7414b28ed90d22e3fc46bc7e5fa78a37689c31e49907efb93ad9ca8bbd0bf00645668
+DIST duplicity-0.7.15.tar.gz 1563272 SHA256 50bf7d14413284ecb036146ab9ba0e271937f2fa7826f8c8300b2965eb450a6c SHA512 7cdcf1c707e9bdbbc250afcd359978607454b1614128d2b7f09403867195795606794c5f193dc869579ae8c3a9251d7ef8f9acd66d4e69bce91344d7c046ca90 WHIRLPOOL 9df0e604a3a3f0a1dd07d4ef1b62d3d6b4f5bfb06e772a3848844656353d9a8dc8b2557f47fb8fd4b5a25d32630467086d701981af951ffa65597cb53e56d349
 EBUILD duplicity-0.7.10.ebuild 1244 SHA256 380a3b7ea640c1eb5d0e58ca9423465c936b6d9a6e2edc5b76ac643780ae95d8 SHA512 a05b660f02332850751d731c6d3b5fb757e29c2a940860858e1f4dff41e15e5876da90a9b8d0cdc39f22affcb7b2e01ad0334d28186b6ea76f27ad00f9134561 WHIRLPOOL 2f784027770674169112d2087e591d4fb9cc36a7e447376aac2fbb824edc1cfef724b4fa4370a087f50b8b38fb7e1a544ff7bd3f8f8ac4e16a1516fa09e79c88
 EBUILD duplicity-0.7.11.ebuild 1247 SHA256 5353006da777dbb2bf5aef9ca952d25333913ef7f8973068cca7a5415b6e9b5c SHA512 eccbc2686f551c90850144e204f3605fce59f218e95b5606beee727982eb6a59bb6c8209b5efd7b9cc5684c0415cd0d7ff03040e3d28386f37e5ee09432058f7 WHIRLPOOL 33278fffd2bc594d75491bc511cef67440bb1c661c4cde640d58a97003ea1092d263684e0b767e7e47cc7efe1f47a052a5c2b48ff0cc48b6b8b5e2091b94c8be
 EBUILD duplicity-0.7.12.ebuild 1247 SHA256 5353006da777dbb2bf5aef9ca952d25333913ef7f8973068cca7a5415b6e9b5c SHA512 eccbc2686f551c90850144e204f3605fce59f218e95b5606beee727982eb6a59bb6c8209b5efd7b9cc5684c0415cd0d7ff03040e3d28386f37e5ee09432058f7 WHIRLPOOL 33278fffd2bc594d75491bc511cef67440bb1c661c4cde640d58a97003ea1092d263684e0b767e7e47cc7efe1f47a052a5c2b48ff0cc48b6b8b5e2091b94c8be
 EBUILD duplicity-0.7.13.1.ebuild 1254 SHA256 bbf50b851c681c5eb81f5f9a3fb4d78f7f462a9d19cf2f41173191d8f110215e SHA512 b098c5be1b6ffb11f4135181d3af2232fd498ee0a62c3c77edf9c6e9569d202175603920da489e32b176e2a84544ccce955de540a942239674287ba670e66eb8 WHIRLPOOL fe38ac77f52ab0afb16f7e3becc5cabd0696aae6ca7363842d87606285c69426393ab3785de29439fc096cd04810d3bef6aa29fd01930ccb54e7e844d2826639
 EBUILD duplicity-0.7.14.ebuild 1254 SHA256 bbf50b851c681c5eb81f5f9a3fb4d78f7f462a9d19cf2f41173191d8f110215e SHA512 b098c5be1b6ffb11f4135181d3af2232fd498ee0a62c3c77edf9c6e9569d202175603920da489e32b176e2a84544ccce955de540a942239674287ba670e66eb8 WHIRLPOOL fe38ac77f52ab0afb16f7e3becc5cabd0696aae6ca7363842d87606285c69426393ab3785de29439fc096cd04810d3bef6aa29fd01930ccb54e7e844d2826639
+EBUILD duplicity-0.7.15.ebuild 1277 SHA256 0fe310cb24b66767c8d642c949660fb5d24c158971a778610223bf5d6e87bb0b SHA512 40b4db1b95451e869370232ff4e20f11adec32a66b27a102d6e785aea67c071e5256e6a8a98920167a0665447875edfd8fcff3d0ad5fcdf2f8d63591009271ce WHIRLPOOL 32937fd449bec43752d8a75df8ab995e6c47d36ace764b84d550d5cf777b4647156cc8b17deac0e473da1449ec28ba58249be963267cdea6cee1b3a9e680de5a
 MISC ChangeLog 4263 SHA256 591850f488d0ffbb448170824948b7b1c1b5d36ac5489fe2021f7d43a4015cf3 SHA512 67f9569cd2fa359f215b2fbbf563628a0536d661c8b81ece0cdb1fa62a8d9866a85300fb7d2b474dd2d79f3de5dd35ba2834a7c89a5631cb972fdf17777ebaf1 WHIRLPOOL b34bc432d3a4fb3cbcd7f688942880e0b3532cd5505b2c5a14c9eceb6253bb31b31e4b8d9a79b2f1dd63cfad88bc4d25dab2f2712aae93858fb39bdaf5b53192
 MISC ChangeLog-2015 16219 SHA256 b21f513ad0ad91c9794189c63f801f11252b4a4060f5aafa52808f33f00fe25e SHA512 c46d3267ba72688adbf022aefcb2c37185cbcc28f0e14f1b7887e3ce8b178e8a04559a414f495903ec7e665f2748f6b9c2651c42997eed5ce3783790eeb59685 WHIRLPOOL bd3032f136b5f28caaf661eb6ad52894f49a2f6e9a0710ad3c9f2ac989ab6c908d281624c31676d5f342a41981adf0b84a84998172993b95d23f0085816ae449
 MISC metadata.xml 438 SHA256 8b43ef79ef703ad2ca0850bf877a44669bed24ce8e37a56781665cee33f7c507 SHA512 d21a61eaada281cf520260d2868ef1dd3ddffa5d1dc6bc2feaf5c2daa8f8fda977d3527de0b5a7b862b18df7f0bbf6371bcb736fe751e5979ec95a66640e4756 WHIRLPOOL 3d15b16f964f55667dd1a4241b4383a853a79c3e4c7b051be81d9cb19c4e91c71219cf5da4b3fc22ad1b15ae2c28d2be1806430814dffd7161d9e39092c69194
diff --git a/app-backup/duplicity/duplicity-0.7.15.ebuild b/app-backup/duplicity/duplicity-0.7.15.ebuild
new file mode 100644
index 000000000000..07a84c1db121
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.15.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
+HOMEPAGE="http://www.nongnu.org/duplicity/"
+SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 1-2)-series/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="s3 test"
+
+CDEPEND="
+	net-libs/librsync
+	app-crypt/gnupg
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-arch/par2cmdline
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	# workaround until failing test is fixed
+	local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch )
+
+	distutils-r1_python_prepare_all
+
+	sed -i "s/'COPYING',//" setup.py || die
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "Currently it's up to you to install them as necessary."
+}