* [gentoo-commits] dev/mschiff:master commit in: app-backup/bareos/, app-backup/bareos/files/
@ 2013-10-21 13:39 Marc Schiffbauer
0 siblings, 0 replies; 5+ messages in thread
From: Marc Schiffbauer @ 2013-10-21 13:39 UTC (permalink / raw
To: gentoo-commits
commit: b09ca8fe92a320830656fee03c353d665e60543f
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 13:38:49 2013 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 13:38:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=commit;h=b09ca8fe
added initial bareos ebuild
---
app-backup/bareos/Manifest | 12 +
app-backup/bareos/bareos-12.4.5.ebuild | 412 +++++++++++++++++++++
.../bareos/files/bareos-12.4.5-Makefile.patch | 27 ++
.../bareos/files/bareos-12.4.5-bat-ldflags.patch | 11 +
app-backup/bareos/files/bareos-dir.confd | 17 +
app-backup/bareos/files/bareos-dir.initd | 25 ++
app-backup/bareos/files/bareos-fd.confd | 8 +
app-backup/bareos/files/bareos-fd.initd | 22 ++
app-backup/bareos/files/bareos-sd.confd | 11 +
app-backup/bareos/files/bareos-sd.initd | 22 ++
app-backup/bareos/metadata.xml | 19 +
11 files changed, 586 insertions(+)
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
new file mode 100644
index 0000000..7019f2e
--- /dev/null
+++ b/app-backup/bareos/Manifest
@@ -0,0 +1,12 @@
+AUX bareos-12.4.5-Makefile.patch 924 SHA256 0b2428d3ee7ea5ceae4e02d3c315cc6f6b59d21d44749967dd121e29c060942d SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed WHIRLPOOL 0aeddbe01415260fce862dfa0b387bb5a443b29ed1367ea0fb0c2350c2af24f4f1934497d1590612fa3a3e62e929e5811caa9591e99e5a76fcfc6d73769baa1a
+AUX bareos-12.4.5-bat-ldflags.patch 389 SHA256 b4b569fecdecbef0b5e0c1bcafddd61a48893ee1e33b52289a455a4773adc9ca SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434 WHIRLPOOL 488a764b303c3ed077d55bf04ae91e33d24c69c71476d8ad3416608f60a8071471a96f2a539266509b20133d5cf0e0f66ac284aee99f5378030b7a6c394a1987
+AUX bareos-dir.confd 744 SHA256 ebf91d07511843935a4c3f324ba195691d610c320988a157913fbda4f2110126 SHA512 04897c9fae56e87e0c4cf4ae747534271f4b7ddc6ba6c9fa400ea6741d598e9f2851e06c5c478b99ad2054efd2ad4d5cdd79c63df16f5321fed49aaa812c442b WHIRLPOOL 7ed264c28e46d70007bf4c37d5d31f2c543a69f938c2971156de6128ce84f9be0c5905c6e01aa187070e5e47bcb707674484bd8c7faa5d75839c1928a67f3b2d
+AUX bareos-dir.initd 619 SHA256 797ba78396c65ebfd943481d8aec81223138167f856e30d1871cd3879b3ecfbf SHA512 34bf8ae1b75d1a677e96f0f11e3613b60f3060a9358e5c2c9e82eecf80fe7d2f9b7894a8acef86e12755179e14d4a2cd862227e76e6f884d462ca4dfdcb1f069 WHIRLPOOL 9c26c98d6dc121c867b4d19e4d2fe083bd2f4009039997fca3b1ebe8d4339472faba9b3cc6d0797687cda6454cabea093860f544ca35b55dac4ea5c99d127d58
+AUX bareos-fd.confd 355 SHA256 adf75da467cafd961a73c3d286afc8e998226f7e504ed513161c1a7a6196fb1c SHA512 1f6b17c9c92f60eb3fe43c111517fd48bb9fdcd31c8485d3573da0ce60b11b0dc7de7d5f6c09dd2ea1bed12fc81dca87911a1da8b9c95099be190ef080c8f5db WHIRLPOOL 5629e0273d99cab6bd4706ef3cc4a65fd63baf740736c6432b5fbe3ab0f7d80bc130271133046717a1878c0b5b8ef33402463e91e719cdd070b531c1d9848742
+AUX bareos-fd.initd 543 SHA256 45e71d920dea9e116ed81d0223d3279cbdc21e88bda1c3f094c922775a4d1f20 SHA512 4140b22bb0b965899954e8092adae3f51c90cd6211313b1e13c6760bb228eb48bbf988eeb48431fe9171d4b4aa349a6b6dd637b6376230bd82ee99eb173ee9c6 WHIRLPOOL 962890fc45718ce77e1c09254d968012465a5316dc9e8e79a977ba4518153b2577e7c7650cf4058b578f5de995314d9e8b3b5f93385598a7352518755817a640
+AUX bareos-sd.confd 505 SHA256 ef5ad6cc2d66d9ea2a90b3ee6dae508e923f7d2ce6c90f708647eea60f8039f8 SHA512 18392ef1cb491fe65ecfb4e6bff4adc1c4eeda71e06a5678a779b8e3c42f082cdb30bd36f648a45f80dfe9b19ce08dcc4e4e4744f392eaafaac36d1a9f00e6f6 WHIRLPOOL 465f452bd344b5a8dbec0887c8438a847133344fc30fb2d922c95a4a201a2ef771e344a8fbe4a6ee155bcfbfb271db5ca6c7320b2511b7ddcd7b293832ec4393
+AUX bareos-sd.initd 550 SHA256 8186f4b1c4ade41c8219c5181c4c37ab2a51402520b706770ff0f5431f70adcb SHA512 659dd0ae767005b1f1d65e6bb62a28a7dc7f8bbb0f092716fd6740e6092758e4fdcd9b285ed98b304464d7ebab2c7a7ae1c46ea326be436fe9e4b12c6f754a52 WHIRLPOOL ab50154d79682418431beed0a3cb1bfff28d95dbaae96733de6d401fa077b231f72321abbec10532714c9a80628de605eea5f8b3322e29a1357d8727129febe3
+DIST bareos-12.4.5.tar.gz 3496879 SHA256 2defc15ed4fb6483e1d45ea63bb9cb8ba009e2b31c7755544984f1813bf4e017 SHA512 a59e95bc9b4a5147d8254e6b802c411956d324571ac084f5cb11629ddad59d605cdad2ab7b86f001af8c32faf15070833f233a44cbefaf71d13cad05faaba5cf WHIRLPOOL c95492acb57729e45a6ff5d2ae1894de4ebdb9e416d9f8a5beeef89ccf563a12ea8d5cdb943c2b6ec5681fb2bf0d348fb5e089ecac571256a835b4fd1a4459c8
+EBUILD bareos-12.4.5.ebuild 11564 SHA256 2a2043fcb29d19e47d7183d1b0752100d951df98cb76d8900b3317d97c43a1cb SHA512 f7a8cfbed7746c4a5c8f1e0dcf6dbbc2aac8c625c6b967c3c13679a26db4db23ae5ff7fe399f9da33a15f8e4b4984dc5ef04b994d638f55ce6333c3bfeadf69d WHIRLPOOL e32fa000d007cb2b3459838b8bf7669044d90e292106c557feeb7e70b51c54534e335dbf42a762af6b3e04c76433bda356ad6eec7c5c4f5e287c3d62f865fbd0
+MISC TODO 71 SHA256 321410731e5588759260d420a94fc1bcd1f9eb1a2f7ec2a01734d0cdebf020f3 SHA512 cf6a318db53cbe18bf9bc0c138c7a6b8386f1f0a776ee318028422b09340bc9c2ae24f5615a331e363dd8456cc3acf444d17cdd435c2610775174252722464e6 WHIRLPOOL 4dcb8f8682579cc234b35ebeab005359d77415cbbcb48738bc298be1b41f1c40b80a9a72c3c8a52c69ddcccc78b89cd51abbf092e3aa22b393b7f85e17c36a58
+MISC metadata.xml 835 SHA256 d56d43bab17d98b05de2400c1ee935d12dc4fcdaa053b6b5fe363ee1d4428626 SHA512 2dc1cb1185fa7d7645ee221f5f8a8b7df1db9015902bf714e3d91c8282daaa35f25d2b3445d7cf42f04ba796a3eff88fef48c9caf2ffd94190f434db8af2b2ad WHIRLPOOL a4523fe5d67cd89f200cd0a9a8c974c206d80fff246352c8ba9285c3b980682d8330b2bf894cfea58ade840685890ba2872f2320e4c9c558a21e2e946a708b29
diff --git a/app-backup/bareos/bareos-12.4.5.ebuild b/app-backup/bareos/bareos-12.4.5.ebuild
new file mode 100644
index 0000000..ac8e458
--- /dev/null
+++ b/app-backup/bareos/bareos-12.4.5.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 qt4-r2 user
+
+#MY_PV=${PV/_beta/-b}
+#MY_P=${PN}-${MY_PV}
+
+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"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl clientonly +director dynamic-cats-backends examples 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
+ )
+ 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 )
+ sys-libs/zlib
+ dev-libs/lzo
+ sys-libs/ncurses
+ ssl? ( dev-libs/openssl )
+ )
+ 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="|| ( ^^ ( mysql postgres sqlite3 ) clientonly )
+ static? ( clientonly )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_setup() {
+ #XOR and !clientonly controlled by REQUIRED_USE
+ use mysql && export mydbtype="mysql"
+ use postgres && export mydbtype="postgresql"
+ use sqlite3 && export mydbtype="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 466688 drop deprecated categories from Desktop file
+ sed -i -e 's/Application;//' src/qt-console/bat.desktop.in || 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
+
+ # fix file not found error during make depend
+ #epatch "${FILESDIR}"/5.2.12/${PN}-5.2.12-depend.patch
+}
+
+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)"
+ else
+ myconf="${myconf} \
+ $(use_enable director build-dird) \
+ $(use_enable storage-daemon 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} \
+ --enable-batch-insert"
+ fi
+
+ # do not build bat 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_with python) \
+ $(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) \
+ $(use_enable dynamic-cats-backends) \
+ $(use_enable scsi-crypto) \
+ $(use_enable sql-pooling) \
+ $(use_enable ndmp)"
+
+ econf \
+ --libdir=/usr/$(get_libdir) \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --with-pid-dir=/run \
+ --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 \
+ --disable-afs \
+ --host=${CHOST} \
+ ${myconf}
+ # correct configuration for QT based bat
+ if use qt4 ; then
+ pushd src/qt-console
+ 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 database update scripts
+ #diropts -m0750
+ #insinto /usr/libexec/bareos/cats
+ #insopts -m0754
+ #doins "${S}"/src/cats/*
+ #fperms 0640 /usr/libexec/bareos/cats/README
+
+ # 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
+ #rm -vf "${D}"/usr/share/man/man1/bareos-tray-monitor.1*
+ 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 ChangeLog ReleaseNotes SUPPORT technotes
+ use ndmp && dodoc README.NDMP
+ use scsi-crypto && dodoc README.scsicrypto
+
+ # 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/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)
+ case "${mydbtype}" in
+ sqlite3)
+ # sqlite3 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
+
+ # 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
+
+ # make sure bareos group can execute bareos programs
+ # TBD
+}
+
+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 ${mydbtype} databases with:"
+ einfo " /usr/libexec/bareos/create_${mydbtype}_database"
+ einfo " /usr/libexec/bareos/make_${mydbtype}_tables"
+ einfo " /usr/libexec/bareos/grant_${mydbtype}_privileges"
+ einfo
+ fi
+
+ if use sqlite3; then
+ einfo
+ einfo "Be aware that Bareos 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=qt4'."
+ einfo
+}
diff --git a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
new file mode 100644
index 0000000..3cdee15
--- /dev/null
+++ b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
@@ -0,0 +1,27 @@
+# stop build if there are errors in subdirs
+--- Makefile.in.orig 2010-07-20 16:53:44.000000000 +0000
++++ Makefile.in 2010-07-20 16:55:50.000000000 +0000
+@@ -44,9 +44,8 @@
+
+ all: Makefile
+ @for I in ${all_subdirs}; \
+- do (cd $$I; echo "==>Entering directory `pwd`"; \
+- $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
+- echo ""; echo ""; exit 1;)); \
++ do \
++ $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
+ done
+
+ depend:
+@@ -55,9 +54,8 @@
+
+ bacula-fd: Makefile
+ @for I in ${fd_subdirs}; \
+- do (cd $$I; echo "==>Entering directory `pwd`"; \
+- $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
+- echo ""; echo ""; exit 1;)); \
++ do \
++ $(MAKE) DESTDIR=$(DESTDIR) -C $$I all || exit 1; \
+ done
+
+ #-------------------------------------------------------------------------
diff --git a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
new file mode 100644
index 0000000..94d8fb6
--- /dev/null
+++ b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
@@ -0,0 +1,11 @@
+# bat needs to respect LDFLAGS
+--- src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.000000000 +0000
++++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000
+@@ -26,6 +26,7 @@
+ QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += .libs/* bat
++QMAKE_LFLAGS += @LDFLAGS@
+
+ qwt {
+ INCLUDEPATH += @QWT_INC@
diff --git a/app-backup/bareos/files/bareos-dir.confd b/app-backup/bareos/files/bareos-dir.confd
new file mode 100644
index 0000000..07f906c
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir.confd
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Config file for /etc/init.d/bareos-dir
+
+# If the database server where you store your bareos catalog
+# is on a different machine, please set this to 0.
+# Setting it to 1 makes bareos-dir depend on the corresponding
+# database service selected at package compile time.
+LOCAL_DB=1
+
+# Options for the director daemon.
+# The director can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+DIR_OPTIONS="-u root -g bareos -c /etc/bareos/bareos-dir.conf"
diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd
new file mode 100644
index 0000000..bbcaed0
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+ need net
+ if [ "${LOCAL_DB}" -eq 1 ]; then
+ need "%database%"
+ fi
+ use dns bareos-fd bareos-sd
+}
+
+start() {
+ ebegin "Starting bareos director"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
+ -- ${DIR_OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping bareos director"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bareos-dir.*.pid
+ eend $?
+}
diff --git a/app-backup/bareos/files/bareos-fd.confd b/app-backup/bareos/files/bareos-fd.confd
new file mode 100644
index 0000000..4bcea49
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Config file for /etc/init.d/bareos-fd
+
+# Options for the file daemon.
+FD_OPTIONS="-u root -g bareos -c /etc/bareos/bareos-fd.conf"
diff --git a/app-backup/bareos/files/bareos-fd.initd b/app-backup/bareos/files/bareos-fd.initd
new file mode 100644
index 0000000..2fdf4fb
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+ need net
+ use dns
+}
+
+start() {
+ ebegin "Starting bareos file daemon"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \
+ -- ${FD_OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping bareos file daemon"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bareos-fd.*.pid
+ eend $?
+}
diff --git a/app-backup/bareos/files/bareos-sd.confd b/app-backup/bareos/files/bareos-sd.confd
new file mode 100644
index 0000000..9e112f7
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd.confd
@@ -0,0 +1,11 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Config file for /etc/init.d/bareos-sd
+
+# Options for the storage daemon.
+# The storage daemon can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+SD_OPTIONS="-u root -g bareos -c /etc/bareos/bareos-sd.conf"
diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd
new file mode 100644
index 0000000..3fa3112
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+ need net
+ use dns
+}
+
+start() {
+ ebegin "Starting bareos storage daemon"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \
+ -- ${SD_OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping bareos storage daemon"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bareos-sd.*.pid
+ eend $?
+}
diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
new file mode 100644
index 0000000..e022705
--- /dev/null
+++ b/app-backup/bareos/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>app-backup</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <use>
+ <flag name='clientonly'>Only install file-daemon (client)</flag>
+ <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='ndmp'>Enable support for NDMP (Network Data Management Protocol)</flag>
+ <flag name='dynamic-cats-backends'>Support dynamic loading of catalog backends</flag>
+ <flag name='sql-pooling'>Enable SQL pooling support</flag>
+ <flag name='scsi-crypto'>Enable low level SCSI crypto support</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/mschiff:master commit in: app-backup/bareos/, app-backup/bareos/files/
@ 2013-10-21 16:09 Marc Schiffbauer
0 siblings, 0 replies; 5+ messages in thread
From: Marc Schiffbauer @ 2013-10-21 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 733265b4cbe677f86ebeb3a5d9b9bd136e952a89
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 16:08:34 2013 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 16:08:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=commit;h=733265b4
honor possibility in bareas to have more than one db backend
---
app-backup/bareos/Manifest | 8 ++--
app-backup/bareos/bareos-12.4.5.ebuild | 78 ++++++++++++--------------------
app-backup/bareos/files/bareos-dir.confd | 11 +++--
app-backup/bareos/files/bareos-dir.initd | 3 --
app-backup/bareos/metadata.xml | 1 -
5 files changed, 39 insertions(+), 62 deletions(-)
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index c7a34df..eb715f5 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,11 +1,11 @@
AUX bareos-12.4.5-Makefile.patch 924 SHA256 0b2428d3ee7ea5ceae4e02d3c315cc6f6b59d21d44749967dd121e29c060942d SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed WHIRLPOOL 0aeddbe01415260fce862dfa0b387bb5a443b29ed1367ea0fb0c2350c2af24f4f1934497d1590612fa3a3e62e929e5811caa9591e99e5a76fcfc6d73769baa1a
AUX bareos-12.4.5-bat-ldflags.patch 389 SHA256 b4b569fecdecbef0b5e0c1bcafddd61a48893ee1e33b52289a455a4773adc9ca SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434 WHIRLPOOL 488a764b303c3ed077d55bf04ae91e33d24c69c71476d8ad3416608f60a8071471a96f2a539266509b20133d5cf0e0f66ac284aee99f5378030b7a6c394a1987
-AUX bareos-dir.confd 642 SHA256 5e0bfd70526980d044e433cb5ebb90df484915aed03b6b2c8255c0dd44a1902c SHA512 9eba6c11c37ffc0e8ac295f6d08f8ec956b033ddb99f980dabe130b30055ef01374fd1f3b89974d36845f40b436a9a34ed9ea47cf5596a1ccb266dfd45358353 WHIRLPOOL 760a9f09519dccc8ca3803f163a6739fce3dde1d2f6f7c5ba0ea1232ca7d48b3aeface2091be93c171dafa3be0975706212c726fe0499212ffdc64a67c725a44
-AUX bareos-dir.initd 517 SHA256 81df96bf0bdf9c25f9fb20e8b45039bb78adee3debf85cae0f7bce7a864728d5 SHA512 5529790b8b4215db06aa72ea1cab220cd35d81241d525ba255d93768ef6f340322ab67a2aee0e9ca2f8da7a6b58842b25e6cae08f6afdebaf65eb2e2e159a602 WHIRLPOOL 92c485d5a4e72a974c894a6bfa4e98d8d1a80c3e08c45bea846cc2e81c3efc2cf6173e52a94c0985b811db3cf7b32b9e8f42b7bf6e102906fe46e0c401b6cccc
+AUX bareos-dir.confd 685 SHA256 7d8775c189968a3dd0555f3fa39396afbcf2921a72df68cc2515384a11ad8fec SHA512 e1035f2177e4e7d187b3e8f7f9bcafa2af70e93981292c4892756704eccb747b4e3ffb17ea3f5cc7587e51e7df033c7320742c347d642a7865cee63eb0c223ee WHIRLPOOL c5fa364e6186989321e2c6b33f288022f9a27bb0f8ad4aa2854838f6638c7c0fca12bbfe58759e2f76d764fab99d88b10d7f0d66e961d39e15efa378d1e9aa85
+AUX bareos-dir.initd 459 SHA256 c3387ddd3f6b16d82691a258a2268932267af0c99a4b34cb1b501e7dccfdf242 SHA512 4377ae0d3e45ee1ef714ad2f2c93e7ef272394f4c177df336f3ac1bf474a013699629452918c93bcfb50596059d90a960a1d04684f5def55e6dbf9be1f8c2949 WHIRLPOOL 220bdd0b0a933f6663f3e54ec32ece64e0ae167afb9fd0ec701c00488bee3cf0e97414f2efb8a6e0ceed5d44f49f1df47337152951170f9d9af71dc227506ef8
AUX bareos-fd.confd 255 SHA256 316257677f732c18aced4e8ec8a9e19102fbab475c270650ecdb9f69334fe208 SHA512 8c57e747c00199b33298437abdf4d54a36daa4df7f954a9352e48524762499a8162f141fc4f335f542b3e4e5d7c8c49c80d0e51e9e572c38f78be415cbd55112 WHIRLPOOL d0853f81364f976c0059b2171fbe5981bd7a6fec62bbe89eddcf36fc5511fa3169267af860689c5aff0a4e6cd0e78a6b9680d2d858d5a2930f49b3527e6b7041
AUX bareos-fd.initd 442 SHA256 85c2e72112400180187b39eb3733f746b28141a235c1a4e0ec53e6f01c29586f SHA512 6574c85bf06853b28787afa72ff673fe8d234b7388f63b4fbbf5809d6bd8aa82a974a5f3196e548cf06a4a5c30ff095015f4c2c7d326ebf4ac5fe4e5d7fb947c WHIRLPOOL 5c302c1d25c1778919d0efe4bdbbd01840b8f37bf0c1b3f4e52d3dec5c210c0b884879256d1a51b7d027e4a00778a7633162a8b7d8a6a44bd9c293a96c79022b
AUX bareos-sd.confd 404 SHA256 61d0da00895796331122eb235283b9b1f31b04c5b85ab68437d21c280577fcf6 SHA512 fce624688561ab81c4233bb7c474f611eaa21377b427da612aded499fa71118204399e9ec6b36fcbaa6806e1723e728b37d9467a5ac8046e36b68ed6b83dec9a WHIRLPOOL dadc545bb75cb1bbf6eb865821227d1ed0e14986a03999e2fcc50a0cb601a4215aa62390e91aabd3555c4f4fbdf81dca074dcdd013a32bcc126e516487d6e00c
AUX bareos-sd.initd 449 SHA256 8f56ac5b188316367d38190dfc53495cf36b3a89cf1711ded0457d79af1daea4 SHA512 d91aba327f1322277e0f2a6d494dc45b83113f07b86bb222f849ae008b90d11a95159753cd464a4250f549149f6c1fcadce29b521831ed19662cb0da759aa941 WHIRLPOOL 287adef27983c407beb77b18d0da71b27a095a9c5798327257afef9dd02b039b1d4416cbc361fea06ff39584405d71bd5f7884ca759ae239bfad105f69c15408
DIST bareos-12.4.5.tar.gz 3496879 SHA256 2defc15ed4fb6483e1d45ea63bb9cb8ba009e2b31c7755544984f1813bf4e017 SHA512 a59e95bc9b4a5147d8254e6b802c411956d324571ac084f5cb11629ddad59d605cdad2ab7b86f001af8c32faf15070833f233a44cbefaf71d13cad05faaba5cf WHIRLPOOL c95492acb57729e45a6ff5d2ae1894de4ebdb9e416d9f8a5beeef89ccf563a12ea8d5cdb943c2b6ec5681fb2bf0d348fb5e089ecac571256a835b4fd1a4459c8
-EBUILD bareos-12.4.5.ebuild 11467 SHA256 7908609df09149fbd319adb035be63c13710c3a80c6f2d0497026d916b0b38ba SHA512 1c4439fcebc0b9f8c7593a44fd82dd6cd10daa95f06bbae168beeffdbf74fca8b888c38301c5d9dfeb145749ac0f2312a1186f899f63d8d5e0cdb0d66c28ca82 WHIRLPOOL 7ccd83c97df328e6a1a240c4b2c5378ccb4aa157bb48db5d2748660654fc8ac7743ef5d92e65d8cc7ce13e73e9647eb9f2ac5bc3a66811783305ae7e7c38885b
-MISC metadata.xml 835 SHA256 d56d43bab17d98b05de2400c1ee935d12dc4fcdaa053b6b5fe363ee1d4428626 SHA512 2dc1cb1185fa7d7645ee221f5f8a8b7df1db9015902bf714e3d91c8282daaa35f25d2b3445d7cf42f04ba796a3eff88fef48c9caf2ffd94190f434db8af2b2ad WHIRLPOOL a4523fe5d67cd89f200cd0a9a8c974c206d80fff246352c8ba9285c3b980682d8330b2bf894cfea58ade840685890ba2872f2320e4c9c558a21e2e946a708b29
+EBUILD bareos-12.4.5.ebuild 10832 SHA256 74b565056574a62a2431444a2b339c582938852c65e40a27e7c68fc27040c7b9 SHA512 dcf1959b68f9032b554da014c4350ed6946afb21d3f38d3beb99ad259bbf7d62905b70f0e20c84eb0083e39034c4f86765ba3a3480da1a0d112834c587d0b3a2 WHIRLPOOL 7302cd9d6564388898654d768b0777217eed0787ef035daac232578c6d0c9e1c9c45441f5e1ea401f763428f33c9fa578495860dfa08b640c9f98cc89f1147a1
+MISC metadata.xml 747 SHA256 6768fbb6797156facd489a2a04c577b11c0b4399827818a3d35cfeba806e06d7 SHA512 02514d479215f287fbbde5860a4cbd7217e2239b2f3f307630061fc340830cb895f001d12566d3db333a4f27446499f646f84f8bdd520eec86405fa398652207 WHIRLPOOL 82cc934911233a460210beb21cef759448f4dbeeecc785130e1425e43c0e231c3d78c75c46ec944a47065c5341d03e6a97682ec6758eb24edbd2f7212774556a
diff --git a/app-backup/bareos/bareos-12.4.5.ebuild b/app-backup/bareos/bareos-12.4.5.ebuild
index ac8e458..ce3f1e4 100644
--- a/app-backup/bareos/bareos-12.4.5.ebuild
+++ b/app-backup/bareos/bareos-12.4.5.ebuild
@@ -19,9 +19,9 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="acl clientonly +director dynamic-cats-backends examples ipv6 logwatch mysql
- ndmp postgres python qt4 readline scsi-crypto sql-pooling +sqlite3 ssl static
- +storage-daemon tcpd vim-syntax X"
+IUSE="acl clientonly +director examples 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
@@ -64,17 +64,17 @@ RDEPEND="${DEPEND}
)
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) clientonly )
- static? ( clientonly )
+#REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) clientonly )
+REQUIRED_USE="static? ( clientonly )
python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${PN}-Release-${PV}
pkg_setup() {
#XOR and !clientonly controlled by REQUIRED_USE
- use mysql && export mydbtype="mysql"
- use postgres && export mydbtype="postgresql"
- use sqlite3 && export mydbtype="sqlite3"
+ 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
@@ -147,16 +147,6 @@ src_configure() {
$(use_enable !static libtool) \
$(use_enable static static-cons) \
$(use_enable static static-fd)"
- else
- myconf="${myconf} \
- $(use_enable director build-dird) \
- $(use_enable storage-daemon 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} \
- --enable-batch-insert"
fi
# do not build bat if 'static' clientonly
@@ -168,18 +158,21 @@ src_configure() {
myconf="${myconf} \
$(use_with X x) \
- $(use_with python) \
- $(use_enable !readline conio) \
+ $(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 mysql) \
+ $(use_with postgres postgresql) \
+ $(use_with python) \
$(use_with readline readline /usr) \
+ $(use_with sqlite3) \
$(use_with ssl openssl) \
- $(use_enable ipv6) \
- $(use_enable acl) \
$(use_with tcpd tcp-wrappers) \
- $(use_enable dynamic-cats-backends) \
- $(use_enable scsi-crypto) \
- $(use_enable sql-pooling) \
- $(use_enable ndmp)"
+ "
econf \
--libdir=/usr/$(get_libdir) \
@@ -200,6 +193,8 @@ src_configure() {
--with-fd-group=bareos \
--with-sbin-perm=0755 \
--enable-smartalloc \
+ --enable-dynamic-cats-backends \
+ --enable-batch-insert \
--disable-afs \
--host=${CHOST} \
${myconf}
@@ -248,13 +243,6 @@ src_install() {
# extra files which 'make install' doesn't cover
if ! use clientonly; then
- # the database update scripts
- #diropts -m0750
- #insinto /usr/libexec/bareos/cats
- #insopts -m0754
- #doins "${S}"/src/cats/*
- #fperms 0640 /usr/libexec/bareos/cats/README
-
# the logrotate configuration
# (now unconditional wrt bug #258187)
diropts -m0755
@@ -279,7 +267,6 @@ src_install() {
if ! use qt4; then
rm -vf "${D}"/usr/share/man/man1/bat.1*
fi
- #rm -vf "${D}"/usr/share/man/man1/bareos-tray-monitor.1*
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*
@@ -315,7 +302,7 @@ src_install() {
fi
# documentation
- #dodoc ChangeLog ReleaseNotes SUPPORT technotes
+ dodoc README.md
use ndmp && dodoc README.NDMP
use scsi-crypto && dodoc README.scsicrypto
@@ -352,16 +339,7 @@ src_install() {
# now set the database dependency for the director init script
case "${script}" in
bareos-dir)
- case "${mydbtype}" in
- sqlite3)
- # sqlite3 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
+ sed -i -e "s:%databasetypes%:${mydbtypes}:" "${T}/${script}".confd || die
;;
*)
;;
@@ -392,10 +370,12 @@ pkg_postinst() {
if ! use clientonly && use director; then
einfo
- einfo "If this is a new install, you must create the ${mydbtype} databases with:"
- einfo " /usr/libexec/bareos/create_${mydbtype}_database"
- einfo " /usr/libexec/bareos/make_${mydbtype}_tables"
- einfo " /usr/libexec/bareos/grant_${mydbtype}_privileges"
+ einfo "If this is a new install, you must create the databases with:"
+ einfo " /usr/libexec/bareos/create_bareos_database <dbtype>"
+ einfo " /usr/libexec/bareos/make_bareos_tables <dbtype>"
+ einfo " /usr/libexec/bareos/grant_bareos_privileges <dbtype>"
+ einfo
+ einfo "where <dbtype> is one sqlite3, mysql or postgresql"
einfo
fi
diff --git a/app-backup/bareos/files/bareos-dir.confd b/app-backup/bareos/files/bareos-dir.confd
index 07f906c..f2b95d2 100644
--- a/app-backup/bareos/files/bareos-dir.confd
+++ b/app-backup/bareos/files/bareos-dir.confd
@@ -4,11 +4,12 @@
# Config file for /etc/init.d/bareos-dir
-# If the database server where you store your bareos catalog
-# is on a different machine, please set this to 0.
-# Setting it to 1 makes bareos-dir depend on the corresponding
-# database service selected at package compile time.
-LOCAL_DB=1
+# Bareos can use more than one catalog database and each one can
+# be of any supported type.
+# If a database server where you store a bareos catalog
+# is on a different machine, you might want to remove the corresponding
+# type from the rc_need variable.
+rc_need="%databasetypes%"
# Options for the director daemon.
# The director can be run as a non-root user, however
diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd
index bbcaed0..0026b20 100644
--- a/app-backup/bareos/files/bareos-dir.initd
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -5,9 +5,6 @@
depend() {
need net
- if [ "${LOCAL_DB}" -eq 1 ]; then
- need "%database%"
- fi
use dns bareos-fd bareos-sd
}
diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
index e022705..3918a62 100644
--- a/app-backup/bareos/metadata.xml
+++ b/app-backup/bareos/metadata.xml
@@ -12,7 +12,6 @@
<flag name='storage-daemon'>Install storage daemon (bareos-sd)</flag>
<flag name='logwatch'>Install support files for logwatch</flag>
<flag name='ndmp'>Enable support for NDMP (Network Data Management Protocol)</flag>
- <flag name='dynamic-cats-backends'>Support dynamic loading of catalog backends</flag>
<flag name='sql-pooling'>Enable SQL pooling support</flag>
<flag name='scsi-crypto'>Enable low level SCSI crypto support</flag>
</use>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/mschiff:master commit in: app-backup/bareos/, app-backup/bareos/files/
@ 2013-10-21 21:30 Marc Schiffbauer
0 siblings, 0 replies; 5+ messages in thread
From: Marc Schiffbauer @ 2013-10-21 21:30 UTC (permalink / raw
To: gentoo-commits
commit: d990386c4c2cb70cc7ca464df69b7ddd0b6f4c48
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 21:30:00 2013 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 21:30:00 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=commit;h=d990386c
fix pid file paths in init scripts
---
app-backup/bareos/Manifest | 6 +++---
app-backup/bareos/files/bareos-dir.initd | 2 +-
app-backup/bareos/files/bareos-fd.initd | 2 +-
app-backup/bareos/files/bareos-sd.initd | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index f880a8f..1f69bae 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,11 +1,11 @@
AUX bareos-12.4.5-Makefile.patch 924 SHA256 0b2428d3ee7ea5ceae4e02d3c315cc6f6b59d21d44749967dd121e29c060942d SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed WHIRLPOOL 0aeddbe01415260fce862dfa0b387bb5a443b29ed1367ea0fb0c2350c2af24f4f1934497d1590612fa3a3e62e929e5811caa9591e99e5a76fcfc6d73769baa1a
AUX bareos-12.4.5-bat-ldflags.patch 389 SHA256 b4b569fecdecbef0b5e0c1bcafddd61a48893ee1e33b52289a455a4773adc9ca SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434 WHIRLPOOL 488a764b303c3ed077d55bf04ae91e33d24c69c71476d8ad3416608f60a8071471a96f2a539266509b20133d5cf0e0f66ac284aee99f5378030b7a6c394a1987
AUX bareos-dir.confd 685 SHA256 7d8775c189968a3dd0555f3fa39396afbcf2921a72df68cc2515384a11ad8fec SHA512 e1035f2177e4e7d187b3e8f7f9bcafa2af70e93981292c4892756704eccb747b4e3ffb17ea3f5cc7587e51e7df033c7320742c347d642a7865cee63eb0c223ee WHIRLPOOL c5fa364e6186989321e2c6b33f288022f9a27bb0f8ad4aa2854838f6638c7c0fca12bbfe58759e2f76d764fab99d88b10d7f0d66e961d39e15efa378d1e9aa85
-AUX bareos-dir.initd 459 SHA256 c3387ddd3f6b16d82691a258a2268932267af0c99a4b34cb1b501e7dccfdf242 SHA512 4377ae0d3e45ee1ef714ad2f2c93e7ef272394f4c177df336f3ac1bf474a013699629452918c93bcfb50596059d90a960a1d04684f5def55e6dbf9be1f8c2949 WHIRLPOOL 220bdd0b0a933f6663f3e54ec32ece64e0ae167afb9fd0ec701c00488bee3cf0e97414f2efb8a6e0ceed5d44f49f1df47337152951170f9d9af71dc227506ef8
+AUX bareos-dir.initd 455 SHA256 773fb193f317d7dd5cb93f018e719e4da8e611316000f45dfddb86e0b4b24eaf SHA512 fe0df1ec630438c06779b39c54497f7cc02fb970e0a46f5b1aa77172d10cf39d046b18de22237b80620bac0c8ce28c60e83dcf233673cbbd304149e34a4ce4fe WHIRLPOOL 109118d007119d98598ec23109817d769fe7de48145860f5e29f86479e888dfc484aa06bae81b7e52c84a47697d4b05acfb4db9616c277b0786e7cc4bc564e56
AUX bareos-fd.confd 255 SHA256 316257677f732c18aced4e8ec8a9e19102fbab475c270650ecdb9f69334fe208 SHA512 8c57e747c00199b33298437abdf4d54a36daa4df7f954a9352e48524762499a8162f141fc4f335f542b3e4e5d7c8c49c80d0e51e9e572c38f78be415cbd55112 WHIRLPOOL d0853f81364f976c0059b2171fbe5981bd7a6fec62bbe89eddcf36fc5511fa3169267af860689c5aff0a4e6cd0e78a6b9680d2d858d5a2930f49b3527e6b7041
-AUX bareos-fd.initd 442 SHA256 85c2e72112400180187b39eb3733f746b28141a235c1a4e0ec53e6f01c29586f SHA512 6574c85bf06853b28787afa72ff673fe8d234b7388f63b4fbbf5809d6bd8aa82a974a5f3196e548cf06a4a5c30ff095015f4c2c7d326ebf4ac5fe4e5d7fb947c WHIRLPOOL 5c302c1d25c1778919d0efe4bdbbd01840b8f37bf0c1b3f4e52d3dec5c210c0b884879256d1a51b7d027e4a00778a7633162a8b7d8a6a44bd9c293a96c79022b
+AUX bareos-fd.initd 438 SHA256 f84649bfb2b2f1f2ed33d4f33f5bc5f61bb05456aa7c8b4e815ddd9a08f9f627 SHA512 bcb2e42c870b117fafbcc3755977b3f91ab8ef91b83db47ad66be0e314d79386a1ece2d080ae5d9059ba295cc17a47a8745fccce4c6353797802a3d0c240d175 WHIRLPOOL d79b0a87faf7aac3f9a9da090cbc1439f20fc1550f8d147af04a96bedc135d0804c5215cd967264135034def1a0a7b76772c82d5090f7a948eb8165d5f96bae4
AUX bareos-sd.confd 404 SHA256 61d0da00895796331122eb235283b9b1f31b04c5b85ab68437d21c280577fcf6 SHA512 fce624688561ab81c4233bb7c474f611eaa21377b427da612aded499fa71118204399e9ec6b36fcbaa6806e1723e728b37d9467a5ac8046e36b68ed6b83dec9a WHIRLPOOL dadc545bb75cb1bbf6eb865821227d1ed0e14986a03999e2fcc50a0cb601a4215aa62390e91aabd3555c4f4fbdf81dca074dcdd013a32bcc126e516487d6e00c
-AUX bareos-sd.initd 449 SHA256 8f56ac5b188316367d38190dfc53495cf36b3a89cf1711ded0457d79af1daea4 SHA512 d91aba327f1322277e0f2a6d494dc45b83113f07b86bb222f849ae008b90d11a95159753cd464a4250f549149f6c1fcadce29b521831ed19662cb0da759aa941 WHIRLPOOL 287adef27983c407beb77b18d0da71b27a095a9c5798327257afef9dd02b039b1d4416cbc361fea06ff39584405d71bd5f7884ca759ae239bfad105f69c15408
+AUX bareos-sd.initd 444 SHA256 dcbe32a148be18533a9e9e797c39c98531810b451743f9df62c9a035d2ca87c9 SHA512 d36446bab66fd8559bd38fe726a735d40c5c366e5b2f0920d8fc5a2727ef17e542725e0436839796ba2236ad4cced251c17babb737d5b826ad7de44f3fe016ab WHIRLPOOL 262ac57a0a503ef73c06362d9d49979a1b5b4ce7e1a270741efe9ccbdbf83faae48ef00ab43364ef5497c6d943cfc9c80bd2cda172c8688ddb369940cdfaf682
DIST bareos-12.4.5.tar.gz 3496879 SHA256 2defc15ed4fb6483e1d45ea63bb9cb8ba009e2b31c7755544984f1813bf4e017 SHA512 a59e95bc9b4a5147d8254e6b802c411956d324571ac084f5cb11629ddad59d605cdad2ab7b86f001af8c32faf15070833f233a44cbefaf71d13cad05faaba5cf WHIRLPOOL c95492acb57729e45a6ff5d2ae1894de4ebdb9e416d9f8a5beeef89ccf563a12ea8d5cdb943c2b6ec5681fb2bf0d348fb5e089ecac571256a835b4fd1a4459c8
EBUILD bareos-12.4.5.ebuild 11116 SHA256 e857b613b5ce17b3bb9ccebc84f44feebd4385732f8ec7509c596f8d1008ef78 SHA512 26bec329c9d51655a532ec3252dfa12c3d045bcd066cbb0fb3a07e76b85121d72401d7d748b2fdf26d38f847644b352b1fd472e49f90b37c71a9d2b99d722464 WHIRLPOOL 192d4a8f33a56c0921bc83901951624763ecbc594fdd12641935a3890372f66a48c3f39f259c9c1a48a53c12680d63533ad81b55d1bb7b92ec579d4a4c219972
MISC metadata.xml 747 SHA256 6768fbb6797156facd489a2a04c577b11c0b4399827818a3d35cfeba806e06d7 SHA512 02514d479215f287fbbde5860a4cbd7217e2239b2f3f307630061fc340830cb895f001d12566d3db333a4f27446499f646f84f8bdd520eec86405fa398652207 WHIRLPOOL 82cc934911233a460210beb21cef759448f4dbeeecc785130e1425e43c0e231c3d78c75c46ec944a47065c5341d03e6a97682ec6758eb24edbd2f7212774556a
diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd
index 0026b20..3dfd20c 100644
--- a/app-backup/bareos/files/bareos-dir.initd
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -17,6 +17,6 @@ start() {
stop() {
ebegin "Stopping bareos director"
- start-stop-daemon --stop --quiet --pidfile /var/run/bareos-dir.*.pid
+ start-stop-daemon --stop --quiet --pidfile /run/bareos-dir.*.pid
eend $?
}
diff --git a/app-backup/bareos/files/bareos-fd.initd b/app-backup/bareos/files/bareos-fd.initd
index 2fdf4fb..4242a9e 100644
--- a/app-backup/bareos/files/bareos-fd.initd
+++ b/app-backup/bareos/files/bareos-fd.initd
@@ -17,6 +17,6 @@ start() {
stop() {
ebegin "Stopping bareos file daemon"
- start-stop-daemon --stop --quiet --pidfile /var/run/bareos-fd.*.pid
+ start-stop-daemon --stop --quiet --pidfile /run/bareos-fd.*.pid
eend $?
}
diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd
index 3fa3112..77af41d 100644
--- a/app-backup/bareos/files/bareos-sd.initd
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -17,6 +17,6 @@ start() {
stop() {
ebegin "Stopping bareos storage daemon"
- start-stop-daemon --stop --quiet --pidfile /var/run/bareos-sd.*.pid
+ start-stop-daemon --stop --quiet --pidfile /un/bareos-sd.*.pid
eend $?
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/mschiff:master commit in: app-backup/bareos/, app-backup/bareos/files/
@ 2013-10-21 21:41 Marc Schiffbauer
0 siblings, 0 replies; 5+ messages in thread
From: Marc Schiffbauer @ 2013-10-21 21:41 UTC (permalink / raw
To: gentoo-commits
commit: c54898665c68c2da8b171590a65ec3b9b1c76b35
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 21:40:42 2013 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 21:40:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=commit;h=c5489866
fix path in sd init script, einfo cleanup
---
app-backup/bareos/Manifest | 4 ++--
app-backup/bareos/bareos-12.4.5.ebuild | 3 ++-
app-backup/bareos/files/bareos-sd.initd | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 6f42b40..62ac21e 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -5,7 +5,7 @@ AUX bareos-dir.initd 455 SHA256 773fb193f317d7dd5cb93f018e719e4da8e611316000f45d
AUX bareos-fd.confd 255 SHA256 316257677f732c18aced4e8ec8a9e19102fbab475c270650ecdb9f69334fe208 SHA512 8c57e747c00199b33298437abdf4d54a36daa4df7f954a9352e48524762499a8162f141fc4f335f542b3e4e5d7c8c49c80d0e51e9e572c38f78be415cbd55112 WHIRLPOOL d0853f81364f976c0059b2171fbe5981bd7a6fec62bbe89eddcf36fc5511fa3169267af860689c5aff0a4e6cd0e78a6b9680d2d858d5a2930f49b3527e6b7041
AUX bareos-fd.initd 438 SHA256 f84649bfb2b2f1f2ed33d4f33f5bc5f61bb05456aa7c8b4e815ddd9a08f9f627 SHA512 bcb2e42c870b117fafbcc3755977b3f91ab8ef91b83db47ad66be0e314d79386a1ece2d080ae5d9059ba295cc17a47a8745fccce4c6353797802a3d0c240d175 WHIRLPOOL d79b0a87faf7aac3f9a9da090cbc1439f20fc1550f8d147af04a96bedc135d0804c5215cd967264135034def1a0a7b76772c82d5090f7a948eb8165d5f96bae4
AUX bareos-sd.confd 404 SHA256 61d0da00895796331122eb235283b9b1f31b04c5b85ab68437d21c280577fcf6 SHA512 fce624688561ab81c4233bb7c474f611eaa21377b427da612aded499fa71118204399e9ec6b36fcbaa6806e1723e728b37d9467a5ac8046e36b68ed6b83dec9a WHIRLPOOL dadc545bb75cb1bbf6eb865821227d1ed0e14986a03999e2fcc50a0cb601a4215aa62390e91aabd3555c4f4fbdf81dca074dcdd013a32bcc126e516487d6e00c
-AUX bareos-sd.initd 444 SHA256 dcbe32a148be18533a9e9e797c39c98531810b451743f9df62c9a035d2ca87c9 SHA512 d36446bab66fd8559bd38fe726a735d40c5c366e5b2f0920d8fc5a2727ef17e542725e0436839796ba2236ad4cced251c17babb737d5b826ad7de44f3fe016ab WHIRLPOOL 262ac57a0a503ef73c06362d9d49979a1b5b4ce7e1a270741efe9ccbdbf83faae48ef00ab43364ef5497c6d943cfc9c80bd2cda172c8688ddb369940cdfaf682
+AUX bareos-sd.initd 445 SHA256 4506733c8b9d069d9a683a346789379ab6235efd1dda59c8ed6f501e3abc9718 SHA512 11da3920d9619432181099b765930fdcdcd6eb4c5a68c3ddb815185418ad2e146eeba6c12de3f93d01665f8e525527d211765416cbf0d2b89700c68b1a93092d WHIRLPOOL 3b788276a572e80d67f29aba1b35f15dd4b6cffe3c5f1ed3296dab36e999e0d90d24bfefed0ffb4c3a8ed7f418f4fb1445ae3eaca59f09976b21efcedc0c406f
DIST bareos-12.4.5.tar.gz 3496879 SHA256 2defc15ed4fb6483e1d45ea63bb9cb8ba009e2b31c7755544984f1813bf4e017 SHA512 a59e95bc9b4a5147d8254e6b802c411956d324571ac084f5cb11629ddad59d605cdad2ab7b86f001af8c32faf15070833f233a44cbefaf71d13cad05faaba5cf WHIRLPOOL c95492acb57729e45a6ff5d2ae1894de4ebdb9e416d9f8a5beeef89ccf563a12ea8d5cdb943c2b6ec5681fb2bf0d348fb5e089ecac571256a835b4fd1a4459c8
-EBUILD bareos-12.4.5.ebuild 11114 SHA256 1f0395af0d3bf45d8136261edfcc248baa76a8775cd3695d43536d9159620db5 SHA512 ae04b419c36baacfaf13999c91c218a74380dd35b9237a04cbc6cc9f230d2323332378b7f445a027abf18f69d5eb66fd0514b6c6519a5142d53471827db44c2d WHIRLPOOL a514b2aaa8e4dd5c760cb201b34574776b2eadeb92348f3702046493d0a054d3b9a8471df83a236b19d346be47314602b4b2f0753cc2c23b21fc0d0b9b02d70f
+EBUILD bareos-12.4.5.ebuild 11124 SHA256 eef0d0648dfaf925af1d4525e57ff4053254d64fe1789981f057ac80c2390a38 SHA512 b6830807dac0c2c7bb260915334a9d22a2db7d7aa6ca61eee3212467856554bafee47ad634b10b2b71ab96de00f1067540ad78c91afc2a163c8f533c56c42002 WHIRLPOOL 56f01d424fd79ea2cfe9b341634229ba14ca4f39ec3f17fe0af4faeeae28363575756e76388a95ab63719b169365fa145bafb933ce65b31d648755a4feee3dd5
MISC metadata.xml 747 SHA256 6768fbb6797156facd489a2a04c577b11c0b4399827818a3d35cfeba806e06d7 SHA512 02514d479215f287fbbde5860a4cbd7217e2239b2f3f307630061fc340830cb895f001d12566d3db333a4f27446499f646f84f8bdd520eec86405fa398652207 WHIRLPOOL 82cc934911233a460210beb21cef759448f4dbeeecc785130e1425e43c0e231c3d78c75c46ec944a47065c5341d03e6a97682ec6758eb24edbd2f7212774556a
diff --git a/app-backup/bareos/bareos-12.4.5.ebuild b/app-backup/bareos/bareos-12.4.5.ebuild
index abdfc9c..ec86829 100644
--- a/app-backup/bareos/bareos-12.4.5.ebuild
+++ b/app-backup/bareos/bareos-12.4.5.ebuild
@@ -360,14 +360,15 @@ pkg_postinst() {
if ! use clientonly && use director; then
einfo
einfo "If this is a new install, you must create the databases with:"
- einfo
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"
diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd
index 77af41d..d71c6f4 100644
--- a/app-backup/bareos/files/bareos-sd.initd
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -17,6 +17,6 @@ start() {
stop() {
ebegin "Stopping bareos storage daemon"
- start-stop-daemon --stop --quiet --pidfile /un/bareos-sd.*.pid
+ start-stop-daemon --stop --quiet --pidfile /run/bareos-sd.*.pid
eend $?
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/mschiff:master commit in: app-backup/bareos/, app-backup/bareos/files/
@ 2013-10-21 21:54 Marc Schiffbauer
0 siblings, 0 replies; 5+ messages in thread
From: Marc Schiffbauer @ 2013-10-21 21:54 UTC (permalink / raw
To: gentoo-commits
commit: fee3873c1071dacafacdd8cb51dbab6d7e9320ad
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 21:54:28 2013 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 21:54:28 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=commit;h=fee3873c
bareos moved to tree
---
app-backup/bareos/Manifest | 11 -
app-backup/bareos/bareos-12.4.5.ebuild | 400 ---------------------
.../bareos/files/bareos-12.4.5-Makefile.patch | 27 --
.../bareos/files/bareos-12.4.5-bat-ldflags.patch | 11 -
app-backup/bareos/files/bareos-dir.confd | 18 -
app-backup/bareos/files/bareos-dir.initd | 22 --
app-backup/bareos/files/bareos-fd.confd | 8 -
app-backup/bareos/files/bareos-fd.initd | 22 --
app-backup/bareos/files/bareos-sd.confd | 11 -
app-backup/bareos/files/bareos-sd.initd | 22 --
app-backup/bareos/metadata.xml | 18 -
11 files changed, 570 deletions(-)
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
deleted file mode 100644
index 62ac21e..0000000
--- a/app-backup/bareos/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX bareos-12.4.5-Makefile.patch 924 SHA256 0b2428d3ee7ea5ceae4e02d3c315cc6f6b59d21d44749967dd121e29c060942d SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed WHIRLPOOL 0aeddbe01415260fce862dfa0b387bb5a443b29ed1367ea0fb0c2350c2af24f4f1934497d1590612fa3a3e62e929e5811caa9591e99e5a76fcfc6d73769baa1a
-AUX bareos-12.4.5-bat-ldflags.patch 389 SHA256 b4b569fecdecbef0b5e0c1bcafddd61a48893ee1e33b52289a455a4773adc9ca SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434 WHIRLPOOL 488a764b303c3ed077d55bf04ae91e33d24c69c71476d8ad3416608f60a8071471a96f2a539266509b20133d5cf0e0f66ac284aee99f5378030b7a6c394a1987
-AUX bareos-dir.confd 685 SHA256 7d8775c189968a3dd0555f3fa39396afbcf2921a72df68cc2515384a11ad8fec SHA512 e1035f2177e4e7d187b3e8f7f9bcafa2af70e93981292c4892756704eccb747b4e3ffb17ea3f5cc7587e51e7df033c7320742c347d642a7865cee63eb0c223ee WHIRLPOOL c5fa364e6186989321e2c6b33f288022f9a27bb0f8ad4aa2854838f6638c7c0fca12bbfe58759e2f76d764fab99d88b10d7f0d66e961d39e15efa378d1e9aa85
-AUX bareos-dir.initd 455 SHA256 773fb193f317d7dd5cb93f018e719e4da8e611316000f45dfddb86e0b4b24eaf SHA512 fe0df1ec630438c06779b39c54497f7cc02fb970e0a46f5b1aa77172d10cf39d046b18de22237b80620bac0c8ce28c60e83dcf233673cbbd304149e34a4ce4fe WHIRLPOOL 109118d007119d98598ec23109817d769fe7de48145860f5e29f86479e888dfc484aa06bae81b7e52c84a47697d4b05acfb4db9616c277b0786e7cc4bc564e56
-AUX bareos-fd.confd 255 SHA256 316257677f732c18aced4e8ec8a9e19102fbab475c270650ecdb9f69334fe208 SHA512 8c57e747c00199b33298437abdf4d54a36daa4df7f954a9352e48524762499a8162f141fc4f335f542b3e4e5d7c8c49c80d0e51e9e572c38f78be415cbd55112 WHIRLPOOL d0853f81364f976c0059b2171fbe5981bd7a6fec62bbe89eddcf36fc5511fa3169267af860689c5aff0a4e6cd0e78a6b9680d2d858d5a2930f49b3527e6b7041
-AUX bareos-fd.initd 438 SHA256 f84649bfb2b2f1f2ed33d4f33f5bc5f61bb05456aa7c8b4e815ddd9a08f9f627 SHA512 bcb2e42c870b117fafbcc3755977b3f91ab8ef91b83db47ad66be0e314d79386a1ece2d080ae5d9059ba295cc17a47a8745fccce4c6353797802a3d0c240d175 WHIRLPOOL d79b0a87faf7aac3f9a9da090cbc1439f20fc1550f8d147af04a96bedc135d0804c5215cd967264135034def1a0a7b76772c82d5090f7a948eb8165d5f96bae4
-AUX bareos-sd.confd 404 SHA256 61d0da00895796331122eb235283b9b1f31b04c5b85ab68437d21c280577fcf6 SHA512 fce624688561ab81c4233bb7c474f611eaa21377b427da612aded499fa71118204399e9ec6b36fcbaa6806e1723e728b37d9467a5ac8046e36b68ed6b83dec9a WHIRLPOOL dadc545bb75cb1bbf6eb865821227d1ed0e14986a03999e2fcc50a0cb601a4215aa62390e91aabd3555c4f4fbdf81dca074dcdd013a32bcc126e516487d6e00c
-AUX bareos-sd.initd 445 SHA256 4506733c8b9d069d9a683a346789379ab6235efd1dda59c8ed6f501e3abc9718 SHA512 11da3920d9619432181099b765930fdcdcd6eb4c5a68c3ddb815185418ad2e146eeba6c12de3f93d01665f8e525527d211765416cbf0d2b89700c68b1a93092d WHIRLPOOL 3b788276a572e80d67f29aba1b35f15dd4b6cffe3c5f1ed3296dab36e999e0d90d24bfefed0ffb4c3a8ed7f418f4fb1445ae3eaca59f09976b21efcedc0c406f
-DIST bareos-12.4.5.tar.gz 3496879 SHA256 2defc15ed4fb6483e1d45ea63bb9cb8ba009e2b31c7755544984f1813bf4e017 SHA512 a59e95bc9b4a5147d8254e6b802c411956d324571ac084f5cb11629ddad59d605cdad2ab7b86f001af8c32faf15070833f233a44cbefaf71d13cad05faaba5cf WHIRLPOOL c95492acb57729e45a6ff5d2ae1894de4ebdb9e416d9f8a5beeef89ccf563a12ea8d5cdb943c2b6ec5681fb2bf0d348fb5e089ecac571256a835b4fd1a4459c8
-EBUILD bareos-12.4.5.ebuild 11124 SHA256 eef0d0648dfaf925af1d4525e57ff4053254d64fe1789981f057ac80c2390a38 SHA512 b6830807dac0c2c7bb260915334a9d22a2db7d7aa6ca61eee3212467856554bafee47ad634b10b2b71ab96de00f1067540ad78c91afc2a163c8f533c56c42002 WHIRLPOOL 56f01d424fd79ea2cfe9b341634229ba14ca4f39ec3f17fe0af4faeeae28363575756e76388a95ab63719b169365fa145bafb933ce65b31d648755a4feee3dd5
-MISC metadata.xml 747 SHA256 6768fbb6797156facd489a2a04c577b11c0b4399827818a3d35cfeba806e06d7 SHA512 02514d479215f287fbbde5860a4cbd7217e2239b2f3f307630061fc340830cb895f001d12566d3db333a4f27446499f646f84f8bdd520eec86405fa398652207 WHIRLPOOL 82cc934911233a460210beb21cef759448f4dbeeecc785130e1425e43c0e231c3d78c75c46ec944a47065c5341d03e6a97682ec6758eb24edbd2f7212774556a
diff --git a/app-backup/bareos/bareos-12.4.5.ebuild b/app-backup/bareos/bareos-12.4.5.ebuild
deleted file mode 100644
index ec86829..0000000
--- a/app-backup/bareos/bareos-12.4.5.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl clientonly +director examples 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
- )
- 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 )
- sys-libs/zlib
- dev-libs/lzo
- sys-libs/ncurses
- ssl? ( dev-libs/openssl )
- )
- 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 mysql) \
- $(use_with postgres postgresql) \
- $(use_with python) \
- $(use_with readline readline /usr) \
- $(use_with 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 \
- --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
-
- # 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/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
-}
diff --git a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
deleted file mode 100644
index 3cdee15..0000000
--- a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# stop build if there are errors in subdirs
---- Makefile.in.orig 2010-07-20 16:53:44.000000000 +0000
-+++ Makefile.in 2010-07-20 16:55:50.000000000 +0000
-@@ -44,9 +44,8 @@
-
- all: Makefile
- @for I in ${all_subdirs}; \
-- do (cd $$I; echo "==>Entering directory `pwd`"; \
-- $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
-- echo ""; echo ""; exit 1;)); \
-+ do \
-+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
- done
-
- depend:
-@@ -55,9 +54,8 @@
-
- bacula-fd: Makefile
- @for I in ${fd_subdirs}; \
-- do (cd $$I; echo "==>Entering directory `pwd`"; \
-- $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
-- echo ""; echo ""; exit 1;)); \
-+ do \
-+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I all || exit 1; \
- done
-
- #-------------------------------------------------------------------------
diff --git a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
deleted file mode 100644
index 94d8fb6..0000000
--- a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# bat needs to respect LDFLAGS
---- src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.000000000 +0000
-+++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000
-@@ -26,6 +26,7 @@
- QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
-
- qwt {
- INCLUDEPATH += @QWT_INC@
diff --git a/app-backup/bareos/files/bareos-dir.confd b/app-backup/bareos/files/bareos-dir.confd
deleted file mode 100644
index f2b95d2..0000000
--- a/app-backup/bareos/files/bareos-dir.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Config file for /etc/init.d/bareos-dir
-
-# Bareos can use more than one catalog database and each one can
-# be of any supported type.
-# If a database server where you store a bareos catalog
-# is on a different machine, you might want to remove the corresponding
-# type from the rc_need variable.
-rc_need="%databasetypes%"
-
-# Options for the director daemon.
-# The director can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-DIR_OPTIONS="-u root -g bareos -c /etc/bareos/bareos-dir.conf"
diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd
deleted file mode 100644
index 3dfd20c..0000000
--- a/app-backup/bareos/files/bareos-dir.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
- need net
- use dns bareos-fd bareos-sd
-}
-
-start() {
- ebegin "Starting bareos director"
- start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
- -- ${DIR_OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping bareos director"
- start-stop-daemon --stop --quiet --pidfile /run/bareos-dir.*.pid
- eend $?
-}
diff --git a/app-backup/bareos/files/bareos-fd.confd b/app-backup/bareos/files/bareos-fd.confd
deleted file mode 100644
index 4bcea49..0000000
--- a/app-backup/bareos/files/bareos-fd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Config file for /etc/init.d/bareos-fd
-
-# Options for the file daemon.
-FD_OPTIONS="-u root -g bareos -c /etc/bareos/bareos-fd.conf"
diff --git a/app-backup/bareos/files/bareos-fd.initd b/app-backup/bareos/files/bareos-fd.initd
deleted file mode 100644
index 4242a9e..0000000
--- a/app-backup/bareos/files/bareos-fd.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
- need net
- use dns
-}
-
-start() {
- ebegin "Starting bareos file daemon"
- start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \
- -- ${FD_OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping bareos file daemon"
- start-stop-daemon --stop --quiet --pidfile /run/bareos-fd.*.pid
- eend $?
-}
diff --git a/app-backup/bareos/files/bareos-sd.confd b/app-backup/bareos/files/bareos-sd.confd
deleted file mode 100644
index 9e112f7..0000000
--- a/app-backup/bareos/files/bareos-sd.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Config file for /etc/init.d/bareos-sd
-
-# Options for the storage daemon.
-# The storage daemon can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-SD_OPTIONS="-u root -g bareos -c /etc/bareos/bareos-sd.conf"
diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd
deleted file mode 100644
index d71c6f4..0000000
--- a/app-backup/bareos/files/bareos-sd.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
- need net
- use dns
-}
-
-start() {
- ebegin "Starting bareos storage daemon"
- start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \
- -- ${SD_OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping bareos storage daemon"
- start-stop-daemon --stop --quiet --pidfile /run/bareos-sd.*.pid
- eend $?
-}
diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
deleted file mode 100644
index 3918a62..0000000
--- a/app-backup/bareos/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>app-backup</herd>
- <maintainer>
- <email>mschiff@gentoo.org</email>
- <name>Marc Schiffbauer</name>
- </maintainer>
- <use>
- <flag name='clientonly'>Only install file-daemon (client)</flag>
- <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='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>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-10-21 21:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-21 13:39 [gentoo-commits] dev/mschiff:master commit in: app-backup/bareos/, app-backup/bareos/files/ Marc Schiffbauer
-- strict thread matches above, loose matches on Subject: below --
2013-10-21 16:09 Marc Schiffbauer
2013-10-21 21:30 Marc Schiffbauer
2013-10-21 21:41 Marc Schiffbauer
2013-10-21 21:54 Marc Schiffbauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox