diff options
Diffstat (limited to 'app-backup/bacula')
20 files changed, 361 insertions, 1373 deletions
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest index be60a8bdd625..79ac896cb237 100644 --- a/app-backup/bacula/Manifest +++ b/app-backup/bacula/Manifest @@ -1,6 +1,3 @@ -DIST bacula-11.0.2.tar.gz 5982176 BLAKE2B 2da10e48b44ada189fb5d9ed48bac41232106721859df823309e7be63d16786ebaf95052d929ef67895fb993d019153d736125ec4fe5949591dd7dced0ee9835 SHA512 7e90352036a544b6a508547ae38660ca5d59b0bfd17126f346652e5c9977367ad9fe972e3f2823c10e7f8ffdcd1623ef24e8a82de030041762f0c0e09783e65c -DIST bacula-11.0.3.tar.gz 5982505 BLAKE2B a09a4829cb4eeb6cfe3b082efcc45f7704ad7da0f882b746a2f4aeeb3233775ccc89d7924442970e9609c449fee96466b33286e7c6f700cbab7f2013f0267f53 SHA512 753ef3f53079fe36e69791a3ff0c4230d611d86257c5ecbc28c2ec593e950b76dc9fedf3525c196b0742cc029d0a8023d31505c83d8d42ff3f48c3273b77c540 -DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee9c51009e04b44bfa4f5f3f8d57de93d8bf6c06f60b01f50838fd8cba4500117245b06e82f42a14a6de507a27d1 SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17 -DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70 -DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a -DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d +DIST bacula-13.0.3.tar.gz 6235649 BLAKE2B c1053e784f995aa45f2810a8b1370211a6e42f9512c11e0290f059d0e39489c24d4a7951fa055a00ecd2c4acb44581cc220271952c6d477d15c86e0a7e8680f7 SHA512 59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5 +DIST bacula-13.0.4.tar.gz 6227040 BLAKE2B e54a754280178f74f97fdbb3c91a596b632d80739fedd5f847d183f0852ea9e82bba55ad9a745ee1ceb945bd527d33b117bc3c866783bd3073166bd20607a72a SHA512 5d33714d5575c351e28676cbd165fe7648ce15a1bc2a03f6d5635528083f3ec3bd6c7137a987690dcc8b232105e5768be91ba405a033ad60c4b82f3c88d73812 +DIST bacula-15.0.2.tar.gz 6524812 BLAKE2B 1dd0722ce2bb6363936ed9cc9df1b6d842945f17277c77f40884bafc4b0a254c5fdd2c21bd200c6ca8b77c8eb718a319552e50135c9925d2b4ad81a64ab819d2 SHA512 71bd206a2bb0cf3ca0f2cb6547b63946bc2a8a5f70c5506b9a589e5ed9871bb98b56205da7d12e54a41c9ab3539fe1114bc94d926f0f831ee9e15bba36f167f3 diff --git a/app-backup/bacula/bacula-11.0.2.ebuild b/app-backup/bacula/bacula-11.0.2.ebuild deleted file mode 100644 index 129e789ee79d..000000000000 --- a/app-backup/bacula/bacula-11.0.2.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 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? ( - dev-libs/openssl:0=[static-libs] - ) - ) - !static? ( - dev-libs/lzo - sys-libs/ncurses:= - sys-libs/zlib - acl? ( virtual/acl ) - ssl? ( - dev-libs/openssl: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}"/${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 - # drop not needed tool - rm src/tools/bsparse.c || die - - 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 - - # 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 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-11.0.5.ebuild b/app-backup/bacula/bacula-13.0.3-r2.ebuild index b2738be8a8a5..952e13c53f82 100644 --- a/app-backup/bacula/bacula-11.0.5.ebuild +++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop libtool qmake-utils systemd @@ -10,17 +10,17 @@ 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" +SRC_URI="https://downloads.sourceforge.net/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 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" +KEYWORDS="amd64 ~ppc ~sparc x86" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X" DEPEND=" !bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) - postgres? ( dev-db/postgresql:=[threads] ) + postgres? ( dev-db/postgresql:=[threads(+)] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) @@ -53,6 +53,7 @@ DEPEND=" ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-util/patchelf " RDEPEND="${DEPEND} acct-user/bacula @@ -63,6 +64,7 @@ RDEPEND="${DEPEND} sys-block/mtx ) ) + selinux? ( sec-policy/selinux-bacula ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) " @@ -71,6 +73,13 @@ REQUIRED_USE=" static? ( bacula-clientonly ) " +# suppress warning wrt 'implicit function declaration' in config logs +# bug 900663 +QA_CONFIG_IMPL_DECL_SKIP=( + makedev # designed to check availability in + # used header file +) + S=${WORKDIR}/${MY_P} pkg_setup() { @@ -117,17 +126,25 @@ src_prepare() { # bat needs to respect LDFLAGS and CFLAGS eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + # tray-monitor needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch + # bug #328701 eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" + # fix soname in libbaccat.so, see bugs #602952, #790140 and #845126 + eapply "${FILESDIR}/bacula-fix-sonames-new.patch" + + # correct library search path for slibtool usage (bug #914389) + eapply -p0 "${FILESDIR}/fix_slibtool.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 + sed -i -e "s/+= qt$/+= qt nostrip/" \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die eapply_user @@ -151,11 +168,21 @@ src_prepare() { touch src/qt-console/.libs/bat || die chmod 755 src/qt-console/.libs/bat || die + # same for tray-monitor (bug #915605) + sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die + mkdir src/qt-console/tray-monitor/.libs || die + touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + + eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die + # 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 + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die # fix bundled libtool (bug 466696) # But first move directory with M4 macros out of the way. @@ -230,6 +257,10 @@ src_compile() { src_install() { emake DESTDIR="${D}" install doicon scripts/bacula.png + keepdir /var/lib/bacula/tmp + + # remove not needed .la files #840957 + find "${ED}" -name '*.la' -delete || die # install bat icon and desktop file when enabled # (for some reason ./configure doesn't pick this up) @@ -283,8 +314,8 @@ src_install() { if ! use qt5; then rm -vf "${D}"/usr/share/man/man1/bat.1* + rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.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 @@ -334,7 +365,7 @@ src_install() { 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 + # now set the database dependency for the director init script case "${script}" in bacula-dir) case "${mydbtype}" in @@ -410,4 +441,9 @@ pkg_postinst() { 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." + + einfo + einfo "If you adapt the port numbers for baculas components in the config files" + einfo "make sure to adapt the file names for the pidfile accordingly" + einfo "(see init.d scripts)." } diff --git a/app-backup/bacula/bacula-11.0.3.ebuild b/app-backup/bacula/bacula-13.0.4.ebuild index b2738be8a8a5..6a4d2259bb25 100644 --- a/app-backup/bacula/bacula-11.0.3.ebuild +++ b/app-backup/bacula/bacula-13.0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop libtool qmake-utils systemd @@ -10,17 +10,17 @@ 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" +SRC_URI="https://downloads.sourceforge.net/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 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X" DEPEND=" !bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) - postgres? ( dev-db/postgresql:=[threads] ) + postgres? ( dev-db/postgresql:=[threads(+)] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) @@ -53,6 +53,7 @@ DEPEND=" ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-util/patchelf " RDEPEND="${DEPEND} acct-user/bacula @@ -63,6 +64,7 @@ RDEPEND="${DEPEND} sys-block/mtx ) ) + selinux? ( sec-policy/selinux-bacula ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) " @@ -71,6 +73,13 @@ REQUIRED_USE=" static? ( bacula-clientonly ) " +# suppress warning wrt 'implicit function declaration' in config logs +# bug 900663 +QA_CONFIG_IMPL_DECL_SKIP=( + makedev # designed to check availability in + # used header file +) + S=${WORKDIR}/${MY_P} pkg_setup() { @@ -117,17 +126,25 @@ src_prepare() { # bat needs to respect LDFLAGS and CFLAGS eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + # tray-monitor needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch + # bug #328701 eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" + # fix soname in libbaccat.so, see bugs #602952, #790140 and #845126 + eapply "${FILESDIR}/bacula-fix-sonames-new.patch" + + # correct library search path for slibtool usage (bug #914389) + eapply -p0 "${FILESDIR}/fix_slibtool.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 + sed -i -e "s/+= qt$/+= qt nostrip/" \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die eapply_user @@ -151,11 +168,21 @@ src_prepare() { touch src/qt-console/.libs/bat || die chmod 755 src/qt-console/.libs/bat || die + # same for tray-monitor (bug #915605) + sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die + mkdir src/qt-console/tray-monitor/.libs || die + touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + + eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die + # 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 + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die # fix bundled libtool (bug 466696) # But first move directory with M4 macros out of the way. @@ -230,6 +257,10 @@ src_compile() { src_install() { emake DESTDIR="${D}" install doicon scripts/bacula.png + keepdir /var/lib/bacula/tmp + + # remove not needed .la files #840957 + find "${ED}" -name '*.la' -delete || die # install bat icon and desktop file when enabled # (for some reason ./configure doesn't pick this up) @@ -283,8 +314,8 @@ src_install() { if ! use qt5; then rm -vf "${D}"/usr/share/man/man1/bat.1* + rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.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 @@ -334,7 +365,7 @@ src_install() { 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 + # now set the database dependency for the director init script case "${script}" in bacula-dir) case "${mydbtype}" in @@ -410,4 +441,9 @@ pkg_postinst() { 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." + + einfo + einfo "If you adapt the port numbers for baculas components in the config files" + einfo "make sure to adapt the file names for the pidfile accordingly" + einfo "(see init.d scripts)." } diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-15.0.2.ebuild index 83f72ca31788..d5c84855a449 100644 --- a/app-backup/bacula/bacula-9.6.7.ebuild +++ b/app-backup/bacula/bacula-15.0.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop libtool qmake-utils systemd @@ -10,17 +10,19 @@ 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" +SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz" + +S=${WORKDIR}/${MY_P} LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X" DEPEND=" !bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) - postgres? ( dev-db/postgresql:=[threads] ) + postgres? ( dev-db/postgresql:=[threads(+)] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) @@ -53,6 +55,7 @@ DEPEND=" ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-util/patchelf " RDEPEND="${DEPEND} acct-user/bacula @@ -63,6 +66,7 @@ RDEPEND="${DEPEND} sys-block/mtx ) ) + selinux? ( sec-policy/selinux-bacula ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) " @@ -71,7 +75,12 @@ REQUIRED_USE=" static? ( bacula-clientonly ) " -S=${WORKDIR}/${MY_P} +# suppress warning wrt 'implicit function declaration' in config logs +# bug 900663 +QA_CONFIG_IMPL_DECL_SKIP=( + makedev # designed to check availability in + # used header file +) pkg_setup() { #XOR and !bacula-clientonly controlled by REQUIRED_USE @@ -117,20 +126,25 @@ src_prepare() { # bat needs to respect LDFLAGS and CFLAGS eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + # tray-monitor needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch + # bug #328701 eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch - eapply -p0 "${FILESDIR}"/9.6.3/${PN}-9.6.3-fix-static.patch + eapply -p0 "${FILESDIR}"/${PN}-15.0.2-fix-static.patch + + # fix soname in libbaccat.so, see bugs #602952, #790140 and #845126 + eapply "${FILESDIR}/bacula-fix-sonames-new.patch" - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" + # correct library search path for slibtool usage (bug #914389) + eapply -p0 "${FILESDIR}/${PN}-15.0.2-fix_slibtool.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 + sed -i -e "s/+= qt$/+= qt nostrip/" \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die eapply_user @@ -154,14 +168,21 @@ src_prepare() { touch src/qt-console/.libs/bat || die chmod 755 src/qt-console/.libs/bat || die + # same for tray-monitor (bug #915605) + sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die + mkdir src/qt-console/tray-monitor/.libs || die + touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + + eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die + # 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 database locking code for bacula-9.6.4 ... -9.6.x (bug #766195) - eapply -p0 "${FILESDIR}"/${PN}-9.6.x-fix-race-condition.patch + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die # fix bundled libtool (bug 466696) # But first move directory with M4 macros out of the way. @@ -236,6 +257,10 @@ src_compile() { src_install() { emake DESTDIR="${D}" install doicon scripts/bacula.png + keepdir /var/lib/bacula/tmp + + # remove not needed .la files #840957 + find "${ED}" -name '*.la' -delete || die # install bat icon and desktop file when enabled # (for some reason ./configure doesn't pick this up) @@ -289,8 +314,8 @@ src_install() { if ! use qt5; then rm -vf "${D}"/usr/share/man/man1/bat.1* + rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.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 @@ -340,7 +365,7 @@ src_install() { 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 + # now set the database dependency for the director init script case "${script}" in bacula-dir) case "${mydbtype}" in @@ -416,4 +441,9 @@ pkg_postinst() { 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." + + einfo + einfo "If you adapt the port numbers for baculas components in the config files" + einfo "make sure to adapt the file names for the pidfile accordingly" + einfo "(see init.d scripts)." } diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild deleted file mode 100644 index 033903ff748f..000000000000 --- a/app-backup/bacula/bacula-9.6.5.ebuild +++ /dev/null @@ -1,419 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 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? ( - dev-libs/openssl:0=[static-libs] - ) - ) - !static? ( - dev-libs/lzo - sys-libs/ncurses:= - sys-libs/zlib - acl? ( virtual/acl ) - ssl? ( - dev-libs/openssl: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/${PN}-9.6.3-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 - - # 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 database locking code for bacula-9.6.4 ... -9.6.x (bug #766195) - eapply -p0 "${FILESDIR}"/${PN}-9.6.x-fix-race-condition.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 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.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild deleted file mode 100644 index 83f72ca31788..000000000000 --- a/app-backup/bacula/bacula-9.6.6.ebuild +++ /dev/null @@ -1,419 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 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? ( - dev-libs/openssl:0=[static-libs] - ) - ) - !static? ( - dev-libs/lzo - sys-libs/ncurses:= - sys-libs/zlib - acl? ( virtual/acl ) - ssl? ( - dev-libs/openssl: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/${PN}-9.6.3-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 - - # 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 database locking code for bacula-9.6.4 ... -9.6.x (bug #766195) - eapply -p0 "${FILESDIR}"/${PN}-9.6.x-fix-race-condition.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 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/7.0.2/bacula-7.0.2-depend.patch b/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch deleted file mode 100644 index e076cd6478cc..000000000000 --- a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch +++ /dev/null @@ -1,12 +0,0 @@ -# fix file not found error during make depend ---- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200 -+++ src/tools/Makefile.in 2012-09-20 20:35:46.000000000 +0200 -@@ -194,7 +194,7 @@ - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile - @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -- @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile -+ @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile - @if test -f Makefile ; then \ - $(RMF) Makefile.bak; \ - else \ diff --git a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch b/app-backup/bacula/files/bacula-15.0.2-fix-static.patch index 1f32cd224f01..57963a271bba 100644 --- a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch +++ b/app-backup/bacula/files/bacula-15.0.2-fix-static.patch @@ -40,24 +40,24 @@ @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) $(IOKITLIBS) +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS) + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS) ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS) 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) +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) - static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../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) +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) strip $@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch b/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch new file mode 100644 index 000000000000..96eddbc5fb46 --- /dev/null +++ b/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch @@ -0,0 +1,67 @@ +# slibtool creates library in .libs directory but need -L. to find them +# Bug #914389 +--- src/stored/Makefile.in.orig 2023-11-15 14:20:23.135630968 +0100 ++++ src/stored/Makefile.in 2023-11-15 14:22:35.771246680 +0100 +@@ -267,7 +267,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + btape: Makefile $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \ + $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + +@@ -277,7 +277,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcloud.o: bcloud.c +@@ -286,7 +286,7 @@ + -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $< + + bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS) + + bls.o: bls.c +@@ -296,7 +296,7 @@ + + bls: Makefile $(BLSOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bextract.o: bextract.c +@@ -306,7 +306,7 @@ + + bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) $(ZSTD_LIBS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) $(ZSTD_LIBS) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bscan.o: bscan.c +@@ -316,7 +316,7 @@ + + bscan: Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ + $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcopy.o: bcopy.c +@@ -325,7 +325,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + bcopy: Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + cloud_parts_test: Makefile cloud_parts.c diff --git a/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch b/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch deleted file mode 100644 index 4862bcece0ef..000000000000 --- a/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/dird/dird.c.orig 2021-01-19 15:25:16.233573546 -0500 -+++ src/dird/dird.c 2021-01-19 15:26:23.884070798 -0500 -@@ -1263,11 +1263,11 @@ - } - if (catalog->db_driver) { - /* To copy dbdriver field into "CAT" catalog resource class (local) - * from dbdriver in "BDB" catalog DB Interface class (global) - */ -- bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len); -+ bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len+1); - } - } - - if (!db || !db_open_database(NULL, db)) { - Pmsg2(000, _("Could not open Catalog \"%s\", database \"%s\".\n"), diff --git a/app-backup/bacula/files/bacula-fix-sonames-new.patch b/app-backup/bacula/files/bacula-fix-sonames-new.patch new file mode 100644 index 000000000000..9a3abedb7d66 --- /dev/null +++ b/app-backup/bacula/files/bacula-fix-sonames-new.patch @@ -0,0 +1,37 @@ +# Fix soname in libbaccat.so, see bugs #602952, #790140 and #845126 +# +# Actual libtool needs a patch to accept '-soname' command line switch, +# otherwise it will ignored. +# slibtool in contrast responds with error and is not easy to patch. +# +# Solution here drops the '-soname' switch and uses patchelf program to +# fix the SONAME after the library is build. +diff --git a/src/cats/Makefile.in b/src/cats/Makefile.in +index d30cc75..9f87798 100644 +--- a/src/cats/Makefile.in ++++ b/src/cats/Makefile.in +@@ -135,17 +135,21 @@ libbaccats.la: Makefile cats_null.lo + libbaccats-mysql.la: Makefile $(MYSQL_LOBJS) + @echo "Making $@ ..." + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ +- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS) ++ $(MYSQL_LIBS) ++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-mysql-$(LIBBACCATS_LT_RELEASE).so + + libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS) + @echo "Making $@ ..." + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ +- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS) ++ $(POSTGRESQL_LIBS) ++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-postgresql-$(LIBBACCATS_LT_RELEASE).so + + libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS) + @echo "Making $@ ..." + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ +- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS) ++ $(SQLITE_LIBS) ++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-sqlite3-$(LIBBACCATS_LT_RELEASE).so ++ + #libbaccats-dbi.la: Makefile $(DBI_LOBJS) + # @echo "Making $@ ..." + # $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(DBI_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ diff --git a/app-backup/bacula/files/bacula-fix-sonames.patch b/app-backup/bacula/files/bacula-fix-sonames.patch deleted file mode 100644 index d05b2b9a37fb..000000000000 --- a/app-backup/bacula/files/bacula-fix-sonames.patch +++ /dev/null @@ -1,36 +0,0 @@ -=== modified file 'autoconf/ltmain.sh' ---- autoconf/ltmain.sh 2011-11-06 20:34:58 +0000 -+++ autoconf/ltmain.sh 2012-02-09 17:27:13 +0000 -@@ -2428,6 +2428,7 @@ - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension -+ -soname SONAME override the standard shared object name - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries -@@ -5422,6 +5423,11 @@ - prev= - continue - ;; -+ soname) -+ soname_spec="$arg" -+ prev= -+ continue -+ ;; - weak) - func_append weak_libs " $arg" - prev= -@@ -5741,6 +5747,11 @@ - continue - ;; - -+ -soname) -+ prev=soname -+ continue -+ ;; -+ - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - diff --git a/app-backup/bacula/files/fix_slibtool.patch b/app-backup/bacula/files/fix_slibtool.patch new file mode 100644 index 000000000000..e38448faa30c --- /dev/null +++ b/app-backup/bacula/files/fix_slibtool.patch @@ -0,0 +1,67 @@ +# slibtool creates library in .libs directory but need -L. to find them +# Bug #914389 +--- src/stored/Makefile.in.orig 2023-11-15 14:20:23.135630968 +0100 ++++ src/stored/Makefile.in 2023-11-15 14:22:35.771246680 +0100 +@@ -267,7 +267,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + btape: Makefile $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \ + $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + +@@ -277,7 +277,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcloud.o: bcloud.c +@@ -286,7 +286,7 @@ + -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $< + + bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS) + + bls.o: bls.c +@@ -296,7 +296,7 @@ + + bls: Makefile $(BLSOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bextract.o: bextract.c +@@ -306,7 +306,7 @@ + + bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bscan.o: bscan.c +@@ -316,7 +316,7 @@ + + bscan: Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ + $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcopy.o: bcopy.c +@@ -325,7 +325,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + bcopy: Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + cloud_parts_test: Makefile cloud_parts.c diff --git a/app-backup/bacula/files/fix_tray_monitor.patch b/app-backup/bacula/files/fix_tray_monitor.patch new file mode 100644 index 000000000000..1d3999c4f4f1 --- /dev/null +++ b/app-backup/bacula/files/fix_tray_monitor.patch @@ -0,0 +1,15 @@ +# original code calls 'qmake' and 'make clean' for tray-monitor configuration twice +# resuting in a Makefile without install rule for binary +# +# see bug #915605 +--- configure.orig 2023-11-14 12:01:38.738557240 +0000 ++++ configure 2023-11-14 12:02:13.845743964 +0000 +@@ -35067,8 +35067,6 @@ + rm -rf moc32 obj32 moc64 obj64 ui32 ui64 + $QMAKE + ${MAKE:-make} clean +- $QMAKE +- ${MAKE:-make} clean + cd ${BUILD_DIR} + fi + diff --git a/app-backup/bacula/files/newscripts/bacula-dir.initd b/app-backup/bacula/files/newscripts/bacula-dir.initd index fdcfc7ef2b65..df76a70ca3ee 100644 --- a/app-backup/bacula/files/newscripts/bacula-dir.initd +++ b/app-backup/bacula/files/newscripts/bacula-dir.initd @@ -1,8 +1,10 @@ #!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + command=/usr/sbin/bacula-dir command_args="${DIR_OPTIONS}" +# make sure the following line matches the portnumber from bacula-dir.conf pidfile=/var/run/bacula-dir.9101.pid depend() { diff --git a/app-backup/bacula/files/newscripts/bacula-fd.initd b/app-backup/bacula/files/newscripts/bacula-fd.initd index fe6a8815b9fd..5063df0f9198 100644 --- a/app-backup/bacula/files/newscripts/bacula-fd.initd +++ b/app-backup/bacula/files/newscripts/bacula-fd.initd @@ -1,9 +1,10 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/sbin/bacula-fd command_args="${FD_OPTIONS}" +# make sure the following line matches the portnumber from bacula-fd.conf pidfile=/var/run/bacula-fd.9102.pid depend() { diff --git a/app-backup/bacula/files/newscripts/bacula-sd.initd b/app-backup/bacula/files/newscripts/bacula-sd.initd index 07facefbb4a4..15aa6d1c6205 100644 --- a/app-backup/bacula/files/newscripts/bacula-sd.initd +++ b/app-backup/bacula/files/newscripts/bacula-sd.initd @@ -1,8 +1,10 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + command=/usr/sbin/bacula-sd command_args="${SD_OPTIONS}" +# make sure the following line matches the portnumber from bacula-sd.conf pidfile=/var/run/bacula-sd.9103.pid depend() { diff --git a/app-backup/bacula/files/tray-monitor-pro.patch b/app-backup/bacula/files/tray-monitor-pro.patch new file mode 100644 index 000000000000..2781903cbb9f --- /dev/null +++ b/app-backup/bacula/files/tray-monitor-pro.patch @@ -0,0 +1,15 @@ +# Build of tray-monitor should respect LDFLAGS and CFLAGS +--- src/qt-console/tray-monitor/tray-monitor.pro.in.orig 2023-11-16 16:25:31.840100695 +0100 ++++ src/qt-console/tray-monitor/tray-monitor.pro.in 2023-11-16 16:26:26.453913247 +0100 +@@ -41,8 +41,9 @@ + QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) + QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p + QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor +-QMAKE_CXXFLAGS += -DTRAY_MONITOR +-QMAKE_CFLAGS += -DTRAY_MONITOR ++QMAKE_CXXFLAGS += @CXXFLAGS@ -DTRAY_MONITOR ++QMAKE_CFLAGS += @CFLAGS@ -DTRAY_MONITOR ++QMAKE_LFLAGS += @LDFLAGS@ + + INSTALLS = bins confs + diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml index 8a6dd3f7f7c4..35c444c8931f 100644 --- a/app-backup/bacula/metadata.xml +++ b/app-backup/bacula/metadata.xml @@ -11,6 +11,7 @@ <flag name="bacula-nodir">Disable building of director</flag> <flag name="bacula-nosd">Disable building of storage daemon</flag> <flag name="batch-insert">Enable batch insert into data base</flag> + <flag name="ipv6">Support IPV6 protocol"</flag> <flag name="logwatch">Install support files for logwatch</flag> </use> <upstream> |