mschiff 14/09/16 20:02:13 Modified: metadata.xml ChangeLog Added: bareos-13.2.3-r1.ebuild Log: Add new faslz USE flag and revbump with fastlz support. Fixes #522620. (Portage version: 2.2.12-r1/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)
Revision Changes Path 1.2 app-backup/bareos/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bareos/metadata.xml?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bareos/metadata.xml?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bareos/metadata.xml?r1=1.1&r2=1.2 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-backup/bareos/metadata.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metadata.xml 21 Oct 2013 21:52:51 -0000 1.1 +++ metadata.xml 16 Sep 2014 20:02:13 -0000 1.2 @@ -10,6 +10,7 @@ <flag name='director'>Install director</flag> <flag name='storage-daemon'>Install storage daemon (bareos-sd)</flag> <flag name='logwatch'>Install support files for logwatch</flag> + <flag name='fastlz'>Enable support vor lz4, lz4hc and lzfast using dev-libs/bareos-fastlzlib</flag> <flag name='ndmp'>Enable support for NDMP (Network Data Management Protocol)</flag> <flag name='sql-pooling'>Enable SQL pooling support</flag> <flag name='scsi-crypto'>Enable low level SCSI crypto support</flag> 1.11 app-backup/bareos/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bareos/ChangeLog?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bareos/ChangeLog?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bareos/ChangeLog?r1=1.10&r2=1.11 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-backup/bareos/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ChangeLog 20 May 2014 23:18:41 -0000 1.10 +++ ChangeLog 16 Sep 2014 20:02:13 -0000 1.11 @@ -1,6 +1,12 @@ # ChangeLog for app-backup/bareos # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/ChangeLog,v 1.10 2014/05/20 23:18:41 mschiff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/ChangeLog,v 1.11 2014/09/16 20:02:13 mschiff Exp $ + +*bareos-13.2.3-r1 (16 Sep 2014) + + 16 Sep 2014; Marc Schiffbauer <msch...@gentoo.org> +bareos-13.2.3-r1.ebuild, + metadata.xml: + Add new faslz USE flag and revbump with fastlz support. Fixes #522620. 20 May 2014; Marc Schiffbauer <msch...@gentoo.org> files/bareos-fd.initd: Do not set owner for pid direrctory in bareos-fd init script 1.1 app-backup/bareos/bareos-13.2.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bareos/bareos-13.2.3-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bareos/bareos-13.2.3-r1.ebuild?rev=1.1&content-type=text/plain Index: bareos-13.2.3-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-13.2.3-r1.ebuild,v 1.1 2014/09/16 20:02:13 mschiff Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} ) PYTHON_REQ_USE="threads" inherit eutils multilib python-single-r1 qt4-r2 user DESCRIPTION="Featureful client/server network backup suite" HOMEPAGE="http://www.bareos.org/"; SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" RESTRICT="mirror" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="acl clientonly +director fastlz ipv6 logwatch mysql ndmp postgres python qt4 readline scsi-crypto sql-pooling +sqlite3 ssl static +storage-daemon tcpd vim-syntax X" DEPEND=" !app-backup/bacula dev-libs/gmp !clientonly? ( postgres? ( dev-db/postgresql-base[threads] ) mysql? ( virtual/mysql ) sqlite3? ( dev-db/sqlite:3 ) director? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses[static-libs] ssl? ( dev-libs/openssl[static-libs] ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( dev-libs/openssl ) sys-libs/ncurses sys-libs/zlib ) python? ( ${PYTHON_DEPS} ) " RDEPEND="${DEPEND} !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" REQUIRED_USE="static? ( clientonly ) python? ( ${PYTHON_REQUIRED_USE} )" S=${WORKDIR}/${PN}-Release-${PV} pkg_setup() { use mysql && export mydbtypes+="mysql" use postgres && export mydbtypes+=" postgresql" use sqlite3 && export mydbtypes+=" sqlite3" # create the daemon group and user if [ -z "$(egetent group bareos 2>/dev/null)" ]; then enewgroup bareos einfo einfo "The group 'bareos' has been created. Any users you add to this" einfo "group have access to files created by the daemons." einfo fi if use clientonly && use static && use qt4; then ewarn ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag." ewarn fi if ! use clientonly; then if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then enewuser bareos -1 -1 /var/lib/bareos bareos,disk,tape,cdrom,cdrw einfo einfo "The user 'bareos' has been created. Please see the bareos manual" einfo "for information about running bareos as a non-root user." einfo fi fi use python && python-single-r1_pkg_setup } src_prepare() { # adjusts default configuration files for several binaries # to /etc/bareos/<config> instead of ./<config> 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/bareos/|g' "${f}" \ || die "sed on ${f} failed" done popd >&/dev/null || die # bug 466690 Use CXXFLAGS instead of CFLAGS sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die # stop build for errors in subdirs epatch "${FILESDIR}"/${PN}-12.4.5-Makefile.patch # bat needs to respect LDFLAGS epatch "${FILESDIR}"/${PN}-12.4.5-bat-ldflags.patch # do not strip binaries for d in filed console dird stored; do sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die done } src_configure() { local myconf='' if use clientonly; then myconf="${myconf} \ $(use_enable clientonly client-only) \ $(use_enable !static libtool) \ $(use_enable static static-cons) \ $(use_enable static static-fd)" fi # do not build bat and traymonitor if 'static' clientonly if ! use clientonly || ! use static; then myconf="${myconf} \ $(use_enable qt4 bat) \ $(use_enable qt4 traymonitor)" fi myconf="${myconf} \ $(use_with X x) \ $(use_enable acl) \ $(use_enable ipv6) \ $(use_enable ndmp) \ $(use_enable readline) \ $(use_enable !readline conio) \ $(use_enable scsi-crypto) \ $(use_enable sql-pooling) \ $(use_with fastlz) \ $(use_with mysql) \ $(use_with postgres postgresql) \ $(use_with python) \ $(use_with readline) \ $(use_with sqlite3) \ $(use sqlite3 || echo "--without-sqlite3") \ $(use_with ssl openssl) \ $(use_with tcpd tcp-wrappers) \ " econf \ --libdir=/usr/$(get_libdir) \ --docdir=/usr/share/doc/${PF} \ --htmldir=/usr/share/doc/${PF}/html \ --with-pid-dir=/run/bareos \ --sysconfdir=/etc/bareos \ --with-subsys-dir=/run/lock/subsys \ --with-working-dir=/var/lib/bareos \ --with-logdir=/var/log/bareos \ --with-scriptdir=/usr/libexec/bareos \ --with-plugindir=/usr/$(get_libdir)/${PN}/plugin \ --with-dir-user=bareos \ --with-dir-group=bareos \ --with-sd-user=root \ --with-sd-group=bareos \ --with-fd-user=root \ --with-fd-group=bareos \ --with-sbin-perm=0755 \ --enable-smartalloc \ --enable-dynamic-cats-backends \ --enable-batch-insert \ --disable-afs \ --host=${CHOST} \ ${myconf} # correct configuration for QT based bat if use qt4 ; then pushd src/qt-console eqmake4 popd pushd src/qt-tray-monitor eqmake4 popd fi } src_compile() { # workaround for build failing with high -j values # if ndmp is enabled use ndmp && MAKEOPTS="$MAKEOPTS -j1" # Make build log verbose (bug #447806) emake NO_ECHO="" } src_install() { emake DESTDIR="${D}" install doicon scripts/bareos.png # install bat icon and desktop file when enabled # (for some reason ./configure doesn't pick this up) if use qt4 && ! use static ; then doicon src/images/bat.png domenu scripts/bat.desktop fi # remove some scripts we don't need at all rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql} rm -f "${D}"/usr/sbin/bareos # remove upstream init scripts rm -f "${D}"/etc/init.d/bareos-* # rename statically linked apps if use clientonly && use static ; then pushd "${D}"/usr/sbin || die mv static-bareos-fd bareos-fd || die mv static-bconsole bconsole || die popd || die fi # extra files which 'make install' doesn't cover if ! use clientonly; then # the logrotate configuration # (now unconditional wrt bug #258187) diropts -m0755 insinto /etc/logrotate.d insopts -m0644 newins "${S}"/scripts/logrotate bareos # the logwatch scripts if use logwatch; then diropts -m0750 dodir /etc/log.d/scripts/services dodir /etc/log.d/scripts/shared dodir /etc/log.d/conf/logfiles dodir /etc/log.d/conf/services pushd "${S}"/scripts/logwatch >&/dev/null || die emake DESTDIR="${D}" install popd >&/dev/null || die fi fi rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* if ! use qt4; then rm -vf "${D}"/usr/share/man/man1/bat.1* fi if use clientonly || ! use director; then rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* rm -vf "${D}"/usr/share/man/man1/bsmtp.1* rm -vf "${D}"/usr/share/man/man8/bwild.8* rm -vf "${D}"/usr/share/man/man8/bregex.8* rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* rm -vf "${D}"/usr/libexec/bareos/create_*_database rm -vf "${D}"/usr/libexec/bareos/drop_*_database rm -vf "${D}"/usr/libexec/bareos/make_*_tables rm -vf "${D}"/usr/libexec/bareos/update_*_tables rm -vf "${D}"/usr/libexec/bareos/drop_*_tables rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup fi if use clientonly || ! use storage-daemon; then rm -vf "${D}"/usr/share/man/man8/bareos-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/bareos/disk-changer rm -vf "${D}"/usr/libexec/bareos/mtx-changer rm -vf "${D}"/usr/libexec/bareos/dvd-handler rm -vf "${D}"/etc/bareos/mtx-changer.conf fi if ! use scsi-crypto; then rm -vf "${D}"/usr/share/man/man8/bscrypto.8* fi if ! use qt4; then rm -vf "${D}"/usr/share/man/man1/bareos-tray-monitor.1* fi # documentation dodoc README.md use ndmp && dodoc README.NDMP use scsi-crypto && dodoc README.scsicrypto # vim-files if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax doins scripts/bareos.vim insinto /usr/share/vim/vimfiles/ftdetect newins scripts/filetype.vim bareos_ft.vim fi # setup init scripts myscripts="bareos-fd" if ! use clientonly; then if use director; then myscripts="${myscripts} bareos-dir" fi if use storage-daemon; then myscripts="${myscripts} bareos-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}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" # now set the database dependency for the director init script case "${script}" in bareos-dir) sed -i -e "s:%databasetypes%:${mydbtypes}:" "${T}/${script}".confd || die ;; *) ;; esac # install init script and config newinitd "${T}/${script}".initd "${script}" newconfd "${T}/${script}".confd "${script}" done # make sure the working directory exists diropts -m0750 keepdir /var/lib/bareos # make sure bareos group can execute bareos libexec scripts fowners -R root:bareos /usr/libexec/bareos } pkg_postinst() { if use clientonly; then fowners root:bareos /var/lib/bareos else fowners bareos:bareos /var/lib/bareos fi if ! use clientonly && use director; then einfo einfo "If this is a new install, you must create the databases with:" if use postgres; then einfo einfo "For postgresql:" einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'" einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'" einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'" fi if use mysql; then einfo einfo "For mysql:" einfo einfo " Make sure root has direct access to your mysql server. You may want to" einfo " create a /root/.my.cnf file with" einfo " [client]" einfo " user=root" einfo " password=YourPasswordForAccessingMysqlAsRoot" einfo " before running:" einfo " /usr/libexec/bareos/create_bareos_database mysql" einfo " /usr/libexec/bareos/make_bareos_tables mysql" einfo " /usr/libexec/bareos/grant_bareos_privileges mysql" fi einfo fi if use sqlite3; then einfo einfo "Be aware that Bareos does not officially support SQLite database." einfo "Best use it only for a client-only installation. See Bug #445540." einfo einfo "It is strongly recommended to use either postgresql or mysql as" einfo "catalog database backend." einfo fi einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" einfo "you have to enable 'USE=qt4'." einfo }
