[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Amadeusz Żołnowski]

commit:     942e6070fbfb08a4489aa14249b62019ce895152
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 23:52:49 2015 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 23:53:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942e6070

app-backup/burp: Use SHA256 for generating certificates

SHA1 used to be a default which classified as broken.

Package-Manager: portage-2.2.20.1

 app-backup/burp/burp-1.3.48.ebuild                 |  1 +
 app-backup/burp/burp-1.3.8.ebuild                  |  5 ++++-
 ...3.48-0001-Set-default_md-sha256-in-CA.cnf.patch | 25 ++++++++++++++++++++++
 ....3.8-0001-Set-default_md-sha256-in-CA.cnf.patch | 25 ++++++++++++++++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/app-backup/burp/burp-1.3.48.ebuild b/app-backup/burp/burp-1.3.48.ebuild
index 6e3a412..6d1e4b7 100644
--- a/app-backup/burp/burp-1.3.48.ebuild
+++ b/app-backup/burp/burp-1.3.48.ebuild
@@ -36,6 +36,7 @@ DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-tinfo.patch"
+	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
 	)
 S="${WORKDIR}/burp"
 

diff --git a/app-backup/burp/burp-1.3.8.ebuild b/app-backup/burp/burp-1.3.8.ebuild
index 5a51e5a..7ac69eb 100644
--- a/app-backup/burp/burp-1.3.8.ebuild
+++ b/app-backup/burp/burp-1.3.8.ebuild
@@ -33,7 +33,10 @@ RDEPEND="${DEPEND}
 	"
 
 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
-PATCHES=( "${FILESDIR}/${PV}-bedup-conf-path.patch" )
+PATCHES=(
+	"${FILESDIR}/${PV}-bedup-conf-path.patch"
+	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
+	)
 S="${WORKDIR}/burp"
 
 pkg_setup() {

diff --git a/app-backup/burp/files/1.3.48-0001-Set-default_md-sha256-in-CA.cnf.patch b/app-backup/burp/files/1.3.48-0001-Set-default_md-sha256-in-CA.cnf.patch
new file mode 100644
index 0000000..e4cce52
--- /dev/null
+++ b/app-backup/burp/files/1.3.48-0001-Set-default_md-sha256-in-CA.cnf.patch
@@ -0,0 +1,25 @@
+From dd9b4bad27bf0395c0836d41e61678ba39459422 Mon Sep 17 00:00:00 2001
+From: graham <graham@space.grke.net>
+Date: Tue, 16 Jun 2015 12:29:56 +0000
+Subject: [PATCH] Set default_md=sha256 in CA.cnf.
+
+---
+ configs/certs/CA/CA.cnf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/certs/CA/CA.cnf b/configs/certs/CA/CA.cnf
+index 097f5fa..608cbce 100644
+--- a/configs/certs/CA/CA.cnf
++++ b/configs/certs/CA/CA.cnf
+@@ -14,7 +14,7 @@ crlnumber               = $dir/crlnumber.txt
+ 
+ unique_subject          = no
+ 
+-default_md              = sha1
++default_md              = sha256
+ default_days            = 7300
+ default_crl_days        = 7300
+ 
+-- 
+2.5.0
+

diff --git a/app-backup/burp/files/1.3.8-0001-Set-default_md-sha256-in-CA.cnf.patch b/app-backup/burp/files/1.3.8-0001-Set-default_md-sha256-in-CA.cnf.patch
new file mode 100644
index 0000000..e4cce52
--- /dev/null
+++ b/app-backup/burp/files/1.3.8-0001-Set-default_md-sha256-in-CA.cnf.patch
@@ -0,0 +1,25 @@
+From dd9b4bad27bf0395c0836d41e61678ba39459422 Mon Sep 17 00:00:00 2001
+From: graham <graham@space.grke.net>
+Date: Tue, 16 Jun 2015 12:29:56 +0000
+Subject: [PATCH] Set default_md=sha256 in CA.cnf.
+
+---
+ configs/certs/CA/CA.cnf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/certs/CA/CA.cnf b/configs/certs/CA/CA.cnf
+index 097f5fa..608cbce 100644
+--- a/configs/certs/CA/CA.cnf
++++ b/configs/certs/CA/CA.cnf
+@@ -14,7 +14,7 @@ crlnumber               = $dir/crlnumber.txt
+ 
+ unique_subject          = no
+ 
+-default_md              = sha1
++default_md              = sha256
+ default_days            = 7300
+ default_crl_days        = 7300
+ 
+-- 
+2.5.0
+

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Amadeusz Żołnowski]

commit:     10dafbf2ba89bccb0ff3b56a2e70bbd882a4fdf1
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 21:41:56 2015 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 21:47:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10dafbf2

app-backup/burp: Version bump

Package-Manager: portage-2.2.20.1

 app-backup/burp/Manifest                           |  1 +
 app-backup/burp/burp-1.4.40.ebuild                 | 95 ++++++++++++++++++++++
 app-backup/burp/files/1.4.40-bedup-conf-path.patch | 33 ++++++++
 app-backup/burp/files/1.4.40-tinfo.patch           | 22 +++++
 4 files changed, 151 insertions(+)

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 274658a..cc324b0 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,3 +1,4 @@
 DIST burp-1.3.48.tar.bz2 683509 SHA256 bb456c208998d2f5806828357934e794cd9675448cb6545473364fd9e6d73509 SHA512 08de252f25ff7aa448dd6768272a9a14622902347445313b570c857b4e690374e92956379d5b388f446a88427fc4924f9c0df83cba390aa15fd040b8e92f1946 WHIRLPOOL ac99abddd74bcc753037841afc78c74c7af23ad550334f0585540f056ce93243b8958cbdc37cae15cb98a02c2884c928dd65ac03820e1ef53ea031128a831a44
 DIST burp-1.3.8.tar.bz2 796082 SHA256 ed1546d97e902d0b3974a32ef3f543b5d9ec0a5448f3caca2373383192169656 SHA512 49f4fa43bcbd2aa54b8cee840dfb2f1b7e396048c609d7303fdef08d13dbaf7b0c7016da39620fc5a15cd9dfb8577f82e8446512887aff1ce1b6ce31e7a60e57 WHIRLPOOL 957cdf4b75ec5a79b7c259786b099cf5c001ebc1684df0a1028dda7ec90a2710c1cfcd4f2a8a2fb349466bc5405672350f01f989a4f6a5302eae4fa466af3056
 DIST burp-1.4.34.tar.bz2 712409 SHA256 547d84a03d84a5ece0562b75f785180846c8f0525c212f66316650187c9cbad2 SHA512 c65d7fab80d24fbf73c5bed1381709ad00c43372e26cebffb2847be57f3c32ec5e6ab060707766a06689a9ab7b490ce10acc93b4c229b336d1791b9dd82e025d WHIRLPOOL fa15dbdae7efd7c9736f40f06555b83b4a4b6cb932ce205eccf3e0606276aa0723c083ef0cf6e006d1cbca814265e6280572a17483d5631ac3928e6967cbcc8a
