gentoo resync : 21.12.2017

10 files changed, 58 insertions, 214 deletions

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index f6609ed24759..a73eb16ede15 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,24 +1,20 @@
-AUX 1.4.40-bedup-conf-path.patch 1620 BLAKE2B bf6417134d69871722486d8199ab424df3a5387114e452fc587185bebc4faaa7ea85d539e02486d74442a72ef1353a77e08bb697c6f53305e7d3d17f8799c9fb SHA512 89298b0d8ce135570070ac688e1798c0eb73c1b2d0cad233c417638afcdcd7409fa029ac78b5c13fd98d6cf6c297c1cb545f5b0b706b53f70b181db174a16255
-AUX 1.4.40-non-zero-or-build-failure.patch 401 BLAKE2B 31a75d0b24f542878babed2ca4e4ebdb6a57d99bc12e4a201e7c70a6088f6c241858d998bf005427fff8d1a2eb650160fa2f663cebdfd657ed072314353c35d9 SHA512 ff407f0b10ea7ce25bd8740d9749c935fd8c46cfd7c0c60f6afe0f2d4b7dccc62615bdda60dfedaf8adeabe35972f42cc2ca5c712e19d5c68ff87f1ea1ae19e6
-AUX 1.4.40-tinfo.patch 767 BLAKE2B 2580814f7c0c4772bfd6ce06f4be3dbbb0abd3174c30c9ebb5ed8b5c1b3bd21d4fa0717d9ab693b49eff42744c1c1df90cad590e618ee3c3b429e3cc08c97ccb SHA512 2f2a60951357f9d05213616ae1e623feb052bdd480e8c46e47eaabb86b53a5822e8ffcbd321d502de49b670f72075445e303ef78bcb02deb9ee16ae7f7590b65
+AUX burp-2.0.54-chuser_after_getting_lock.patch 1131 BLAKE2B 4eb5a685362e94fc74c65f60824fe13ec430b9b2dd57a9b2b7c8d902db10c8b25436d194a86ca0daf7b43d4e0a4e1a42a1143cdc0cf279121303ca5513d3fdd0 SHA512 b3de280a6059ed4fadc0a33aa4bef7d76a98597c13606ee4061094e502dc6255506e95d8398bcf734f8be08606e06484562490c5c25fa4c075b6cc1c5ba33fcf
 AUX burp-2.0.54-ncurses_pkg-config.patch 1023 BLAKE2B 7350242ce62e1ec29ce27e4683e4331a56fdab2cc8faebf5ecb4e5ff4a9e4ea80fbc206cd1bc0b6553a8d31662262f2b85de85fb540f96fed575bb0bfe781b93 SHA512 51c27ecbef57b589e53d9791795f0aaaf07abd11b4eb127c1282f4ff6665694bcc33aea4a2cde7add5b0b0565256fdaa113ac57c9799c0d4f614599dd087bc06
 AUX burp-2.0.54-no_mkdir_run.patch 224 BLAKE2B 6928be7b978b36d58fbbef3661059629eb4e80f933ef8285eec64e0ff0469a5da654680e02d4002e2cfc5b57ac9eda970ece71effdc549824bf6a077cf5a3f3a SHA512 052378bb276555d91c2b54e7c6ac792f5beb8dfb38f045f3d9a03828e6a3ab63ca49a17fd278ceb9b0ce38e17ba24cccf7d62b6803453af0369414f5e69964f6
 AUX burp-2.0.54-protocol1_by_default.patch 931 BLAKE2B 891a38c375087a8bf12ded266f4583fd4a04efdf89490c4c012b8c2abf0820ff468850209285411efea5cc90fe2a38e55461e5e326c994e7181e7d5aba259364 SHA512 76b641c0403f2e3f5ec12e02440bc9c1d6fb1ebad2a05a7e785e5ea39fc763bf3113461e182d7791ab8d28d34a3f1e49eaf026843783e6736c30a03647d5081d
 AUX burp-2.0.54-server_user.patch 282 BLAKE2B b949a5f1b8d73048145a5efd62bcee605f77f272fe3d4759958092e0c37b14b7077e01b9c55a865728a856293b7acdae494f8583e4451cd02b9242807b05ed72 SHA512 a4cd302967deed776b663f037e509e354dcb5958d6a4c33770062e5455d2ff641d62604779d25c6bb542aa547548c39d8b529fa7787ab1b42dba262f1439fcea
 AUX burp-2.1.20-no_mkdir_run.patch 238 BLAKE2B 44ba927f8ca97386d70d52411f2fe5ca233160e85de56d58e33c9a038c542e6d8cc5a96f1e6eb60fefd5677c201a5416949742d1ba725575021cb28b0afae254 SHA512 b25ce17b66988cdcdb67d847160d7a80a8daf8470cbc5ece066a70dfae34b369e175a2ee2cf10b0e68f51b8fd99f52762dc4c429d6abbc4411fd09a8500c067c
 AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610dd918b583455fda6d13eef6292a7eeaac0d14266bf21f97caf6dba65f0a46b1534695e7b72b91c6958d86f70ac63e356b5e05691 SHA512 249a426a76a81a2582f824d2d767695bfd848a04190ee9a2f1d4296bed03f93d4eaa86c13b4b755700b1b552bb584f9b0031ec60a705f2b27b20d62eb58aef8c
