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 -}