+DIST burp-1.4.40.tar.bz2 712937 SHA256 4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e SHA512 b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c WHIRLPOOL 636120b3fa2d4a3217567177f3c8abbdeb562d298043fd6bd685842287964d835f2a369e36db0bc32ce908ce8f96e4e2677569e6ca4bac80f8d9958a2364a62d

diff --git a/app-backup/burp/burp-1.4.40.ebuild b/app-backup/burp/burp-1.4.40.ebuild
new file mode 100644
index 0000000..9c1ed76
--- /dev/null
+++ b/app-backup/burp/burp-1.4.40.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="acl afs ipv6 nls ssl tcpd xattr"
+
+DEPEND="
+	dev-libs/openssl:0
+	dev-libs/uthash
+	sys-libs/libcap
+	net-libs/librsync
+	sys-libs/ncurses
+	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}-bedup-conf-path.patch"
+	"${FILESDIR}/${PV}-tinfo.patch"
+	)
+
+pkg_setup() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 "" "" "${PN}"
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sbindir=/usr/sbin
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		$(use_with ssl openssl)
+		$(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 /var/spool/burp
+	fperms 0775 /etc/burp /var/spool/burp
+	fowners root:burp /etc/burp/clientconfdir
+	fperms 0750 /etc/burp/clientconfdir
+	fowners root:burp /etc/burp/burp-server.conf
+	fperms 0640 /etc/burp/burp-server.conf
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	dodoc docs/*
+
+	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 use ssl && [ ! -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/files/1.4.40-bedup-conf-path.patch b/app-backup/burp/files/1.4.40-bedup-conf-path.patch
new file mode 100644
index 0000000..30346d4
--- /dev/null
+++ b/app-backup/burp/files/1.4.40-bedup-conf-path.patch
@@ -0,0 +1,33 @@
+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-tinfo.patch b/app-backup/burp/files/1.4.40-tinfo.patch
new file mode 100644
index 0000000..0814922
--- /dev/null
+++ b/app-backup/burp/files/1.4.40-tinfo.patch
@@ -0,0 +1,22 @@
+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

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Amadeusz Żołnowski]

commit:     b2143e2e46588c1b1dca74e927140aa398a6634f
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 16:33:53 2015 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 16:33:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2143e2e

app-backup/burp: Remove oldest 1.4.x version

Package-Manager: portage-2.2.20.1

 app-backup/burp/Manifest                           |  1 -
 app-backup/burp/burp-1.4.34.ebuild                 | 95 ----------------------
 app-backup/burp/files/1.4.34-bedup-conf-path.patch | 33 --------
 app-backup/burp/files/1.4.34-tinfo.patch           | 22 -----
 4 files changed, 151 deletions(-)

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index cc324b0..5fc8c0f 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,4 +1,3 @@
 DIST burp-1.3.48.tar.bz2 683509 SHA256 bb456c208998d2f5806828357934e794cd9675448cb6545473364fd9e6d73509 SHA512 08de252f25ff7aa448dd6768272a9a14622902347445313b570c857b4e690374e92956379d5b388f446a88427fc4924f9c0df83cba390aa15fd040b8e92f1946 WHIRLPOOL ac99abddd74bcc753037841afc78c74c7af23ad550334f0585540f056ce93243b8958cbdc37cae15cb98a02c2884c928dd65ac03820e1ef53ea031128a831a44
 DIST burp-1.3.8.tar.bz2 796082 SHA256 ed1546d97e902d0b3974a32ef3f543b5d9ec0a5448f3caca2373383192169656 SHA512 49f4fa43bcbd2aa54b8cee840dfb2f1b7e396048c609d7303fdef08d13dbaf7b0c7016da39620fc5a15cd9dfb8577f82e8446512887aff1ce1b6ce31e7a60e57 WHIRLPOOL 957cdf4b75ec5a79b7c259786b099cf5c001ebc1684df0a1028dda7ec90a2710c1cfcd4f2a8a2fb349466bc5405672350f01f989a4f6a5302eae4fa466af3056
-DIST burp-1.4.34.tar.bz2 712409 SHA256 547d84a03d84a5ece0562b75f785180846c8f0525c212f66316650187c9cbad2 SHA512 c65d7fab80d24fbf73c5bed1381709ad00c43372e26cebffb2847be57f3c32ec5e6ab060707766a06689a9ab7b490ce10acc93b4c229b336d1791b9dd82e025d WHIRLPOOL fa15dbdae7efd7c9736f40f06555b83b4a4b6cb932ce205eccf3e0606276aa0723c083ef0cf6e006d1cbca814265e6280572a17483d5631ac3928e6967cbcc8a
 DIST burp-1.4.40.tar.bz2 712937 SHA256 4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e SHA512 b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c WHIRLPOOL 636120b3fa2d4a3217567177f3c8abbdeb562d298043fd6bd685842287964d835f2a369e36db0bc32ce908ce8f96e4e2677569e6ca4bac80f8d9958a2364a62d

diff --git a/app-backup/burp/burp-1.4.34.ebuild b/app-backup/burp/burp-1.4.34.ebuild
deleted file mode 100644
index e4da6c6..0000000
--- a/app-backup/burp/burp-1.4.34.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-IUSE="acl afs ipv6 nls tcpd xattr"
-
-DEPEND="
-	dev-libs/openssl:0
-	dev-libs/uthash
-	sys-libs/libcap
-	net-libs/librsync
-	sys-libs/ncurses
-	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}-bedup-conf-path.patch"
-	"${FILESDIR}/${PV}-tinfo.patch"
-	)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eautoreconf
-}
-
-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 /var/spool/burp
-	fperms 0775 /etc/burp /var/spool/burp
-	fowners root:burp /etc/burp/clientconfdir
-	fperms 0750 /etc/burp/clientconfdir
-	fowners root:burp /etc/burp/burp-server.conf
-	fperms 0640 /etc/burp/burp-server.conf
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	dodoc docs/*
-
-	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/files/1.4.34-bedup-conf-path.patch b/app-backup/burp/files/1.4.34-bedup-conf-path.patch
deleted file mode 100644
index 30346d4..0000000
--- a/app-backup/burp/files/1.4.34-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.34-tinfo.patch b/app-backup/burp/files/1.4.34-tinfo.patch
deleted file mode 100644
index 0814922..0000000
--- a/app-backup/burp/files/1.4.34-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

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Amadeusz Piotr Żołnowski]

commit:     e84839054932a23e20fb788532f731cff6f82577
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 14:45:44 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 14:45:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8483905

app-backup/burp: Terminate compile phase on error

Because exit status of sub call to make gets lost, ebuild proceeds to
next phase even on failure. This results in installing all files except
of binaries. Patch first level Makefile to exit with 1 on failure.

Package-Manager: portage-2.2.26

 app-backup/burp/burp-1.3.48.ebuild                          |  3 ++-
 app-backup/burp/burp-1.3.8.ebuild                           |  3 ++-
 app-backup/burp/burp-1.4.40.ebuild                          |  3 ++-
 .../burp/files/1.3.48-non-zero-or-build-failure.patch       | 13 +++++++++++++
 app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch | 13 +++++++++++++
 .../burp/files/1.4.40-non-zero-or-build-failure.patch       | 13 +++++++++++++
 6 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/app-backup/burp/burp-1.3.48.ebuild b/app-backup/burp/burp-1.3.48.ebuild
index 9d2da50..98b7423 100644
--- a/app-backup/burp/burp-1.3.48.ebuild
+++ b/app-backup/burp/burp-1.3.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-tinfo.patch"
 	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"

diff --git a/app-backup/burp/burp-1.3.8.ebuild b/app-backup/burp/burp-1.3.8.ebuild
index 3a529b9..d281950 100644
--- a/app-backup/burp/burp-1.3.8.ebuild
+++ b/app-backup/burp/burp-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
 	)

diff --git a/app-backup/burp/burp-1.4.40.ebuild b/app-backup/burp/burp-1.4.40.ebuild
index 16d59fd..4acadd8 100644
--- a/app-backup/burp/burp-1.4.40.ebuild
+++ b/app-backup/burp/burp-1.4.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
 PATCHES=(
+	"${FILESDIR}/${PV}-non-zero-or-build-failure.patch"
 	"${FILESDIR}/${PV}-bedup-conf-path.patch"
 	"${FILESDIR}/${PV}-tinfo.patch"
 	)

diff --git a/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch b/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch
new file mode 100644
index 0000000..2c57048
--- /dev/null
+++ b/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch
@@ -0,0 +1,13 @@
+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.3.8-non-zero-or-build-failure.patch b/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch
new file mode 100644
index 0000000..2c57048
--- /dev/null
+++ b/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch
@@ -0,0 +1,13 @@
+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-non-zero-or-build-failure.patch b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
new file mode 100644
index 0000000..2c57048
--- /dev/null
+++ b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
@@ -0,0 +1,13 @@
+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:

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Amadeusz Piotr Żołnowski]

commit:     c423a307e3760dd54195b137ddb272a2db2d298d
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 21:13:14 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 21:15:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c423a307

app-backup/burp: Remove ancient version

Package-Manager: portage-2.3.0_rc1

 app-backup/burp/Manifest                           |  1 -
 app-backup/burp/burp-1.3.8-r1.ebuild               | 94 ----------------------
 ....3.8-0001-Set-default_md-sha256-in-CA.cnf.patch | 25 ------
 app-backup/burp/files/1.3.8-bedup-conf-path.patch  | 33 --------
 .../files/1.3.8-non-zero-or-build-failure.patch    | 13 ---
 5 files changed, 166 deletions(-)

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 5fc8c0f..bdcd141 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,3 +1,2 @@
 DIST burp-1.3.48.tar.bz2 683509 SHA256 bb456c208998d2f5806828357934e794cd9675448cb6545473364fd9e6d73509 SHA512 08de252f25ff7aa448dd6768272a9a14622902347445313b570c857b4e690374e92956379d5b388f446a88427fc4924f9c0df83cba390aa15fd040b8e92f1946 WHIRLPOOL ac99abddd74bcc753037841afc78c74c7af23ad550334f0585540f056ce93243b8958cbdc37cae15cb98a02c2884c928dd65ac03820e1ef53ea031128a831a44
-DIST burp-1.3.8.tar.bz2 796082 SHA256 ed1546d97e902d0b3974a32ef3f543b5d9ec0a5448f3caca2373383192169656 SHA512 49f4fa43bcbd2aa54b8cee840dfb2f1b7e396048c609d7303fdef08d13dbaf7b0c7016da39620fc5a15cd9dfb8577f82e8446512887aff1ce1b6ce31e7a60e57 WHIRLPOOL 957cdf4b75ec5a79b7c259786b099cf5c001ebc1684df0a1028dda7ec90a2710c1cfcd4f2a8a2fb349466bc5405672350f01f989a4f6a5302eae4fa466af3056
 DIST burp-1.4.40.tar.bz2 712937 SHA256 4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e SHA512 b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c WHIRLPOOL 636120b3fa2d4a3217567177f3c8abbdeb562d298043fd6bd685842287964d835f2a369e36db0bc32ce908ce8f96e4e2677569e6ca4bac80f8d9958a2364a62d

diff --git a/app-backup/burp/burp-1.3.8-r1.ebuild b/app-backup/burp/burp-1.3.8-r1.ebuild
deleted file mode 100644
index 3c136e5..0000000
--- a/app-backup/burp/burp-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="http://burp.grke.org/"
-SRC_URI="http://burp.grke.org/downloads/${P}/${P}.tar.bz2"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="acl afs nls tcpd xattr"
-
-DEPEND="
-	dev-libs/openssl:0
-	dev-libs/uthash
-	sys-libs/libcap
-	<net-libs/librsync-2.0
-	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}-0001-Set-default_md-sha256-in-CA.cnf.patch"
-	)
-S="${WORKDIR}/burp"
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sbindir=/usr/sbin
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable afs)
-		$(use_enable nls)
-		$(use_enable xattr)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	fowners root:burp /etc/burp /var/spool/burp
-	fperms 0775 /etc/burp /var/spool/burp
-	fowners root:burp /etc/burp/clientconfdir
-	fperms 0750 /etc/burp/clientconfdir
-	fowners root:burp /etc/burp/burp-server.conf
-	fperms 0640 /etc/burp/burp-server.conf
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	dodoc docs/*
-
-	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/files/1.3.8-0001-Set-default_md-sha256-in-CA.cnf.patch b/app-backup/burp/files/1.3.8-0001-Set-default_md-sha256-in-CA.cnf.patch
deleted file mode 100644
index e4cce52..0000000
--- a/app-backup/burp/files/1.3.8-0001-Set-default_md-sha256-in-CA.cnf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dd9b4bad27bf0395c0836d41e61678ba39459422 Mon Sep 17 00:00:00 2001
-From: graham <graham@space.grke.net>
-Date: Tue, 16 Jun 2015 12:29:56 +0000
-Subject: [PATCH] Set default_md=sha256 in CA.cnf.
-
----
- configs/certs/CA/CA.cnf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configs/certs/CA/CA.cnf b/configs/certs/CA/CA.cnf
-index 097f5fa..608cbce 100644
---- a/configs/certs/CA/CA.cnf
-+++ b/configs/certs/CA/CA.cnf
-@@ -14,7 +14,7 @@ crlnumber               = $dir/crlnumber.txt
- 
- unique_subject          = no
- 
--default_md              = sha1
-+default_md              = sha256
- default_days            = 7300
- default_crl_days        = 7300
- 
--- 
-2.5.0
-

diff --git a/app-backup/burp/files/1.3.8-bedup-conf-path.patch b/app-backup/burp/files/1.3.8-bedup-conf-path.patch
deleted file mode 100644
index a9bed19..0000000
--- a/app-backup/burp/files/1.3.8-bedup-conf-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur burp-1.3.48/manpages/bedup.8 burp-1.3.48.new/manpages/bedup.8
---- burp-1.3.48/manpages/bedup.8	2014-01-27 11:55:47.000000000 +0100
-+++ burp-1.3.48.new/manpages/bedup.8	2014-11-22 12:57:20.241299376 +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-1.3.48/src/bedup.c burp-1.3.48.new/src/bedup.c
---- burp-1.3.48/src/bedup.c	2014-01-27 11:55:47.000000000 +0100
-+++ burp-1.3.48.new/src/bedup.c	2014-11-22 12:57:20.241299376 +0100
-@@ -734,7 +734,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.3.8-non-zero-or-build-failure.patch b/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch
deleted file mode 100644
index 2c57048..0000000
--- a/app-backup/burp/files/1.3.8-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:

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Amadeusz Piotr Żołnowski]

commit:     9f367ab90f56e5dbcfde65a1cf3ef97498fd7cae
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 20:46:24 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 20:49:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f367ab9

app-backup/burp: Correct permissions

Remove autoupgrade configuration.

Package-Manager: portage-2.3.0

 app-backup/burp/burp-1.4.40-r3.ebuild | 116 ++++++++++++++++++++++++++++++++++
 app-backup/burp/files/burp.initd      |   7 +-
 2 files changed, 122 insertions(+), 1 deletion(-)

diff --git a/app-backup/burp/burp-1.4.40-r3.ebuild b/app-backup/burp/burp-1.4.40-r3.ebuild
new file mode 100644
index 0000000..f7cbc66
--- /dev/null
+++ b/app-backup/burp/burp-1.4.40-r3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-2.0
+	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/files/burp.initd b/app-backup/burp/files/burp.initd
index fda1a75..d88af55 100644
--- a/app-backup/burp/files/burp.initd
+++ b/app-backup/burp/files/burp.initd
@@ -17,6 +17,11 @@ extra_started_commands="reload summary"
 description_reload="Reloads configuration"
 description_summary="Displays main status monitor summary"
 
+get_backup_dir() {
+	grep '^directory = ' "${BURP_CONFIG}" \
+		| sed -e 's/^directory = //'
+}
+
 depend() {
 	need localmount
 	after bootmisc
@@ -28,7 +33,7 @@ start_pre() {
 	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 0750 -d /var/spool/burp
+	checkpath -o root:burp -m 0770 -d "$(get_backup_dir)"
 }
 
 reload() {

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Amadeusz Piotr Żołnowski]

commit:     65f08e8900abf4e0304f619521d0de048419a45c
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 19:58:46 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 21:38:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f08e89

app-backup/burp: Remove old, unsupported version

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-backup/burp/Manifest                           |   1 -
 app-backup/burp/burp-1.3.48-r1.ebuild              | 100 ---------------------
 ...3.48-0001-Set-default_md-sha256-in-CA.cnf.patch |  25 ------
 app-backup/burp/files/1.3.48-bedup-conf-path.patch |  33 -------
 .../files/1.3.48-non-zero-or-build-failure.patch   |  13 ---
 app-backup/burp/files/1.3.48-tinfo.patch           |  22 -----
 6 files changed, 194 deletions(-)

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index bdcd141..220be5c 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,2 +1 @@
-DIST burp-1.3.48.tar.bz2 683509 SHA256 bb456c208998d2f5806828357934e794cd9675448cb6545473364fd9e6d73509 SHA512 08de252f25ff7aa448dd6768272a9a14622902347445313b570c857b4e690374e92956379d5b388f446a88427fc4924f9c0df83cba390aa15fd040b8e92f1946 WHIRLPOOL ac99abddd74bcc753037841afc78c74c7af23ad550334f0585540f056ce93243b8958cbdc37cae15cb98a02c2884c928dd65ac03820e1ef53ea031128a831a44
 DIST burp-1.4.40.tar.bz2 712937 SHA256 4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e SHA512 b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c WHIRLPOOL 636120b3fa2d4a3217567177f3c8abbdeb562d298043fd6bd685842287964d835f2a369e36db0bc32ce908ce8f96e4e2677569e6ca4bac80f8d9958a2364a62d

diff --git a/app-backup/burp/burp-1.3.48-r1.ebuild b/app-backup/burp/burp-1.3.48-r1.ebuild
deleted file mode 100644
index 0e50013..00000000
--- a/app-backup/burp/burp-1.3.48-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 nls tcpd xattr"
-
-DEPEND="
-	dev-libs/openssl: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"
-	"${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch"
-	)
-S="${WORKDIR}/burp"
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	# see bug #426262
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-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 /var/spool/burp
-	fperms 0775 /etc/burp /var/spool/burp
-	fowners root:burp /etc/burp/clientconfdir
-	fperms 0750 /etc/burp/clientconfdir
-	fowners root:burp /etc/burp/burp-server.conf
-	fperms 0640 /etc/burp/burp-server.conf
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	dodoc docs/*
-
-	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/files/1.3.48-0001-Set-default_md-sha256-in-CA.cnf.patch b/app-backup/burp/files/1.3.48-0001-Set-default_md-sha256-in-CA.cnf.patch
deleted file mode 100644
index e4cce52..00000000
--- a/app-backup/burp/files/1.3.48-0001-Set-default_md-sha256-in-CA.cnf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dd9b4bad27bf0395c0836d41e61678ba39459422 Mon Sep 17 00:00:00 2001
-From: graham <graham@space.grke.net>
-Date: Tue, 16 Jun 2015 12:29:56 +0000
-Subject: [PATCH] Set default_md=sha256 in CA.cnf.
-
----
- configs/certs/CA/CA.cnf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configs/certs/CA/CA.cnf b/configs/certs/CA/CA.cnf
-index 097f5fa..608cbce 100644
---- a/configs/certs/CA/CA.cnf
-+++ b/configs/certs/CA/CA.cnf
-@@ -14,7 +14,7 @@ crlnumber               = $dir/crlnumber.txt
- 
- unique_subject          = no
- 
--default_md              = sha1
-+default_md              = sha256
- default_days            = 7300
- default_crl_days        = 7300
- 
--- 
-2.5.0
-

diff --git a/app-backup/burp/files/1.3.48-bedup-conf-path.patch b/app-backup/burp/files/1.3.48-bedup-conf-path.patch
deleted file mode 100644
index a9bed19..00000000
--- a/app-backup/burp/files/1.3.48-bedup-conf-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur burp-1.3.48/manpages/bedup.8 burp-1.3.48.new/manpages/bedup.8
---- burp-1.3.48/manpages/bedup.8	2014-01-27 11:55:47.000000000 +0100
-+++ burp-1.3.48.new/manpages/bedup.8	2014-11-22 12:57:20.241299376 +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-1.3.48/src/bedup.c burp-1.3.48.new/src/bedup.c
---- burp-1.3.48/src/bedup.c	2014-01-27 11:55:47.000000000 +0100
-+++ burp-1.3.48.new/src/bedup.c	2014-11-22 12:57:20.241299376 +0100
-@@ -734,7 +734,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.3.48-non-zero-or-build-failure.patch b/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch
deleted file mode 100644
index 2c57048..00000000
--- a/app-backup/burp/files/1.3.48-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.3.48-tinfo.patch b/app-backup/burp/files/1.3.48-tinfo.patch
deleted file mode 100644
index 30b5cb8..00000000
--- a/app-backup/burp/files/1.3.48-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur burp-1.3.48/configure.in burp-1.3.48.new/configure.in
---- burp-1.3.48/configure.in	2014-01-27 11:55:47.000000000 +0100
-+++ burp-1.3.48.new/configure.in	2014-11-22 13:01:01.192403673 +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

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Marek Szuba]

commit:     72555ee7026afed5ae84df6c5151cb1d715d482d
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 12:14:20 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 12:20:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72555ee7

app-backup/burp: bump to 2.1.12

Includes a fix which allows correct detection of sys-libs/ncurses when
USE=tinfo is set.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-backup/burp/Manifest                           |   1 +
 app-backup/burp/burp-2.1.12.ebuild                 | 114 +++++++++++++++++++++
 .../files/burp-2.0.54-ncurses_pkg-config.patch     |  37 +++++++
 3 files changed, 152 insertions(+)

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index cb4e6c4c492..6c0cd7d10c9 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,3 +1,4 @@
 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.10.tar.gz 574716 SHA256 857492493fe8ba21c54dc77e36bdedd5009edb7be66e19c533c6c0d437927d99 SHA512 ebb9901c4f5b281f05fe96499067a3e85edb7dab3132a7e00b14f10a5bb2ce51ccb32ce466176ca9b2ffcba70c7bc168b258df2494bbc6e984391f1c3fd8803a WHIRLPOOL ffc01c898033cc112bf2a01bfc2b2871152f13cbeac4a8f8b96f4432476e75ccb170f36e8af7ecee7bce05601e87959803a8b1c96cfb7e717c7648d5399ff5e4
+DIST burp-2.1.12.tar.gz 576544 SHA256 78ebd3f9a37daf935f474b1e297f716172e44db45f6641966eca2b0fa3aafce1 SHA512 85715593178bc77640b246ed5d10278a16ff4151274391c88981366d284c5a4315c542912a0d590162418e7556450ebe523b97ff2f5123413d1ce01c5b140a45 WHIRLPOOL bed5f0fb92b42cd8de1425395dc7f774747061d7ef873eb2d59b2e31815c978c91eb9e25fd8ac7c5bdaa167377760f101fea24d16cb0c3c5ba569481b5e111fe

diff --git a/app-backup/burp/burp-2.1.12.ebuild b/app-backup/burp/burp-2.1.12.ebuild
new file mode 100644
index 00000000000..e05b1d7a3ff
--- /dev/null
+++ b/app-backup/burp/burp-2.1.12.ebuild
@@ -0,0 +1,114 @@
+# 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.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
+)
+
+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/burp/files/burp-2.0.54-ncurses_pkg-config.patch b/app-backup/burp/files/burp-2.0.54-ncurses_pkg-config.patch
new file mode 100644
index 00000000000..07310d66b20
--- /dev/null
+++ b/app-backup/burp/files/burp-2.0.54-ncurses_pkg-config.patch
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,3 +1,4 @@
++
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ dnl require a recent autoconf
+@@ -276,21 +277,22 @@
+ dnl -----------------------------------------------------------
+ 
+ have_ncurses=no
+-AC_CHECK_HEADERS([ncurses.h ncurses/ncurses.h],
++m4_ifdef([PKG_CHECK_MODULES],
+   [
+-    AC_CHECK_LIB([ncurses], [curs_set],
++    PKG_CHECK_MODULES([ncurses], [ncurses],
+       [
+-        NCURSES_LIBS="-lncurses"
+-        have_ncurses=yes
+-        AC_DEFINE([HAVE_NCURSES], [1], [Set to 1 if we have ncurses])
+-      ]
++       have_ncurses=yes
++       NCURSES_LIBS="$ncurses_LIBS"
++       CFLAGS="$CFLAGS $ncurses_CFLAGS -DHAVE_NCURSES_H=1"
++       AC_DEFINE([HAVE_NCURSES], [1], [Set to 1 if we have ncurses])
++      ],
++      []
+     )
+   ]
+ )
+ 
+ AC_SUBST([NCURSES_LIBS])
+ 
+-
+ dnl -----------------------------------------------------------
+ dnl Check whether libcheck ('Check') is available
+ dnl -----------------------------------------------------------

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Marek Szuba]

commit:     52f00ab4e634c49f2d290f6e53646e325ad0eb22
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 22:11:39 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 22:13:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f00ab4

app-backup/burp: bump to 2.1.20

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 app-backup/burp/Manifest                           |   1 +
 app-backup/burp/burp-2.1.20.ebuild                 | 113 +++++++++++++++++++++
 .../burp/files/burp-2.1.20-no_mkdir_run.patch      |  10 ++
 .../files/burp-2.1.20-protocol1_by_default.patch   |  24 +++++
 4 files changed, 148 insertions(+)

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 6c0cd7d10c9..f04242a70fb 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -2,3 +2,4 @@ DIST burp-1.4.40.tar.bz2 712937 SHA256 4108eb45e14740de990d918a2adbb661d88f90de4
 DIST burp-2.0.54.tar.gz 558845 SHA256 26130da9791c57b1e194973ef1ea292dec57468bf4291a4d0eae880d192c1fd1 SHA512 dccc4d3679dd759028cd6b71d09ae4e49a511e5d94b4df2f112ad974abb507bbc8fffaf63ef85c847b0f9363b20a9e817179ab556c5a788acacb7a25e7600fa4 WHIRLPOOL 60e9bec56c08bc7ebc4700824eab34cf8cefdc5871140471eec5e05dbff4f4b83c2f7c6d5554d33dbb918f46e2c60159ba99a5da599938acd40b9d5b7b582978
 DIST burp-2.1.10.tar.gz 574716 SHA256 857492493fe8ba21c54dc77e36bdedd5009edb7be66e19c533c6c0d437927d99 SHA512 ebb9901c4f5b281f05fe96499067a3e85edb7dab3132a7e00b14f10a5bb2ce51ccb32ce466176ca9b2ffcba70c7bc168b258df2494bbc6e984391f1c3fd8803a WHIRLPOOL ffc01c898033cc112bf2a01bfc2b2871152f13cbeac4a8f8b96f4432476e75ccb170f36e8af7ecee7bce05601e87959803a8b1c96cfb7e717c7648d5399ff5e4
 DIST burp-2.1.12.tar.gz 576544 SHA256 78ebd3f9a37daf935f474b1e297f716172e44db45f6641966eca2b0fa3aafce1 SHA512 85715593178bc77640b246ed5d10278a16ff4151274391c88981366d284c5a4315c542912a0d590162418e7556450ebe523b97ff2f5123413d1ce01c5b140a45 WHIRLPOOL bed5f0fb92b42cd8de1425395dc7f774747061d7ef873eb2d59b2e31815c978c91eb9e25fd8ac7c5bdaa167377760f101fea24d16cb0c3c5ba569481b5e111fe
+DIST burp-2.1.20.tar.gz 579488 SHA256 225f8ac0ad80ef4fa19c77c2d397d6829086a29dd8ab3d762820b9862d8b8f5c SHA512 5937187e0c93e21b4e3f4ab92f05589f8da56c774cf86644f095a0bff93c127911b2d513c04e380188956c2a97fb01ce471bb746d630baa5d30e6a70b53a0389 WHIRLPOOL b1253df69e20c9448249e14c898cdabc40ba5cbe5e5da5e20c8c4d7e161bf498b9f8a7ead80175d1bf00ad4b0bc893436abde27e37b61b1fad1792de04f16e99

diff --git a/app-backup/burp/burp-2.1.20.ebuild b/app-backup/burp/burp-2.1.20.ebuild
new file mode 100644
index 00000000000..ca210f89c0f
--- /dev/null
+++ b/app-backup/burp/burp-2.1.20.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/burp/files/burp-2.1.20-no_mkdir_run.patch b/app-backup/burp/files/burp-2.1.20-no_mkdir_run.patch
new file mode 100644
index 00000000000..5dbdcf9e7c4
--- /dev/null
+++ b/app-backup/burp/files/burp-2.1.20-no_mkdir_run.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -417,7 +417,6 @@
+ 
+ install-data-local:
+ 	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(localstatedir)/spool/$(PACKAGE_TARNAME)
+-	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(runstatedir)
+ 
+ clean-local: clean-local-check
+ 

diff --git a/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch b/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch
new file mode 100644
index 00000000000..db9e9b6a9de
--- /dev/null
+++ b/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch
@@ -0,0 +1,24 @@
+--- a/configs/client/burp.conf.in
++++ b/configs/client/burp.conf.in
+@@ -10,7 +10,8 @@
+ # 0 to decide automatically, 1 to force protocol1 mode (file level granularity
+ # with a pseudo mirrored storage on the server and optional rsync). 2 forces
+ # protocol2 mode (inline deduplication with variable length blocks).
+-# protocol = 0
++# WARNING: as of September 2017 protocol2 is still considered experimental.
++protocol = 1
+ pidfile = @runstatedir@/@name@.client.pid
+ syslog = 0
+ stdout = 1
+--- a/configs/server/burp.conf.in
++++ b/configs/server/burp.conf.in
+@@ -21,7 +21,8 @@
+ # protocol2 mode (inline deduplication with variable length blocks).
+ # Like many other settings, this can be set per client in the clientconfdir
+ # files.
+-# protocol = 0
++# WARNING: as of September 2017 protocol2 is still considered experimental.
++protocol = 1
+ pidfile = @runstatedir@/@name@.server.pid
+ hardlinked_archive = 0
+ working_dir_recovery_method = delete

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Marek Szuba]

commit:     7dc0fb3aff1255a725286e0aafc73cf9f3b27bbd
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 11:57:38 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 12:49:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dc0fb3a

app-backup/burp: remove old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-backup/burp/Manifest                           |   2 -
 app-backup/burp/burp-1.4.40-r5.ebuild              | 115 ---------------------
 app-backup/burp/burp-2.0.54-r1.ebuild              | 112 --------------------
 app-backup/burp/burp-2.1.20.ebuild                 | 113 --------------------
 app-backup/burp/files/1.4.40-bedup-conf-path.patch |  33 ------
 .../files/1.4.40-non-zero-or-build-failure.patch   |  13 ---
 app-backup/burp/files/1.4.40-tinfo.patch           |  22 ----
 app-backup/burp/files/burp.initd                   |  46 ---------
 8 files changed, 456 deletions(-)

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 76eac330771..357a085e653 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,4 +1,2 @@
-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

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 069a2df1365..00000000000
--- 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-r1.ebuild
deleted file mode 100644
index 3b33781ac1e..00000000000
--- a/app-backup/burp/burp-2.0.54-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${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
-)
-
-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/burp/burp-2.1.20.ebuild b/app-backup/burp/burp-2.1.20.ebuild
deleted file mode 100644
index ca210f89c0f..00000000000
--- a/app-backup/burp/burp-2.1.20.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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/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 30346d46614..00000000000
--- 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 2c570486ce0..00000000000
--- 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 08149226168..00000000000
--- 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.initd b/app-backup/burp/files/burp.initd
deleted file mode 100644
index 201af0a9712..00000000000
--- a/app-backup/burp/files/burp.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BURP_CONFIG="/etc/burp/burp-server.conf"
-
-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"
-
-extra_started_commands="reload summary"
-description_reload="Reloads configuration"
-description_summary="Displays main status monitor summary"
-
-get_backup_dir() {
-	grep '^directory = ' "${BURP_CONFIG}" \
-		| sed -e 's/^directory = //'
-}
-
-depend() {
-	need localmount
-	after bootmisc
-	use net
-}
-
-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)"
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME} configuration"
-	start-stop-daemon --exec ${command} --signal HUP
-	eend $?
-}
-
-summary() {
-	"${command}" -c "${BURP_CONFIG}" -a S
-}

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Marek Szuba]

commit:     88b7eff0dff2a5ac42ba1915a902051060323b57
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 16:02:37 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 16:30:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b7eff0

app-backup/burp-2.0.54: backport setuid-after-getting-lock fix from 2.1

This should take care of potential privilege escalation via PID-file
manipulation.

Gentoo-Bug: https://bugs.gentoo.org/628770
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-backup/burp/burp-2.0.54-r3.ebuild              | 111 +++++++++++++++++++++
 .../burp-2.0.54-chuser_after_getting_lock.patch    |  38 +++++++
 2 files changed, 149 insertions(+)

diff --git a/app-backup/burp/burp-2.0.54-r3.ebuild b/app-backup/burp/burp-2.0.54-r3.ebuild
new file mode 100644
index 00000000000..7d916cbb59c
--- /dev/null
+++ b/app-backup/burp/burp-2.0.54-r3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd 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.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() {
+	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' \
+		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}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	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/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 00000000000..3f75c878d5b
--- /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);

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Marek Szuba]

commit:     5cd39164b55ee94a0754a89c0069f228e58183ee
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 09:25:37 2018 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue May 29 09:26:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd39164

app-backup/burp: remove old following full stabilisation of 2.1.32

There are now no versions left in the tree that are vulnerable to
either #628770 or #641842

Bug: https://bugs.gentoo.org/show_bug.cgi?id=628770
Bug: https://bugs.gentoo.org/show_bug.cgi?id=641842
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-backup/burp/Manifest                           |   1 -
 app-backup/burp/burp-2.0.54-r4.ebuild              | 111 ---------------------
 app-backup/burp/burp-2.0.54.ebuild                 | 110 --------------------
 .../burp-2.0.54-chuser_after_getting_lock.patch    |  38 -------
 .../files/burp-2.0.54-ncurses_pkg-config.patch     |  37 -------
 .../burp/files/burp-2.0.54-no_mkdir_run.patch      |  10 --
 .../files/burp-2.0.54-protocol1_by_default.patch   |  24 -----
 app-backup/burp/files/burp.tmpfiles                |   1 -
 app-backup/burp/files/burp2.initd                  |  45 ---------
 9 files changed, 377 deletions(-)

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index ed43c346dc7..36b9ddd4865 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,2 +1 @@
-DIST burp-2.0.54.tar.gz 558845 BLAKE2B f6a868b09ad73e3b8aa171993849c8fec43c141d14a64ba7919ad73890905647741688d2f0c0b01ef2a584474ecd1464423b07279160d86c7f37d1bf37a384a7 SHA512 dccc4d3679dd759028cd6b71d09ae4e49a511e5d94b4df2f112ad974abb507bbc8fffaf63ef85c847b0f9363b20a9e817179ab556c5a788acacb7a25e7600fa4
 DIST burp-2.1.32.tar.gz 591737 BLAKE2B fd525bff32348f1dbc37b1c065d262ff8af1d999d19f63711ebcff3fb55e90a7440cc6cfc0b7eefe6f8e250672c799d86e65ed599f0b8d7dd80bebcb99888987 SHA512 2477b7a9a2123b227a27519f7f3d9facca7173a9e63d66f6a8fb2ae5408d8af4ad5bfdd0a14efd6cf80e7bc8e91907f7c293a3d621b86bafdbf163bfa08d0c81

diff --git a/app-backup/burp/burp-2.0.54-r4.ebuild b/app-backup/burp/burp-2.0.54-r4.ebuild
deleted file mode 100644
index 4484457367e..00000000000
--- a/app-backup/burp/burp-2.0.54-r4.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd 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.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() {
-	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' \
-		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 0750 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	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/burp/burp-2.0.54.ebuild b/app-backup/burp/burp-2.0.54.ebuild
deleted file mode 100644
index 7194c7c6964..00000000000
--- a/app-backup/burp/burp-2.0.54.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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 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}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${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
-)
-
-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() {
-	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/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
deleted file mode 100644
index 3f75c878d5b..00000000000
--- a/app-backup/burp/files/burp-2.0.54-chuser_after_getting_lock.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-2.0.54-ncurses_pkg-config.patch b/app-backup/burp/files/burp-2.0.54-ncurses_pkg-config.patch
deleted file mode 100644
index 07310d66b20..00000000000
--- a/app-backup/burp/files/burp-2.0.54-ncurses_pkg-config.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,3 +1,4 @@
-+
- dnl Process this file with autoconf to produce a configure script.
- 
- dnl require a recent autoconf
-@@ -276,21 +277,22 @@
- dnl -----------------------------------------------------------
- 
- have_ncurses=no
--AC_CHECK_HEADERS([ncurses.h ncurses/ncurses.h],
-+m4_ifdef([PKG_CHECK_MODULES],
-   [
--    AC_CHECK_LIB([ncurses], [curs_set],
-+    PKG_CHECK_MODULES([ncurses], [ncurses],
-       [
--        NCURSES_LIBS="-lncurses"
--        have_ncurses=yes
--        AC_DEFINE([HAVE_NCURSES], [1], [Set to 1 if we have ncurses])
--      ]
-+       have_ncurses=yes
-+       NCURSES_LIBS="$ncurses_LIBS"
-+       CFLAGS="$CFLAGS $ncurses_CFLAGS -DHAVE_NCURSES_H=1"
-+       AC_DEFINE([HAVE_NCURSES], [1], [Set to 1 if we have ncurses])
-+      ],
-+      []
-     )
-   ]
- )
- 
- AC_SUBST([NCURSES_LIBS])
- 
--
- dnl -----------------------------------------------------------
- dnl Check whether libcheck ('Check') is available
- dnl -----------------------------------------------------------

diff --git a/app-backup/burp/files/burp-2.0.54-no_mkdir_run.patch b/app-backup/burp/files/burp-2.0.54-no_mkdir_run.patch
deleted file mode 100644
index 8d1cdc0a062..00000000000
--- a/app-backup/burp/files/burp-2.0.54-no_mkdir_run.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -405,7 +405,6 @@
- 
- install-data-local:
- 	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(localstatedir)/spool/burp
--	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(runstatedir)
- 
- clean-local: clean-local-check
- 

diff --git a/app-backup/burp/files/burp-2.0.54-protocol1_by_default.patch b/app-backup/burp/files/burp-2.0.54-protocol1_by_default.patch
deleted file mode 100644
index 391c68a5f74..00000000000
--- a/app-backup/burp/files/burp-2.0.54-protocol1_by_default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configs/client/burp.conf.in
-+++ b/configs/client/burp.conf.in
-@@ -10,7 +10,8 @@
- # 0 to decide automatically, 1 to force protocol1 mode (file level granularity
- # with a pseudo mirrored storage on the server and optional rsync). 2 forces
- # protocol2 mode (inline deduplication with variable length blocks).
--# protocol = 0
-+# WARNING: as of April 2017 protocol2 is still considered experimental.
-+protocol = 1
- pidfile = @runstatedir@/burp.client.pid
- syslog = 0
- stdout = 1
---- a/configs/server/burp.conf.in
-+++ b/configs/server/burp.conf.in
-@@ -21,7 +21,8 @@
- # protocol2 mode (inline deduplication with variable length blocks).
- # Like many other settings, this can be set per client in the clientconfdir
- # files.
--# protocol = 0
-+# WARNING: as of April 2017 protocol2 is still considered experimental.
-+protocol = 1
- pidfile = @runstatedir@/burp.server.pid
- hardlinked_archive = 0
- working_dir_recovery_method = delete

diff --git a/app-backup/burp/files/burp.tmpfiles b/app-backup/burp/files/burp.tmpfiles
deleted file mode 100644
index 2f04960f230..00000000000
--- a/app-backup/burp/files/burp.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/burp 0755 burp burp -

diff --git a/app-backup/burp/files/burp2.initd b/app-backup/burp/files/burp2.initd
deleted file mode 100644
index 02a7ea856c4..00000000000
--- a/app-backup/burp/files/burp2.initd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BURP_CONFIG="/etc/burp/burp-server.conf"
-
-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/burp.server.pid"
-start_stop_daemon_arg="--wait 500"
-
-extra_started_commands="reload summary"
-description_reload="Reloads configuration"
-description_summary="Displays main status monitor summary"
-
-get_backup_dir() {
-	grep '^directory = ' "${BURP_CONFIG}" \
-		| sed -e 's/^directory = //'
-}
-
-depend() {
-	need localmount
-	after bootmisc
-	use net
-}
-
-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 root:burp -m 0770 -d "$(get_backup_dir)"
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME} configuration"
-	start-stop-daemon --exec ${command} --signal HUP
-	eend $?
-}
-
-summary() {
-	"${command}" -c "${BURP_CONFIG}" -a S
-}

[gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/

[Sam James]

commit:     2023986b99552df0336306e0e37ab7d5b2f6554d
Author:     Anton Fischl <github <AT> fischl-online <DOT> de>
AuthorDate: Tue Aug  9 06:36:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 04:09:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2023986b

app-backup/burp: fix strptime for musl

Closes: https://bugs.gentoo.org/862019
Signed-off-by: Anton Fischl <github <AT> fischl-online.de>
Closes: https://github.com/gentoo/gentoo/pull/26790
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/burp/burp-2.4.0-r1.ebuild               | 118 +++++++++++++++++++++
 app-backup/burp/burp-2.5.4-r1.ebuild               | 118 +++++++++++++++++++++
 .../burp/files/burp-2.4.0-fix-musl-strptime.patch  |  86 +++++++++++++++
 3 files changed, 322 insertions(+)

diff --git a/app-backup/burp/burp-2.4.0-r1.ebuild b/app-backup/burp/burp-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..fdcea9103813
--- /dev/null
+++ b/app-backup/burp/burp-2.4.0-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://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 test xattr"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
+	dev-libs/openssl:0=
+	net-libs/librsync:=
+	sys-libs/ncurses:0=
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( dev-libs/check )"
+BDEPEND=">=sys-devel/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	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
+	"${FILESDIR}"/${PN}-2.4.0-fix-musl-strptime.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		--runstatedir=/run
+		$(use_enable acl)
+		$(use_enable ipv6)
+		$(use_enable xattr)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See https://github.com/grke/burp/issues/869
+	local -x CK_DEFAULT_TIMEOUT=10
+	default
+}
+
+src_install() {
+	default
+	keepdir /var/spool/burp
+	fowners -R root:${PN} /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:${PN} /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	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 ${EROOT}/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 "  ${EROOT}/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 [[ $(ver_cut 1 ${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 ${EROOT}/etc/burp/burp-server.conf"
+			ewarn ""
+			ewarn "Otherwise deduplication will not work!"
+			break
+		fi
+	done
+}

diff --git a/app-backup/burp/burp-2.5.4-r1.ebuild b/app-backup/burp/burp-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..fdcea9103813
--- /dev/null
+++ b/app-backup/burp/burp-2.5.4-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://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 test xattr"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
+	dev-libs/openssl:0=
+	net-libs/librsync:=
+	sys-libs/ncurses:0=
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( dev-libs/check )"
+BDEPEND=">=sys-devel/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	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
+	"${FILESDIR}"/${PN}-2.4.0-fix-musl-strptime.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		--runstatedir=/run
+		$(use_enable acl)
+		$(use_enable ipv6)
+		$(use_enable xattr)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See https://github.com/grke/burp/issues/869
+	local -x CK_DEFAULT_TIMEOUT=10
+	default
+}
+
+src_install() {
+	default
+	keepdir /var/spool/burp
+	fowners -R root:${PN} /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:${PN} /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	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 ${EROOT}/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 "  ${EROOT}/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 [[ $(ver_cut 1 ${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 ${EROOT}/etc/burp/burp-server.conf"
+			ewarn ""
+			ewarn "Otherwise deduplication will not work!"
+			break
+		fi
+	done
+}

diff --git a/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch b/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch
new file mode 100644
index 000000000000..e8afca8fefa7
--- /dev/null
+++ b/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch
@@ -0,0 +1,86 @@
+https://github.com/grke/burp/commit/76b7f1ba9f4445108059b13f3d79a7fde8a292a3
+https://github.com/grke/burp/issues/908
+https://bugs.gentoo.org/862019
+
+From 76b7f1ba9f4445108059b13f3d79a7fde8a292a3 Mon Sep 17 00:00:00 2001
+From: Graham Keeling <grke@grke.net>
+Date: Mon, 8 Aug 2022 07:53:38 +1000
+Subject: [PATCH] 908: Only glibc supports %z in strptime()
+
+Change-Id: I220e4529073c92df856b892559725b323dc84334
+---
+ src/times.h                            |  8 ++++----
+ utest/client/monitor/test_json_input.c | 15 +++++++++++----
+ utest/test_times.c                     |  7 ++++---
+ 3 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/times.h b/src/times.h
+index 325419c2b..b0fd3876f 100644
+--- a/src/times.h
++++ b/src/times.h
+@@ -3,11 +3,11 @@
+ 
+ #define DEFAULT_TIMESTAMP_FORMAT_OLD	"%Y-%m-%d %H:%M:%S"
+ 
+-// Windows does not seem to support %z.
+-#ifdef HAVE_WIN32
+-#define DEFAULT_TIMESTAMP_FORMAT DEFAULT_TIMESTAMP_FORMAT_OLD
+-#else
++#ifdef __GLIBC__
+ #define DEFAULT_TIMESTAMP_FORMAT	"%Y-%m-%d %H:%M:%S %z"
++#else
++// Only glibc supports %z in strptime.
++#define DEFAULT_TIMESTAMP_FORMAT DEFAULT_TIMESTAMP_FORMAT_OLD
+ #endif
+ 
+ extern const char *getdatestr(const time_t t);
+diff --git a/utest/client/monitor/test_json_input.c b/utest/client/monitor/test_json_input.c
+index 516fc779b..aea2a4154 100644
+--- a/utest/client/monitor/test_json_input.c
++++ b/utest/client/monitor/test_json_input.c
+@@ -162,13 +162,20 @@ static struct sd sd1[] = {
+ 
+ static void assert_bu_minimal(struct bu *bu, struct sd *s)
+ {
+-	const char *sd_timestamp;
++	const char *cp;
++	const char *cp_end;
+ 	fail_unless(bu!=NULL);
+ 	fail_unless(s->bno==bu->bno);
+ 	fail_unless(s->flags==bu->flags);
+-	fail_unless((sd_timestamp=strchr(s->timestamp, ' '))!=NULL);
+-	sd_timestamp++;
+-	ck_assert_str_eq(sd_timestamp, bu->timestamp);
++	fail_unless((cp=strchr(s->timestamp, ' '))!=NULL);
++	cp++;
++#ifdef __GLIBC__
++	cp_end=s->timestamp+strlen(s->timestamp)-1;
++#else
++	// Only glibc supports %z in strptime.
++	fail_unless((cp_end=strrchr(s->timestamp, ' '))!=NULL);
++#endif
++	fail_unless(strncmp(cp, bu->timestamp, cp_end-cp)==0);
+ }
+ 
+ static void do_test_json_clients_with_backup(const char *path,
+diff --git a/utest/test_times.c b/utest/test_times.c
+index 98be11fd1..5a68203a6 100644
+--- a/utest/test_times.c
++++ b/utest/test_times.c
+@@ -35,12 +35,13 @@ struct ds
+ 
+ static struct ds ds[] = {
+ 	{ 0, "", "never" },
+-#ifdef HAVE_WIN32
+-	{ 1000, "", "1970-01-01 00:16:40" },
+-#else
++#ifdef __GLIBC__
+ 	{ 1000, "", "1970-01-01 00:16:40 +0000" },
+ 	{ 1000, "UTC+10", "1969-12-31 14:16:40 -1000" },
+ 	{ 1000, "UTC+10", "1969-12-31 14:16:40 -1000" },
++#else
++	// Only glibc supports %z in strptime.
++	{ 1000, "", "1970-01-01 00:16:40" },
+ #endif
+ };
+