-AUX burp.initd 1151 BLAKE2B 5a5da7c570eae9d0cc605b6f3a1f4dc5bad7aa251df96a4f96468c5082d3ac0af9b8e41b853bd4bcf74527acfaa2277bcfccd120b1f00fd27b1a1f38301c0fa9 SHA512 bfe9be4c33e26340ac8124d26a62dec5451b1258bf857ace60bf97ca8cfdd8c8f6a0845321d5b9000bd702e31fc46ec96f5d37cdc7673431ec0a607265b2572d
-AUX burp.service 227 BLAKE2B 7771e901b76a295565a598a7cb462db01cb1fd22a7417ef7fd3edff4ea73f9fcb3fee43528c2fa4a5b6a1a98b4fc9d00c962277a4b2ef778cc2bfaca9579abe1 SHA512 8b538cf21e45f7d4b89a6ab51774a5ba874d4969d3ae0cce9e7276defbf2c388887d12b1438fff80cade0ea3ce85ab5c27281a38f4c5e8a30ca47e915b0dd69a
+AUX burp.initd 1086 BLAKE2B 7946355a6de36f956e953e59b216ea1807eabcee1a1631fc4f0e3d1bb7165adfba99c2d3c1c47631a5d4fdccca81171106583ba3a994263e08ff73a7b5d7125c SHA512 cb78acab82a919d9dd9eb21dc525f62d3443a690efbf77a695f7d3bc9e2245aafd025977a6f08084c6db545f460ee3d32d83b6f7f5641eae19e2e92d4e0d0850
+AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
 AUX burp.tmpfiles 29 BLAKE2B 8cf38caeb3109607d4a8b7a0397e0a053d3cf2b25a196c4d76671a245c99dd48991ec820e15f8227325040c38d4ab8d5f5e67692052d7b0cbd0f7cdd35f1282c SHA512 b109b405d0add3d357269fbec65de06654068624672eff4ed44af69e5151586a727a13c9526e02b97fc18a4be77ba48d4d4d41cdf6b76b62fed242f9172cebff
 AUX burp2.initd 1091 BLAKE2B 55d7bd294fc4c603627c682a396f59e6004bcd131ac03210dde3346d5abf1904f19b683e57d131c04218e9638ad1049b818b8c5e5e60c01099d3065ffd108eb2 SHA512 68b460484e049f816c36a862f748da0902c9c7320a5fd8f46813cec55f5c0e9c3a54ac726d76a62f90e2d740456283215028ba3d4c91613191cac70554d8f8f9
