1 |
commit: 97e7a4cfcea9ad0b22cf47012ced97b014d19cc5 |
2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 18 16:40:00 2021 +0000 |
4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 18 16:40:00 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e7a4cf |
7 |
|
8 |
app-backup/bacula: Version bump |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> |
12 |
|
13 |
app-backup/bacula/Manifest | 1 + |
14 |
app-backup/bacula/bacula-11.0.2.ebuild | 417 +++++++++++++++++++++ |
15 |
.../bacula/files/bacula-11.0.2-fix-static.patch | 63 ++++ |
16 |
3 files changed, 481 insertions(+) |
17 |
|
18 |
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest |
19 |
index a4201f8397c..23ed3ce5e00 100644 |
20 |
--- a/app-backup/bacula/Manifest |
21 |
+++ b/app-backup/bacula/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
+DIST bacula-11.0.2.tar.gz 5982176 BLAKE2B 2da10e48b44ada189fb5d9ed48bac41232106721859df823309e7be63d16786ebaf95052d929ef67895fb993d019153d736125ec4fe5949591dd7dced0ee9835 SHA512 7e90352036a544b6a508547ae38660ca5d59b0bfd17126f346652e5c9977367ad9fe972e3f2823c10e7f8ffdcd1623ef24e8a82de030041762f0c0e09783e65c |
24 |
DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70 |
25 |
DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a |
26 |
DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d |
27 |
|
28 |
diff --git a/app-backup/bacula/bacula-11.0.2.ebuild b/app-backup/bacula/bacula-11.0.2.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..129e789ee79 |
31 |
--- /dev/null |
32 |
+++ b/app-backup/bacula/bacula-11.0.2.ebuild |
33 |
@@ -0,0 +1,417 @@ |
34 |
+# Copyright 1999-2021 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+inherit desktop libtool qmake-utils systemd |
40 |
+ |
41 |
+MY_PV=${PV/_beta/-b} |
42 |
+MY_P=${PN}-${MY_PV} |
43 |
+ |
44 |
+DESCRIPTION="Featureful client/server network backup suite" |
45 |
+HOMEPAGE="https://www.bacula.org/" |
46 |
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="AGPL-3" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
51 |
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" |
52 |
+ |
53 |
+DEPEND=" |
54 |
+ !bacula-clientonly? ( |
55 |
+ !bacula-nodir? ( virtual/mta ) |
56 |
+ postgres? ( dev-db/postgresql:=[threads] ) |
57 |
+ mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) |
58 |
+ sqlite? ( dev-db/sqlite:3 ) |
59 |
+ ) |
60 |
+ dev-libs/gmp:0 |
61 |
+ qt5? ( |
62 |
+ dev-qt/qtcore:5 |
63 |
+ dev-qt/qtgui:5 |
64 |
+ dev-qt/qtwidgets:5 |
65 |
+ dev-qt/qtsvg:5 |
66 |
+ x11-libs/qwt:6 |
67 |
+ ) |
68 |
+ logwatch? ( sys-apps/logwatch ) |
69 |
+ readline? ( sys-libs/readline:0 ) |
70 |
+ static? ( |
71 |
+ dev-libs/lzo[static-libs] |
72 |
+ sys-libs/ncurses:=[static-libs] |
73 |
+ sys-libs/zlib[static-libs] |
74 |
+ acl? ( virtual/acl[static-libs(+)] ) |
75 |
+ ssl? ( |
76 |
+ dev-libs/openssl:0=[static-libs] |
77 |
+ ) |
78 |
+ ) |
79 |
+ !static? ( |
80 |
+ dev-libs/lzo |
81 |
+ sys-libs/ncurses:= |
82 |
+ sys-libs/zlib |
83 |
+ acl? ( virtual/acl ) |
84 |
+ ssl? ( |
85 |
+ dev-libs/openssl:0= |
86 |
+ ) |
87 |
+ ) |
88 |
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
89 |
+" |
90 |
+RDEPEND="${DEPEND} |
91 |
+ acct-user/bacula |
92 |
+ acct-group/bacula |
93 |
+ !bacula-clientonly? ( |
94 |
+ !bacula-nosd? ( |
95 |
+ app-arch/mt-st |
96 |
+ sys-block/mtx |
97 |
+ ) |
98 |
+ ) |
99 |
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) |
100 |
+" |
101 |
+ |
102 |
+REQUIRED_USE=" |
103 |
+ !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) |
104 |
+ static? ( bacula-clientonly ) |
105 |
+" |
106 |
+ |
107 |
+S=${WORKDIR}/${MY_P} |
108 |
+ |
109 |
+pkg_setup() { |
110 |
+ #XOR and !bacula-clientonly controlled by REQUIRED_USE |
111 |
+ use mysql && export mydbtype="mysql" |
112 |
+ use postgres && export mydbtype="postgresql" |
113 |
+ use sqlite && export mydbtype="sqlite3" |
114 |
+ |
115 |
+ if use bacula-clientonly && use static && use qt5; then |
116 |
+ ewarn |
117 |
+ ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." |
118 |
+ ewarn |
119 |
+ fi |
120 |
+} |
121 |
+ |
122 |
+src_prepare() { |
123 |
+ # adjusts default configuration files for several binaries |
124 |
+ # to /etc/bacula/<config> instead of ./<config> |
125 |
+ pushd src >&/dev/null || die |
126 |
+ for f in console/console.c dird/dird.c filed/filed.c \ |
127 |
+ stored/bcopy.c stored/bextract.c stored/bls.c \ |
128 |
+ stored/bscan.c stored/btape.c stored/stored.c \ |
129 |
+ qt-console/main.cpp; do |
130 |
+ sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ |
131 |
+ || die "sed on ${f} failed" |
132 |
+ done |
133 |
+ popd >&/dev/null || die |
134 |
+ |
135 |
+ # bug 466688 drop deprecated categories from Desktop file |
136 |
+ sed -i -e 's/Application;//' scripts/bat.desktop.in || die |
137 |
+ |
138 |
+ # bug 466690 Use CXXFLAGS instead of CFLAGS |
139 |
+ sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die |
140 |
+ |
141 |
+ # drop automatic install of unneeded documentation (for bug 356499) |
142 |
+ eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch |
143 |
+ |
144 |
+ # bug #310087 |
145 |
+ eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch |
146 |
+ |
147 |
+ # bug #311161 |
148 |
+ eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch |
149 |
+ |
150 |
+ # bat needs to respect LDFLAGS and CFLAGS |
151 |
+ eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch |
152 |
+ |
153 |
+ # bug #328701 |
154 |
+ eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch |
155 |
+ |
156 |
+ eapply -p0 "${FILESDIR}"/${P}-fix-static.patch |
157 |
+ |
158 |
+ # fix soname in libbaccat.so bug #602952 |
159 |
+ eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" |
160 |
+ |
161 |
+ # do not strip binaries |
162 |
+ sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die |
163 |
+ sed -i -e "s/strip /# strip /" src/console/Makefile.in || die |
164 |
+ |
165 |
+ # fix file not found error during make depend |
166 |
+ # drop not needed tool |
167 |
+ rm src/tools/bsparse.c || die |
168 |
+ |
169 |
+ eapply_user |
170 |
+ |
171 |
+ # Fix systemd unit files: |
172 |
+ # bug 497748 |
173 |
+ sed -i -e '/Requires/d' platforms/systemd/*.service.in || die |
174 |
+ sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die |
175 |
+ # bug 504370 |
176 |
+ sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die |
177 |
+ # bug 584442 and 504368 |
178 |
+ sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die |
179 |
+ |
180 |
+ # build 'bat' for Qt5 |
181 |
+ export QMAKE="$(qt5_get_bindir)"/qmake |
182 |
+ |
183 |
+ # adapt to >=Qt-5.9 (see bug #644566) |
184 |
+ # qmake needs an existing target file to generate install instructions |
185 |
+ sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ |
186 |
+ src/qt-console/bat.pro.in || die |
187 |
+ mkdir src/qt-console/.libs || die |
188 |
+ touch src/qt-console/.libs/bat || die |
189 |
+ chmod 755 src/qt-console/.libs/bat || die |
190 |
+ |
191 |
+ # Don't let program install man pages directly |
192 |
+ sed -i -e 's/ manpages//' Makefile.in || die |
193 |
+ |
194 |
+ # correct installation for plugins to mode 0755 (bug #725946) |
195 |
+ sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die |
196 |
+ |
197 |
+ # fix bundled libtool (bug 466696) |
198 |
+ # But first move directory with M4 macros out of the way. |
199 |
+ # It is only needed by autoconf and gives errors during elibtoolize. |
200 |
+ mv autoconf/libtool autoconf/libtool1 || die |
201 |
+ elibtoolize |
202 |
+} |
203 |
+ |
204 |
+src_configure() { |
205 |
+ local myconf='' |
206 |
+ |
207 |
+ if use bacula-clientonly; then |
208 |
+ myconf="${myconf} \ |
209 |
+ $(use_enable bacula-clientonly client-only) \ |
210 |
+ $(use_enable !static libtool) \ |
211 |
+ $(use_enable static static-cons) \ |
212 |
+ $(use_enable static static-fd)" |
213 |
+ else |
214 |
+ myconf="${myconf} \ |
215 |
+ $(use_enable !bacula-nodir build-dird) \ |
216 |
+ $(use_enable !bacula-nosd build-stored)" |
217 |
+ # bug #311099 |
218 |
+ # database support needed by dir-only *and* sd-only |
219 |
+ # build as well (for building bscan, btape, etc.) |
220 |
+ myconf="${myconf} |
221 |
+ --with-${mydbtype}" |
222 |
+ fi |
223 |
+ |
224 |
+ # do not build bat if 'static' clientonly |
225 |
+ if ! use bacula-clientonly || ! use static; then |
226 |
+ myconf="${myconf} \ |
227 |
+ $(use_enable qt5 bat)" |
228 |
+ fi |
229 |
+ |
230 |
+ myconf="${myconf} \ |
231 |
+ $(use_with X x) \ |
232 |
+ $(use_enable batch-insert) \ |
233 |
+ $(use_enable !readline conio) \ |
234 |
+ $(use_enable readline) \ |
235 |
+ $(use_with ssl openssl) \ |
236 |
+ $(use_enable ipv6) \ |
237 |
+ $(use_enable acl) \ |
238 |
+ $(use_with tcpd tcp-wrappers)" |
239 |
+ |
240 |
+ econf \ |
241 |
+ --with-pid-dir=/var/run \ |
242 |
+ --sysconfdir=/etc/bacula \ |
243 |
+ --with-archivedir=/var/lib/bacula/tmp \ |
244 |
+ --with-subsys-dir=/var/lock/subsys \ |
245 |
+ --with-working-dir=/var/lib/bacula \ |
246 |
+ --with-logdir=/var/lib/bacula \ |
247 |
+ --with-scriptdir=/usr/libexec/bacula \ |
248 |
+ --with-systemd=$(systemd_get_systemunitdir) \ |
249 |
+ --with-dir-user=bacula \ |
250 |
+ --with-dir-group=bacula \ |
251 |
+ --with-sd-user=root \ |
252 |
+ --with-sd-group=bacula \ |
253 |
+ --with-fd-user=root \ |
254 |
+ --with-fd-group=bacula \ |
255 |
+ --enable-smartalloc \ |
256 |
+ --disable-afs \ |
257 |
+ --without-s3 \ |
258 |
+ --host=${CHOST} \ |
259 |
+ ${myconf} |
260 |
+} |
261 |
+ |
262 |
+src_compile() { |
263 |
+ # Make build log verbose (bug #447806) |
264 |
+ emake NO_ECHO="" |
265 |
+} |
266 |
+ |
267 |
+src_install() { |
268 |
+ emake DESTDIR="${D}" install |
269 |
+ doicon scripts/bacula.png |
270 |
+ |
271 |
+ # install bat icon and desktop file when enabled |
272 |
+ # (for some reason ./configure doesn't pick this up) |
273 |
+ if use qt5 && ! use static ; then |
274 |
+ doicon src/qt-console/images/bat_icon.png |
275 |
+ domenu scripts/bat.desktop |
276 |
+ fi |
277 |
+ |
278 |
+ # remove some scripts we don't need at all |
279 |
+ rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} |
280 |
+ |
281 |
+ # rename statically linked apps |
282 |
+ if use bacula-clientonly && use static ; then |
283 |
+ pushd "${D}"/usr/sbin || die |
284 |
+ mv static-bacula-fd bacula-fd || die |
285 |
+ mv static-bconsole bconsole || die |
286 |
+ popd || die |
287 |
+ fi |
288 |
+ |
289 |
+ # extra files which 'make install' doesn't cover |
290 |
+ if ! use bacula-clientonly; then |
291 |
+ # the database update scripts |
292 |
+ diropts -m0750 |
293 |
+ insinto /usr/libexec/bacula/updatedb |
294 |
+ insopts -m0754 |
295 |
+ doins "${S}"/updatedb/* |
296 |
+ fperms 0640 /usr/libexec/bacula/updatedb/README |
297 |
+ |
298 |
+ # the logrotate configuration |
299 |
+ # (now unconditional wrt bug #258187) |
300 |
+ diropts -m0755 |
301 |
+ insinto /etc/logrotate.d |
302 |
+ insopts -m0644 |
303 |
+ newins "${S}"/scripts/logrotate bacula |
304 |
+ |
305 |
+ # the logwatch scripts |
306 |
+ if use logwatch; then |
307 |
+ diropts -m0750 |
308 |
+ dodir /usr/share/logwatch/scripts/services |
309 |
+ dodir /usr/share/logwatch/scripts/shared |
310 |
+ dodir /etc/logwatch/conf/logfiles |
311 |
+ dodir /etc/logwatch/conf/services |
312 |
+ pushd "${S}"/scripts/logwatch >&/dev/null || die |
313 |
+ emake DESTDIR="${D}" install |
314 |
+ popd >&/dev/null || die |
315 |
+ fi |
316 |
+ fi |
317 |
+ |
318 |
+ # Install all man pages |
319 |
+ doman "${S}"/manpages/*.[18] |
320 |
+ |
321 |
+ if ! use qt5; then |
322 |
+ rm -vf "${D}"/usr/share/man/man1/bat.1* |
323 |
+ fi |
324 |
+ rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* |
325 |
+ |
326 |
+ if use bacula-clientonly || use bacula-nodir ; then |
327 |
+ rm -vf "${D}"/usr/libexec/bacula/create_*_database |
328 |
+ rm -vf "${D}"/usr/libexec/bacula/drop_*_database |
329 |
+ rm -vf "${D}"/usr/libexec/bacula/make_*_tables |
330 |
+ rm -vf "${D}"/usr/libexec/bacula/update_*_tables |
331 |
+ rm -vf "${D}"/usr/libexec/bacula/drop_*_tables |
332 |
+ rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges |
333 |
+ rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup |
334 |
+ fi |
335 |
+ if use bacula-clientonly || use bacula-nosd; then |
336 |
+ rm -vf "${D}"/usr/libexec/bacula/disk-changer |
337 |
+ rm -vf "${D}"/usr/libexec/bacula/mtx-changer |
338 |
+ rm -vf "${D}"/usr/libexec/bacula/dvd-handler |
339 |
+ fi |
340 |
+ |
341 |
+ # documentation |
342 |
+ dodoc ChangeLog ReleaseNotes SUPPORT |
343 |
+ |
344 |
+ # install examples (bug #457504) |
345 |
+ if use examples; then |
346 |
+ docinto examples/ |
347 |
+ dodoc -r examples/* |
348 |
+ fi |
349 |
+ |
350 |
+ # vim-files |
351 |
+ if use vim-syntax; then |
352 |
+ insinto /usr/share/vim/vimfiles/syntax |
353 |
+ doins scripts/bacula.vim |
354 |
+ insinto /usr/share/vim/vimfiles/ftdetect |
355 |
+ newins scripts/filetype.vim bacula_ft.vim |
356 |
+ fi |
357 |
+ |
358 |
+ # setup init scripts |
359 |
+ myscripts="bacula-fd" |
360 |
+ if ! use bacula-clientonly; then |
361 |
+ if ! use bacula-nodir; then |
362 |
+ myscripts="${myscripts} bacula-dir" |
363 |
+ fi |
364 |
+ if ! use bacula-nosd; then |
365 |
+ myscripts="${myscripts} bacula-sd" |
366 |
+ fi |
367 |
+ fi |
368 |
+ for script in ${myscripts}; do |
369 |
+ # copy over init script and config to a temporary location |
370 |
+ # so we can modify them as needed |
371 |
+ cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" |
372 |
+ cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" |
373 |
+ |
374 |
+ # now set the database dependancy for the director init script |
375 |
+ case "${script}" in |
376 |
+ bacula-dir) |
377 |
+ case "${mydbtype}" in |
378 |
+ sqlite3) |
379 |
+ # sqlite databases don't have a daemon |
380 |
+ sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die |
381 |
+ ;; |
382 |
+ *) |
383 |
+ # all other databases have daemons |
384 |
+ sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die |
385 |
+ ;; |
386 |
+ esac |
387 |
+ ;; |
388 |
+ *) |
389 |
+ ;; |
390 |
+ esac |
391 |
+ |
392 |
+ # install init script and config |
393 |
+ newinitd "${T}/${script}".initd "${script}" |
394 |
+ newconfd "${T}/${script}".confd "${script}" |
395 |
+ done |
396 |
+ |
397 |
+ systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service |
398 |
+ |
399 |
+ # make sure the working directory exists |
400 |
+ diropts -m0750 |
401 |
+ keepdir /var/lib/bacula |
402 |
+ |
403 |
+ # make sure bacula group can execute bacula libexec scripts |
404 |
+ fowners -R root:bacula /usr/libexec/bacula |
405 |
+} |
406 |
+ |
407 |
+pkg_postinst() { |
408 |
+ if use bacula-clientonly; then |
409 |
+ fowners root:bacula /var/lib/bacula |
410 |
+ else |
411 |
+ fowners bacula:bacula /var/lib/bacula |
412 |
+ fi |
413 |
+ |
414 |
+ einfo |
415 |
+ einfo "A group 'bacula' has been created. Any users you add to this" |
416 |
+ einfo "group have access to files created by the daemons." |
417 |
+ einfo |
418 |
+ einfo "A user 'bacula' has been created. Please see the bacula manual" |
419 |
+ einfo "for information about running bacula as a non-root user." |
420 |
+ einfo |
421 |
+ |
422 |
+ if ! use bacula-clientonly && ! use bacula-nodir; then |
423 |
+ einfo |
424 |
+ einfo "If this is a new install, you must create the ${mydbtype} databases with:" |
425 |
+ einfo " /usr/libexec/bacula/create_${mydbtype}_database" |
426 |
+ einfo " /usr/libexec/bacula/make_${mydbtype}_tables" |
427 |
+ einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" |
428 |
+ einfo |
429 |
+ |
430 |
+ ewarn "ATTENTION!" |
431 |
+ ewarn "The format of the database may have changed." |
432 |
+ ewarn "If you just upgraded from a version below 9.0.0 you must run" |
433 |
+ ewarn "'update_bacula_tables' now." |
434 |
+ ewarn "Make sure to have a backup of your catalog before." |
435 |
+ ewarn |
436 |
+ fi |
437 |
+ |
438 |
+ if use sqlite; then |
439 |
+ einfo |
440 |
+ einfo "Be aware that Bacula does not officially support SQLite database anymore." |
441 |
+ einfo "Best use it only for a client-only installation. See Bug #445540." |
442 |
+ einfo |
443 |
+ fi |
444 |
+ |
445 |
+ einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" |
446 |
+ einfo "you have to enable 'USE=qt5'." |
447 |
+ einfo |
448 |
+ einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" |
449 |
+ einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." |
450 |
+} |
451 |
|
452 |
diff --git a/app-backup/bacula/files/bacula-11.0.2-fix-static.patch b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch |
453 |
new file mode 100644 |
454 |
index 00000000000..f7ffccf0fe5 |
455 |
--- /dev/null |
456 |
+++ b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch |
457 |
@@ -0,0 +1,63 @@ |
458 |
+--- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200 |
459 |
++++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200 |
460 |
+@@ -24,6 +24,7 @@ |
461 |
+ CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@ |
462 |
+ CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@ |
463 |
+ JSONOBJS = bbconsjson.o console_conf.o |
464 |
++ZLIBS=@ZLIBS@ |
465 |
+ |
466 |
+ # these are the objects that are changed by the .configure process |
467 |
+ EXTRAOBJS = @OBJLIST@ |
468 |
+@@ -50,18 +51,18 @@ |
469 |
+ |
470 |
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) |
471 |
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ |
472 |
+- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ |
473 |
+- $(OPENSSL_LIBS) |
474 |
++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ |
475 |
++ $(OPENSSL_LIBS) $(LIBS) |
476 |
+ |
477 |
+ bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) |
478 |
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \ |
479 |
+- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ |
480 |
+- $(OPENSSL_LIBS) |
481 |
++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ |
482 |
++ $(OPENSSL_LIBS) $(LIBS) |
483 |
+ |
484 |
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) |
485 |
+ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ |
486 |
+- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ |
487 |
+- $(OPENSSL_LIBS) |
488 |
++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ |
489 |
++ $(OPENSSL_LIBS) $(LIBS) |
490 |
+ strip $@ |
491 |
+ |
492 |
+ |
493 |
+--- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200 |
494 |
++++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200 |
495 |
+@@ -69,19 +69,19 @@ |
496 |
+ bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ |
497 |
+ @echo "Linking $@ ..." |
498 |
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ |
499 |
+- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ |
500 |
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS) |
501 |
++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ |
502 |
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS) |
503 |
+ |
504 |
+ bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ |
505 |
+ @echo "Linking $@ ..." |
506 |
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \ |
507 |
+- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ |
508 |
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) |
509 |
++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ |
510 |
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) |
511 |
+ |
512 |
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ |
513 |
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ |
514 |
+- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ |
515 |
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) |
516 |
++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ |
517 |
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) |
518 |
+ strip $@ |
519 |
+ |
520 |
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status |