* [gentoo-commits] gentoo-x86 commit in app-backup/bacula: bacula-5.0.2-r2.ebuild ChangeLog
@ 2010-07-22 15:48 Thomas Beierlein (tomjbe)
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Beierlein (tomjbe) @ 2010-07-22 15:48 UTC (permalink / raw
To: gentoo-commits
tomjbe 10/07/22 15:48:51
Modified: ChangeLog
Added: bacula-5.0.2-r2.ebuild
Log:
- fix for bug #291160, #322181 and #326333
- add vimfiles
- make 'bat' respect LDFLAGS
- let 'make' fail if some error emerges in a subdir build
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.96 app-backup/bacula/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?r1=1.95&r2=1.96
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog 19 Jul 2010 09:10:09 -0000 1.95
+++ ChangeLog 22 Jul 2010 15:48:51 -0000 1.96
@@ -1,6 +1,16 @@
# ChangeLog for app-backup/bacula
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.95 2010/07/19 09:10:09 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.96 2010/07/22 15:48:51 tomjbe Exp $
+
+*bacula-5.0.2-r2 (22 Jul 2010)
+
+ 22 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> +bacula-5.0.2-r2.ebuild,
+ +files/5.0.2/bacula-5.0.2-Makefile.patch,
+ +files/5.0.2/bacula-5.0.2-ldflags.patch:
+ - fix for bug #291160, #322181 and #326333
+ - add vimfiles
+ - make 'bat' respect LDFLAGS
+ - let 'make' fail if some error emerges in a subdir build
19 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org>
files/5.0.2/bacula-5.0.2-openssl-1.patch:
1.1 app-backup/bacula/bacula-5.0.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?rev=1.1&content-type=text/plain
Index: bacula-5.0.2-r2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v 1.1 2010/07/22 15:48:51 tomjbe Exp $
EAPI="2"
inherit eutils multilib
MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
#DOC_VER="${MY_PV}"
DESCRIPTION="Featureful client/server network backup suite"
HOMEPAGE="http://www.bacula.org/"
#DOC_SRC_URI="mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
# doc? ( ${DOC_SRC_URI} )
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
# maintainer comment:
# postgresql-base should have USE=threads (see bug 326333) but fails to build
# atm with it (see bug #300964)
DEPEND="
>=sys-libs/zlib-1.1.4
dev-libs/gmp
!bacula-clientonly? (
postgres? ( dev-db/postgresql-base[threads] )
mysql? ( virtual/mysql )
sqlite3? ( dev-db/sqlite:3 )
!bacula-nodir? ( virtual/mta )
)
qt4? (
x11-libs/qt-svg:4
>=x11-libs/qwt-5
)
ssl? ( dev-libs/openssl )
logwatch? ( sys-apps/logwatch )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
readline? ( >=sys-libs/readline-4.1 )
sys-libs/ncurses
python? ( dev-lang/python[threads] )"
# doc? (
# app-text/ghostscript-gpl
# dev-tex/latex2html[png]
# app-text/dvipdfm
# )
RDEPEND="${DEPEND}
!bacula-clientonly? (
!bacula-nosd? (
sys-block/mtx
app-arch/mt-st
)
)
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
local -i dbnum=0
if ! use bacula-clientonly; then
if use mysql; then
export mydbtype=mysql
let dbnum++
fi
if use postgres; then
export mydbtype=postgresql
let dbnum++
fi
if use sqlite3; then
export mydbtype=sqlite3
let dbnum++
fi
if [[ "${dbnum}" -lt 1 ]]; then
eerror
eerror "To use ${P} it is required to set a database in the USE flags."
eerror "Supported databases are mysql, postgresql, sqlite3"
eerror
die "No database type selected."
elif [[ "${dbnum}" -gt 1 ]]; then
eerror
eerror "You have set ${P} to use multiple database types."
eerror "I don't know which to set as the default!"
eerror "You can use /etc/portage/package.use to set per-package USE flags"
eerror "Set it so only one database type, mysql, postgres, sqlite3"
eerror
die "Multiple database types selected."
fi
fi
# create the daemon group and user
if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
enewgroup bacula || die
einfo
einfo "The group 'bacula' has been created. Any users you add to this"
einfo "group have access to files created by the daemons."
einfo
fi
if ! use bacula-clientonly; then
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw || die
einfo
einfo "The user 'bacula' has been created. Please see the bacula manual"
einfo "for information about running bacula as a non-root user."
einfo
fi
fi
}
src_prepare() {
# adjusts default configuration files for several binaries
# to /etc/bacula/<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/bacula/|g' "${f}" \
|| die "sed on ${f} failed"
done
popd >&/dev/null || die
# bug #310087
epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch
# bug #311161
epatch "${FILESDIR}"/${PV}/${P}-lib-search-path.patch
# stop build for errors in subdirs
epatch "${FILESDIR}"/${PV}/${P}-Makefile.patch
# bat needs to respect LDFLAGS
epatch "${FILESDIR}"/${PV}/${P}-ldflags.patch
# bug #32701
epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch
}
src_configure() {
local myconf=''
if use bacula-clientonly; then
myconf="${myconf} \
$(use_enable bacula-clientonly client-only) \
$(use_enable static static-fd)"
else
myconf="${myconf} \
$(use_enable static static-tools) \
$(use_enable static static-fd) \
$(use_enable !bacula-nodir build-dird) \
$(use_enable !bacula-nosd build-stored)"
# bug #311099
# database support needed by dir-only *and* sd-only
# build as well (for building bscan, btape, etc.)
myconf="${myconf} \
--with-${mydbtype}"
if ! use bacula-nodir; then
myconf="${myconf} $(use_enable static static-dir)"
fi
if ! use bacula-nosd; then
myconf="${myconf} $(use_enable static static-sd)"
fi
fi
# maintainer comment:
# see bug 326333 for the batch-insert problem
myconf="${myconf} \
--disable-tray-monitor \
$(use_enable !postgres batch-insert) \
$(use_with X x) \
$(use_enable qt4 bat) \
$(use_enable static static-cons)
$(use_with python) \
$(use_enable !readline conio) \
$(use_enable readline) \
$(use_with readline readline /usr) \
$(use_with ssl openssl) \
$(use_enable ipv6) \
$(use_with tcpd tcp-wrappers)"
econf \
--libdir=/usr/$(get_libdir) \
--docdir=/usr/share/doc/${PF} \
--htmldir=/usr/share/doc/${PF}/html \
--with-pid-dir=/var/run \
--sysconfdir=/etc/bacula \
--with-subsys-dir=/var/lock/subsys \
--with-working-dir=/var/lib/bacula \
--with-scriptdir=/usr/libexec/bacula \
--with-dir-user=bacula \
--with-dir-group=bacula \
--with-sd-user=root \
--with-sd-group=bacula \
--with-fd-user=root \
--with-fd-group=bacula \
--enable-smartalloc \
--host=${CHOST} \
${myconf} \
|| die "econf failed"
}
src_compile() {
emake || die "emake failed"
# build docs from bacula-docs tarball
# if use doc; then
# pushd "${WORKDIR}/${PN}-docs-${DOC_VER}"
# ./configure \
# --with-bacula="${S}" \
# || die "configure for bacula-docs failed"
# emake -j1 || die "emake for bacula-docs failed"
# popd
# fi
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
insinto /usr/share/pixmaps
doins scripts/bacula.png || die
# install bat when enabled (for some reason ./configure doesn't pick this up)
if use qt4; then
dosbin "${S}"/src/qt-console/.libs/bat || die
insinto /usr/share/pixmaps
doins src/qt-console/images/bat_icon.png || die
insinto /usr/share/applications
doins scripts/bat.desktop || die
fi
# remove some scripts we don't need at all
rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
# rename statically linked apps
if use static; then
pushd "${D}"/usr/sbin || die
mv static-bacula-fd bacula-fd || die
mv static-bconsole bconsole || die
if ! use bacula-clientonly; then
mv static-bacula-dir bacula-dir || die
mv static-bacula-sd bacula-sd || die
fi
if use qt4; then
mv static-bat bat || die
fi
popd || die
fi
# extra files which 'make install' doesn't cover
if ! use bacula-clientonly; then
# the database update scripts
diropts -m0750
insinto /usr/libexec/bacula/updatedb
insopts -m0754
doins "${S}"/updatedb/* || die
fperms 0640 /usr/libexec/bacula/updatedb/README || die
# the logrotate configuration
# (now unconditional wrt bug #258187)
diropts -m0755
insinto /etc/logrotate.d
insopts -m0644
newins "${S}"/scripts/logrotate bacula || die
# 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 || die "Failed to install logwatch scripts"
popd >&/dev/null || die
fi
fi
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
if ! use qt4; then
rm -vf "${D}"/usr/share/man/man1/bat.1*
fi
rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
if use bacula-clientonly || use bacula-nodir; then
rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
rm -vf "${D}"/usr/libexec/bacula/create_*_database
rm -vf "${D}"/usr/libexec/bacula/drop_*_database
rm -vf "${D}"/usr/libexec/bacula/make_*_tables
rm -vf "${D}"/usr/libexec/bacula/update_*_tables
rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
fi
if use bacula-clientonly || use bacula-nosd; then
rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
rm -vf "${D}"/usr/share/man/man8/bcopy.8*
rm -vf "${D}"/usr/share/man/man8/bextract.8*
rm -vf "${D}"/usr/share/man/man8/bls.8*
rm -vf "${D}"/usr/share/man/man8/bscan.8*
rm -vf "${D}"/usr/share/man/man8/btape.8*
rm -vf "${D}"/usr/libexec/bacula/disk-changer
rm -vf "${D}"/usr/libexec/bacula/mtx-changer
rm -vf "${D}"/usr/libexec/bacula/dvd-handler
fi
# documentation
ecompress "${D}"/usr/share/doc/${PF}/*
# if use doc; then
# for i in catalog concepts console developers install problems utility; do
# dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manuals/en/${i}/${i}.pdf || die
# done
# fi
# vim-files
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/syntax
doins scripts/bacula.vim || die
insinto /usr/share/vim/vimfiles/ftdetect
newins scripts/filetype.vim bacula_ft.vim || die
fi
# setup init scripts
myscripts="bacula-fd"
if ! use bacula-clientonly; then
if ! use bacula-nodir; then
myscripts="${myscripts} bacula-dir"
fi
if ! use bacula-nosd; then
myscripts="${myscripts} bacula-sd"
fi
fi
for script in ${myscripts}; do
# copy over init script and config to a temporary location
# so we can modify them as needed
cp "${FILESDIR}/${PV}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
cp "${FILESDIR}/${PV}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
# set database dependancy for the director init script
case "${script}" in
bacula-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}" || die
newconfd "${T}/${script}".confd "${script}" || die
done
# make sure the working directory exists
diropts -m0750
keepdir /var/lib/bacula
# make sure bacula group can execute bacula libexec scripts
fowners -R root:bacula /usr/libexec/bacula
}
pkg_postinst() {
if use bacula-clientonly; then
fowners root:bacula /var/lib/bacula
else
fowners bacula:bacula /var/lib/bacula
fi
if ! use bacula-clientonly && ! use bacula-nodir; then
einfo
einfo "If this is a new install, you must create the ${mydbtype} databases with:"
einfo " /usr/libexec/bacula/create_${mydbtype}_database"
einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
einfo
ewarn
ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
ewarn
ewarn "If you're upgrading from a major release, you must upgrade your bacula catalog database."
ewarn "Please read the manual chapter for how to upgrade your database."
ewarn "You can find database upgrade scripts in /usr/libexec/bacula/updatedb/."
ewarn
ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
ewarn
ebeep 5
epause 10
echo
ewarn
ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
ewarn
ewarn "The bundled catalog backup script (/usr/libexec/bacula/make_catalog_backup)"
ewarn "is INSECURE. The script needs to be called with the database access password"
ewarn "as a command line parameter, thus, the password can be seen from any other"
ewarn "user on the system"
ewarn
ewarn "NOTICE:"
ewarn "Since version 5.0.0 Bacula bundles an alternative catalog backup script"
ewarn "installed as /usr/libexec/bacula/make_catalog_backup.pl that is not"
ewarn "subject to this issue as it parses the director daemon config to extract"
ewarn "the configured database connection parameters (including the password)."
ewarn
ewarn "See also:"
ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Bacula_Security_Issues.html"
ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Catalog_Maintenance.html#SECTION0043140000000000000000"
ewarn
ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
ewarn
ebeep 5
epause 10
echo
einfo
einfo "Please note that SQLite v2 support as well as wxwindows (bwx-console)"
einfo "and gnome (gnome-console) support have been dropped."
einfo
fi
einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
einfo "you have to enable 'USE=qt4'."
einfo
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-backup/bacula: bacula-5.0.2-r2.ebuild ChangeLog
@ 2010-07-22 15:58 Thomas Beierlein (tomjbe)
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Beierlein (tomjbe) @ 2010-07-22 15:58 UTC (permalink / raw
To: gentoo-commits
tomjbe 10/07/22 15:58:16
Modified: bacula-5.0.2-r2.ebuild ChangeLog
Log:
revert batch-insert to always enabled
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.2 app-backup/bacula/bacula-5.0.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?r1=1.1&r2=1.2
Index: bacula-5.0.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-5.0.2-r2.ebuild 22 Jul 2010 15:48:51 -0000 1.1
+++ bacula-5.0.2-r2.ebuild 22 Jul 2010 15:58:16 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v 1.1 2010/07/22 15:48:51 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v 1.2 2010/07/22 15:58:16 tomjbe Exp $
EAPI="2"
inherit eutils multilib
@@ -156,7 +156,8 @@
# database support needed by dir-only *and* sd-only
# build as well (for building bscan, btape, etc.)
myconf="${myconf} \
- --with-${mydbtype}"
+ --with-${mydbtype} \
+ --enable-batch-insert"
if ! use bacula-nodir; then
myconf="${myconf} $(use_enable static static-dir)"
fi
@@ -169,7 +170,6 @@
# see bug 326333 for the batch-insert problem
myconf="${myconf} \
--disable-tray-monitor \
- $(use_enable !postgres batch-insert) \
$(use_with X x) \
$(use_enable qt4 bat) \
$(use_enable static static-cons)
1.97 app-backup/bacula/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?r1=1.96&r2=1.97
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog 22 Jul 2010 15:48:51 -0000 1.96
+++ ChangeLog 22 Jul 2010 15:58:16 -0000 1.97
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/bacula
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.96 2010/07/22 15:48:51 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.97 2010/07/22 15:58:16 tomjbe Exp $
+
+ 22 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.0.2-r2.ebuild:
+ revert batch-insert to always enabled
*bacula-5.0.2-r2 (22 Jul 2010)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-backup/bacula: bacula-5.0.2-r2.ebuild ChangeLog
@ 2010-07-22 17:22 Thomas Beierlein (tomjbe)
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Beierlein (tomjbe) @ 2010-07-22 17:22 UTC (permalink / raw
To: gentoo-commits
tomjbe 10/07/22 17:22:59
Modified: bacula-5.0.2-r2.ebuild ChangeLog
Log:
Make sqlite3 the default database if none or to many database backends are selected. Thanks darkside for pointing it out
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.3 app-backup/bacula/bacula-5.0.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?r1=1.2&r2=1.3
Index: bacula-5.0.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-5.0.2-r2.ebuild 22 Jul 2010 15:58:16 -0000 1.2
+++ bacula-5.0.2-r2.ebuild 22 Jul 2010 17:22:59 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v 1.2 2010/07/22 15:58:16 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v 1.3 2010/07/22 17:22:59 tomjbe Exp $
EAPI="2"
inherit eutils multilib
@@ -75,19 +75,17 @@
let dbnum++
fi
if [[ "${dbnum}" -lt 1 ]]; then
- eerror
- eerror "To use ${P} it is required to set a database in the USE flags."
- eerror "Supported databases are mysql, postgresql, sqlite3"
- eerror
- die "No database type selected."
+ ewarn
+ ewarn "No database backend selected, defaulting to sqlite3."
+ ewarn "Supported databases are mysql, postgresql, sqlite3"
+ ewarn
+ export mydbtype=sqlite3
elif [[ "${dbnum}" -gt 1 ]]; then
- eerror
- eerror "You have set ${P} to use multiple database types."
- eerror "I don't know which to set as the default!"
- eerror "You can use /etc/portage/package.use to set per-package USE flags"
- eerror "Set it so only one database type, mysql, postgres, sqlite3"
- eerror
- die "Multiple database types selected."
+ ewarn
+ ewarn "Too many database backends selected, defaulting to sqlite3."
+ ewarn "Supported databases are mysql, postgresql, sqlite3"
+ ewarn
+ export mydbtype=sqlite3
fi
fi
1.98 app-backup/bacula/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?r1=1.97&r2=1.98
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog 22 Jul 2010 15:58:16 -0000 1.97
+++ ChangeLog 22 Jul 2010 17:22:59 -0000 1.98
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/bacula
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.97 2010/07/22 15:58:16 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.98 2010/07/22 17:22:59 tomjbe Exp $
+
+ 22 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.0.2-r2.ebuild:
+ Make sqlite3 the default database if none or to many database backends are
+ selected. Thanks darkside for pointing it out
22 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.0.2-r2.ebuild:
revert batch-insert to always enabled
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-backup/bacula: bacula-5.0.2-r2.ebuild ChangeLog
@ 2010-07-23 7:10 Thomas Beierlein (tomjbe)
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Beierlein (tomjbe) @ 2010-07-23 7:10 UTC (permalink / raw
To: gentoo-commits
tomjbe 10/07/23 07:10:09
Modified: bacula-5.0.2-r2.ebuild ChangeLog
Log:
drop leftover comment
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.4 app-backup/bacula/bacula-5.0.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild?r1=1.3&r2=1.4
Index: bacula-5.0.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula-5.0.2-r2.ebuild 22 Jul 2010 17:22:59 -0000 1.3
+++ bacula-5.0.2-r2.ebuild 23 Jul 2010 07:10:09 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v 1.3 2010/07/22 17:22:59 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r2.ebuild,v 1.4 2010/07/23 07:10:09 tomjbe Exp $
EAPI="2"
inherit eutils multilib
@@ -164,8 +164,6 @@
fi
fi
- # maintainer comment:
- # see bug 326333 for the batch-insert problem
myconf="${myconf} \
--disable-tray-monitor \
$(use_with X x) \
1.99 app-backup/bacula/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?r1=1.98&r2=1.99
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ChangeLog 22 Jul 2010 17:22:59 -0000 1.98
+++ ChangeLog 23 Jul 2010 07:10:09 -0000 1.99
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/bacula
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.98 2010/07/22 17:22:59 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.99 2010/07/23 07:10:09 tomjbe Exp $
+
+ 23 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.0.2-r2.ebuild:
+ drop leftover comment
22 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.0.2-r2.ebuild:
Make sqlite3 the default database if none or to many database backends are
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-23 7:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-22 15:58 [gentoo-commits] gentoo-x86 commit in app-backup/bacula: bacula-5.0.2-r2.ebuild ChangeLog Thomas Beierlein (tomjbe)
-- strict thread matches above, loose matches on Subject: below --
2010-07-23 7:10 Thomas Beierlein (tomjbe)
2010-07-22 17:22 Thomas Beierlein (tomjbe)
2010-07-22 15:48 Thomas Beierlein (tomjbe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox