From eccb70a7f91b2d22582587f26d1a28bb31408b45 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 May 2019 00:10:51 +0100 Subject: gentoo resync : 18.05.2019 --- app-backup/bacula/Manifest | 19 +- app-backup/bacula/bacula-9.0.6-r4.ebuild | 436 -------------------- app-backup/bacula/bacula-9.0.8-r1.ebuild | 3 + app-backup/bacula/bacula-9.2.1.ebuild | 440 --------------------- app-backup/bacula/bacula-9.2.2-r1.ebuild | 3 + app-backup/bacula/bacula-9.2.2.ebuild | 440 --------------------- app-backup/bacula/bacula-9.4.1-r1.ebuild | 3 + app-backup/bacula/bacula-9.4.1.ebuild | 434 -------------------- app-backup/bacula/bacula-9.4.2.ebuild | 3 + app-backup/bacula/bacula-9.4.3.ebuild | 438 ++++++++++++++++++++ .../files/7.2.0/bacula-7.2.0-fix-static.patch | 56 --- .../files/9.0.2/bacula-9.0.2-fix-static.patch | 63 --- .../bacula-9.0.6-fix-pages-h-qt-includes.patch | 15 - 13 files changed, 456 insertions(+), 1897 deletions(-) delete mode 100644 app-backup/bacula/bacula-9.0.6-r4.ebuild delete mode 100644 app-backup/bacula/bacula-9.2.1.ebuild delete mode 100644 app-backup/bacula/bacula-9.2.2.ebuild delete mode 100644 app-backup/bacula/bacula-9.4.1.ebuild create mode 100644 app-backup/bacula/bacula-9.4.3.ebuild delete mode 100644 app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch delete mode 100644 app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch delete mode 100644 app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch (limited to 'app-backup/bacula') diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest index 9fca2d515a88..d8aba167ab39 100644 --- a/app-backup/bacula/Manifest +++ b/app-backup/bacula/Manifest @@ -8,11 +8,8 @@ AUX 5.2.3/bacula-5.2.3-lib-search-path.patch 631 BLAKE2B 6d7f724d96d3111a0929054 AUX 5.2.3/bacula-5.2.3-openssl-1.patch 863 BLAKE2B 32d49a53c8f639e762bd964f4fa1426952ccb2fd595717e015ee9c060e182d9189cf1749cb5e9d90d8712a0b1c3800ad98ba175e48935e7b6d172e6474719456 SHA512 729f01b5e88230561482cbe87fd185707be28ba92252e54a5111f0154f7d3df9cec9e31ee932bbdb34fe8b5e212cf43dc74d46460f68579e5f953ffe565a7a2c AUX 7.0.2/bacula-7.0.2-depend.patch 599 BLAKE2B be676329434260e65f7dcbefbfa8d9a04998856ab6743e5f3577e9e316346a22eed45a02960ed8590c946e079ba1e9d814061f67d6ef25c0a72f8bcafe38a48e SHA512 0474e077d89c5b1552f8b1929209db380ac67ca29add78987ad1593b139647a2d1822a0d89c3b117ca93024bffd74da7da5a5f23bc5095492c0cc9e4eddb24f6 AUX 7.2.0/bacula-7.2.0-doc.patch 435 BLAKE2B 65d528b337f9a3e2eaf456b6dad37ddc59bc1a3f6e54208899346a6bc285fe2b19a464b39cc0c9439c4266baf98c1b3a06afd235b3ee7c88373d3c890163e01a SHA512 27d2839658e3471487dce023c806261e5b5d03212f12eab75885b9b61eb22e57c96e85c07a5f81c812974963904ab81b6ce15abf5381647bd2188abd14139b34 -AUX 7.2.0/bacula-7.2.0-fix-static.patch 2599 BLAKE2B 8b9119b0d6f47cace3e77a93434bec735276ddc8295157aaca67778dad1bbd62603201c011d5457f36b92b0ba9e7975fc4d0d7ca06d33decf510dd805759d210 SHA512 12b241ca20e7d3eff3c4fdf495c3f4f2074e41196379ae3bf5d655299413c0dec263200644745d081e77253fe20b07845d567de71dedb7564a6f64f134c3c905 -AUX 9.0.2/bacula-9.0.2-fix-static.patch 3637 BLAKE2B 4119db6091fdaf7d8d103a166ce672c405da8093e2a04eef5e9bda1cc0e0cde997fef378d92e0fa1531c39281e877aa10f8dd939377924fc7252d6c228722c86 SHA512 218febc3ccbfeccea4a5b05f6086aeff7f4e0e88e3a6670a8a0406101e7276c35d254f4bfa6b6782ea5bdcd1ad8fc5080cff80bb9befcf4d7f968075eb850360 AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 BLAKE2B f04bbf695a926424092dd974994967eefcd48407f2de43b9e94bff25403e66f4a49cde08d667e3b5fc4fb9f8d273a786c3422325db3f589278d16f136d4a9a0c SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e0a6835b9f6cadb6b43b2b55ea33113e20c20b6a367d965ea12358597e9807c79846e45571b31f9b66dc3ad83265fed4e7 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf -AUX 9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch 306 BLAKE2B a6bca03d7e61051046083f1773ce65035f695dd8d5de45d58e0488eb5047580db444cbb52ae5e93068ff60028220a9286da9d1323d141335be31ebfb9c9acb44 SHA512 86a869f10e512eac6aa4500f73ace1cfe3883cc4d176c26d275f6dc51320763cb55c2d139a7a0230c57c40f4996651a0de71788e3a7ef343a4290e56f9585a22 AUX 9.0.6/bacula-9.0.6-libressl26.patch 2318 BLAKE2B 6d918bbf3eb0af17b3d1ccc5fe70788de21aed8823178a36dc04ada1198fef99425bf0af55d86bfff8342ba7df635e05e813548d3469cf51edb1c813836f45c3 SHA512 c6d7a386a89eaeaa3281cfe4bc2d8c48a84762d4a6e01d1f327110efeada0168261d03b3ab1183fffa5456975ff475b12b286f360d7001cf459f0a10be6ba8be AUX 9.0.6/bacula-9.0.6-libressl27.patch 429 BLAKE2B 0342617198722981b1efa335bdd856e0eaa139cc9628520c43c6d8e33f2c312ec536b16821a2e7d704189e341a55e7f1b33508ee28db4482f748f4a0fdf2503e SHA512 527f280d5d4ecbbbb419d535f1c1ef6cbd7c429a6e8e375cd9365eea914fa136b60282d1a00ad4fa1dca58afc3bb915a51bf8e1b888feb52d5ed0b0b308bb208 AUX 9.0.8/bacula-9.0.8-fix-static.patch 3705 BLAKE2B 5aef2b819608538d6fd360577b873cb1d7da459417fa03c05c007abe322e848429eb1b1d620d194f430233e3a9b72bd909f7ee6288b6f0c45dc0297c6b00f85f SHA512 4453a491c2b5a19e8f1e19e6e44e22032e0e626003bc871417d4e189abc29c0617d5079fd7a40b1ea6e94fd65d99e44098fef69543e036cb426cf87276fd0510 @@ -31,19 +28,15 @@ AUX newscripts/bacula-dir.initd 318 BLAKE2B f482ce3c49ff8106244b62946ab8bc4ab14d AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4 DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b031e5e4febfb537a72a0481c2f7c3e80d39b84657238bc147b58174ce544749aed70882f66678edfaa2fb51ac2f SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 -DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B be321a2a215cc2b127423cf8d103303957c7064ba4453f0da8b82b3c23a38d45df7ee0e434da8a010911976812b23886fcf366d0dee9f1880c0f14fa641c1937 SHA512 4041525f594e23bfb231ea182a680899020347dd26e1d7f6d05c9f97aac8000a1bbeb9acaf2f73b283616fe03caf38fbb335b0e65e6a18e0322ca64da6f98e64 -DIST bacula-9.2.1.tar.gz 4115337 BLAKE2B 17c678bee46c9788d9abf220d0c810f94864f9f1609fc25513b2cf0a11ac584fc2ca4429fa49d7af567d316b92c243900bed21511b59f8976fd230186896c70f SHA512 6b14372fb505a4c5e084b96154c764b20e173504e335813cfffd406eb1739a301a5352047696501a11fcc297381a9fbed6e0e8714ad62998f02edbd9e0ff8d1b DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B affc6efa3543836690e3d89eb37faa2d5066344308dc29a22c491374f04a2fd00bedb57a869d0bcf8a0f58d806bc9f9b9381330c22984ddb4d5acd97b757d2c8 SHA512 390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708 DIST bacula-9.4.1.tar.gz 4162956 BLAKE2B f3fdd2ab64dc4fe50210d83a80ce16f36996f6d23bb67326e8bcee97ae9fd83b2dc8a96eabcd86c522c5e1ca5b8923110e97c03be953427a5c5f59140fdea332 SHA512 5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee DIST bacula-9.4.2.tar.gz 4163642 BLAKE2B 5b12b44749186fbcd0da4eb97fca304cc8a0152cff87dd9dcf7058452a853a8a58208537496978a213067691cecaa5626e21d3a94438981e12f028a6157d3fb8 SHA512 f8c8f4c788ced1ab846e02656a0a1d9d1b65fe57ae0b888780167ac7e9272e8ca624ef5c41bd44a7454cf518c8e451c2201970b3e4862a99b4290a377da40b0d +DIST bacula-9.4.3.tar.gz 4167892 BLAKE2B 058d51fa62f7a37ccb19d91c33589dd2d2a52ee2d17e82c5b5ce7b9f80f36ead81cd6cb4fafcfc269f4202a2a9f989106ade72efd673f89693f155c0f4a0b336 SHA512 042bf1b974ff60b054bd4a16ce93cd1d93b89d0b743f340c00cc4636922e1e25a38d97dc140bf5842859b3694736df2a812801747ced678610f8583e14ea5e81 EBUILD bacula-5.2.13-r7.ebuild 11664 BLAKE2B 76603fc56fc0143680aa204e614bf66ed64e0502946c28663bc9dbd8d51bcb7ff77d60d74afd82b822cceea10d9c01a59faea6b0dfae437490e4eab2d08df6ec SHA512 29c0993f6a02fdb400d7a3cbcb94410e4ac3d96073ef84ea4fb39845ae1e637511a19ef419b52d10b5757f9d9196238a63c244fa0fb9bf3114e10c9d131931be -EBUILD bacula-9.0.6-r4.ebuild 12772 BLAKE2B 0ef1458b22c2b69a153a4e8461dc498b6eeb8069293592c7cd555bcec92990f6ec3ae134588c25aa323095909d27cdb46c607e736b1c8e751acc8f9f7f2444a1 SHA512 ab6b4b2e88cda5d1b26e96b22f4247cce9fa3caf44b0c8c38aa9eab48435c89a02dd83a6a3d863117263676509d18c40b45a634ae13aafa5b0a0ac614d73483b -EBUILD bacula-9.0.8-r1.ebuild 12629 BLAKE2B b3716615e05a59f9b5918d4dfd5a5436fb0e6cd5dd5b85af83009612d1eda80e68f3606a138d85a5692253ed2ac09e2892d10063f14f5002deed635250da2093 SHA512 41103f97c4e429ff011d8f19200d42e2465b5271c57c5f1ef8ee5722f65b8017ce65b588dc7d8b0b3fbeba27279c1fbba8294af7273b504d0f2440ebefe058b4 -EBUILD bacula-9.2.1.ebuild 12704 BLAKE2B eac968cd82b1f34b79f55dd2549c03afa15c33789b5ce82462722f0e9c3162817f079de9b4cb132f23b1b5e8e3dc38d378a8badb87a02b4acd5bd74fc4ac500e SHA512 73170ba9f12b12764a0f4122b85d472c2442f7cb0328d0ff818cf4b168294b90e05b426a9d7067a96ef7b96bd44b164f6b5f8ba7714e6815b3b20cb15a518d85 -EBUILD bacula-9.2.2-r1.ebuild 12614 BLAKE2B 039ec4a82bc116e82436e9b6ec0b29232ae33ea00f44a2b8d852b651417e5cef5cbbd684db7bf975fa942fc8d2f73a0059f0e337223ec8404ad8f3ca49463b62 SHA512 19443157051519a5ed1770adc07653bc24ecfb025503e5e091b09a512a581b93975d64d8f149e34c3d824b2e1120c84bfaac0ebb8152802c1be1bc6ce49e4916 -EBUILD bacula-9.2.2.ebuild 12707 BLAKE2B ac2dc80b9fd32e3fe001f344fa86b09f2f7bf7b7fd3d9a5b50498864fbfec6707573551a515aa6f2eaa10a72d16ee795ff3dd4c0f57dcbb901a2d08666241c88 SHA512 744906d7fb8a22fd9ee0caad8b5e5afab6d083cdd66156783db18a58eeb0bfb83000124f9fd226a92c25fab2e6470bf12e4e3696c8ca8a0905ac16bbc9b25350 -EBUILD bacula-9.4.1-r1.ebuild 12732 BLAKE2B 26ce97455f384cdfdc17f7f45bfce2b4ad81a76770080eda0a287910f0ae790c0269ab29f1e8af85187a374ea22916ff38d905d9c74e1b255f9581eb953a7c16 SHA512 3d96f6031bc53958210a8e311b2018922ccd375db50eb0af842e4b1910b4001a8210a86db10eaa36fed761a202063c50a9e8924e9ef104932eb3d1a91259cd5a -EBUILD bacula-9.4.1.ebuild 12609 BLAKE2B 476867ef246b9f6d941dd5a6f2fee5a6b59c8b56029281f62a36c7912ff2ef5a0918b5fb318965c5187564ebe1b9e84db1e2a6989ed4e777625c6573240f4656 SHA512 27dc20a52a100d8af9ae73801ce0a8b6649e23569c1c3b8e68397dd746e6e7788e46198e56539990988b417a1d50e0132cbd9b772554ed6318fe6fc51b5add63 -EBUILD bacula-9.4.2.ebuild 12626 BLAKE2B bbc034ab7a310df65e4e7603d4008f05759f302113c828923cafb942447119ef4e991e9c83673ae095d6b8e62d95ac15a7a2ec0784554f2d1c1e1154c1fb731c SHA512 20ebc8ea23a4f31194356cf9be9116151696bc4b488d1a66ba698df238af596f631a72d0e4b8da69ba6bd75d74ea29ab5c6dc65dfc12f80a4199b087c809cd6f +EBUILD bacula-9.0.8-r1.ebuild 12685 BLAKE2B 23f9d0906008ebb264c5490f43eee05ccd85b590c152015037f281c3af33d31f8cd9b2e30b49b74406032331fbf38037755b9da4f5e18dfa951fb72f4860b368 SHA512 a495f5c3b076f9197435ca903afbab3bf8851a4c291ecf441408d0c231102a0549836bc113b80f092a209dfd7041399832fb14b39fbacbd8723e222c8b40d53e +EBUILD bacula-9.2.2-r1.ebuild 12670 BLAKE2B a8c95b2a8eed0008d640cc5945d1f0ed735225e6ad708b91930e8183002876defb6ed992bb004d6d8a5b9f8e11a4ef05ade1b5ed2c5efb6cd1c5a51c2647cbda SHA512 cfa5270dfb41873e2fa625bbac8988784d4c3ad5f44da95edcb91ed57c098b472b8f683c38fbf9c953531e4a142cb22773b5489444df6c6979f7b7692c90b1a7 +EBUILD bacula-9.4.1-r1.ebuild 12788 BLAKE2B 7c4db91d2d226679542a82e5381ade4a4118dc34990932161b8144f60e5a704a966941cab9299d1cd87db9d1f6452fbcb73aca1d4e0119537178bacd1c487797 SHA512 555817ecbd8f685eed263b063bd0a4d5751103fbf8b873094a32194b63d9b238c17a063567fb0a61965793fbf0ab924d1ae38a976a820a305b5a595907bd0d0a +EBUILD bacula-9.4.2.ebuild 12682 BLAKE2B 9edc19e42ab2f0c278135e8816dc4e4cb19566616f5d0a28383d4f30940b93beda567fdb3f4266715441f91d08b73eea8093df3abeb34d2369d00dd92588edd8 SHA512 75a02bab960ffed611c5987c4a3c7232ebcc61db7588e3442fd2e8a58b86aa7879cc8a31eb17d3c6d4f742b89b9bea9f5711b6f1335ca94fdd7c05f3515534c6 +EBUILD bacula-9.4.3.ebuild 12682 BLAKE2B 9edc19e42ab2f0c278135e8816dc4e4cb19566616f5d0a28383d4f30940b93beda567fdb3f4266715441f91d08b73eea8093df3abeb34d2369d00dd92588edd8 SHA512 75a02bab960ffed611c5987c4a3c7232ebcc61db7588e3442fd2e8a58b86aa7879cc8a31eb17d3c6d4f742b89b9bea9f5711b6f1335ca94fdd7c05f3515534c6 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875 diff --git a/app-backup/bacula/bacula-9.0.6-r4.ebuild b/app-backup/bacula/bacula-9.0.6-r4.ebuild deleted file mode 100644 index f67ebadf7141..000000000000 --- a/app-backup/bacula/bacula-9.0.6-r4.ebuild +++ /dev/null @@ -1,436 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit qmake-utils desktop systemd user libtool - -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 examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" - -DEPEND=" - dev-libs/gmp:0 - !bacula-clientonly? ( - postgres? ( dev-db/postgresql:=[threads] ) - mysql? ( dev-db/mysql-connector-c:= ) - sqlite? ( dev-db/sqlite:3 ) - !bacula-nodir? ( virtual/mta ) - ) - qt5? ( - dev-qt/qtsvg:5 - x11-libs/qwt:6 - ) - logwatch? ( sys-apps/logwatch ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - readline? ( sys-libs/readline:0 ) - static? ( - acl? ( virtual/acl[static-libs] ) - sys-libs/zlib[static-libs] - dev-libs/lzo[static-libs] - sys-libs/ncurses:=[static-libs] - ssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) - ) - ) - !static? ( - acl? ( virtual/acl ) - sys-libs/zlib - dev-libs/lzo - sys-libs/ncurses:= - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - )" -RDEPEND="${DEPEND} - !bacula-clientonly? ( - !bacula-nosd? ( - sys-block/mtx - app-arch/mt-st - ) - ) - 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" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/ instead of ./ - 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.2/${PN}-9.0.2-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 - - # fix missing QtGlobal include in src/qt-console/pages.h for Qt5 - eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-fix-pages-h-qt-includes.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 wrong handling of libressl version - # needs separate handling for =libressl2.7 - # (see bug #655520) - if has_version "&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - 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/share/man/man8/bacula-dir.8* - rm -vf "${D}"/usr/share/man/man8/dbcheck.8* - rm -vf "${D}"/usr/share/man/man1/bsmtp.1* - rm -vf "${D}"/usr/libexec/bacula/create_*_database - rm -vf "${D}"/usr/libexec/bacula/drop_*_database - rm -vf "${D}"/usr/libexec/bacula/make_*_tables - rm -vf "${D}"/usr/libexec/bacula/update_*_tables - rm -vf "${D}"/usr/libexec/bacula/drop_*_tables - rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges - rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup - fi - if use bacula-clientonly || use bacula-nosd; then - rm -vf "${D}"/usr/share/man/man8/bacula-sd.8* - rm -vf "${D}"/usr/share/man/man8/bcopy.8* - rm -vf "${D}"/usr/share/man/man8/bextract.8* - rm -vf "${D}"/usr/share/man/man8/bls.8* - rm -vf "${D}"/usr/share/man/man8/bscan.8* - rm -vf "${D}"/usr/share/man/man8/btape.8* - rm -vf "${D}"/usr/libexec/bacula/disk-changer - rm -vf "${D}"/usr/libexec/bacula/mtx-changer - rm -vf "${D}"/usr/libexec/bacula/dvd-handler - fi - - # documentation - 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 - - 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 -} diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild index 0ea0135150c8..14a98bb221b3 100644 --- a/app-backup/bacula/bacula-9.0.8-r1.ebuild +++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild @@ -26,6 +26,9 @@ DEPEND=" !bacula-nodir? ( virtual/mta ) ) qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) diff --git a/app-backup/bacula/bacula-9.2.1.ebuild b/app-backup/bacula/bacula-9.2.1.ebuild deleted file mode 100644 index 7078d302e01e..000000000000 --- a/app-backup/bacula/bacula-9.2.1.ebuild +++ /dev/null @@ -1,440 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop libtool qmake-utils systemd user - -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 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/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} - !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" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/ instead of ./ - 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 wrong handling of libressl version - # needs separate handling for =libressl2.7 - # (see bug #655520) - if has_version "&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - 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 all man pages - doman "${S}"/manpages/* - - # 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 - - 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 dir in the bacula config." -} diff --git a/app-backup/bacula/bacula-9.2.2-r1.ebuild b/app-backup/bacula/bacula-9.2.2-r1.ebuild index eedf7f28d1be..6e8635da494b 100644 --- a/app-backup/bacula/bacula-9.2.2-r1.ebuild +++ b/app-backup/bacula/bacula-9.2.2-r1.ebuild @@ -26,6 +26,9 @@ DEPEND=" ) 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 ) diff --git a/app-backup/bacula/bacula-9.2.2.ebuild b/app-backup/bacula/bacula-9.2.2.ebuild deleted file mode 100644 index df22d058de95..000000000000 --- a/app-backup/bacula/bacula-9.2.2.ebuild +++ /dev/null @@ -1,440 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop libtool qmake-utils systemd user - -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 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/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} - !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" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/ instead of ./ - 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 wrong handling of libressl version - # needs separate handling for =libressl2.7 - # (see bug #655520) - if has_version "&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - 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 all man pages - doman "${S}"/manpages/* - - # 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 - - 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.1-r1.ebuild b/app-backup/bacula/bacula-9.4.1-r1.ebuild index 7cd85d81e5c7..750f5bddbfa8 100644 --- a/app-backup/bacula/bacula-9.4.1-r1.ebuild +++ b/app-backup/bacula/bacula-9.4.1-r1.ebuild @@ -26,6 +26,9 @@ DEPEND=" ) 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 ) diff --git a/app-backup/bacula/bacula-9.4.1.ebuild b/app-backup/bacula/bacula-9.4.1.ebuild deleted file mode 100644 index 470df2887e2c..000000000000 --- a/app-backup/bacula/bacula-9.4.1.ebuild +++ /dev/null @@ -1,434 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop libtool qmake-utils systemd user - -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/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} - !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" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/ instead of ./ - 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 =libressl2.7 - # (see bug #655520) - if has_version "&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - 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 all man pages - doman "${S}"/manpages/* - - # 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 - - 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.2.ebuild b/app-backup/bacula/bacula-9.4.2.ebuild index 0ec8c9e23520..17ec8d24af39 100644 --- a/app-backup/bacula/bacula-9.4.2.ebuild +++ b/app-backup/bacula/bacula-9.4.2.ebuild @@ -26,6 +26,9 @@ DEPEND=" ) 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 ) diff --git a/app-backup/bacula/bacula-9.4.3.ebuild b/app-backup/bacula/bacula-9.4.3.ebuild new file mode 100644 index 000000000000..17ec8d24af39 --- /dev/null +++ b/app-backup/bacula/bacula-9.4.3.ebuild @@ -0,0 +1,438 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop libtool qmake-utils systemd user + +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} + !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" + + # create the daemon group and user + if [ -z "$(egetent group bacula 2>/dev/null)" ]; then + enewgroup bacula + einfo + einfo "The group 'bacula' has been created. Any users you add to this" + einfo "group have access to files created by the daemons." + einfo + fi + + if use bacula-clientonly && use static && use qt5; then + ewarn + ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." + ewarn + fi + + if ! use bacula-clientonly; then + if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then + enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw + einfo + einfo "The user 'bacula' has been created. Please see the bacula manual" + einfo "for information about running bacula as a non-root user." + einfo + fi + fi +} + +src_prepare() { + # adjusts default configuration files for several binaries + # to /etc/bacula/ instead of ./ + 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 =libressl2.7 + # (see bug #655520) + if has_version "&/dev/null || die + emake DESTDIR="${D}" install + popd >&/dev/null || die + fi + fi + + 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 all man pages + doman "${S}"/manpages/* + + # 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 + + 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.2.0/bacula-7.2.0-fix-static.patch b/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch deleted file mode 100644 index faf0d065b90f..000000000000 --- a/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400 -+++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400 -@@ -29,10 +29,11 @@ - GETTEXT_LIBS = @LIBINTL@ - - CONS_INC=@CONS_INC@ - CONS_LIBS=@CONS_LIBS@ - CONS_LDFLAGS=@CONS_LDFLAGS@ -+ZLIBS=@ZLIBS@ - - .SUFFIXES: .c .o - .PHONY: - .DONTCARE: - -@@ -46,17 +47,17 @@ - @echo " " - - - 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) - - static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -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) $(ZLIBS) - strip $@ - - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ ---- src/filed/Makefile.in.orig 2015-09-04 12:47:13.000000000 +0200 -+++ src/filed/Makefile.in 2015-09-04 12:49:39.000000000 +0200 -@@ -66,13 +66,13 @@ - bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(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) - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(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/9.0.2/bacula-9.0.2-fix-static.patch b/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch deleted file mode 100644 index bf6630a74a29..000000000000 --- a/app-backup/bacula/files/9.0.2/bacula-9.0.2-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) - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(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) - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(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/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch deleted file mode 100644 index 9d6507c9c71a..000000000000 --- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/qt-console/pages.h.orig 2017-11-21 12:37:16.000000000 -0500 -+++ src/qt-console/pages.h 2018-02-07 13:11:46.223273248 -0500 -@@ -20,10 +20,11 @@ - */ - /* - * Dirk Bartley, March 2007 - */ - -+#include - #if QT_VERSION >= 0x050000 - #include - #else - #include - #endif - -- cgit v1.2.3