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 <g...@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 -}
