Created attachment 144070 [details] update bacula ports to 7.0.4 Update sysutils/bacula-server, sysutils/bacula-client, sysutils/bacula-client-static to 7.0.4, add stage support
*** Bug 191305 has been marked as a duplicate of this bug. ***
please test and approve.
The OP and I discussed this. I already posted to the duplicate bug, and my thinking has slightly changed. I think we should copy the existing ports to sysutils/bacula5-server, sysutils/bacula5-client, etc. This patch would then be committed against sysutils/bacula-server I cannot test this right away. I hope the OP is able to submit more patches.
Created attachment 144232 [details] patch to use for update I have tested this patch, provided by Andrey K, and I'm happy with the results.
When committing this change, several ports need to be svn copied. The goal is to retain Bacula 5 within the source tree. sysutils/bacula-bat -> sysutils/bacula5-bat sysutils/bacula-client-static -> sysutils/bacula5-client-static sysutils/bacula-client -> sysutils/bacula5-client sysutils/bacula-docs -> sysutils/bacula5-docs sysutils/bacula-server -> sysutils/bacula5-server
NOTE: the port has been updated (with maintainer permission) since this patch was submitted. Any committer wishing to proceed with the current patch is welcome to do so.
The original patch needs to be reworked against the current port.
Created attachment 144542 [details] svn diff for bacula ports New svn diff for bacula 7.0.4 ( diff from 5.2.12_6 ): bacula-server, bacula-client, bacula-client-static, bacula-bat
Comment on attachment 144542 [details] svn diff for bacula ports Thank you for the patch. I will be unable to review it for several days.
Comment on attachment 144542 [details] svn diff for bacula ports This patch seems to add items removed by revision 359586, the commit by bapt which implemented staging. That doesn't seem right to me.
Created attachment 145161 [details] Patch based on svn co This needs some work. When building the client, we get this . I have not tried building the server yet; it requires the client. NOTE we are going for libraries like: libbac.so.7 libbaccfg.so.7 libbacfind.so.7 libbacpy.so.7 See files/patch-src__cats__Makefile.in where we do magic like this: -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) I'm not sure how that should be updated, but this is being built: # ls /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbac* /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbac.so /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbac.so.3 /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbac.so.3.4.0 /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbaccfg.so /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbaccfg.so.3 /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbaccfg.so.3.4.0 /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbacfind.so /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbacfind.so.3 /var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbacfind.so.3.4.0 ===> Installing for bacula-client-7.0.4_1 ===> bacula-client-7.0.4_1 depends on shared library: liblzo2.so - found (/usr/local/lib/liblzo2.so.2.0.0) ===> bacula-client-7.0.4_1 depends on shared library: libintl.so - found (/usr/local/lib/libintl.so.9) ===> Checking if sysutils/bacula-client already installed ===> Registering installation for bacula-client-7.0.4_1 pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbac.la): No such file or directory pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbac.so.7): No such file or directory pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbaccfg.la): No such file or directory pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbaccfg.so.7): No such file or directory pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbacfind.la): No such file or directory pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbacfind.so.7): No such file or directory pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbacpy.la): No such file or directory pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbacpy.so): No such file or directory pkg-static: lstat(/var/ports/usr/ports.SVN/sysutils/bacula-client/work/stage/usr/local/lib/libbacpy.so.7): No such file or directory pkg-static: duplicate file listing: /usr/local/etc/bacula/bconsole.conf.sample, ignoring pkg-static: duplicate file listing: /usr/local/etc/bacula/bacula-fd.conf.sample, ignoring pkg-static: duplicate directory listing: /usr/local/etc/bacula/, ignoring *** [fake-pkg] Error code 74 Stop in /usr/ports.SVN/sysutils/bacula-client. *** [install] Error code 1 Stop in /usr/ports.SVN/sysutils/bacula-client.
Attached is a patch which attempts to return the port to a shorter library versioning solution. For my installed bacula-client-5.2.12_4, I have these library files: $ cd /usr/local/lib $ ls libbac* libbac.la libbaccfg.la libbacfind.la libbacpy.la libbac.so libbaccfg.so libbacfind.so libbacpy.so libbac.so.5 libbaccfg.so.5 libbacfind.so.5 libbacpy.so.5 This patch is not completed, but I'm hoping someone else can proceed where I have left off.
Comment on attachment 145161 [details] Patch based on svn co I am not sure about these changes: https://bugs.freebsd.org/bugzilla/attachment.cgi?id=145161&action=diff#- src/lib/Makefile.in_sec2 Not sure if it should be removed or not yet.
Created attachment 145187 [details] Removed /var/ports prefixes from patch I did some more work this morning.
Created attachment 145193 [details] client installs, server does not. Can't install server first
Created attachment 145195 [details] bacula-server cannot connect to db I cannot start the Director: /usr/local/sbin/bacula-dir -f -u bacula -g bacula -v -c /usr/local/etc/bacula/bacula-dir.conf -d 900 Part of the output includes: Enter dispatch_msg type=3 msg=bacula-dir JobId 0: Fatal error: Please replace this null libbaccats library with a proper one.
Created attachment 145196 [details] Just a library symlink problem now /usr/local/lib/libbaccats.so.7 should be a symlink to libbaccats-postgresql.so but is not This allowed bacula-dir to start: mv libbaccats.so.7 libbaccats.so.7.ORIGINAL ln -s libbaccats-postgresql.so libbaccats.so.7
Created attachment 145366 [details] all issues fixed. Can someone please review the latest patch for me. I hope I've not undone any staging or OPTIONS stuff.
This patch is now ready for public consumption. I would appreciate feedback please. See also https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191311#c5 regarding repo-copies before committing this patch. Thanks.
When committing this change, several ports need to be svn copied. The goal is to retain Bacula 5 within the source tree. net-mgmt/nagios-check_bacula -> net-mgmt/nagios-check_bacula5 sysutils/bacula-bat -> sysutils/bacula5-bat sysutils/bacula-client-static -> sysutils/bacula5-client-static sysutils/bacula-client -> sysutils/bacula5-client sysutils/bacula-docs -> sysutils/bacula5-docs sysutils/bacula-server -> sysutils/bacula5-server
Slave ports are not building correctly.
One remaining error with slave port: sysutils/bacula-client-static Linking bacula-fd ... /usr/bin/c++ -L/usr/local/lib -liconv -L../lib -L../findlib -o bacula-fd filed.o authenticate.o acl.o backup.o estimate.o fd_plugins.o accurate.o filed_conf.o heartbeat.o job.o restore.o status.o verify.o verify_vol.o xattr.o -lz -lbacfind -lbaccfg -lbac -lm -lpthread -lintl /usr/local/lib/libintl.so -Wl,-rpath -Wl,/usr/local/lib -lssl -lcrypto -llzo2 /usr/bin/c++ -L/usr/local/lib -liconv -static -L../lib -L../findlib -o static-bacula-fd filed.o authenticate.o acl.o backup.o estimate.o fd_plugins.o accurate.o filed_conf.o heartbeat.o job.o restore.o status.o verify.o verify_vol.o xattr.o -lz -lbacfind -lbaccfg -lbac -lm -lpthread -lintl /usr/local/lib/libintl.a -Wl,-rpath -Wl,/usr/local/lib -lssl -lcrypto backup.o: In function `blast_data_to_storage_daemon(JCR*, char*)': backup.c:(.text+0xd64): undefined reference to `__lzo_init_v2' backup.o: In function `save_file(JCR*, FF_PKT*, bool)': backup.c:(.text+0x2b4e): undefined reference to `lzo1x_1_compress' restore.o: In function `decompress_data(JCR*, int, char**, unsigned int*)': restore.c:(.text+0x457): undefined reference to `lzo1x_decompress_safe' restore.o: In function `do_restore(JCR*)': restore.c:(.text+0x1eab): undefined reference to `__lzo_init_v2' /usr/local/lib/libintl.a(dcigettext.o): In function `_nl_find_msg': dcigettext.c:(.text+0x94b): undefined reference to `libiconv_open' dcigettext.c:(.text+0x9fa): undefined reference to `libiconv' dcigettext.c:(.text+0xbaf): undefined reference to `libiconv_open' /usr/local/lib/libintl.a(relocatable.o): In function `libintl_set_relocation_prefix': relocatable.c:(.text+0x14b): undefined reference to `libiconv_set_relocation_prefix' *** [static-bacula-fd] Error code 1 1 error
Created attachment 145429 [details] Good to go A greatly reduced patch. Please commit.
All the source patches are failing to apply. Did you forget to remove them in the patch? Or is there another patch?
Created attachment 145475 [details] include deleted patch file in patch This should make make check-plist happier
A commit references this bug: Author: wg Date: Thu Aug 7 19:21:47 UTC 2014 New revision: 364312 URL: http://svnweb.freebsd.org/changeset/ports/364312 Log: Copy bacula ports preparing to bacula 7.x update Ports have been modified to conflict with bacula- and PKGNAMESUFFIX changed accordingly. PR: 191311 Submitted by: maintainer Changes: head/net-mgmt/Makefile head/net-mgmt/nagios-check_bacula5/ head/net-mgmt/nagios-check_bacula5/Makefile head/sysutils/Makefile head/sysutils/bacula5-bat/ head/sysutils/bacula5-bat/Makefile head/sysutils/bacula5-client/ head/sysutils/bacula5-client/Makefile head/sysutils/bacula5-client-static/ head/sysutils/bacula5-client-static/Makefile head/sysutils/bacula5-docs/ head/sysutils/bacula5-docs/Makefile head/sysutils/bacula5-server/ head/sysutils/bacula5-server/Makefile head/sysutils/bacula5-server/Makefile.common
A commit references this bug: Author: wg Date: Thu Aug 7 19:24:14 UTC 2014 New revision: 364313 URL: http://svnweb.freebsd.org/changeset/ports/364313 Log: sysutils/bacula-server: update to 7.0.4 PR: 191311 Submitted by: maintainer Changes: head/sysutils/bacula-server/Makefile head/sysutils/bacula-server/Makefile.common head/sysutils/bacula-server/distinfo head/sysutils/bacula-server/files/patch-src__cats__Makefile.in head/sysutils/bacula-server/files/patch-src__cats__install-default-backend.in head/sysutils/bacula-server/files/patch-src__console__Makefile.in head/sysutils/bacula-server/files/patch-src__dird__Makefile.in head/sysutils/bacula-server/files/patch-src__filed__Makefile.in head/sysutils/bacula-server/files/patch-src__findlib__Makefile.in head/sysutils/bacula-server/files/patch-src__lib__Makefile.in head/sysutils/bacula-server/files/patch-src__stored__Makefile.in head/sysutils/bacula-server/files/patch-src__tools__Makefile.in head/sysutils/bacula-server/files/pkg-deinstall.client.in head/sysutils/bacula-server/files/pkg-deinstall.server.in head/sysutils/bacula-server/files/pkg-install.client.in head/sysutils/bacula-server/files/pkg-install.server.in head/sysutils/bacula-server/files/pkg-message.client.in head/sysutils/bacula-server/files/pkg-message.server.in head/sysutils/bacula-server/pkg-plist head/sysutils/bacula-server/pkg-plist.client