Gentoo Archives: gentoo-commits

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