-DIST burp-1.4.40.tar.bz2 712937 BLAKE2B b6d9496ba8693db82f1f8119e3fc643c4bd533f448beecc9846a5e5f3b558d4bbf6539d764cf2ae9c1b328fae217bad7665ec0e491e903174583541879d4c841 SHA512 b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c
 DIST burp-2.0.54.tar.gz 558845 BLAKE2B f6a868b09ad73e3b8aa171993849c8fec43c141d14a64ba7919ad73890905647741688d2f0c0b01ef2a584474ecd1464423b07279160d86c7f37d1bf37a384a7 SHA512 dccc4d3679dd759028cd6b71d09ae4e49a511e5d94b4df2f112ad974abb507bbc8fffaf63ef85c847b0f9363b20a9e817179ab556c5a788acacb7a25e7600fa4
-DIST burp-2.1.20.tar.gz 579488 BLAKE2B 6a89456b75caacb9079b845eb5b443fd0b6872e7dac9e94ed11fc05a0005211a5a9311a9f609eb88230c817f6576b7b8bc80d05339cb7e7097ad726ffa838945 SHA512 5937187e0c93e21b4e3f4ab92f05589f8da56c774cf86644f095a0bff93c127911b2d513c04e380188956c2a97fb01ce471bb746d630baa5d30e6a70b53a0389
 DIST burp-2.1.22.tar.gz 582938 BLAKE2B dbc0b7612e9cda2186d16426ec1a39559af965fcbc393259e5d4d1f376c666e8532f25dbe51d2ec816fc2e630f81b059c77aee572c562bf47f466f4114e875fd SHA512 028b48c585cdc607eb00af5f60e01541a54885b8084e0353d01b1e01744848967011cd330a443ae143884852c2dbc18fb25f364ce129a31ccbcf0f8d25ccb730
-EBUILD burp-1.4.40-r5.ebuild 2852 BLAKE2B e383760ceb801432c9a62fe73f37d07cfcd5352fb1c4669b171fcffcbaa9c1aee626b921bd90d076bbd6ceed650c397aaf482b142133ed432a24d41b0b3ce8bc SHA512 63210b7bfb11033633f167ee49ff8d4eb6402c9517d12b8e5e000f62d39a7fcfd742b13e41bd3d19fef63fdb508257c0bf16878abd509863f678a9bfc5ec2c4a
-EBUILD burp-2.0.54-r1.ebuild 2925 BLAKE2B 8048c1a1694af41927e0ff100688ed51953e8d4a34a7d315db6d34c789a3d3c51af447ec069f4b01754e68a9e119a62f5c7a61bc0bd714d37687fd2b312c0e85 SHA512 cbf286ec00a6db919dc1aaa0673cc6ee51fdc6c4605c84727024d155a0c3af239e3c7af0cf51f0aea9b8f2a6955b20aa410fae9f14ff4ce61676fd961beacf7b
+DIST burp-2.1.24.tar.gz 586055 BLAKE2B 6186e791e8b0cea74ecfbd4a85624f2492bd2721e705d8f5fb6783eb03390c7c10d88e4e4e33095aff985c70e6da59b3bb3b0f652cc850f443dabef23517c05f SHA512 b23f5e33510493e08b9b6eda405a017c8f75811fa18c9bcb6f96fbf716a79934e6c714f1258c39a81dcc52ef1a88e3629a0862bbd2462fbdc30cc7fb1b117ba6
 EBUILD burp-2.0.54-r2.ebuild 2997 BLAKE2B f1273b3897c72cab7a54e149e31c4ed9bc1ae3bf3c9c7f5cee706720161846d37622fd5398389e920dbb884b4a5c43f03e1218f6f1e28aca1ec079893833755b SHA512 e46d39437a830437ef6fa32e7406cb32c738514e22fffaee722523df4973b9e90ca8d2d1247b9c70b12e0068fb420016d2cdbe1522ea1d75622471feed0e6f3e
