commit: 904a93932dc13cba29de518378f508f3c9e6124b
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 18:55:53 2020 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 18:56:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904a9393
app-backup/bacula: Drop old
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
app-backup/bacula/Manifest | 2 -
app-backup/bacula/bacula-9.4.4-r2.ebuild | 426 --------------------
app-backup/bacula/bacula-9.4.4-r3.ebuild | 429 ---------------------
app-backup/bacula/bacula-9.6.3-r1.ebuild | 428 --------------------
app-backup/bacula/bacula-9.6.3.ebuild | 425 --------------------
.../files/9.0.8/bacula-9.0.8-fix-static.patch | 63 ---
app-backup/bacula/files/bacula-fix-manpages.patch | 32 --
7 files changed, 1805 deletions(-)
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 1ad79877304..b043eabf262 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,3 +1 @@
-DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B
29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3
SHA512
f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31
-DIST bacula-9.6.3.tar.gz 4246447 BLAKE2B
c591fcd5a6c3a79b52cf778f7719ad59f35bfdf99293abb4f6e9c701c0d545125734721a926f071056433d7a9801c40c546f4a73770f5d0fea9fc33c334bcd93
SHA512
8ee14311945ff04c4d3ca736725e2187bcf3e9e0a3093df215c8651bd6a7b07792edea4912ba84189ee79df614c1e99a4333ce173163cfc7efb536dad582106f
DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B
48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d
SHA512
4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
diff --git a/app-backup/bacula/bacula-9.4.4-r2.ebuild
b/app-backup/bacula/bacula-9.4.4-r2.ebuild
deleted file mode 100644
index 1abaa55baab..00000000000
--- a/app-backup/bacula/bacula-9.4.4-r2.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/";
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples
ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd
vim-syntax X"
-
-DEPEND="
- !bacula-clientonly? (
- !bacula-nodir? ( virtual/mta )
- postgres? ( dev-db/postgresql:=[threads] )
- mysql? ( || ( dev-db/mysql-connector-c
dev-db/mariadb-connector-c ) )
- sqlite? ( dev-db/sqlite:3 )
- )
- dev-libs/gmp:0
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtsvg:5
- x11-libs/qwt:6
- )
- logwatch? ( sys-apps/logwatch )
- readline? ( sys-libs/readline:0 )
- static? (
- dev-libs/lzo[static-libs]
- sys-libs/ncurses:=[static-libs]
- sys-libs/zlib[static-libs]
- acl? ( virtual/acl[static-libs] )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? ( dev-libs/libressl:0=[static-libs] )
- )
- )
- !static? (
- dev-libs/lzo
- sys-libs/ncurses:=
- sys-libs/zlib
- acl? ( virtual/acl )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
- acct-user/bacula
- acct-group/bacula
- !bacula-clientonly? (
- !bacula-nosd? (
- app-arch/mt-st
- sys-block/mtx
- )
- )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
- !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
- static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- #XOR and !bacula-clientonly controlled by REQUIRED_USE
- use mysql && export mydbtype="mysql"
- use postgres && export mydbtype="postgresql"
- use sqlite && export mydbtype="sqlite3"
-
- if use bacula-clientonly && use static && use qt5; then
- ewarn
- ewarn "Building statically linked 'bat' is not supported.
Ignorig 'qt5' useflag."
- ewarn
- 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 466688 drop deprecated categories from Desktop file
- sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
- # bug 466690 Use CXXFLAGS instead of CFLAGS
- sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
- # drop automatic install of unneeded documentation (for bug 356499)
- eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
- # bug #310087
- eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
- # bug #311161
- eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
- # bat needs to respect LDFLAGS and CFLAGS
- eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
- # bug #328701
- eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
- eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
-
- # fix soname in libbaccat.so bug #602952
- eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
- # do not strip binaries
- sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
- sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
- # fix file not found error during make depend
- eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
- eapply_user
-
- # Fix systemd unit files:
- # bug 497748
- sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
- sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
- # bug 504370
- sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in
|| die
- # bug 584442 and 504368
- sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in
|| die
-
- # build 'bat' for Qt5
- export QMAKE="$(qt5_get_bindir)"/qmake
-
- # adapt to >=Qt-5.9 (see bug #644566)
- # qmake needs an existing target file to generate install instructions
- sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
- src/qt-console/bat.pro.in || die
- mkdir src/qt-console/.libs || die
- touch src/qt-console/.libs/bat || die
- chmod 755 src/qt-console/.libs/bat || die
-
- # fix handling of libressl version
- # needs separate handling for <libressl-2.7 and >=libressl2.7
- # (see bug #655520)
- if has_version "<dev-libs/libressl-2.7"; then
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
- else
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
- fi
-
- # Don't let program install man pages directly
- rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages
Makefile.in"
- eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
-
- # fix bundled libtool (bug 466696)
- # But first move directory with M4 macros out of the way.
- # It is only needed by autoconf and gives errors during elibtoolize.
- mv autoconf/libtool autoconf/libtool1 || die
- elibtoolize
-}
-
-src_configure() {
- local myconf=''
-
- if use bacula-clientonly; then
- myconf="${myconf} \
- $(use_enable bacula-clientonly client-only) \
- $(use_enable !static libtool) \
- $(use_enable static static-cons) \
- $(use_enable static static-fd)"
- else
- myconf="${myconf} \
- $(use_enable !bacula-nodir build-dird) \
- $(use_enable !bacula-nosd build-stored)"
- # bug #311099
- # database support needed by dir-only *and* sd-only
- # build as well (for building bscan, btape, etc.)
- myconf="${myconf}
- --with-${mydbtype}"
- fi
-
- # do not build bat if 'static' clientonly
- if ! use bacula-clientonly || ! use static; then
- myconf="${myconf} \
- $(use_enable qt5 bat)"
- fi
-
- myconf="${myconf} \
- $(use_with X x) \
- $(use_enable batch-insert) \
- $(use_enable !readline conio) \
- $(use_enable readline) \
- $(use_with readline readline /usr) \
- $(use_with ssl openssl) \
- $(use_enable ipv6) \
- $(use_enable acl) \
- $(use_with tcpd tcp-wrappers)"
-
- econf \
- --with-pid-dir=/var/run \
- --sysconfdir=/etc/bacula \
- --with-archivedir=/var/lib/bacula/tmp \
- --with-subsys-dir=/var/lock/subsys \
- --with-working-dir=/var/lib/bacula \
- --with-logdir=/var/lib/bacula \
- --with-scriptdir=/usr/libexec/bacula \
- --with-systemd=$(systemd_get_systemunitdir) \
- --with-dir-user=bacula \
- --with-dir-group=bacula \
- --with-sd-user=root \
- --with-sd-group=bacula \
- --with-fd-user=root \
- --with-fd-group=bacula \
- --enable-smartalloc \
- --disable-afs \
- --without-s3 \
- --host=${CHOST} \
- ${myconf}
-}
-
-src_compile() {
- # Make build log verbose (bug #447806)
- emake NO_ECHO=""
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- doicon scripts/bacula.png
-
- # install bat icon and desktop file when enabled
- # (for some reason ./configure doesn't pick this up)
- if use qt5 && ! use static ; then
- doicon src/qt-console/images/bat_icon.png
- domenu scripts/bat.desktop
- fi
-
- # remove some scripts we don't need at all
- rm -f
"${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
- # rename statically linked apps
- if use bacula-clientonly && use static ; then
- pushd "${D}"/usr/sbin || die
- mv static-bacula-fd bacula-fd || die
- mv static-bconsole bconsole || die
- popd || die
- fi
-
- # extra files which 'make install' doesn't cover
- if ! use bacula-clientonly; then
- # the database update scripts
- diropts -m0750
- insinto /usr/libexec/bacula/updatedb
- insopts -m0754
- doins "${S}"/updatedb/*
- fperms 0640 /usr/libexec/bacula/updatedb/README
-
- # the logrotate configuration
- # (now unconditional wrt bug #258187)
- diropts -m0755
- insinto /etc/logrotate.d
- insopts -m0644
- newins "${S}"/scripts/logrotate bacula
-
- # the logwatch scripts
- if use logwatch; then
- diropts -m0750
- dodir /usr/share/logwatch/scripts/services
- dodir /usr/share/logwatch/scripts/shared
- dodir /etc/logwatch/conf/logfiles
- dodir /etc/logwatch/conf/services
- pushd "${S}"/scripts/logwatch >&/dev/null || die
- emake DESTDIR="${D}" install
- popd >&/dev/null || die
- fi
- fi
-
- # Install all man pages
- doman "${S}"/manpages/*
-
- if ! use qt5; then
- rm -vf "${D}"/usr/share/man/man1/bat.1*
- fi
- rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
- if use bacula-clientonly || use bacula-nodir ; then
- rm -vf "${D}"/usr/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/libexec/bacula/disk-changer
- rm -vf "${D}"/usr/libexec/bacula/mtx-changer
- rm -vf "${D}"/usr/libexec/bacula/dvd-handler
- fi
-
- # documentation
- dodoc ChangeLog ReleaseNotes SUPPORT
-
- # install examples (bug #457504)
- if use examples; then
- docinto examples/
- dodoc -r examples/*
- fi
-
- # vim-files
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins scripts/bacula.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- newins scripts/filetype.vim bacula_ft.vim
- fi
-
- # setup init scripts
- myscripts="bacula-fd"
- if ! use bacula-clientonly; then
- if ! use bacula-nodir; then
- myscripts="${myscripts} bacula-dir"
- fi
- if ! use bacula-nosd; then
- myscripts="${myscripts} bacula-sd"
- fi
- fi
- for script in ${myscripts}; do
- # copy over init script and config to a temporary location
- # so we can modify them as needed
- cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die
"failed to copy ${script}.confd"
- cp "${FILESDIR}/newscripts/${script}".initd
"${T}/${script}".initd || die "failed to copy ${script}.initd"
-
- # now set the database dependancy for the director init script
- case "${script}" in
- bacula-dir)
- case "${mydbtype}" in
- sqlite3)
- # sqlite databases don't have a
daemon
- sed -i -e 's/need
"%database%"/:/g' "${T}/${script}".initd || die
- ;;
- *)
- # all other databases have
daemons
- sed -i -e
"s:%database%:${mydbtype}:" "${T}/${script}".initd || die
- ;;
- esac
- ;;
- *)
- ;;
- esac
-
- # install init script and config
- newinitd "${T}/${script}".initd "${script}"
- newconfd "${T}/${script}".confd "${script}"
- done
-
- systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
- # make sure the working directory exists
- diropts -m0750
- keepdir /var/lib/bacula
-
- # make sure bacula group can execute bacula libexec scripts
- fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
- if use bacula-clientonly; then
- fowners root:bacula /var/lib/bacula
- else
- fowners bacula:bacula /var/lib/bacula
- fi
-
- einfo
- einfo "A group 'bacula' has been created. Any users you add to this"
- einfo "group have access to files created by the daemons."
- einfo
- einfo "A user 'bacula' has been created. Please see the bacula manual"
- einfo "for information about running bacula as a non-root user."
- einfo
-
- if ! use bacula-clientonly && ! use bacula-nodir; then
- einfo
- einfo "If this is a new install, you must create the
${mydbtype} databases with:"
- einfo " /usr/libexec/bacula/create_${mydbtype}_database"
- einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
- einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
- einfo
-
- ewarn "ATTENTION!"
- ewarn "The format of the database may have changed."
- ewarn "If you just upgraded from a version below 9.0.0 you must
run"
- ewarn "'update_bacula_tables' now."
- ewarn "Make sure to have a backup of your catalog before."
- ewarn
- fi
-
- if use sqlite; then
- einfo
- einfo "Be aware that Bacula does not officially support SQLite
database anymore."
- einfo "Best use it only for a client-only installation. See Bug
#445540."
- einfo
- fi
-
- einfo "Please note that 'bconsole' will always be installed. To compile
'bat'"
- einfo "you have to enable 'USE=qt5'."
- einfo
- einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will
be used during"
- einfo "restores, so be sure to set it to an appropriate in dir in the
bacula config."
-}
diff --git a/app-backup/bacula/bacula-9.4.4-r3.ebuild
b/app-backup/bacula/bacula-9.4.4-r3.ebuild
deleted file mode 100644
index 6ebe92cbe9a..00000000000
--- a/app-backup/bacula/bacula-9.4.4-r3.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/";
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples
ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd
vim-syntax X"
-
-DEPEND="
- !bacula-clientonly? (
- !bacula-nodir? ( virtual/mta )
- postgres? ( dev-db/postgresql:=[threads] )
- mysql? ( || ( dev-db/mysql-connector-c
dev-db/mariadb-connector-c ) )
- sqlite? ( dev-db/sqlite:3 )
- )
- dev-libs/gmp:0
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtsvg:5
- x11-libs/qwt:6
- )
- logwatch? ( sys-apps/logwatch )
- readline? ( sys-libs/readline:0 )
- static? (
- dev-libs/lzo[static-libs]
- sys-libs/ncurses:=[static-libs]
- sys-libs/zlib[static-libs]
- acl? ( virtual/acl[static-libs(+)] )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? ( dev-libs/libressl:0=[static-libs] )
- )
- )
- !static? (
- dev-libs/lzo
- sys-libs/ncurses:=
- sys-libs/zlib
- acl? ( virtual/acl )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
- acct-user/bacula
- acct-group/bacula
- !bacula-clientonly? (
- !bacula-nosd? (
- app-arch/mt-st
- sys-block/mtx
- )
- )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
- !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
- static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- #XOR and !bacula-clientonly controlled by REQUIRED_USE
- use mysql && export mydbtype="mysql"
- use postgres && export mydbtype="postgresql"
- use sqlite && export mydbtype="sqlite3"
-
- if use bacula-clientonly && use static && use qt5; then
- ewarn
- ewarn "Building statically linked 'bat' is not supported.
Ignorig 'qt5' useflag."
- ewarn
- 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 466688 drop deprecated categories from Desktop file
- sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
- # bug 466690 Use CXXFLAGS instead of CFLAGS
- sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
- # drop automatic install of unneeded documentation (for bug 356499)
- eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
- # bug #310087
- eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
- # bug #311161
- eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
- # bat needs to respect LDFLAGS and CFLAGS
- eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
- # bug #328701
- eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
- eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
-
- # fix soname in libbaccat.so bug #602952
- eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
- # do not strip binaries
- sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
- sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
- # fix file not found error during make depend
- eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
- eapply_user
-
- # Fix systemd unit files:
- # bug 497748
- sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
- sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
- # bug 504370
- sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in
|| die
- # bug 584442 and 504368
- sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in
|| die
-
- # build 'bat' for Qt5
- export QMAKE="$(qt5_get_bindir)"/qmake
-
- # adapt to >=Qt-5.9 (see bug #644566)
- # qmake needs an existing target file to generate install instructions
- sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
- src/qt-console/bat.pro.in || die
- mkdir src/qt-console/.libs || die
- touch src/qt-console/.libs/bat || die
- chmod 755 src/qt-console/.libs/bat || die
-
- # fix handling of libressl version
- # needs separate handling for <libressl-2.7 and >=libressl2.7
- # (see bug #655520)
- if has_version "<dev-libs/libressl-2.7"; then
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
- else
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
- fi
-
- # Don't let program install man pages directly
- rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages
Makefile.in"
- eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
-
- # correct installation for plugins to mode 0755 (bug #725946)
- sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /"
src/plugins/fd/Makefile.in ||die
-
- # fix bundled libtool (bug 466696)
- # But first move directory with M4 macros out of the way.
- # It is only needed by autoconf and gives errors during elibtoolize.
- mv autoconf/libtool autoconf/libtool1 || die
- elibtoolize
-}
-
-src_configure() {
- local myconf=''
-
- if use bacula-clientonly; then
- myconf="${myconf} \
- $(use_enable bacula-clientonly client-only) \
- $(use_enable !static libtool) \
- $(use_enable static static-cons) \
- $(use_enable static static-fd)"
- else
- myconf="${myconf} \
- $(use_enable !bacula-nodir build-dird) \
- $(use_enable !bacula-nosd build-stored)"
- # bug #311099
- # database support needed by dir-only *and* sd-only
- # build as well (for building bscan, btape, etc.)
- myconf="${myconf}
- --with-${mydbtype}"
- fi
-
- # do not build bat if 'static' clientonly
- if ! use bacula-clientonly || ! use static; then
- myconf="${myconf} \
- $(use_enable qt5 bat)"
- fi
-
- myconf="${myconf} \
- $(use_with X x) \
- $(use_enable batch-insert) \
- $(use_enable !readline conio) \
- $(use_enable readline) \
- $(use_with readline readline /usr) \
- $(use_with ssl openssl) \
- $(use_enable ipv6) \
- $(use_enable acl) \
- $(use_with tcpd tcp-wrappers)"
-
- econf \
- --with-pid-dir=/var/run \
- --sysconfdir=/etc/bacula \
- --with-archivedir=/var/lib/bacula/tmp \
- --with-subsys-dir=/var/lock/subsys \
- --with-working-dir=/var/lib/bacula \
- --with-logdir=/var/lib/bacula \
- --with-scriptdir=/usr/libexec/bacula \
- --with-systemd=$(systemd_get_systemunitdir) \
- --with-dir-user=bacula \
- --with-dir-group=bacula \
- --with-sd-user=root \
- --with-sd-group=bacula \
- --with-fd-user=root \
- --with-fd-group=bacula \
- --enable-smartalloc \
- --disable-afs \
- --without-s3 \
- --host=${CHOST} \
- ${myconf}
-}
-
-src_compile() {
- # Make build log verbose (bug #447806)
- emake NO_ECHO=""
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- doicon scripts/bacula.png
-
- # install bat icon and desktop file when enabled
- # (for some reason ./configure doesn't pick this up)
- if use qt5 && ! use static ; then
- doicon src/qt-console/images/bat_icon.png
- domenu scripts/bat.desktop
- fi
-
- # remove some scripts we don't need at all
- rm -f
"${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
- # rename statically linked apps
- if use bacula-clientonly && use static ; then
- pushd "${D}"/usr/sbin || die
- mv static-bacula-fd bacula-fd || die
- mv static-bconsole bconsole || die
- popd || die
- fi
-
- # extra files which 'make install' doesn't cover
- if ! use bacula-clientonly; then
- # the database update scripts
- diropts -m0750
- insinto /usr/libexec/bacula/updatedb
- insopts -m0754
- doins "${S}"/updatedb/*
- fperms 0640 /usr/libexec/bacula/updatedb/README
-
- # the logrotate configuration
- # (now unconditional wrt bug #258187)
- diropts -m0755
- insinto /etc/logrotate.d
- insopts -m0644
- newins "${S}"/scripts/logrotate bacula
-
- # the logwatch scripts
- if use logwatch; then
- diropts -m0750
- dodir /usr/share/logwatch/scripts/services
- dodir /usr/share/logwatch/scripts/shared
- dodir /etc/logwatch/conf/logfiles
- dodir /etc/logwatch/conf/services
- pushd "${S}"/scripts/logwatch >&/dev/null || die
- emake DESTDIR="${D}" install
- popd >&/dev/null || die
- fi
- fi
-
- # Install all man pages
- doman "${S}"/manpages/*
-
- if ! use qt5; then
- rm -vf "${D}"/usr/share/man/man1/bat.1*
- fi
- rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
- if use bacula-clientonly || use bacula-nodir ; then
- rm -vf "${D}"/usr/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/libexec/bacula/disk-changer
- rm -vf "${D}"/usr/libexec/bacula/mtx-changer
- rm -vf "${D}"/usr/libexec/bacula/dvd-handler
- fi
-
- # documentation
- dodoc ChangeLog ReleaseNotes SUPPORT
-
- # install examples (bug #457504)
- if use examples; then
- docinto examples/
- dodoc -r examples/*
- fi
-
- # vim-files
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins scripts/bacula.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- newins scripts/filetype.vim bacula_ft.vim
- fi
-
- # setup init scripts
- myscripts="bacula-fd"
- if ! use bacula-clientonly; then
- if ! use bacula-nodir; then
- myscripts="${myscripts} bacula-dir"
- fi
- if ! use bacula-nosd; then
- myscripts="${myscripts} bacula-sd"
- fi
- fi
- for script in ${myscripts}; do
- # copy over init script and config to a temporary location
- # so we can modify them as needed
- cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die
"failed to copy ${script}.confd"
- cp "${FILESDIR}/newscripts/${script}".initd
"${T}/${script}".initd || die "failed to copy ${script}.initd"
-
- # now set the database dependancy for the director init script
- case "${script}" in
- bacula-dir)
- case "${mydbtype}" in
- sqlite3)
- # sqlite databases don't have a
daemon
- sed -i -e 's/need
"%database%"/:/g' "${T}/${script}".initd || die
- ;;
- *)
- # all other databases have
daemons
- sed -i -e
"s:%database%:${mydbtype}:" "${T}/${script}".initd || die
- ;;
- esac
- ;;
- *)
- ;;
- esac
-
- # install init script and config
- newinitd "${T}/${script}".initd "${script}"
- newconfd "${T}/${script}".confd "${script}"
- done
-
- systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
- # make sure the working directory exists
- diropts -m0750
- keepdir /var/lib/bacula
-
- # make sure bacula group can execute bacula libexec scripts
- fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
- if use bacula-clientonly; then
- fowners root:bacula /var/lib/bacula
- else
- fowners bacula:bacula /var/lib/bacula
- fi
-
- einfo
- einfo "A group 'bacula' has been created. Any users you add to this"
- einfo "group have access to files created by the daemons."
- einfo
- einfo "A user 'bacula' has been created. Please see the bacula manual"
- einfo "for information about running bacula as a non-root user."
- einfo
-
- if ! use bacula-clientonly && ! use bacula-nodir; then
- einfo
- einfo "If this is a new install, you must create the
${mydbtype} databases with:"
- einfo " /usr/libexec/bacula/create_${mydbtype}_database"
- einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
- einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
- einfo
-
- ewarn "ATTENTION!"
- ewarn "The format of the database may have changed."
- ewarn "If you just upgraded from a version below 9.0.0 you must
run"
- ewarn "'update_bacula_tables' now."
- ewarn "Make sure to have a backup of your catalog before."
- ewarn
- fi
-
- if use sqlite; then
- einfo
- einfo "Be aware that Bacula does not officially support SQLite
database anymore."
- einfo "Best use it only for a client-only installation. See Bug
#445540."
- einfo
- fi
-
- einfo "Please note that 'bconsole' will always be installed. To compile
'bat'"
- einfo "you have to enable 'USE=qt5'."
- einfo
- einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will
be used during"
- einfo "restores, so be sure to set it to an appropriate in dir in the
bacula config."
-}
diff --git a/app-backup/bacula/bacula-9.6.3-r1.ebuild
b/app-backup/bacula/bacula-9.6.3-r1.ebuild
deleted file mode 100644
index 55c0d02d3b8..00000000000
--- a/app-backup/bacula/bacula-9.6.3-r1.ebuild
+++ /dev/null
@@ -1,428 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/";
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples
ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd
vim-syntax X"
-
-DEPEND="
- !bacula-clientonly? (
- !bacula-nodir? ( virtual/mta )
- postgres? ( dev-db/postgresql:=[threads] )
- mysql? ( || ( dev-db/mysql-connector-c
dev-db/mariadb-connector-c ) )
- sqlite? ( dev-db/sqlite:3 )
- )
- dev-libs/gmp:0
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtsvg:5
- x11-libs/qwt:6
- )
- logwatch? ( sys-apps/logwatch )
- readline? ( sys-libs/readline:0 )
- static? (
- dev-libs/lzo[static-libs]
- sys-libs/ncurses:=[static-libs]
- sys-libs/zlib[static-libs]
- acl? ( virtual/acl[static-libs(+)] )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? ( dev-libs/libressl:0=[static-libs] )
- )
- )
- !static? (
- dev-libs/lzo
- sys-libs/ncurses:=
- sys-libs/zlib
- acl? ( virtual/acl )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
- acct-user/bacula
- acct-group/bacula
- !bacula-clientonly? (
- !bacula-nosd? (
- app-arch/mt-st
- sys-block/mtx
- )
- )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
- !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
- static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- #XOR and !bacula-clientonly controlled by REQUIRED_USE
- use mysql && export mydbtype="mysql"
- use postgres && export mydbtype="postgresql"
- use sqlite && export mydbtype="sqlite3"
-
- if use bacula-clientonly && use static && use qt5; then
- ewarn
- ewarn "Building statically linked 'bat' is not supported.
Ignorig 'qt5' useflag."
- ewarn
- 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 466688 drop deprecated categories from Desktop file
- sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
- # bug 466690 Use CXXFLAGS instead of CFLAGS
- sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
- # drop automatic install of unneeded documentation (for bug 356499)
- eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
- # bug #310087
- eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
- # bug #311161
- eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
- # bat needs to respect LDFLAGS and CFLAGS
- eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
- # bug #328701
- eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
- eapply -p0 "${FILESDIR}"/9.6.3/${P}-fix-static.patch
-
- # fix soname in libbaccat.so bug #602952
- eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
- # do not strip binaries
- sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
- sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
- # fix file not found error during make depend
- eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
- eapply_user
-
- # Fix systemd unit files:
- # bug 497748
- sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
- sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
- # bug 504370
- sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in
|| die
- # bug 584442 and 504368
- sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in
|| die
-
- # build 'bat' for Qt5
- export QMAKE="$(qt5_get_bindir)"/qmake
-
- # adapt to >=Qt-5.9 (see bug #644566)
- # qmake needs an existing target file to generate install instructions
- sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
- src/qt-console/bat.pro.in || die
- mkdir src/qt-console/.libs || die
- touch src/qt-console/.libs/bat || die
- chmod 755 src/qt-console/.libs/bat || die
-
- # fix handling of libressl version
- # needs separate handling for <libressl-2.7 and >=libressl2.7
- # (see bug #655520)
- if has_version "<dev-libs/libressl-2.7"; then
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
- else
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
- fi
-
- # Don't let program install man pages directly
- sed -i -e 's/ manpages//' Makefile.in || die
-
- # correct installation for plugins to mode 0755 (bug #725946)
- sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /"
src/plugins/fd/Makefile.in ||die
-
- # fix bundled libtool (bug 466696)
- # But first move directory with M4 macros out of the way.
- # It is only needed by autoconf and gives errors during elibtoolize.
- mv autoconf/libtool autoconf/libtool1 || die
- elibtoolize
-}
-
-src_configure() {
- local myconf=''
-
- if use bacula-clientonly; then
- myconf="${myconf} \
- $(use_enable bacula-clientonly client-only) \
- $(use_enable !static libtool) \
- $(use_enable static static-cons) \
- $(use_enable static static-fd)"
- else
- myconf="${myconf} \
- $(use_enable !bacula-nodir build-dird) \
- $(use_enable !bacula-nosd build-stored)"
- # bug #311099
- # database support needed by dir-only *and* sd-only
- # build as well (for building bscan, btape, etc.)
- myconf="${myconf}
- --with-${mydbtype}"
- fi
-
- # do not build bat if 'static' clientonly
- if ! use bacula-clientonly || ! use static; then
- myconf="${myconf} \
- $(use_enable qt5 bat)"
- fi
-
- myconf="${myconf} \
- $(use_with X x) \
- $(use_enable batch-insert) \
- $(use_enable !readline conio) \
- $(use_enable readline) \
- $(use_with readline readline /usr) \
- $(use_with ssl openssl) \
- $(use_enable ipv6) \
- $(use_enable acl) \
- $(use_with tcpd tcp-wrappers)"
-
- econf \
- --with-pid-dir=/var/run \
- --sysconfdir=/etc/bacula \
- --with-archivedir=/var/lib/bacula/tmp \
- --with-subsys-dir=/var/lock/subsys \
- --with-working-dir=/var/lib/bacula \
- --with-logdir=/var/lib/bacula \
- --with-scriptdir=/usr/libexec/bacula \
- --with-systemd=$(systemd_get_systemunitdir) \
- --with-dir-user=bacula \
- --with-dir-group=bacula \
- --with-sd-user=root \
- --with-sd-group=bacula \
- --with-fd-user=root \
- --with-fd-group=bacula \
- --enable-smartalloc \
- --disable-afs \
- --without-s3 \
- --host=${CHOST} \
- ${myconf}
-}
-
-src_compile() {
- # Make build log verbose (bug #447806)
- emake NO_ECHO=""
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- doicon scripts/bacula.png
-
- # install bat icon and desktop file when enabled
- # (for some reason ./configure doesn't pick this up)
- if use qt5 && ! use static ; then
- doicon src/qt-console/images/bat_icon.png
- domenu scripts/bat.desktop
- fi
-
- # remove some scripts we don't need at all
- rm -f
"${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
- # rename statically linked apps
- if use bacula-clientonly && use static ; then
- pushd "${D}"/usr/sbin || die
- mv static-bacula-fd bacula-fd || die
- mv static-bconsole bconsole || die
- popd || die
- fi
-
- # extra files which 'make install' doesn't cover
- if ! use bacula-clientonly; then
- # the database update scripts
- diropts -m0750
- insinto /usr/libexec/bacula/updatedb
- insopts -m0754
- doins "${S}"/updatedb/*
- fperms 0640 /usr/libexec/bacula/updatedb/README
-
- # the logrotate configuration
- # (now unconditional wrt bug #258187)
- diropts -m0755
- insinto /etc/logrotate.d
- insopts -m0644
- newins "${S}"/scripts/logrotate bacula
-
- # the logwatch scripts
- if use logwatch; then
- diropts -m0750
- dodir /usr/share/logwatch/scripts/services
- dodir /usr/share/logwatch/scripts/shared
- dodir /etc/logwatch/conf/logfiles
- dodir /etc/logwatch/conf/services
- pushd "${S}"/scripts/logwatch >&/dev/null || die
- emake DESTDIR="${D}" install
- popd >&/dev/null || die
- fi
- fi
-
- # Install all man pages
- doman "${S}"/manpages/*.[18]
-
- if ! use qt5; then
- rm -vf "${D}"/usr/share/man/man1/bat.1*
- fi
- rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
- if use bacula-clientonly || use bacula-nodir ; then
- rm -vf "${D}"/usr/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/libexec/bacula/disk-changer
- rm -vf "${D}"/usr/libexec/bacula/mtx-changer
- rm -vf "${D}"/usr/libexec/bacula/dvd-handler
- fi
-
- # documentation
- dodoc ChangeLog ReleaseNotes SUPPORT
-
- # install examples (bug #457504)
- if use examples; then
- docinto examples/
- dodoc -r examples/*
- fi
-
- # vim-files
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins scripts/bacula.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- newins scripts/filetype.vim bacula_ft.vim
- fi
-
- # setup init scripts
- myscripts="bacula-fd"
- if ! use bacula-clientonly; then
- if ! use bacula-nodir; then
- myscripts="${myscripts} bacula-dir"
- fi
- if ! use bacula-nosd; then
- myscripts="${myscripts} bacula-sd"
- fi
- fi
- for script in ${myscripts}; do
- # copy over init script and config to a temporary location
- # so we can modify them as needed
- cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die
"failed to copy ${script}.confd"
- cp "${FILESDIR}/newscripts/${script}".initd
"${T}/${script}".initd || die "failed to copy ${script}.initd"
-
- # now set the database dependancy for the director init script
- case "${script}" in
- bacula-dir)
- case "${mydbtype}" in
- sqlite3)
- # sqlite databases don't have a
daemon
- sed -i -e 's/need
"%database%"/:/g' "${T}/${script}".initd || die
- ;;
- *)
- # all other databases have
daemons
- sed -i -e
"s:%database%:${mydbtype}:" "${T}/${script}".initd || die
- ;;
- esac
- ;;
- *)
- ;;
- esac
-
- # install init script and config
- newinitd "${T}/${script}".initd "${script}"
- newconfd "${T}/${script}".confd "${script}"
- done
-
- systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
- # make sure the working directory exists
- diropts -m0750
- keepdir /var/lib/bacula
-
- # make sure bacula group can execute bacula libexec scripts
- fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
- if use bacula-clientonly; then
- fowners root:bacula /var/lib/bacula
- else
- fowners bacula:bacula /var/lib/bacula
- fi
-
- einfo
- einfo "A group 'bacula' has been created. Any users you add to this"
- einfo "group have access to files created by the daemons."
- einfo
- einfo "A user 'bacula' has been created. Please see the bacula manual"
- einfo "for information about running bacula as a non-root user."
- einfo
-
- if ! use bacula-clientonly && ! use bacula-nodir; then
- einfo
- einfo "If this is a new install, you must create the
${mydbtype} databases with:"
- einfo " /usr/libexec/bacula/create_${mydbtype}_database"
- einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
- einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
- einfo
-
- ewarn "ATTENTION!"
- ewarn "The format of the database may have changed."
- ewarn "If you just upgraded from a version below 9.0.0 you must
run"
- ewarn "'update_bacula_tables' now."
- ewarn "Make sure to have a backup of your catalog before."
- ewarn
- fi
-
- if use sqlite; then
- einfo
- einfo "Be aware that Bacula does not officially support SQLite
database anymore."
- einfo "Best use it only for a client-only installation. See Bug
#445540."
- einfo
- fi
-
- einfo "Please note that 'bconsole' will always be installed. To compile
'bat'"
- einfo "you have to enable 'USE=qt5'."
- einfo
- einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will
be used during"
- einfo "restores, so be sure to set it to an appropriate in dir in the
bacula config."
-}
diff --git a/app-backup/bacula/bacula-9.6.3.ebuild
b/app-backup/bacula/bacula-9.6.3.ebuild
deleted file mode 100644
index 604e97d35a8..00000000000
--- a/app-backup/bacula/bacula-9.6.3.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/";
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples
ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd
vim-syntax X"
-
-DEPEND="
- !bacula-clientonly? (
- !bacula-nodir? ( virtual/mta )
- postgres? ( dev-db/postgresql:=[threads] )
- mysql? ( || ( dev-db/mysql-connector-c
dev-db/mariadb-connector-c ) )
- sqlite? ( dev-db/sqlite:3 )
- )
- dev-libs/gmp:0
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtsvg:5
- x11-libs/qwt:6
- )
- logwatch? ( sys-apps/logwatch )
- readline? ( sys-libs/readline:0 )
- static? (
- dev-libs/lzo[static-libs]
- sys-libs/ncurses:=[static-libs]
- sys-libs/zlib[static-libs]
- acl? ( virtual/acl[static-libs(+)] )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? ( dev-libs/libressl:0=[static-libs] )
- )
- )
- !static? (
- dev-libs/lzo
- sys-libs/ncurses:=
- sys-libs/zlib
- acl? ( virtual/acl )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
- acct-user/bacula
- acct-group/bacula
- !bacula-clientonly? (
- !bacula-nosd? (
- app-arch/mt-st
- sys-block/mtx
- )
- )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
- !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
- static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- #XOR and !bacula-clientonly controlled by REQUIRED_USE
- use mysql && export mydbtype="mysql"
- use postgres && export mydbtype="postgresql"
- use sqlite && export mydbtype="sqlite3"
-
- if use bacula-clientonly && use static && use qt5; then
- ewarn
- ewarn "Building statically linked 'bat' is not supported.
Ignorig 'qt5' useflag."
- ewarn
- 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 466688 drop deprecated categories from Desktop file
- sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
- # bug 466690 Use CXXFLAGS instead of CFLAGS
- sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
- # drop automatic install of unneeded documentation (for bug 356499)
- eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
- # bug #310087
- eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
- # bug #311161
- eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
- # bat needs to respect LDFLAGS and CFLAGS
- eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
- # bug #328701
- eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
- eapply -p0 "${FILESDIR}"/9.6.3/${P}-fix-static.patch
-
- # fix soname in libbaccat.so bug #602952
- eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
- # do not strip binaries
- sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
- sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
- # fix file not found error during make depend
- eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
- eapply_user
-
- # Fix systemd unit files:
- # bug 497748
- sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
- sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
- # bug 504370
- sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in
|| die
- # bug 584442 and 504368
- sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in
|| die
-
- # build 'bat' for Qt5
- export QMAKE="$(qt5_get_bindir)"/qmake
-
- # adapt to >=Qt-5.9 (see bug #644566)
- # qmake needs an existing target file to generate install instructions
- sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
- src/qt-console/bat.pro.in || die
- mkdir src/qt-console/.libs || die
- touch src/qt-console/.libs/bat || die
- chmod 755 src/qt-console/.libs/bat || die
-
- # fix handling of libressl version
- # needs separate handling for <libressl-2.7 and >=libressl2.7
- # (see bug #655520)
- if has_version "<dev-libs/libressl-2.7"; then
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
- else
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
- fi
-
- # Don't let program install man pages directly
- sed -i -e 's/ manpages//' Makefile.in || die
-
- # fix bundled libtool (bug 466696)
- # But first move directory with M4 macros out of the way.
- # It is only needed by autoconf and gives errors during elibtoolize.
- mv autoconf/libtool autoconf/libtool1 || die
- elibtoolize
-}
-
-src_configure() {
- local myconf=''
-
- if use bacula-clientonly; then
- myconf="${myconf} \
- $(use_enable bacula-clientonly client-only) \
- $(use_enable !static libtool) \
- $(use_enable static static-cons) \
- $(use_enable static static-fd)"
- else
- myconf="${myconf} \
- $(use_enable !bacula-nodir build-dird) \
- $(use_enable !bacula-nosd build-stored)"
- # bug #311099
- # database support needed by dir-only *and* sd-only
- # build as well (for building bscan, btape, etc.)
- myconf="${myconf}
- --with-${mydbtype}"
- fi
-
- # do not build bat if 'static' clientonly
- if ! use bacula-clientonly || ! use static; then
- myconf="${myconf} \
- $(use_enable qt5 bat)"
- fi
-
- myconf="${myconf} \
- $(use_with X x) \
- $(use_enable batch-insert) \
- $(use_enable !readline conio) \
- $(use_enable readline) \
- $(use_with readline readline /usr) \
- $(use_with ssl openssl) \
- $(use_enable ipv6) \
- $(use_enable acl) \
- $(use_with tcpd tcp-wrappers)"
-
- econf \
- --with-pid-dir=/var/run \
- --sysconfdir=/etc/bacula \
- --with-archivedir=/var/lib/bacula/tmp \
- --with-subsys-dir=/var/lock/subsys \
- --with-working-dir=/var/lib/bacula \
- --with-logdir=/var/lib/bacula \
- --with-scriptdir=/usr/libexec/bacula \
- --with-systemd=$(systemd_get_systemunitdir) \
- --with-dir-user=bacula \
- --with-dir-group=bacula \
- --with-sd-user=root \
- --with-sd-group=bacula \
- --with-fd-user=root \
- --with-fd-group=bacula \
- --enable-smartalloc \
- --disable-afs \
- --without-s3 \
- --host=${CHOST} \
- ${myconf}
-}
-
-src_compile() {
- # Make build log verbose (bug #447806)
- emake NO_ECHO=""
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- doicon scripts/bacula.png
-
- # install bat icon and desktop file when enabled
- # (for some reason ./configure doesn't pick this up)
- if use qt5 && ! use static ; then
- doicon src/qt-console/images/bat_icon.png
- domenu scripts/bat.desktop
- fi
-
- # remove some scripts we don't need at all
- rm -f
"${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
- # rename statically linked apps
- if use bacula-clientonly && use static ; then
- pushd "${D}"/usr/sbin || die
- mv static-bacula-fd bacula-fd || die
- mv static-bconsole bconsole || die
- popd || die
- fi
-
- # extra files which 'make install' doesn't cover
- if ! use bacula-clientonly; then
- # the database update scripts
- diropts -m0750
- insinto /usr/libexec/bacula/updatedb
- insopts -m0754
- doins "${S}"/updatedb/*
- fperms 0640 /usr/libexec/bacula/updatedb/README
-
- # the logrotate configuration
- # (now unconditional wrt bug #258187)
- diropts -m0755
- insinto /etc/logrotate.d
- insopts -m0644
- newins "${S}"/scripts/logrotate bacula
-
- # the logwatch scripts
- if use logwatch; then
- diropts -m0750
- dodir /usr/share/logwatch/scripts/services
- dodir /usr/share/logwatch/scripts/shared
- dodir /etc/logwatch/conf/logfiles
- dodir /etc/logwatch/conf/services
- pushd "${S}"/scripts/logwatch >&/dev/null || die
- emake DESTDIR="${D}" install
- popd >&/dev/null || die
- fi
- fi
-
- # Install all man pages
- doman "${S}"/manpages/*.[18]
-
- if ! use qt5; then
- rm -vf "${D}"/usr/share/man/man1/bat.1*
- fi
- rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
- if use bacula-clientonly || use bacula-nodir ; then
- rm -vf "${D}"/usr/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/libexec/bacula/disk-changer
- rm -vf "${D}"/usr/libexec/bacula/mtx-changer
- rm -vf "${D}"/usr/libexec/bacula/dvd-handler
- fi
-
- # documentation
- dodoc ChangeLog ReleaseNotes SUPPORT
-
- # install examples (bug #457504)
- if use examples; then
- docinto examples/
- dodoc -r examples/*
- fi
-
- # vim-files
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins scripts/bacula.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- newins scripts/filetype.vim bacula_ft.vim
- fi
-
- # setup init scripts
- myscripts="bacula-fd"
- if ! use bacula-clientonly; then
- if ! use bacula-nodir; then
- myscripts="${myscripts} bacula-dir"
- fi
- if ! use bacula-nosd; then
- myscripts="${myscripts} bacula-sd"
- fi
- fi
- for script in ${myscripts}; do
- # copy over init script and config to a temporary location
- # so we can modify them as needed
- cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die
"failed to copy ${script}.confd"
- cp "${FILESDIR}/newscripts/${script}".initd
"${T}/${script}".initd || die "failed to copy ${script}.initd"
-
- # now set the database dependancy for the director init script
- case "${script}" in
- bacula-dir)
- case "${mydbtype}" in
- sqlite3)
- # sqlite databases don't have a
daemon
- sed -i -e 's/need
"%database%"/:/g' "${T}/${script}".initd || die
- ;;
- *)
- # all other databases have
daemons
- sed -i -e
"s:%database%:${mydbtype}:" "${T}/${script}".initd || die
- ;;
- esac
- ;;
- *)
- ;;
- esac
-
- # install init script and config
- newinitd "${T}/${script}".initd "${script}"
- newconfd "${T}/${script}".confd "${script}"
- done
-
- systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
- # make sure the working directory exists
- diropts -m0750
- keepdir /var/lib/bacula
-
- # make sure bacula group can execute bacula libexec scripts
- fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
- if use bacula-clientonly; then
- fowners root:bacula /var/lib/bacula
- else
- fowners bacula:bacula /var/lib/bacula
- fi
-
- einfo
- einfo "A group 'bacula' has been created. Any users you add to this"
- einfo "group have access to files created by the daemons."
- einfo
- einfo "A user 'bacula' has been created. Please see the bacula manual"
- einfo "for information about running bacula as a non-root user."
- einfo
-
- if ! use bacula-clientonly && ! use bacula-nodir; then
- einfo
- einfo "If this is a new install, you must create the
${mydbtype} databases with:"
- einfo " /usr/libexec/bacula/create_${mydbtype}_database"
- einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
- einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
- einfo
-
- ewarn "ATTENTION!"
- ewarn "The format of the database may have changed."
- ewarn "If you just upgraded from a version below 9.0.0 you must
run"
- ewarn "'update_bacula_tables' now."
- ewarn "Make sure to have a backup of your catalog before."
- ewarn
- fi
-
- if use sqlite; then
- einfo
- einfo "Be aware that Bacula does not officially support SQLite
database anymore."
- einfo "Best use it only for a client-only installation. See Bug
#445540."
- einfo
- fi
-
- einfo "Please note that 'bconsole' will always be installed. To compile
'bat'"
- einfo "you have to enable 'USE=qt5'."
- einfo
- einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will
be used during"
- einfo "restores, so be sure to set it to an appropriate in dir in the
bacula config."
-}
diff --git a/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch
b/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch
deleted file mode 100644
index a2034cefde8..00000000000
--- a/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200
-+++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200
-@@ -24,6 +24,7 @@
- CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
- CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
- JSONOBJS = bbconsjson.o console_conf.o
-+ZLIBS=@ZLIBS@
-
- # these are the objects that are changed by the .configure process
- EXTRAOBJS = @OBJLIST@
-@@ -50,18 +51,18 @@
-
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o
$@ $(CONSOBJS) \
-- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
-- $(OPENSSL_LIBS)
-+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+ $(OPENSSL_LIBS) $(LIBS)
-
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o
$@ $(JSONOBJS) \
-- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
-- $(OPENSSL_LIBS)
-+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+ $(OPENSSL_LIBS) $(LIBS)
-
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS)
$(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
-- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
-- $(OPENSSL_LIBS)
-+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+ $(OPENSSL_LIBS) $(LIBS)
- strip $@
-
-
---- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200
-+++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200
-@@ -69,19 +69,19 @@
- bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@WIN32@
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o
$@ $(SVROBJS) \
-- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
-- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
$(AFS_LIBS) $(LZO_LIBS)
-+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS)
$(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-
- bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@WIN32@
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o
$@ $(JSONOBJS) \
-- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
-- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
$(AFS_LIBS) $(LZO_LIBS)
-+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS)
$(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@WIN32@
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib
-L../findlib -o $@ $(SVROBJS) \
-- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS)
\
-- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
$(AFS_LIBS) $(LZO_LIBS)
-+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS)
$(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- strip $@
-
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/bacula-fix-manpages.patch
b/app-backup/bacula/files/bacula-fix-manpages.patch
deleted file mode 100644
index 5ab0f084da2..00000000000
--- a/app-backup/bacula/files/bacula-fix-manpages.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur bacula-9.2.1.orig/configure bacula-9.2.1/configure
---- bacula-9.2.1.orig/configure 2018-08-12 07:28:00.000000000 +0000
-+++ bacula-9.2.1/configure 2018-10-26 19:12:34.838003264 +0000
-@@ -31277,7 +31277,7 @@
- fi
-
-
--ac_config_files="$ac_config_files autoconf/Make.common Makefile
manpages/Makefile scripts/btraceback scripts/bconsole
scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir
scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula
scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer
scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf
scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper
scripts/bat.console_apps scripts/bacula-tray-monitor.desktop src/Makefile
src/host.h src/console/Makefile src/console/bconsole.conf
src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32
src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file
src/qt-console/tray-monitor/tray-monitor.conf
src/qt-console/tray-monitor/bacula-tray-monitor.conf
src/qt-console/tray-monitor/tray-monitor.pro
src/qt-console/tray-monitor/tray-monitor.pro.mingw32
src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dir
d/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile
src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf
src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup
src/cats/delete_catalog_backup src/cats/create_postgresql_database
src/cats/update_postgresql_tables src/cats/make_postgresql_tables
src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables
src/cats/drop_postgresql_database src/cats/create_mysql_database
src/cats/update_mysql_tables src/cats/make_mysql_tables
src/cats/grant_mysql_privileges src/cats/drop_mysql_tables
src/cats/drop_mysql_database src/cats/create_sqlite3_database
src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables
src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables
src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql
src/cats/create_bacula_database src/cats/update_bacula_tables
src/cats/grant_bacula_privileges src/cats/make_bacula_tables
src/cats/drop_bacula_ta
bles src/cats/drop_bacula_database src/cats/install-d
efault-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile
src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in
updatedb/update_mysql_tables updatedb/update_sqlite3_tables
updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10
updatedb/update_sqlite3_tables_9_to_10
updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11
updatedb/update_sqlite3_tables_10_to_11
updatedb/update_postgresql_tables_10_to_11
updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12
updatedb/update_postgresql_tables_11_to_12
examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec
platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec
platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec
platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec
platforms/rpms/suse/bacula-mtx.spec $PFILES"
-+ac_config_files="$ac_config_files autoconf/Make.common Makefile
scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula
scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd
scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer
scripts/disk-changer scripts/logwatch/Makefile
scripts/logwatch/logfile.bacula.conf scripts/bat.desktop
scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper
scripts/bat.console_apps scripts/bacula-tray-monitor.desktop src/Makefile
src/host.h src/console/Makefile src/console/bconsole.conf
src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32
src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file
src/qt-console/tray-monitor/tray-monitor.conf
src/qt-console/tray-monitor/bacula-tray-monitor.conf
src/qt-console/tray-monitor/tray-monitor.pro
src/qt-console/tray-monitor/tray-monitor.pro.mingw32
src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dir
d/bacula-dir.conf src/lib/Makefile src/stored/Makefile
src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf
src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup
src/cats/delete_catalog_backup src/cats/create_postgresql_database
src/cats/update_postgresql_tables src/cats/make_postgresql_tables
src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables
src/cats/drop_postgresql_database src/cats/create_mysql_database
src/cats/update_mysql_tables src/cats/make_mysql_tables
src/cats/grant_mysql_privileges src/cats/drop_mysql_tables
src/cats/drop_mysql_database src/cats/create_sqlite3_database
src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables
src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables
src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql
src/cats/create_bacula_database src/cats/update_bacula_tables
src/cats/grant_bacula_privileges src/cats/make_bacula_tables
src/cats/drop_bacula_tables src/cats/drop
_bacula_database src/cats/install-default-backend src
/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile
src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in
updatedb/update_mysql_tables updatedb/update_sqlite3_tables
updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10
updatedb/update_sqlite3_tables_9_to_10
updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11
updatedb/update_sqlite3_tables_10_to_11
updatedb/update_postgresql_tables_10_to_11
updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12
updatedb/update_postgresql_tables_11_to_12
examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec
platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec
platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec
platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec
platforms/rpms/suse/bacula-mtx.spec $PFILES"
-
- ac_config_commands="$ac_config_commands default"
-
-@@ -32368,7 +32368,6 @@
- "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "autoconf/Make.common") CONFIG_FILES="$CONFIG_FILES autoconf/Make.common"
;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "manpages/Makefile") CONFIG_FILES="$CONFIG_FILES manpages/Makefile" ;;
- "scripts/btraceback") CONFIG_FILES="$CONFIG_FILES scripts/btraceback" ;;
- "scripts/bconsole") CONFIG_FILES="$CONFIG_FILES scripts/bconsole" ;;
- "scripts/baculabackupreport") CONFIG_FILES="$CONFIG_FILES
scripts/baculabackupreport" ;;
-diff -ur bacula-9.2.1.orig/Makefile.in bacula-9.2.1/Makefile.in
---- bacula-9.2.1.orig/Makefile.in 2018-08-12 07:28:00.000000000 +0000
-+++ bacula-9.2.1/Makefile.in 2018-10-26 19:13:08.788012946 +0000
-@@ -27,7 +27,7 @@
- # Non-client-only directores
- subdirs = src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
-
--all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} manpages
-+all_subdirs = ${fd_subdirs} ${@ALL_DIRS@}
-
- DIST = INSTALL README.configure configure Makefile Makefile.in
ChangeLog
-
