Update ports sysutils/bacula-server, sysutils/bacula-client, sysutils/bacula-client-static to 7.0.4 Add staging support Environment: FreeBSD 9.2-RELEASE-p6 FreeBSD 9.2-RELEASE-p6 #0: Tue May 13 08:21:53 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 Fix: Patch attached with submission follows: Index: bacula-client/Makefile =================================================================== --- bacula-client/Makefile (revision 358940) +++ bacula-client/Makefile (working copy) @@ -14,5 +14,4 @@ OPTIONS_DEFINE= NLS OPENSSL PYTHON OPTIONS_DEFAULT=NLS OPENSSL -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: bacula-client-static/Makefile =================================================================== --- bacula-client-static/Makefile (revision 358940) +++ bacula-client-static/Makefile (working copy) @@ -17,5 +17,4 @@ --disable-build-dird \ --disable-build-stored -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: bacula-server/Makefile =================================================================== --- bacula-server/Makefile (revision 358940) +++ bacula-server/Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= bacula -DISTVERSION= 5.2.12 -PORTREVISION?= 3 +DISTVERSION= 7.0.4 +PORTREVISION?= 1 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -12,8 +12,12 @@ MAINTAINER= dan@langille.org COMMENT?= Network backup solution (server) -LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2 +CONFLICTS_BUILD= bacula-*-5.2.12_3 +GNU_CONFIGURE= yes + +LIB_DEPENDS= lzo2.so:${PORTSDIR}/archivers/lzo2 + UNIQUENAME?= ${PORTNAME}${PKGNAMESUFFIX} USERS= bacula @@ -24,14 +28,15 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes +USES= libtool + CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +#LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL OPTIONS_DEFAULT?= NLS OPENSSL PGSQL MTX_DESC= Install mtx for control of autochanger devices -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file @@ -42,7 +47,7 @@ .endif .if !defined(WITH_CLIENT_ONLY) -LIB_DEPENDS+= bac:${PORTSDIR}/sysutils/bacula-client +LIB_DEPENDS= libbac.so:${PORTSDIR}/sysutils/bacula-client USE_RC_SUBR?= bacula-dir bacula-sd .endif @@ -52,7 +57,6 @@ SUB_FILES+= pkg-install.server pkg-deinstall.server pkg-message.server .endif -MANCOMPRESSED= yes CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --sysconfdir=${ETCDIR} \ @@ -112,8 +116,8 @@ CONFFILES= fd CONFIGURE_ARGS+= --enable-client-only -PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client -PKGINSTALL= ${FILESDIR}/pkg-install.client +PKGDEINSTALL= ${STAGEDIR}${FILESDIR}/pkg-deinstall.client +PKGINSTALL= ${STAGEDIR}${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir @@ -125,7 +129,7 @@ SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} CONFIGURE_ARGS+= --with-sqlite3=yes -LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 DBTYPE= sqlite3 .else USE_PGSQL= yes @@ -134,7 +138,7 @@ SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} -# Install mtx +## Install mtx .if ${PORT_OPTIONS:MMTX} RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx .endif @@ -147,14 +151,6 @@ CONFIGURE_ARGS+= --with-openssl="no" .endif -.if defined(WITH_CLIENT_ONLY) -MAN8+= bacula-fd.8 bconsole.8 -.else -MAN8+= bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ - btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8 -MAN1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1 -.endif - MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}" pre-everything:: @@ -184,34 +180,34 @@ @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \ ${WRKSRC}/src/console/Makefile.in # Default bconsole.conf is in ${ETCDIR} - @${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c - @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in -.if defined(WITH_CLIENT_ONLY) -# In client port only install startup script out of script dir (see below post-install) -# Dont mkdir ${PREFIX}/share/bacula cause it's empty - @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in -.else -# In server port don't install filed - @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ - -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ - ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in - @${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \ - ${WRKSRC}/src/tools/bpluginfo.c -.endif + @${REINPLACE_CMD} -e 's|./bconsole.conf|${STAGEDIR}${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c +# @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in +#.if defined(WITH_CLIENT_ONLY) +## In client port only install startup script out of script dir (see below post-install) +## Dont mkdir ${PREFIX}/share/bacula cause it's empty +# @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in +# ${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in +#.else +## In server port don't install filed +# @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ +# -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in +# @${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ +# ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in +# @${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \ +# ${WRKSRC}/src/tools/bpluginfo.c +#.endif .if !target(pre-install) pre-install: - if [ ! -d "${BACULA_DIR}" ]; then \ - ${ECHO_CMD} "creating ${BACULA_DIR}" ; \ - ${MKDIR} ${BACULA_DIR}; \ + if [ ! -d "${STAGEDIR}${BACULA_DIR}" ]; then \ + ${ECHO_CMD} "creating ${STAGEDIR}${BACULA_DIR}" ; \ + ${MKDIR} ${STAGEDIR}${BACULA_DIR}; \ else \ - ${ECHO_CMD} "${BACULA_DIR} already exists"; \ + ${ECHO_CMD} "${STAGEDIR}${BACULA_DIR} already exists"; \ fi # Extend /etc/services and install UID/GID - @ ${SETENV} PKG_PREFIX=${PREFIX} \ + @ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif @@ -219,52 +215,50 @@ post-install: .if defined(WITH_CLIENT_ONLY) # Extend only /etc/services - @ ${SETENV} PKG_PREFIX=${PREFIX} \ + @ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} # Console stuff - if [ -f ${ETCDIR}/bconsole.conf.new ]; then \ + if [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf.new ]; then \ ${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \ - ${CHGRP} bacula ${ETCDIR}/bconsole.conf.new; \ - elif [ -f ${ETCDIR}/bconsole.conf ]; then \ - ${MV} ${ETCDIR}/bconsole.conf ${ETCDIR}/bconsole.conf.sample; \ - ${CHGRP} bacula ${ETCDIR}/bconsole.conf.sample; \ + ${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bconsole.conf.new; \ + elif [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf ]; then \ + ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample; \ + ${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bconsole.conf.sample; \ ${ECHO_CMD} "etc/bacula/bconsole.conf.sample" >> ${TMPPLIST}; \ fi # ensure that users in the bacula group can run bconsole - ${CHGRP} bacula ${PREFIX}/sbin/bconsole + ${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/bconsole .else # Install config files and preserve existing ones - ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin if [ -f ${ETCDIR}/bacula-barcodes ]; then \ ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.new ; \ ${ECHO_CMD} "etc/bacula/bacula-barcodes.new" >> ${TMPPLIST}; \ else \ - ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.samples ; \ + ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples ; \ ${ECHO_CMD} "etc/bacula/bacula-barcodes.samples" >> ${TMPPLIST}; \ fi # Add configuration files directory to packing list ${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null || true" >> ${TMPPLIST} -# chmod of bsmtp program so bacula can use it with dropped down permissions - ${CHMOD} o+x ${PREFIX}/sbin/bsmtp - ${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula + ${CHOWN} -R bacula:bacula ${STAGEDIR}${PREFIX}/share/bacula # on a fresh install, the .new suffix is not used - if [ -f ${ETCDIR}/bacula-dir.conf.new ]; then \ - ${CHGRP} bacula ${ETCDIR}/bacula-dir.conf.new; \ + if [ -f ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new ]; then \ + ${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new; \ else \ - ${CHGRP} bacula ${ETCDIR}/bacula-dir.conf; \ + ${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf; \ fi - ${CHGRP} bacula ${PREFIX}/sbin/dbcheck + ${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/dbcheck .endif # Install leaves existing conf files untouched. Respect this here! for na in ${CONFFILES}; do \ - if [ -f ${ETCDIR}/bacula-$$na.conf.new ]; then \ + if [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.new ]; then \ ${ECHO_CMD} "etc/bacula/bacula-$$na.conf.new" >> ${TMPPLIST}; \ - elif [ -f ${ETCDIR}/bacula-$$na.conf ]; then \ - ${MV} ${ETCDIR}/bacula-$$na.conf ${ETCDIR}/bacula-$$na.conf.sample; \ + elif [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ]; then \ + ${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \ ${ECHO_CMD} "etc/bacula/bacula-$$na.conf.sample" >> ${TMPPLIST}; \ fi; \ done @@ -272,9 +266,8 @@ # Add configuration files directory to packing list ${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null || true" >> ${TMPPLIST} - ${CHGRP} wheel ${PREFIX}/etc + ${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc - @${CAT} ${PKGMESSAGE} .endif .else .include "${MASTERDIR}/Makefile.common" Index: bacula-server/Makefile.common =================================================================== --- bacula-server/Makefile.common (revision 358940) +++ bacula-server/Makefile.common (working copy) @@ -1,14 +1,5 @@ PLIST= ${WRKDIR}/pkg-plist -.if ${PKGNAMESUFFIX} == "-bat" -.if defined(WITH_OPENSSL) -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} -.else -CONFIGURE_ARGS+= --with-openssl="no" -.endif -.endif - pre-everything:: .if ${PKGNAMESUFFIX} == "-bat" @${ECHO_MSG} "===> Building bat the GUI interface for Bacula." @@ -21,15 +12,7 @@ .endif post-patch: -# Change $(ECHO) to echo in some Makefile.in files - @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \ - ${WRKSRC}/src/console/Makefile.in -post-build: -.if ${PKGNAMEPREFIX} == "nagios-check_" - ${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula -.endif - pre-install: @${RM} -f ${PLIST} .if ${PKGNAMESUFFIX} == "-bat" @@ -46,18 +29,3 @@ .endif do-install: -.if ${PKGNAMESUFFIX} == "-bat" -# Install config files and preserve existing ones - ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bacula/bat.conf.sample - ${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${PREFIX}/man/man1/ - ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin -.endif -.if ${PKGNAMEPREFIX} == "nagios-check_" - @${MKDIR} ${PREFIX}/libexec/nagios - ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \ - ${PREFIX}/libexec/nagios -.endif -.if ${PKGNAMESUFFIX} == "-client-static" - ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${PREFIX}/sbin/bacula-fd-static - ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${PREFIX}/sbin/bconsole-static -.endif Index: bacula-server/distinfo =================================================================== --- bacula-server/distinfo (revision 358940) +++ bacula-server/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (bacula-5.2.12.tar.gz) = 360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887 -SIZE (bacula-5.2.12.tar.gz) = 4147847 +SHA256 (bacula-7.0.4.tar.gz) = ebf802b843a95f6526e82dd181dff7cd7dc7d1fdc55cec8636e0fe3af69acf7e +SIZE (bacula-7.0.4.tar.gz) = 3596569 Index: bacula-server/files/patch-src__cats__Makefile.in =================================================================== --- bacula-server/files/patch-src__cats__Makefile.in (revision 358940) +++ bacula-server/files/patch-src__cats__Makefile.in (working copy) @@ -1,51 +0,0 @@ ---- src/cats/Makefile.in 2012-06-28 09:52:03.000000000 -0500 -+++ src/cats/Makefile.in 2012-08-09 15:30:19.000000000 -0500 -@@ -142,25 +142,25 @@ - - libbacsql.la: Makefile $(LIBBACSQL_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_RELEASE:S/./:/g:S/12/0/g) - - libbaccats.la: Makefile cats_dummy.lo - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) - - libbaccats-mysql.la: Makefile $(MYSQL_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \ - -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS) - - libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \ - -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS) - - libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \ - -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS) - - #libbaccats-ingres.la: Makefile $(INGRES_LOBJS) -@@ -237,7 +237,7 @@ - for db_type in @DB_BACKENDS@; do \ - $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats-$${db_type}.la $(DESTDIR)$(libdir); \ - done -- ./install-default-backend @DEFAULT_DB_TYPE@ $(LIBBACCATS_LT_RELEASE) $(DESTDIR)$(libdir) -+ ./install-default-backend @DEFAULT_DB_TYPE@ 5 $(DESTDIR)$(libdir) - - libtool-uninstall: - $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la -@@ -323,7 +323,7 @@ - depend: - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile -- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile - @for src in $(LIBBACSQL_SRCS); do \ - $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(DEFS) -I$(srcdir) -I$(basedir) $$src >> Makefile; \ - done Index: bacula-server/files/patch-src__cats__install-default-backend.in =================================================================== --- bacula-server/files/patch-src__cats__install-default-backend.in (revision 358940) +++ bacula-server/files/patch-src__cats__install-default-backend.in (working copy) @@ -1,25 +0,0 @@ ---- src/cats/install-default-backend.in 2012-03-31 23:39:38.000000000 -0500 -+++ src/cats/install-default-backend.in 2012-03-31 23:40:56.000000000 -0500 -@@ -22,11 +22,11 @@ - exit 1 - fi - --if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then -+if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version} ]; then - # - # Create a default catalog library pointing to one of the shared libs. - # -- rm -f ${install_dir}/libbaccats-${library_version}${SHLIB_EXT} -+ rm -f ${install_dir}/libbaccats${SHLIB_EXT}.${library_version} - - # - # Create a relative symlink to the default backend -@@ -34,7 +34,7 @@ - # always work. - # - ln -s libbaccats-${default_backend}${SHLIB_EXT} \ -- ${install_dir}/libbaccats-${library_version}${SHLIB_EXT} -+ ${install_dir}/libbaccats${SHLIB_EXT}.${library_version} - fi - - exit 0 Index: bacula-server/files/patch-src__console__Makefile.in =================================================================== --- bacula-server/files/patch-src__console__Makefile.in (revision 358940) +++ bacula-server/files/patch-src__console__Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- src/console/Makefile.in 2012-03-24 15:10:18.000000000 -0500 -+++ src/console/Makefile.in 2012-03-24 15:10:35.000000000 -0500 -@@ -53,7 +53,7 @@ - - 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) \ -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS:S/.so/.a/g) \ - $(OPENSSL_LIBS) - strip $@ - Index: bacula-server/files/patch-src__dird__Makefile.in =================================================================== --- bacula-server/files/patch-src__dird__Makefile.in (revision 358940) +++ bacula-server/files/patch-src__dird__Makefile.in (working copy) @@ -1,28 +0,0 @@ ---- src/dird/Makefile.in 2011-11-26 09:08:12.000000000 -0500 -+++ src/dird/Makefile.in 2011-12-02 13:15:46.000000000 -0500 -@@ -68,14 +68,14 @@ - ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ - ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) - @echo "Linking $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ -+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \ - -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ - $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) - - static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ - ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ - ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ -+ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \ - -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ - $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) - strip $@ -@@ -141,7 +141,7 @@ - depend: - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile -- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile - @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile - @if test -f Makefile ; then \ - $(RMF) Makefile.bak; \ Index: bacula-server/files/patch-src__filed__Makefile.in =================================================================== --- bacula-server/files/patch-src__filed__Makefile.in (revision 358940) +++ bacula-server/files/patch-src__filed__Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- src/filed/Makefile.in 2012-06-28 09:52:03.000000000 -0500 -+++ src/filed/Makefile.in 2012-08-09 15:04:48.000000000 -0500 -@@ -102,7 +102,7 @@ - static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS:S/.so/.a/g) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) - strip $@ - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status Index: bacula-server/files/patch-src__findlib__Makefile.in =================================================================== --- bacula-server/files/patch-src__findlib__Makefile.in (revision 358940) +++ bacula-server/files/patch-src__findlib__Makefile.in (working copy) @@ -1,20 +0,0 @@ ---- src/findlib/Makefile.in 2011-11-26 09:08:12.000000000 -0500 -+++ src/findlib/Makefile.in 2011-12-02 13:02:46.000000000 -0500 -@@ -57,7 +57,7 @@ - - libbacfind.la: Makefile $(LIBBACFIND_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_RELEASE:S/./:/g:S/12/0/g) - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ -@@ -112,7 +112,7 @@ - depend: - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile -- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile - @for src in $(LIBBACFIND_SRCS); do \ - $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \ - done Index: bacula-server/files/patch-src__lib__Makefile.in =================================================================== --- bacula-server/files/patch-src__lib__Makefile.in (revision 358940) +++ bacula-server/files/patch-src__lib__Makefile.in (working copy) @@ -1,38 +0,0 @@ ---- src/lib/Makefile.in 2012-06-28 09:52:03.000000000 -0500 -+++ src/lib/Makefile.in 2012-08-09 15:08:16.000000000 -0500 -@@ -120,7 +120,7 @@ - - libbac.la: Makefile $(LIBBAC_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_RELEASE:S/./:/g:S/12/0/g) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS) - - libbaccfg.a: $(LIBBACCFG_OBJS) - @echo "Making $@ ..." -@@ -129,7 +129,7 @@ - - libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_RELEASE:S/./:/g:S/12/0/g) $(OPENSSL_LIBS) $(LIBS) - - libbacpy.a: $(LIBBACPY_OBJS) - @echo "Making $@ ..." -@@ -138,7 +138,7 @@ - - libbacpy.la: Makefile $(LIBBACPY_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_RELEASE:S/./:/g:S/12/0/g) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS) - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ -@@ -267,7 +267,7 @@ - depend: - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile -- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile - @for src in $(LIBBAC_SRCS) $(LIBBACCFG_SRCS) $(LIBBACPY_SRCS); do \ - $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \ - done Index: bacula-server/files/patch-src__stored__Makefile.in =================================================================== --- bacula-server/files/patch-src__stored__Makefile.in (revision 358940) +++ bacula-server/files/patch-src__stored__Makefile.in (working copy) @@ -1,71 +0,0 @@ ---- src/stored/Makefile.in 2011-11-26 09:08:12.000000000 -0500 -+++ src/stored/Makefile.in 2011-12-02 13:20:38.000000000 -0500 -@@ -95,12 +95,12 @@ - - bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Linking $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \ -+ $(LIBTOOL_LINK) $(CXX) -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \ - -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ - $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) - - static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \ -+ $(LIBTOOL_LINK) $(CXX) -static -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \ - -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ - $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) - strip $@ -@@ -111,7 +111,7 @@ - -I$(basedir) $(DINCLUDE) $(CFLAGS) $< - - btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \ -+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(TAPEOBJS) \ - -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bls.o: bls.c -@@ -121,7 +121,7 @@ - - bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Compiling $<" -- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ -+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BLSOBJS) $(DLIB) \ - -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bextract.o: bextract.c -@@ -131,7 +131,7 @@ - - bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Compiling $<" -- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \ -+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \ - -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bscan.o: bscan.c -@@ -141,7 +141,7 @@ - - bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ - ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ -+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../cats -L../findlib $(LDFLAGS) -o $@ $(SCNOBJS) \ - -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bcopy.o: bcopy.c -@@ -150,7 +150,7 @@ - -I$(basedir) $(DINCLUDE) $(CFLAGS) $< - - bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \ -+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(COPYOBJS) \ - -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status -@@ -215,7 +215,7 @@ - depend: - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile -- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile - @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile - @if test -f Makefile ; then \ - $(RMF) Makefile.bak; \ Index: bacula-server/files/patch-src__tools__Makefile.in =================================================================== --- bacula-server/files/patch-src__tools__Makefile.in (revision 358940) +++ bacula-server/files/patch-src__tools__Makefile.in (working copy) @@ -1,99 +0,0 @@ ---- src/tools/Makefile.in 2011-11-26 09:08:12.000000000 -0500 -+++ src/tools/Makefile.in 2011-12-02 13:26:44.000000000 -0500 -@@ -58,22 +58,22 @@ - @echo " " - - bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ - ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS) -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \ -+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) -o $@ dbcheck.o $(DIRCONFOBJS) \ - -lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \ -+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ fstype.o -lbacfind -lbac -lm \ - $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \ -+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ drivetype.o -lbacfind -lbac -lm \ - $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - dird_conf.o: ../dird/dird_conf.c -@@ -87,34 +87,34 @@ - - testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ - ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS) -- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \ -+ $(LIBTOOL_LINK) $(CXX) -g -o $@ $(FINDOBJS) -L. -L../lib -L../findlib $(LDFLAGS) \ - $(DLIB) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - testls: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) testls.o -- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \ -+ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib -L../findlib $(LDFLAGS) -o $@ testls.o \ - $(DLIB) -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o -- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \ -+ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bregex.o \ - $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o -- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \ -+ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bwild.o \ - $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ - ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o -- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \ -+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib $(LDFLAGS) -o $@ bbatch.o \ - -lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \ - ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o -- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \ -+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ bvfs_test.o \ - -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \ - ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ing_test.o -- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o \ -+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ ing_test.o \ - -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - cats_test.o: cats_test.c -@@ -122,7 +122,7 @@ - $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< - - cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o -- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \ -+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ cats_test.o \ - -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - gigaslam.o: gigaslam.c -@@ -132,7 +132,7 @@ - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o - - grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ -@@ -184,7 +184,7 @@ - depend: - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile -- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile - @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile - @if test -f Makefile ; then \ - $(RMF) Makefile.bak; \ Index: bacula-server/pkg-plist =================================================================== --- bacula-server/pkg-plist (revision 358940) +++ bacula-server/pkg-plist (working copy) @@ -1,12 +1,9 @@ -lib/libbaccats.la lib/libbaccats.so -lib/libbaccats.so.%%MAJOR%% -lib/libbaccats-%%DBTYPE%%.la lib/libbaccats-%%DBTYPE%%.so -lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%% -lib/libbacsql.la +lib/libbaccats-%%DBTYPE%%-7.0.4.so lib/libbacsql.so -lib/libbacsql.so.%%MAJOR%% +lib/libbacsql-7.0.4.so +lib/libbaccats-7.0.4.so sbin/bacula sbin/bacula-dir sbin/bacula-sd @@ -15,12 +12,16 @@ sbin/bls sbin/bregex sbin/bscan +@mode 755 sbin/bsmtp +@mode sbin/btape sbin/btraceback sbin/bwild sbin/chio-bacula sbin/dbcheck +@owner bacula +@group bacula %%DATADIR%%/bacula %%DATADIR%%/bacula-ctl-dir %%DATADIR%%/bacula-ctl-fd @@ -50,6 +51,21 @@ %%DATADIR%%/query.sql %%DATADIR%%/update_bacula_tables %%DATADIR%%/update_%%DBTYPE%%_tables +@owner +@group +man/man1/bsmtp.1.gz +man/man8/bacula-dir.8.gz +man/man8/bacula-sd.8.gz +man/man8/bacula.8.gz +man/man8/bcopy.8.gz +man/man8/bextract.8.gz +man/man8/bls.8.gz +man/man8/bregex.8.gz +man/man8/bscan.8.gz +man/man8/btape.8.gz +man/man8/btraceback.8.gz +man/man8/bwild.8.gz +man/man8/dbcheck.8.gz @dirrm %%DATADIR%% @unexec /usr/bin/killall bacula-sd > /dev/null 2>&1 || true @unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true
Please check and approve.
Plese close these PR, because it's duplicate of https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191311 *** This bug has been marked as a duplicate of bug 191311 ***
The OP and I discussed this. We are planning to create bacula7-server, bacula7-client, bacula7-bat, etc because I reckon many people will stay on Bacula 5 for a while.