+EBUILD burp-2.0.54-r4.ebuild 2958 BLAKE2B e7ebacc80b7c78d92af1a13d069ae4aad495efcd4ed16baa05929c6fa5c6ea39afb2e33b61d1d0856f180bb5c9c839644dd60b00f64b68abe4c29f66243a8987 SHA512 d3f28bf715688bf5fcafc94d5242524ddf22fea6a898f2f71620439e49117dd626889f90d37875996c2f7fbb5521175af5a661a38ac93bf830af10a3f28d1390
 EBUILD burp-2.0.54.ebuild 2888 BLAKE2B 8b1082f4461af6be06f44487c3dd2f3a11cf6baeb16fa9ccf7aaf61226b7fbc49ab5fa844beabf8dfc8c619f798a82ec5fe0df2ade5aa5b59de329a0b0f0723a SHA512 25cbf3277f4d8a1ff6f897c06cd3205d9e2acf312cb9117120c3803ef1db97d0b0705b533dfb57b702cfc6ed4d4cfaad76a63d4a594b5853ff54a2b49b4b4be3
-EBUILD burp-2.1.20.ebuild 2944 BLAKE2B 4eace50b19e23adb1909efc2cd73846a852cd88c7ec3f03a0208f89b6eede0ecedce060fb3e41b87f899425d916c88952e226007444dec72d4ff2fec9daf2579 SHA512 afb696b8d45e7cd98f8db4a2c647a6c74b20e0ed5fa72010e45c594b56bbe8b340d434352733f50d6d368ad0f3534ccd5f40400021120230474c951263acab71
 EBUILD burp-2.1.22.ebuild 2944 BLAKE2B 4eace50b19e23adb1909efc2cd73846a852cd88c7ec3f03a0208f89b6eede0ecedce060fb3e41b87f899425d916c88952e226007444dec72d4ff2fec9daf2579 SHA512 afb696b8d45e7cd98f8db4a2c647a6c74b20e0ed5fa72010e45c594b56bbe8b340d434352733f50d6d368ad0f3534ccd5f40400021120230474c951263acab71
