diff options
author | Marc Schiffbauer <mschiff@gentoo.org> | 2013-10-21 18:08:34 +0200 |
---|---|---|
committer | Marc Schiffbauer <mschiff@gentoo.org> | 2013-10-21 18:08:34 +0200 |
commit | 733265b4cbe677f86ebeb3a5d9b9bd136e952a89 (patch) | |
tree | b60fd1531af127a4bca2d963bac112788957a44f /app-backup | |
parent | fix Manifest (diff) | |
download | mschiff-733265b4cbe677f86ebeb3a5d9b9bd136e952a89.tar.gz mschiff-733265b4cbe677f86ebeb3a5d9b9bd136e952a89.tar.bz2 mschiff-733265b4cbe677f86ebeb3a5d9b9bd136e952a89.zip |
honor possibility in bareas to have more than one db backend
Diffstat (limited to 'app-backup')
-rw-r--r-- | app-backup/bareos/Manifest | 8 | ||||
-rw-r--r-- | app-backup/bareos/bareos-12.4.5.ebuild | 78 | ||||
-rw-r--r-- | app-backup/bareos/files/bareos-dir.confd | 11 | ||||
-rw-r--r-- | app-backup/bareos/files/bareos-dir.initd | 3 | ||||
-rw-r--r-- | 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> |