diff options
author | Michael Orlitzky <mjo@gentoo.org> | 2016-08-03 17:08:01 -0400 |
---|---|---|
committer | Michael Orlitzky <mjo@gentoo.org> | 2016-08-03 17:13:28 -0400 |
commit | 25080a9ba262a0634f6922113be791778157cfb1 (patch) | |
tree | 52ca40679b51f2bcd21d0fb5f148c83063b5c805 /app-backup | |
parent | media-sound/spotify: cleanup (diff) | |
download | gentoo-25080a9ba262a0634f6922113be791778157cfb1.tar.gz gentoo-25080a9ba262a0634f6922113be791778157cfb1.tar.bz2 gentoo-25080a9ba262a0634f6922113be791778157cfb1.zip |
app-backup/boxbackup: new revision to fix three QA issues.
This new revision adds "GPL-2" to LICENSE to cover the init script. It
also adds two patches, one to eliminate format-security warnings, and
the other (provided by a user) to fix the manpage install path.
Gentoo-Bug: 425884
Gentoo-Bug: 515422
Gentoo-Bug: 520978
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-backup')
3 files changed, 116 insertions, 0 deletions
diff --git a/app-backup/boxbackup/boxbackup-0.11.1-r2.ebuild b/app-backup/boxbackup/boxbackup-0.11.1-r2.ebuild new file mode 100644 index 000000000000..3f82ca1748ca --- /dev/null +++ b/app-backup/boxbackup/boxbackup-0.11.1-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit user + +DESCRIPTION="A completely automatic on-line backup system" +HOMEPAGE="http://boxbackup.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="http://boxbackup.org/svn/box/packages/${P/_/}.tgz" + +# GPL-2 is included for the init script, bug 425884. +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos" +IUSE="client-only libressl" +DEPEND="sys-libs/zlib + sys-libs/db:= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + >=dev-lang/perl-5.6" +RDEPEND="${DEPEND} + virtual/mta" + +S="${WORKDIR}/${P/_/}" + +PATCHES=( + "${FILESDIR}/${PN}-0.11_rc8-testbbackupd.patch" + "${FILESDIR}/${PN}-0.11.1-fix-Wformat-security.patch" + "${FILESDIR}/${PN}-0.11.1-fix-mandir.patch" +) + +src_compile() { + # Bug 299411. + emake -j1 +} + +src_install() { + emake -j1 DESTDIR="${D}" install + emake -j1 DESTDIR="${D}" install-backup-client + + dodoc BUGS.txt CONTACT.txt DOCUMENTATION.txt ExceptionCodes.txt THANKS.txt + newinitd "${FILESDIR}"/bbackupd.rc bbackupd + + if ! use client-only ; then + emake -j1 DESTDIR="${D}" install-backup-server + newinitd "${FILESDIR}"/bbstored.rc bbstored + fi + + keepdir /etc/boxbackup +} + +pkg_preinst() { + if ! use client-only ; then + enewgroup bbstored + enewuser bbstored -1 -1 -1 bbstored + fi +} + +pkg_postinst() { + while read line; do elog "${line}"; done <<EOF +After configuring the Box Backup client and/or server, you can start +the daemon using the init scripts /etc/init.d/bbackupd and +/etc/init.d/bbstored. +The configuration files can be found in /etc/boxbackup + +More information about configuring the client can be found at +${HOMEPAGE}client.html, +and more information about configuring the server can be found at +${HOMEPAGE}server.html. +EOF + echo +} diff --git a/app-backup/boxbackup/files/boxbackup-0.11.1-fix-Wformat-security.patch b/app-backup/boxbackup/files/boxbackup-0.11.1-fix-Wformat-security.patch new file mode 100644 index 000000000000..22efb3266f46 --- /dev/null +++ b/app-backup/boxbackup/files/boxbackup-0.11.1-fix-Wformat-security.patch @@ -0,0 +1,27 @@ +From 53e968624b5540bf0c97bb69636f1bc908f9b00a Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 3 Aug 2016 16:38:23 -0400 +Subject: [PATCH 1/1] bin/bbackupquery/BackupQueries.cpp: fix trivial + -Wformat-security warning. + +Gentoo-Bug: 520978 +--- + bin/bbackupquery/BackupQueries.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp +index 0418ec9..b377218 100644 +--- a/bin/bbackupquery/BackupQueries.cpp ++++ b/bin/bbackupquery/BackupQueries.cpp +@@ -613,7 +613,7 @@ void BackupQueries::List(int64_t DirID, const std::string &rListRoot, const bool + // terminate + *(f++) = ' '; + *(f++) = '\0'; +- printf(displayflags); ++ printf("%s", displayflags); + + if(en_flags != 0) + { +-- +2.7.3 + diff --git a/app-backup/boxbackup/files/boxbackup-0.11.1-fix-mandir.patch b/app-backup/boxbackup/files/boxbackup-0.11.1-fix-mandir.patch new file mode 100644 index 000000000000..842655491d19 --- /dev/null +++ b/app-backup/boxbackup/files/boxbackup-0.11.1-fix-mandir.patch @@ -0,0 +1,14 @@ +Install man pages into /usr/share/man instead of /usr/man. This patch +was provided by a Gentoo user in bug 515422. + +--- a/infrastructure/makeparcels.pl.in 2015-04-30 15:28:26.790570655 +0200 ++++ b/infrastructure/makeparcels.pl.in 2015-04-30 15:35:40.795699542 +0200 +@@ -304,7 +304,7 @@ + if ($type eq 'man') + { + $name =~ /([0-9])$/; +- $dest = "man/man$1"; ++ $dest = "share/man/man$1"; + $name =~ s/$/\.gz/; + } + |