Index: bacula-server/Makefile =================================================================== --- bacula-server/Makefile (revision 363625) +++ bacula-server/Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= bacula -DISTVERSION= 5.2.12 -PORTREVISION?= 6 +DISTVERSION= 7.0.4 +PORTREVISION?= 1 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -12,10 +12,20 @@ MAINTAINER= dan@langille.org COMMENT?= Network backup solution (server) -USES+= libtool:keepla +CONFLICTS_BUILD= bacula-*-5.2.12_3 -LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 +GNU_CONFIGURE= yes +LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2 + +.if ${PKGNAMESUFFIX} == "-server" +RUN_DEPENDS= ${LOCALBASE}/lib/libbac.so:${PORTSDIR}/sysutils/bacula-client \ + ${LOCALBASE}/lib/libbacfg.so:${PORTSDIR}/sysutils/bacula-client \ + ${LOCALBASE}/lib/libbacfind.so:${PORTSDIR}/sysutils/bacula-client +.endif + +UNIQUENAME?= ${PORTNAME}${PKGNAMESUFFIX} + USERS= bacula GROUPS= ${USERS} @@ -24,24 +34,26 @@ 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 -OPENSSL_USE= OPENSSL=yes -OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} -OPENSSL_CONFIGURE_OFF= --with-openssl="no" +.include .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file -PYTHON_USE= PYTHON=yes -PYTHON_CONFIGURE_ON= --with-python=yes +.if defined(WITH_PYTHON) +USE_PYTHON= yes +CONFIGURE_ARGS+= --with-python=yes +.endif .if !defined(WITH_CLIENT_ONLY) -LIB_DEPENDS+= libbac.so:${PORTSDIR}/sysutils/bacula-client +LIB_DEPENDS= libbac.so:${PORTSDIR}/sysutils/bacula-client USE_RC_SUBR?= bacula-dir bacula-sd .endif @@ -48,10 +60,9 @@ .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else -SUB_FILES+= pkg-message.server +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} \ @@ -66,6 +77,7 @@ --with-db-name=bacula \ --with-sbin-perm=755 \ --with-db-user=bacula \ + --with-logdir=/var/log \ --with-baseport=9101 .if defined(WITH_CLIENT_ONLY) @@ -95,55 +107,79 @@ BACULA_GID=${BACULA_GID} \ BACULA_DIR=${BACULA_DIR} -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +CONFIGURE_ARGS+= --enable-nls +.else +CONFIGURE_ARGS+= --disable-nls +.endif +# overridden if client install +PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.server +PKGINSTALL= ${FILESDIR}/pkg-install.server + # Client only or full server version .if defined(WITH_CLIENT_ONLY) 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 # Server default database - -MYSQL_CONFIGURE_ON= --with-mysql=yes -MYSQL_USE= MYSQL=yes -SQLITE3_CONFIGURE_ON= --with-sqlite3=yes -SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 -PGSQL_CONFIGURE_ON= --with-postgresql=yes -PGSQL_USES= pgsql - -MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx - -.include - .if ${PORT_OPTIONS:MMYSQL} +CONFIGURE_ARGS+= --with-mysql=yes +USE_MYSQL= yes DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} +CONFIGURE_ARGS+= --with-sqlite3=yes +LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 DBTYPE= sqlite3 .else +USE_PGSQL= yes +CONFIGURE_ARGS+= --with-postgresql=yes DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} - +## Install mtx +.if ${PORT_OPTIONS:MMTX} +RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx .endif +.endif -.if defined(WITH_CLIENT_ONLY) -MP8+= bacula-fd.8 bconsole.8 +.if ${PORT_OPTIONS:MOPENSSL} +.include "${PORTSDIR}/Mk/bsd.openssl.mk" +CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .else -MP8+= 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 -MP1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1 +CONFIGURE_ARGS+= --with-openssl="no" .endif -MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" +MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}" +pre-everything:: +.if !defined(WITH_CLIENT_ONLY) + @${ECHO_MSG} "You may use the following build options (or make config):" + @${ECHO_MSG} "" + @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." + @${ECHO_MSG} " WITH_MTX=yes if you want to use mtx instead of chio for autochanger control." + @${ECHO_MSG} " WITH_PYTHON=yes Enable Python scripting in the director." + @${ECHO_MSG} " WITH_SQLITE3=yes if you want SQLite-3 as the database (not recommended)." +.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} + @${ECHO_MSG} " WITH_MYSQL=yes if you want MySQL as the database." + @${ECHO_MSG} " WITH_PGSQL=yes if you want PostgreSQL as the database." + @${ECHO_MSG} "" + @${ECHO_MSG} "The default DB is PostgreSQL!" +.endif + @${ECHO_MSG} " WITH_OPENSSL=yes Enable OpenSSL for encrypted communication." + @${ECHO_MSG} "" + @${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database." + @${ECHO_MSG} "" +.endif + post-patch: # This port does not install docs. See bacula-docs for that ${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in @@ -151,38 +187,94 @@ @${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: - ${MKDIR} ${STAGEDIR}${BACULA_DIR} + if [ ! -d "${STAGEDIR}${BACULA_DIR}" ]; then \ + ${ECHO_CMD} "creating ${STAGEDIR}${BACULA_DIR}" ; \ + ${MKDIR} ${STAGEDIR}${BACULA_DIR}; \ + else \ + ${ECHO_CMD} "${STAGEDIR}${BACULA_DIR} already exists"; \ + fi +# Extend /etc/services and install UID/GID + @ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \ + ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL +.endif + .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) - ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample +# Extend only /etc/services + @ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \ + ${SH} ${PKGINSTALL} ${PORTNAME} +# Console stuff + if [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf.new ]; then \ + ${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \ + ${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 ${STAGEDIR}${PREFIX}/sbin/bconsole .else +# Install config files and preserve existing ones ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample - ${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp + 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 ${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} + ${CHOWN} -R bacula:bacula ${STAGEDIR}${PREFIX}/share/bacula + +# on a fresh install, the .new suffix is not used + if [ -f ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new ]; then \ + ${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new; \ + else \ + ${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf; \ + fi + + ${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/dbcheck + .endif +# Install leaves existing conf files untouched. Respect this here! for na in ${CONFFILES}; do \ - ${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \ + if [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.new ]; then \ + ${ECHO_CMD} "etc/bacula/bacula-$$na.conf.new" >> ${TMPPLIST}; \ + 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 + +# Add configuration files directory to packing list + ${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null || true" >> ${TMPPLIST} + + ${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc + .endif .else .include "${MASTERDIR}/Makefile.common" Index: bacula-server/Makefile.common =================================================================== --- bacula-server/Makefile.common (revision 363625) +++ bacula-server/Makefile.common (working copy) @@ -1,27 +1,36 @@ -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 +PLIST= ${WRKDIR}/pkg-plist -post-build: +pre-everything:: +.if ${PKGNAMESUFFIX} == "-bat" + @${ECHO_MSG} "===> Building bat the GUI interface for Bacula." +.endif .if ${PKGNAMEPREFIX} == "nagios-check_" - ${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula + @${ECHO_MSG} "===> Building nagios check only." .endif +.if ${PKGNAMESUFFIX} == "-client-static" + @${ECHO_MSG} "===> Building static version of fd." +.endif -do-install: +post-patch: + +pre-install: + @${RM} -f ${PLIST} .if ${PKGNAMESUFFIX} == "-bat" -# Install config files and preserve existing ones - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample - ${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin + ${MKDIR} ${STAGEDIR}/usr/local/etc/bacula + ${CP} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}/usr/local/sbin/bat + ${CP} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${ETCDIR}/bat.conf.sample + @${ECHO_CMD} "etc/bacula/bat.conf.sample" >> ${PLIST} + @${ECHO_CMD} "sbin/bat" >> ${PLIST} .endif .if ${PKGNAMEPREFIX} == "nagios-check_" - @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios - ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \ - ${STAGEDIR}${PREFIX}/libexec/nagios + @${ECHO_CMD} "libexec/nagios/check_bacula" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry libexec/nagios" >> ${PLIST} .endif .if ${PKGNAMESUFFIX} == "-client-static" - ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static - ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static + ${CP} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}/usr/local/sbin/bconsole-static + ${CP} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}/usr/local/sbin/bacula-fd-static + @${ECHO_CMD} "sbin/bacula-fd-static" >> ${PLIST} + @${ECHO_CMD} "sbin/bconsole-static" >> ${PLIST} .endif + +do-install: Index: bacula-server/distinfo =================================================================== --- bacula-server/distinfo (revision 363625) +++ 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__install-default-backend.in =================================================================== --- bacula-server/files/patch-src__cats__install-default-backend.in (revision 363625) +++ bacula-server/files/patch-src__cats__install-default-backend.in (working copy) @@ -18,8 +18,8 @@ # always work. # ln -s libbaccats-${default_backend}${SHLIB_EXT} \ -- ${install_dir}/libbaccats-${library_version}${SHLIB_EXT} -+ ${install_dir}/libbaccats${SHLIB_EXT}.${library_version} +- ${install_dir}/libbaccats-${library_version}${SHLIB_EXT} ++ ${install_dir}/libbaccats${SHLIB_EXT}.${library_version} fi exit 0 Index: bacula-server/files/patch-src__dird__Makefile.in =================================================================== --- bacula-server/files/patch-src__dird__Makefile.in (revision 363625) +++ bacula-server/files/patch-src__dird__Makefile.in (working copy) @@ -1,28 +1,11 @@ ---- 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 @@ +--- src/dird/Makefile.in 2014-06-03 08:28:41.000000000 +0000 ++++ src/dird/Makefile.in 2014-07-31 15:30:20.250513717 +0000 +@@ -137,7 +137,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 + @$(CXX) -S -M $(CPPFLAGS) $(XINC) -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 363625) +++ bacula-server/files/patch-src__filed__Makefile.in (working copy) @@ -1,10 +1,10 @@ ---- 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@ +--- src/filed/Makefile.in 2014-06-03 08:28:41.000000000 +0000 ++++ src/filed/Makefile.in 2014-07-31 15:32:42.943996352 +0000 +@@ -95,7 +95,7 @@ + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS:S/.so/.a/g) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) strip $@ Index: bacula-server/files/patch-src__lib__Makefile.in =================================================================== --- bacula-server/files/patch-src__lib__Makefile.in (revision 363625) +++ bacula-server/files/patch-src__lib__Makefile.in (working copy) @@ -18,21 +18,12 @@ 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 @@ +@@ -242,7 +242,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; \ + @for src in $(LIBBAC_SRCS) $(LIBBACCFG_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__stored__Makefile.in =================================================================== --- bacula-server/files/patch-src__stored__Makefile.in (revision 363625) +++ bacula-server/files/patch-src__stored__Makefile.in (working copy) @@ -1,18 +1,18 @@ --- 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 @@ +@@ -111,12 +111,12 @@ - bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + bacula-sd: Makefile $(SDOBJS) ../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) \ + -lbaccfg -lbac -lm $(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) + static-bacula-sd: Makefile $(SDOBJS) ../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) \ + -lbaccfg -lbac -lm $(DLIB) $(LIBS) $(WRAPLIBS) \ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) strip $@ @@ -111,7 +111,7 @@ @@ -37,8 +37,8 @@ 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) \ +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) bscan.o: bscan.c @@ -60,12 +60,12 @@ -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status -@@ -215,7 +215,7 @@ +@@ -231,7 +231,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 + @$(CXX) -S -M $(CPPFLAGS) $(XINC) -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 363625) +++ bacula-server/files/patch-src__tools__Makefile.in (working copy) @@ -88,12 +88,12 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ -@@ -184,7 +184,7 @@ +@@ -193,7 +193,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 + @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile @if test -f Makefile ; then \ $(RMF) Makefile.bak; \ Index: bacula-server/pkg-plist =================================================================== --- bacula-server/pkg-plist (revision 363625) +++ bacula-server/pkg-plist (working copy) @@ -1,35 +1,9 @@ -@sample %%ETCDIR%%/bacula-barcodes.sample -@group bacula -@sample %%ETCDIR%%/bacula-dir.conf.sample -@group wheel -@sample %%ETCDIR%%/bacula-sd.conf.sample -lib/libbaccats.la lib/libbaccats.so -lib/libbaccats.so.5 -lib/libbaccats.so.5.0.2 -lib/libbaccats-%%DBTYPE%%.la lib/libbaccats-%%DBTYPE%%.so -lib/libbaccats-%%DBTYPE%%.so.5 -lib/libbaccats-%%DBTYPE%%.so.5.0.2 -lib/libbacsql.la +lib/libbaccats-%%DBTYPE%%-7.0.4.so lib/libbacsql.so -lib/libbacsql.so.5 -lib/libbacsql.so.5.0.2 -man/man1/bacula-bwxconsole.1.gz -man/man1/bacula-tray-monitor.1.gz -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 +lib/libbacsql-7.0.4.so +lib/libbaccats-7.0.4.so sbin/bacula sbin/bacula-dir sbin/bacula-sd @@ -38,14 +12,16 @@ sbin/bls sbin/bregex sbin/bscan +@mode 755 sbin/bsmtp +@mode sbin/btape sbin/btraceback sbin/bwild sbin/chio-bacula -@group bacula sbin/dbcheck @owner bacula +@group bacula %%DATADIR%%/bacula %%DATADIR%%/bacula-ctl-dir %%DATADIR%%/bacula-ctl-fd @@ -75,5 +51,23 @@ %%DATADIR%%/query.sql %%DATADIR%%/update_bacula_tables %%DATADIR%%/update_%%DBTYPE%%_tables -@owner root -@group wheel +@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 +@exec mkdir -p %%BACULA_DIR%% +@dirrmtry %%BACULA_DIR%% Index: bacula-server/pkg-plist.client =================================================================== --- bacula-server/pkg-plist.client (revision 363625) +++ bacula-server/pkg-plist.client (working copy) @@ -1,31 +1,19 @@ -@sample %%ETCDIR%%/bacula-fd.conf.sample -@group bacula -@sample %%ETCDIR%%/bconsole.conf.sample -@group wheel lib/libbac.la lib/libbac.so -lib/libbac.so.5 -lib/libbac.so.5.0.2 +lib/libbac.so.%%MAJOR%% lib/libbaccfg.la lib/libbaccfg.so -lib/libbaccfg.so.5 -lib/libbaccfg.so.5.0.2 +lib/libbaccfg.so.%%MAJOR%% lib/libbacfind.la lib/libbacfind.so -lib/libbacfind.so.5 -lib/libbacfind.so.5.0.2 +lib/libbacfind.so.%%MAJOR%% lib/libbacpy.la lib/libbacpy.so -lib/libbacpy.so.5 -lib/libbacpy.so.5.0.2 +lib/libbacpy.so.%%MAJOR%% lib/bpipe-fd.so -man/man8/bacula-fd.8.gz -man/man8/bconsole.8.gz sbin/bacula-fd -@group bacula sbin/bconsole -@group wheel +@unexec /usr/bin/killall bacula-fd > /dev/null 2>&1 || true @exec mkdir -p %%BACULA_DIR%% @dirrmtry %%BACULA_DIR%% @dirrmtry share/bacula -@dirrmtry %%ETCDIR%%