+EBUILD burp-2.1.24-r1.ebuild 2845 BLAKE2B 7ac52194fb89b2eeccfc66e28de8fcff590d92bded3bda76a24c722ef78dd19f15b2aa51f5a15d9b75df1268423a21c9630f61fc0aca826fb1cd190476ffb88c SHA512 2bd8f4f1c7928615b08b16a9cc1bff2fe38b601a7a71ea22487ba064ef4758e67792f99dfcdcc9ce0683d788ad7e9fe0362a32e1e26d1c6c735abb5e74fa0a0d
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
diff --git a/app-backup/burp/burp-1.4.40-r5.ebuild b/app-backup/burp/burp-1.4.40-r5.ebuild
deleted file mode 100644
index 069a2df1365a..000000000000
--- a/app-backup/burp/burp-1.4.40-r5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="http://burp.grke.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	http://burp.grke.org/downloads/${P}/${P}.tar.bz2"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="acl afs ipv6 libressl nls tcpd xattr"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/uthash
-	sys-libs/libcap
-	~net-libs/librsync-0.9.7
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	acl? ( sys-apps/acl )
-	afs? ( net-fs/openafs )
-	nls? ( sys-devel/gettext )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xattr? ( sys-apps/attr )
-	"
-RDEPEND="${DEPEND}
-	virtual/logger
-	"
-
-DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
-PATCHES=(
-	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
-	"${FILESDIR}/${PV}-bedup-conf-path.patch"
-	"${FILESDIR}/${PV}-tinfo.patch"
-	)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eautoreconf
-	sed -e '/autoupgrade/d' -i "${S}"/Makefile.in || die
-	rm "${S}"/docs/autoupgrade.txt || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sbindir=/usr/sbin
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable afs)
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable xattr)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	fowners root:burp /etc/burp
-	fperms 0775 /etc/burp
-	fowners root:burp /etc/burp/burp-server.conf
-	fperms 0640 /etc/burp/burp-server.conf
-	fowners root:burp /etc/burp/clientconfdir
-	fperms 0750 /etc/burp/clientconfdir
-	fowners root:burp /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	dodoc docs/*
-
-	local scripts_dir=/usr/share/burp/scripts
-	dodir "${scripts_dir}"
-	local script
-	for script in notify_script ssl_extra_checks_script summary_script \
-			timer_script; do
-		mv "${D}etc/burp/${script}" "${D}${scripts_dir}/" || die
-		sed -r \
-			-e "s|(=\\s*)/etc/burp/${script}\\s*$|\1${scripts_dir}/${script}|" \
-			-i "${D}etc/burp/burp-server.conf" \
-			|| die
-	done
-
-	sed -e '/autoupgrade/d' -i "${D}etc/burp/burp.conf" || die
-	sed -e '/autoupgrade/,+1d' -i "${D}etc/burp/burp-server.conf" || die
-
-	sed -e 's|^# user=graham|user = burp|' \
-		-e 's|^# group=nogroup|group = burp|' \
-		-e 's|^pidfile = .*|lockfile = /run/lock/burp/server.lock|' \
-		-i "${D}etc/burp/burp-server.conf" || die
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		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
-}
diff --git a/app-backup/burp/burp-2.0.54-r1.ebuild b/app-backup/burp/burp-2.0.54-r4.ebuild
index 3b33781ac1ec..4484457367ec 100644
--- a/app-backup/burp/burp-2.0.54-r1.ebuild
+++ b/app-backup/burp/burp-2.0.54-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools systemd tmpfiles user versionator
+inherit autotools systemd user versionator
 
 DESCRIPTION="Network backup and restore client and server for Unix and Windows"
 HOMEPAGE="http://burp.grke.org/"
@@ -23,14 +23,17 @@ CDEPEND="dev-libs/uthash
 	acl? ( sys-apps/acl )
 	xattr? ( sys-apps/attr )"
 DEPEND="${CDEPEND}
+	virtual/pkgconfig
 	test? ( dev-libs/check )"
 RDEPEND="${CDEPEND}
 	virtual/logger"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.54-ncurses_pkg-config.patch
 	"${FILESDIR}"/${PN}-2.0.54-no_mkdir_run.patch
 	"${FILESDIR}"/${PN}-2.0.54-protocol1_by_default.patch
 	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
+	"${FILESDIR}"/${PN}-2.0.54-chuser_after_getting_lock.patch
 )
 
 pkg_setup() {
@@ -54,7 +57,7 @@ src_configure() {
 		$(use_enable xattr)
 	)
 	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run/burp' \
+	runstatedir='/run' \
 		econf "${myeconfargs[@]}"
 }
 
@@ -65,19 +68,15 @@ src_install() {
 
 	emake DESTDIR="${D}" install-configs
 	fowners -R root:${PN} /etc/burp
-	fperms 0775 /etc/burp
+	fperms 0750 /etc/burp
 	fperms 0640 /etc/burp/burp-server.conf
 	fperms 0750 /etc/burp/clientconfdir
 
-	newinitd "${FILESDIR}"/${PN}2.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.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"
diff --git a/app-backup/burp/burp-2.1.20.ebuild b/app-backup/burp/burp-2.1.24-r1.ebuild
index ca210f89c0ff..c4b44cdd39c9 100644
--- a/app-backup/burp/burp-2.1.20.ebuild
+++ b/app-backup/burp/burp-2.1.24-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools systemd tmpfiles user versionator
+inherit autotools systemd user versionator
 
 DESCRIPTION="Network backup and restore client and server for Unix and Windows"
 HOMEPAGE="http://burp.grke.org/"
@@ -55,7 +55,7 @@ src_configure() {
 		$(use_enable xattr)
 	)
 	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run/burp' \
+	runstatedir='/run' \
 		econf "${myeconfargs[@]}"
 }
 
@@ -66,19 +66,15 @@ src_install() {
 
 	emake DESTDIR="${D}" install-configs
 	fowners -R root:${PN} /etc/burp
-	fperms 0775 /etc/burp
+	fperms 0750 /etc/burp
 	fperms 0640 /etc/burp/burp-server.conf
 	fperms 0750 /etc/burp/clientconfdir
 
-	newinitd "${FILESDIR}"/${PN}2.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.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"
diff --git a/app-backup/burp/files/1.4.40-bedup-conf-path.patch b/app-backup/burp/files/1.4.40-bedup-conf-path.patch
deleted file mode 100644
index 30346d466148..000000000000
--- a/app-backup/burp/files/1.4.40-bedup-conf-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur burp/manpages/bedup.8 burp.new/manpages/bedup.8
---- burp/manpages/bedup.8	2014-10-28 12:45:26.000000000 +0100
-+++ burp.new/manpages/bedup.8	2014-11-21 09:49:57.705796144 +0100
-@@ -16,7 +16,7 @@
- .SH OPTIONS
- .TP
- \fB\-c\fR \fBpath\fR
--Path to config file (default: /etc/burp/burp.conf).
-+Path to config file (default: /etc/burp/burp-server.conf).
- .TP
- \fB\-g\fR \fB<list of group names>\fR
- Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server.
-@@ -42,7 +42,7 @@
- \fB\-V\fR \fB\fR
- Print version and exit.\fR
- .TP
--By default, bedup will read /etc/burp/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR
-+By default, bedup will read /etc/burp/burp-server.conf and deduplicate client storage directories using special knowledge of the structure.\fR
- .TP
- With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating burp storage directories.
- 
-diff -Naur burp/src/bedup.c burp.new/src/bedup.c
---- burp/src/bedup.c	2014-10-28 12:45:56.000000000 +0100
-+++ burp.new/src/bedup.c	2014-11-20 21:39:28.728206536 +0100
-@@ -740,7 +740,7 @@
- static char *get_config_path(void)
- {
-         static char path[256]="";
--        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp.conf");
-+        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp-server.conf");
-         return path;
- }
- 
diff --git a/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
deleted file mode 100644
index 2c570486ce02..000000000000
--- a/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index ac22a24..f99ce96 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -40,7 +40,7 @@ all: Makefile
- 	@for I in ${all_subdirs}; \
- 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
- 	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
--			    echo ""; echo "";)); \
-+			    echo ""; echo ""; exit 1;)) || exit 1; \
- 	done
- 
- depend:
diff --git a/app-backup/burp/files/1.4.40-tinfo.patch b/app-backup/burp/files/1.4.40-tinfo.patch
deleted file mode 100644
index 081492261685..000000000000
--- a/app-backup/burp/files/1.4.40-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur burp/configure.ac burp-new/configure.ac
---- burp/configure.ac	2014-10-28 12:45:56.000000000 +0100
-+++ burp-new/configure.ac	2014-11-10 17:40:50.996955441 +0100
-@@ -1203,13 +1203,12 @@
- fi
- 
- AC_CHECK_HEADERS(ncurses.h)
--AC_CHECK_LIB(ncurses, curs_set, [NCURSES_LIBS="-lncurses"])
- have_ncurses=no
--if test x$NCURSES_LIBS = x-lncurses; then
--   AC_DEFINE(HAVE_NCURSES, 1, [Defined to 1 if libncurses was found])
--   have_ncurses=yes
--fi
--AC_SUBST(NCURSES_LIBS)
-+AC_CHECK_LIB(ncurses, endwin,
-+	[NCURSES_LIBS="-lncurses"; have_ncurses=yes]
-+	AC_SEARCH_LIBS(curs_set, tinfo, [NCURSES_LIBS="$NCURSES_LIBS $ac_res"]),
-+	AC_DEFINE(HAVE_NCURSES, 1, [Defined to 1 if libncurses was found])
-+	AC_SUBST(NCURSES_LIBS))
- 
- dnl
- dnl Check if we have AFS on this system
diff --git a/app-backup/burp/files/burp-2.0.54-chuser_after_getting_lock.patch b/app-backup/burp/files/burp-2.0.54-chuser_after_getting_lock.patch
new file mode 100644
index 000000000000..3f75c878d5bb
--- /dev/null
+++ b/app-backup/burp/files/burp-2.0.54-chuser_after_getting_lock.patch
@@ -0,0 +1,38 @@
+From f765ad2c9f421eefcd3afc447ed45fa3fd2d17a0 Mon Sep 17 00:00:00 2001
+From: Graham Keeling <grke@grke.net>
+Date: Sun, 13 Aug 2017 11:50:54 +0000
+Subject: [PATCH] Drop privileges after main pidfile creation.
+
+Change-Id: I762541db55e7884531e4d869e1a86533df71b5b8
+---
+ src/prog.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/prog.c b/src/prog.c
+index 244590d3..b94df6d3 100644
+--- a/src/prog.c
++++ b/src/prog.c
+@@ -111,11 +111,6 @@ int reload(struct conf **confs, const char *conffile, bool firsttime)
+ 		setup_signals();
+ #endif
+ 
+-	// Do not try to change user or group after the first time.
+-	if(firsttime && chuser_and_or_chgrp(
+-		get_string(confs[OPT_USER]), get_string(confs[OPT_GROUP])))
+-			return -1;
+-
+ 	return 0;
+ }
+ 
+@@ -486,6 +481,11 @@ int real_main(int argc, char *argv[])
+ 		}
+ 	}
+ 
++	// Change privileges after having got the lock, for convenience.
++	if(chuser_and_or_chgrp(
++		get_string(confs[OPT_USER]), get_string(confs[OPT_GROUP])))
++			return -1;
++
+ 	set_int(confs[OPT_OVERWRITE], forceoverwrite);
+ 	set_int(confs[OPT_STRIP], strip);
+ 	set_int(confs[OPT_FORK], forking);
diff --git a/app-backup/burp/files/burp.initd b/app-backup/burp/files/burp.initd
index 201af0a97123..a0b0dccacbcc 100644
--- a/app-backup/burp/files/burp.initd
+++ b/app-backup/burp/files/burp.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 BURP_CONFIG="/etc/burp/burp-server.conf"
@@ -9,8 +9,8 @@ description="Burp is a network backup and restore program"
 command="/usr/sbin/burp"
 command_args="-c '${BURP_CONFIG}' -F"
 command_background="yes"
-pidfile="/run/burp-server.pid"
-start_stop_daemon_arg="--make-pidfile --wait 500"
+pidfile="/run/burp.server.pid"
+start_stop_daemon_arg="--wait 500"
 
 extra_started_commands="reload summary"
 description_reload="Reloads configuration"
@@ -31,7 +31,6 @@ start_pre() {
 	checkpath -o root:burp -m 0775 -d /etc/burp
 	checkpath -o root:burp -m 0640 -f /etc/burp/burp-server.conf
 	checkpath -o root:burp -m 0750 -d /etc/burp/clientconfdir
-	checkpath -o burp:burp -m 0775 -d /run/lock/burp
 	checkpath -o root:burp -m 0770 -d "$(get_backup_dir)"
 }
 
diff --git a/app-backup/burp/files/burp.service b/app-backup/burp/files/burp.service
index 5a40b5e36781..121753629607 100644
--- a/app-backup/burp/files/burp.service
+++ b/app-backup/burp/files/burp.service
@@ -4,7 +4,6 @@ After=network.target
 
 [Service]
 Type=simple
-PIDFile=/run/burp/burp.server.pid
 ExecStart=/usr/sbin/burp -F -c /etc/burp/burp-server.conf
 
 [Install]