From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- app-backup/Manifest.gz | Bin 10822 -> 10828 bytes app-backup/backintime/Manifest | 4 +- app-backup/backintime/backintime-1.1.24.ebuild | 87 ----- .../backintime/backintime-1.2.0_pre20180221.ebuild | 2 +- app-backup/bacula/Manifest | 2 + app-backup/bacula/bacula-9.0.6-r3.ebuild | 430 +++++++++++++++++++++ .../bacula/files/9.0.6/bacula-9.0.6-libressl.patch | 62 +++ app-backup/borgweb/Manifest | 2 +- app-backup/borgweb/borgweb-0.2.0-r2.ebuild | 2 +- app-backup/zbackup/Manifest | 1 - app-backup/zbackup/zbackup-1.4.4.ebuild | 34 -- 11 files changed, 498 insertions(+), 128 deletions(-) delete mode 100644 app-backup/backintime/backintime-1.1.24.ebuild create mode 100644 app-backup/bacula/bacula-9.0.6-r3.ebuild create mode 100644 app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch delete mode 100644 app-backup/zbackup/zbackup-1.4.4.ebuild (limited to 'app-backup') diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index 7f7ce2dcc2df..4dcc1841fcc3 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest index b8f131d68a58..16341a967afe 100644 --- a/app-backup/backintime/Manifest +++ b/app-backup/backintime/Manifest @@ -1,6 +1,4 @@ -DIST backintime-1.1.24.tar.gz 658961 BLAKE2B 88255ea138f31c4540f54d2053616d4c8ce35f7c969b15a9c46422bfed4f0fd2cabb01e0cd4d1505fb84eee31daacb9da36c6bf71225f5b9a1d47d6941e571b2 SHA512 d16b6d3a710154ca8bddf80a8f06835efe84dd2f2435102e06a732f7e6e291b1954864298542658bab2b7bc42d5a6bf1d9338a98c66fd3f888c450b9685cc011 DIST backintime-1.2.0_pre20180221.tar.gz 712330 BLAKE2B 9ba40c5f89b9fbdf0b1c381bf2e3edce13553b2c301792627fc037bd2de181804b2dc6cad6e78a02844f8835dcd6415a35590125e832d55187fa2ed1a5fa864b SHA512 ad1bb11ea411904027952809c577de1a5317f40430af9b91b16a2c157d560c72b65c879bb880b557e9b5e333e76a44977a26486f4ed4f45281a5e8b0d4583c2a -EBUILD backintime-1.1.24.ebuild 1813 BLAKE2B 60766b823aa74012c76716da47e526b1b46889a4b536c1cc9414a99535cb922419bf5b3266e30d452bd34ea99da32cc591cf14b4ea5374050d746d5b7479719e SHA512 d4b76c90a12c31741dbaec30c881fee6458970921aa54465b0bd503e2bbca3f1801e2bc2cbffc1df7ad58a7a306d6fa0a7957c0f7e79dbe806a66801d2da7a37 -EBUILD backintime-1.2.0_pre20180221.ebuild 1834 BLAKE2B 0dc311d045f0dc7ccb477b5ec22cdd3932a05d7c361967808c1233b9ad143b3d50d988907d2f74a084d1dd08b36212b448c2c4054d1dfea6acd1cd48758243b9 SHA512 360f4be91e2025923251fb4d62de0632ec217ad212141bb90ab838e147085ebbc1b6a8a852e0d97a0b72921bc7c84d3f35953d83835f7e69dcf9e044b58202e6 +EBUILD backintime-1.2.0_pre20180221.ebuild 1833 BLAKE2B dd1cb47f69f160df1ea0ae5cb60276001517cbc4647ede66d4bc55351c65012eb105fc63bbac81dd2f3321f90f7f078f75ecfaa07f1f4c9fd550902ecb90e059 SHA512 00f3dbace06bb8609dd14bc1253deb505f63a97685e32fa3ade6c89e226ebd52f7c3b0be97b8713e86f270517eaad284b9298c1b3cb3f90a885a2966ebb21305 EBUILD backintime-9999.ebuild 1742 BLAKE2B 2f898508c8297374a05f3c5a69bd5cdc1ca306729a1ee79fed8d60d319b2f4ff788a882bc789fd1be6c9a8d61413a84b2b055b55dead2845f68c317960065867 SHA512 acbbee1a19b0c627cfe7268770e1c51d41059c375ed022d94983b530d06f83e5d05f53a189a0a3e844d8baf77fb1df2ef62312e583dcd94245215ae3ae6b2015 MISC metadata.xml 716 BLAKE2B 469a4318ff5607d74bb1d2166feba52686891921e59c117e15d54057eeafc1d5d3a2c9232e434c3783b04716b8784fcd092bc2d77553e1e56d27939ffb89dd50 SHA512 377471e000a0cb8f034f7c6a20596e48f7fe380c7910f0a97b6a47b779eb466efb6a02b4eef10569a9b9baf7e3eca03d6e22f87e36e4f11836ffb05fa38f7f0a diff --git a/app-backup/backintime/backintime-1.1.24.ebuild b/app-backup/backintime/backintime-1.1.24.ebuild deleted file mode 100644 index e06ed0d26293..000000000000 --- a/app-backup/backintime/backintime-1.1.24.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit eutils python-single-r1 gnome2-utils - -DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4" -HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/" -SRC_URI="https://github.com/bit-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="qt4" - -DEPEND="${PYTHON_DEPS} - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/keyring[${PYTHON_USEDEP}] - net-misc/openssh - net-misc/rsync[xattr,acl]" -RDEPEND="${DEPEND} - qt4? ( dev-python/PyQt4 )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_prepare() { - #fix doc install location - sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \ - -i common/configure || die - sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \ - -i qt4/configure || die - sed -e "/addInstallFile \"..\/VERSION/d" \ - -e "/addInstallFile \"..\/LICENSE/d" \ - -e "/addInstallFile \"..\/debian\/copyright/d" \ - -i {qt4,common}/configure || die - - if [ -n ${LINGUAS+x} ] ; then - cd common/po || die - for po in *.po ; do - if ! has ${po/.po} ${LINGUAS} ; then - rm ${po} || die - fi - done - fi - - default -} - -src_configure() { - cd "${S}"/common || die - ./configure --python3 --no-fuse-group || die - if use qt4 ; then - cd "${S}"/qt4 || die - ./configure --python3 || die - fi -} - -src_compile() { - cd "${S}"/common || die - emake - if use qt4 ; then - cd "${S}"/qt4 || die - emake - fi -} - -src_install() { - cd "${S}"/common || die - emake DESTDIR="${D}" install - if use qt4 ; then - cd "${S}"/qt4 || die - emake DESTDIR="${D}" install - fi - - python_optimize "${D}" -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild index 0df305389205..1b1e607dc857 100644 --- a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild +++ b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/bit-team/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="qt5" DEPEND="${PYTHON_DEPS} diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest index 866c76b97b8e..e061669226c3 100644 --- a/app-backup/bacula/Manifest +++ b/app-backup/bacula/Manifest @@ -13,6 +13,7 @@ AUX 9.0.2/bacula-9.0.2-fix-static.patch 3637 BLAKE2B 4119db6091fdaf7d8d103a166ce AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 BLAKE2B f04bbf695a926424092dd974994967eefcd48407f2de43b9e94bff25403e66f4a49cde08d667e3b5fc4fb9f8d273a786c3422325db3f589278d16f136d4a9a0c SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e0a6835b9f6cadb6b43b2b55ea33113e20c20b6a367d965ea12358597e9807c79846e45571b31f9b66dc3ad83265fed4e7 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf AUX 9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch 306 BLAKE2B a6bca03d7e61051046083f1773ce65035f695dd8d5de45d58e0488eb5047580db444cbb52ae5e93068ff60028220a9286da9d1323d141335be31ebfb9c9acb44 SHA512 86a869f10e512eac6aa4500f73ace1cfe3883cc4d176c26d275f6dc51320763cb55c2d139a7a0230c57c40f4996651a0de71788e3a7ef343a4290e56f9585a22 +AUX 9.0.6/bacula-9.0.6-libressl.patch 2318 BLAKE2B 6d918bbf3eb0af17b3d1ccc5fe70788de21aed8823178a36dc04ada1198fef99425bf0af55d86bfff8342ba7df635e05e813548d3469cf51edb1c813836f45c3 SHA512 c6d7a386a89eaeaa3281cfe4bc2d8c48a84762d4a6e01d1f327110efeada0168261d03b3ab1183fffa5456975ff475b12b286f360d7001cf459f0a10be6ba8be AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf AUX bacula-dir.initd 505 BLAKE2B 385c24291c0a0108baf441d078054f70fd0346dfe4b6de7a236f9c1e7a4416b895c73075509dfcc03d1b58760668ca1fc5415033188f9dcb3acceea7f5e1044a SHA512 de0003d6c873ecf9609a6e1838772a29555b4e5e251369035746ede296f4b0f1c85dcbe8822d526d6a5489ba0921a8566f7f2b963682fddb3560f6f7e817c40a AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f @@ -36,5 +37,6 @@ EBUILD bacula-7.4.7.ebuild 11866 BLAKE2B 92e8f89091d44ce6ca67a36cc01d13c5462f681 EBUILD bacula-9.0.3.ebuild 11951 BLAKE2B 55d8dae509ee19c19f6c4e0dfa7b75d55f5f76ca74dd07b89991e431289dd2833e83da9b2367e663d2c4817d69a3b53d356c2ad8d837d472d3d95d37dab797cc SHA512 5d1ce8edf72b57a290ce991cc54c672c45d4e35588bb81963faace7d63f8211296afe2aab85b6c7d86ab6659bec6a03b14d063159bbbae19195910bc2f862c7e EBUILD bacula-9.0.6-r1.ebuild 12207 BLAKE2B 5bf1269ca69b0207c86af611e24d6117008c9170c2fb1807e877352f29686e3cdf6c1b485b3d6b6f106a60553bfcc64dbd75ccb04465de2ba4332da23e5cccef SHA512 27b66052ca76d4338fc05604252fd4f43a61771d5e5f5dfb4910d8da4bd6fbd654200167322d5b9de339060d97773bcf9e474ea73129ea3ce064057fcce1c7b2 EBUILD bacula-9.0.6-r2.ebuild 12451 BLAKE2B 2a9bca065cf34b174b0d8db568be353c5dba172c915b71d2f60b52e10c1f169ab1459792ba41ac6877a0aa2d3984e987a9dc21eb5cb8dc2533550512ed2691d1 SHA512 af17a2b9e88a4d7901b7cb0c6b2ac535f5ea4e3d0feca14bc12976b2de0c839810828006237700d71ac6817387fb2917ff7c418202519d39f7d74d60d34b5f8d +EBUILD bacula-9.0.6-r3.ebuild 12555 BLAKE2B 970c7dadba73cf531c7d68dc68381b36333f80a3166e7c02fca6533540d67c871914af19a72da7355c5cfc23eace65aa1704e2f7e96a8e4e61bc28d0ac68092c SHA512 883f41666bfcbeb795f11c4a134575aad426fca89599a52e52ef47ba0a67a8296ba15290423c37fe27f2167a6fc34f3fb06277a66ef44c2997f57d20b0ef34c4 EBUILD bacula-9.0.6.ebuild 11975 BLAKE2B a6583a0b62fdcda8eed514e52947abf61e2b3f14d5e662500749a584fe6a67b2b04f10a48a5d9f84a23b43b52247b9a867308e5c269531bf423f273c18b48228 SHA512 7f79eb42b9d48f2073bcb4c43333d26c64fb2a43bddcf398483a5b98a025291d037854eec80965e86e1054e6341cdb03184a7ec297bd017a8284a53c302686ca MISC metadata.xml 626 BLAKE2B 5794ff725aacf865d2f20f402d057e6358a2c68be16f760f1446b2de5292c9582247ab86417131063e181168f003e1d6f5d200ac0dc3d47da24a3bca688dd93c SHA512 69d63f22a63a53daada5561d751f9903932c9a4596c164894a9aa6465a0f4ac90af99548439545fff1cfbcac9a1eb266a91119cbf73cb13edebd16b440613e55 diff --git a/app-backup/bacula/bacula-9.0.6-r3.ebuild b/app-backup/bacula/bacula-9.0.6-r3.ebuild new file mode 100644 index 000000000000..f30acaa0b53f --- /dev/null +++ b/app-backup/bacula/bacula-9.0.6-r3.ebuild @@ -0,0 +1,430 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit qmake-utils desktop systemd user libtool + +MY_PV=${PV/_beta/-b} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="http://www.bacula.org/" +SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" + +DEPEND=" + dev-libs/gmp:0 + !bacula-clientonly? ( + postgres? ( dev-db/postgresql:=[threads] ) + mysql? ( virtual/mysql ) + sqlite? ( dev-db/sqlite:3 ) + !bacula-nodir? ( virtual/mta ) + ) + qt5? ( + dev-qt/qtsvg:5 + x11-libs/qwt:6 + ) + logwatch? ( sys-apps/logwatch ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + readline? ( sys-libs/readline:0 ) + static? ( + acl? ( virtual/acl[static-libs] ) + sys-libs/zlib[static-libs] + dev-libs/lzo[static-libs] + sys-libs/ncurses:=[static-libs] + ssl? ( + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[static-libs] ) + ) + ) + !static? ( + acl? ( virtual/acl ) + sys-libs/zlib + dev-libs/lzo + sys-libs/ncurses:= + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + )" +RDEPEND="${DEPEND} + !bacula-clientonly? ( + !bacula-nosd? ( + sys-block/mtx + app-arch/mt-st + ) + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" + +REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) + static? ( bacula-clientonly )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + #XOR and !bacula-clientonly controlled by REQUIRED_USE + use mysql && export mydbtype="mysql" + use postgres && export mydbtype="postgresql" + use sqlite && export mydbtype="sqlite3" + + # create the daemon group and user + if [ -z "$(egetent group bacula 2>/dev/null)" ]; then + enewgroup bacula + einfo + einfo "The group 'bacula' has been created. Any users you add to this" + einfo "group have access to files created by the daemons." + einfo + fi + + if use bacula-clientonly && use static && use qt5; then + ewarn + ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." + ewarn + fi + + if ! use bacula-clientonly; then + if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then + enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw + einfo + einfo "The user 'bacula' has been created. Please see the bacula manual" + einfo "for information about running bacula as a non-root user." + einfo + fi + fi +} + +src_prepare() { + # adjusts default configuration files for several binaries + # to /etc/bacula/ instead of ./ + pushd src >&/dev/null || die + for f in console/console.c dird/dird.c filed/filed.c \ + stored/bcopy.c stored/bextract.c stored/bls.c \ + stored/bscan.c stored/btape.c stored/stored.c \ + qt-console/main.cpp; do + sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ + || die "sed on ${f} failed" + done + popd >&/dev/null || die + + # bug 466688 drop deprecated categories from Desktop file + sed -i -e 's/Application;//' scripts/bat.desktop.in || die + + # bug 466690 Use CXXFLAGS instead of CFLAGS + sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die + + # drop automatic install of unneeded documentation (for bug 356499) + eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch + + # bug #310087 + eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch + + # bug #311161 + eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch + + # bat needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + + # bug #328701 + eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch + + eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-fix-static.patch + + # fix soname in libbaccat.so bug #602952 + eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" + + # do not strip binaries + sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die + sed -i -e "s/strip /# strip /" src/console/Makefile.in || die + + # fix file not found error during make depend + eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch + + # fix missing QtGlobal include in src/qt-console/pages.h for Qt5 + eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-fix-pages-h-qt-includes.patch + eapply_user + + # Fix systemd unit files: + # bug 497748 + sed -i -e '/Requires/d' platforms/systemd/*.service.in || die + sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die + # bug 504370 + sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die + # bug 584442 and 504368 + sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die + + # build 'bat' for Qt5 + export QMAKE="$(qt5_get_bindir)"/qmake + + # adapt to >=Qt-5.9 (see bug #644566) + # qmake needs an existing target file to generate install instructions + sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ + src/qt-console/bat.pro.in || die + mkdir src/qt-console/.libs || die + touch src/qt-console/.libs/bat || die + chmod 755 src/qt-console/.libs/bat || die + + # fix wrong handling of libressl version + eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl.patch + + # fix bundled libtool (bug 466696) + # But first move directory with M4 macros out of the way. + # It is only needed by autoconf and gives errors during elibtoolize. + mv autoconf/libtool autoconf/libtool1 || die + elibtoolize +} + +src_configure() { + local myconf='' + + if use bacula-clientonly; then + myconf="${myconf} \ + $(use_enable bacula-clientonly client-only) \ + $(use_enable !static libtool) \ + $(use_enable static static-cons) \ + $(use_enable static static-fd)" + else + myconf="${myconf} \ + $(use_enable !bacula-nodir build-dird) \ + $(use_enable !bacula-nosd build-stored)" + # bug #311099 + # database support needed by dir-only *and* sd-only + # build as well (for building bscan, btape, etc.) + myconf="${myconf} + --with-${mydbtype}" + if use mysql; then + myconf="${myconf} \ + --disable-batch-insert" + else + myconf="${myconf} \ + --enable-batch-insert" + fi + fi + + # do not build bat if 'static' clientonly + if ! use bacula-clientonly || ! use static; then + myconf="${myconf} \ + $(use_enable qt5 bat)" + fi + + myconf="${myconf} \ + $(use_with X x) \ + $(use_enable !readline conio) \ + $(use_enable readline) \ + $(use_with readline readline /usr) \ + $(use_with ssl openssl) \ + $(use_enable ipv6) \ + $(use_enable acl) \ + $(use_with tcpd tcp-wrappers)" + + econf \ + --libdir=/usr/$(get_libdir) \ + --docdir=/usr/share/doc/${PF} \ + --htmldir=/usr/share/doc/${PF}/html \ + --with-pid-dir=/var/run \ + --sysconfdir=/etc/bacula \ + --with-subsys-dir=/var/lock/subsys \ + --with-working-dir=/var/lib/bacula \ + --with-logdir=/var/lib/bacula \ + --with-scriptdir=/usr/libexec/bacula \ + --with-systemd=$(systemd_get_systemunitdir) \ + --with-dir-user=bacula \ + --with-dir-group=bacula \ + --with-sd-user=root \ + --with-sd-group=bacula \ + --with-fd-user=root \ + --with-fd-group=bacula \ + --enable-smartalloc \ + --disable-afs \ + --host=${CHOST} \ + ${myconf} +} + +src_compile() { + # Make build log verbose (bug #447806) + emake NO_ECHO="" +} + +src_install() { + emake DESTDIR="${D}" install + doicon scripts/bacula.png + + # install bat icon and desktop file when enabled + # (for some reason ./configure doesn't pick this up) + if use qt5 && ! use static ; then + doicon src/qt-console/images/bat_icon.png + domenu scripts/bat.desktop + fi + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} + + # rename statically linked apps + if use bacula-clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bacula-fd bacula-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use bacula-clientonly; then + # the database update scripts + diropts -m0750 + insinto /usr/libexec/bacula/updatedb + insopts -m0754 + doins "${S}"/updatedb/* + fperms 0640 /usr/libexec/bacula/updatedb/README + + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/scripts/logrotate bacula + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /usr/share/logwatch/scripts/services + dodir /usr/share/logwatch/scripts/shared + dodir /etc/logwatch/conf/logfiles + dodir /etc/logwatch/conf/services + pushd "${S}"/scripts/logwatch >&/dev/null || die + emake DESTDIR="${D}" install + popd >&/dev/null || die + fi + fi + + if ! use qt5; then + rm -vf "${D}"/usr/share/man/man1/bat.1* + fi + rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* + if use bacula-clientonly || use bacula-nodir; then + rm -vf "${D}"/usr/share/man/man8/bacula-dir.8* + rm -vf "${D}"/usr/share/man/man8/dbcheck.8* + rm -vf "${D}"/usr/share/man/man1/bsmtp.1* + rm -vf "${D}"/usr/libexec/bacula/create_*_database + rm -vf "${D}"/usr/libexec/bacula/drop_*_database + rm -vf "${D}"/usr/libexec/bacula/make_*_tables + rm -vf "${D}"/usr/libexec/bacula/update_*_tables + rm -vf "${D}"/usr/libexec/bacula/drop_*_tables + rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges + rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup + fi + if use bacula-clientonly || use bacula-nosd; then + rm -vf "${D}"/usr/share/man/man8/bacula-sd.8* + rm -vf "${D}"/usr/share/man/man8/bcopy.8* + rm -vf "${D}"/usr/share/man/man8/bextract.8* + rm -vf "${D}"/usr/share/man/man8/bls.8* + rm -vf "${D}"/usr/share/man/man8/bscan.8* + rm -vf "${D}"/usr/share/man/man8/btape.8* + rm -vf "${D}"/usr/libexec/bacula/disk-changer + rm -vf "${D}"/usr/libexec/bacula/mtx-changer + rm -vf "${D}"/usr/libexec/bacula/dvd-handler + fi + + # documentation + dodoc ChangeLog ReleaseNotes SUPPORT + + # install examples (bug #457504) + if use examples; then + docinto examples/ + dodoc -r examples/* + fi + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins scripts/bacula.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins scripts/filetype.vim bacula_ft.vim + fi + + # setup init scripts + myscripts="bacula-fd" + if ! use bacula-clientonly; then + if ! use bacula-nodir; then + myscripts="${myscripts} bacula-dir" + fi + if ! use bacula-nosd; then + myscripts="${myscripts} bacula-sd" + fi + fi + for script in ${myscripts}; do + # copy over init script and config to a temporary location + # so we can modify them as needed + cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" + cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" + + # now set the database dependancy for the director init script + case "${script}" in + bacula-dir) + case "${mydbtype}" in + sqlite3) + # sqlite databases don't have a daemon + sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die + ;; + *) + # all other databases have daemons + sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die + ;; + esac + ;; + *) + ;; + esac + + # install init script and config + newinitd "${T}/${script}".initd "${script}" + newconfd "${T}/${script}".confd "${script}" + done + + systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bacula + + # make sure bacula group can execute bacula libexec scripts + fowners -R root:bacula /usr/libexec/bacula +} + +pkg_postinst() { + if use bacula-clientonly; then + fowners root:bacula /var/lib/bacula + else + fowners bacula:bacula /var/lib/bacula + fi + + if ! use bacula-clientonly && ! use bacula-nodir; then + einfo + einfo "If this is a new install, you must create the ${mydbtype} databases with:" + einfo " /usr/libexec/bacula/create_${mydbtype}_database" + einfo " /usr/libexec/bacula/make_${mydbtype}_tables" + einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" + einfo + + ewarn "ATTENTION!" + ewarn "The format of the database may have changed." + ewarn "If you just upgraded from a version below 9.0.0 you must run" + ewarn "'update_bacula_tables' now." + ewarn "Make sure to have a backup of your catalog before." + ewarn + fi + + if use sqlite; then + einfo + einfo "Be aware that Bacula does not officially support SQLite database anymore." + einfo "Best use it only for a client-only installation. See Bug #445540." + einfo + fi + + einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" + einfo "you have to enable 'USE=qt5'." + einfo +} diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch new file mode 100644 index 000000000000..3df4285c2e2e --- /dev/null +++ b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch @@ -0,0 +1,62 @@ +--- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 ++++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 +@@ -195,7 +195,7 @@ + IMPLEMENT_ASN1_FUNCTIONS(SignatureData) + IMPLEMENT_ASN1_FUNCTIONS(CryptoData) + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) + DEFINE_STACK_OF(SignerInfo); + DEFINE_STACK_OF(RecipientInfo); + #else +--- src/lib/openssl-compat.h.orig 2018-02-02 15:26:04.182557000 -0600 ++++ src/lib/openssl-compat.h 2018-02-02 15:27:50.229100000 -0600 +@@ -1,7 +1,7 @@ + #ifndef __OPENSSL_COPMAT__H__ + #define __OPENSSL_COPMAT__H__ + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey) + { + CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); +--- src/lib/openssl.c.orig 2018-02-16 08:36:24.092583000 -0600 ++++ src/lib/openssl.c 2018-02-16 08:37:23.795454000 -0600 +@@ -69,7 +69,7 @@ + } + } + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + /* Array of mutexes for use with OpenSSL static locking */ + static pthread_mutex_t *mutexes; + +@@ -263,7 +263,7 @@ + { + int stat = 0; + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + if ((stat = openssl_init_threads()) != 0) { + berrno be; + Jmsg1(NULL, M_ABORT, 0, +@@ -310,7 +310,7 @@ + Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n")); + } + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + openssl_cleanup_threads(); + + /* Free libssl and libcrypto error strings */ +--- src/lib/tls.c.orig 2017-11-21 18:37:16.000000000 +0100 ++++ src/lib/tls.c 2018-04-16 20:00:54.082000000 +0200 +@@ -116,7 +116,7 @@ + ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT)); + + /* Allocate our OpenSSL TLS Context */ +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */ + ctx->openssl = SSL_CTX_new(TLS_method()); + diff --git a/app-backup/borgweb/Manifest b/app-backup/borgweb/Manifest index afbf19b9c0ab..4be24b5ac86b 100644 --- a/app-backup/borgweb/Manifest +++ b/app-backup/borgweb/Manifest @@ -1,3 +1,3 @@ DIST borgweb-0.2.0.tar.gz 503852 BLAKE2B 6d37eeca4893f825486d46e03d8212fc3597a8704cee976429a7c55f7ab98b405038948ce7e407fa7c78a2a9f6c2b0ca4307144ffae3bf68ad6e582921989bfb SHA512 7898caf803b82e910eaa1672b892657038da6606777ecefd97c27698c14524094f0c1741621ad4ff9a230d66454de419558644ba185488b0fdb5e1aa604010a0 -EBUILD borgweb-0.2.0-r2.ebuild 518 BLAKE2B 5ed88b900462fcaca4a328f817586bb36c0222db4f08744884b5d2f927fefd25d5ec971fb45d8d8b99c9449c4ea5d7001879f4f49fdb00c8c4093de062bfcb8e SHA512 6c9003224ccca6884fa2963e01ac97f1f0b3e0fb32f961743dd860df57c76eef9dea1b86eb82a81445f3e3acb8422fbf1c49a12391844b25a2d698e258a3df03 +EBUILD borgweb-0.2.0-r2.ebuild 519 BLAKE2B e7cdc87cba88166f1ba61d28c8a6101d0140a456f4b232f9ffc5e5c5402d273693fedbf3a3d3257da1e162cfca0f0206f13477a1c33a3469778cc71f15389a08 SHA512 16baf2b97219f353912ff5b58dbd153405d817d89d7cbb86a06e0acd8ebc25cc51d4afab258ef0a4bd028d5ede7d7e9abcbb17e316727b0126d14be46fbf9d6b MISC metadata.xml 332 BLAKE2B 92f900ce23301edc58aa8e3ddee5d733b060c16e8783721bedc6c7972deafde64f6aff446789f60e08ddae44135b2cae05950c4781a9502fc8cc475c9f6e43a3 SHA512 4a8daf7ccdafc221264a6fce41f8fca702ca101cfbfd113ea9f300b31c53bc1be89b89f5fa1b54b16af5c3e0f36e720cd862829fc3eabf4f27c0c80e7235347b diff --git a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild index 33f9eadc3f0f..c63ce9708275 100644 --- a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild +++ b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} ) inherit distutils-r1 DESCRIPTION="Browser-based user interface for BorgBackup" -HOMEPAGE="https://pypi.org/project/borgweb" +HOMEPAGE="https://pypi.org/project/borgweb/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" diff --git a/app-backup/zbackup/Manifest b/app-backup/zbackup/Manifest index 855c30bf8755..59c4dd882fd0 100644 --- a/app-backup/zbackup/Manifest +++ b/app-backup/zbackup/Manifest @@ -2,6 +2,5 @@ AUX zbackup-1.4.4-tartool.patch 277 BLAKE2B 612cf1a5b6faf753829a859582ccd9cc7410 AUX zbackup-9999-tartool.patch 283 BLAKE2B 227d8a478ab9bdb67208a493b1f06225e3ecf7a6595ba4a41be1d8647df4a7a46645421ce9dd6b7fa5f9af191bbc73ca16cce6a31ea040bd3cf9bd4065c0c142 SHA512 53724bf11c6219e494a77090de34105eb87732a6f6b671bb950ac3d86d8c188544b25e06bd49b9df00cfd471e7de976a37ec8ce60dbbc55dd4ba0d0e21e3d61c DIST zbackup-1.4.4.tar.gz 87118 BLAKE2B b51727dfdd756109498acbfe19c9bbe541856a5424f86e664a124cd4042f81a42cd48f14542fbf278444666ce20539fdb6571cce8aeacfcafac9a44c3ee6e789 SHA512 96f0984be71e521b2a188448bb2801996701be6e96b1dac4672cabc9f6bcb6631fdb8d03f5dde4bbdbb0050d9bd1409d468fcba15f93730d69e6c55271aba575 EBUILD zbackup-1.4.4-r1.ebuild 773 BLAKE2B e3736ff92beb0847675549bbb6504278b06c002f3fecf005725439c8f3bedff8eb41cd3498c974e3dd4f727a5d9f78542525f619e03071bb1fe86fe8a4047c43 SHA512 992cdd5eee2c7ccf264617f6c42069db7a4eedcc33f99f0c579b6110e68e7f8188f6b7689b70dd0d027858f202a2683b892a07ba278aa9006cd91ba9439f2de9 -EBUILD zbackup-1.4.4.ebuild 776 BLAKE2B 0182262abe2cd83b4bb38e2cfed0c75b69f8e4454751a0becfba088bf751be711630bdd5ca11762d99cff06c6468742b0a6e57955b4d58c773f444b52afdbc0f SHA512 611bf46435444ff81a5b139721c1a1498db36cfe7135836418c996a0253317f8ed638269838a88bb011e1ea73e38b0b3eaf380a371596a496f1a40c0c78736d6 EBUILD zbackup-9999.ebuild 776 BLAKE2B b54cadd2af1da601fdd9aff31468b9294c2461eb086ff5be4d24d03d1d42035b51f79a66f29f9d464b66b162760b7c650c1b27ed70bce819fe247011e0d89765 SHA512 a83157f48f1457114527b38f28a7f74159b7173d5f3891aed6d5fdd9f98ddcfd08dc5c0196c74321c2841f52af138dcdbd35cba3959c297399507ac99868ae3d MISC metadata.xml 868 BLAKE2B 2ca9b107e5d3351ff15030e11d7da82a1b029fcdbcd24c6e0d67bd63b173fe7403c6642b11022253ba735fe70ba085c276dcfbf5dfd01e56d8c91be8144ee82d SHA512 d452d2e94449e05f0d2f99d223587560380999c7afd1396e3c7e3ed8a3792d4abd0bb717d078053cec0cd397df4cb2cf00949b24ab407fc966705bfe6911b524 diff --git a/app-backup/zbackup/zbackup-1.4.4.ebuild b/app-backup/zbackup/zbackup-1.4.4.ebuild deleted file mode 100644 index 75f7cf5fca25..000000000000 --- a/app-backup/zbackup/zbackup-1.4.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="A versatile deduplicating backup tool" -HOMEPAGE="http://zbackup.org/ https://github.com/zbackup/zbackup" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="libressl tartool" - -DEPEND="app-arch/lzma - dev-libs/lzo:2 -