From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-960904-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E7A2139695 for <garchives@archives.gentoo.org>; Mon, 10 Jul 2017 12:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9C5C27418E; Mon, 10 Jul 2017 12:20:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78E1927418E for <gentoo-commits@lists.gentoo.org>; Mon, 10 Jul 2017 12:20:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B7B5341B8D for <gentoo-commits@lists.gentoo.org>; Mon, 10 Jul 2017 12:20:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 070507497 for <gentoo-commits@lists.gentoo.org>; Mon, 10 Jul 2017 12:20:51 +0000 (UTC) From: "Marek Szuba" <marecki@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org> Message-ID: <1499689242.72555ee7026afed5ae84df6c5151cb1d715d482d.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/burp/files/, app-backup/burp/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/burp/Manifest app-backup/burp/burp-2.1.12.ebuild app-backup/burp/files/burp-2.0.54-ncurses_pkg-config.patch X-VCS-Directories: app-backup/burp/files/ app-backup/burp/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 72555ee7026afed5ae84df6c5151cb1d715d482d X-VCS-Branch: master Date: Mon, 10 Jul 2017 12:20:51 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c860eed-a524-41b8-a393-c483fd1545ad X-Archives-Hash: fd366ccd70692d0f7926f1bca2bb4718 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 -----------------------------------------------------------