svn commit: r368124 - in head/sysutils: bacula-bat bacula-server
Dan Langille
dvl at FreeBSD.org
Sat Sep 13 18:11:38 UTC 2014
Author: dvl
Date: Sat Sep 13 18:11:36 2014
New Revision: 368124
URL: http://svnweb.freebsd.org/changeset/ports/368124
QAT: https://qat.redports.org/buildarchive/r368124/
Log:
* Upgrade to 7.0.5
* do not remove etc/bacula; let bacula-client do that
* use UID and GID provided by ports/UIDs & ports/GIDs
* minimize use of owner/group
PR: 193532
Submitted by: Kevin Thompson
Approved by: mat (mentor)
Modified:
head/sysutils/bacula-bat/Makefile
head/sysutils/bacula-bat/pkg-plist
head/sysutils/bacula-server/Makefile
head/sysutils/bacula-server/distinfo
head/sysutils/bacula-server/pkg-plist
head/sysutils/bacula-server/pkg-plist.client
Modified: head/sysutils/bacula-bat/Makefile
==============================================================================
--- head/sysutils/bacula-bat/Makefile Sat Sep 13 18:05:28 2014 (r368123)
+++ head/sysutils/bacula-bat/Makefile Sat Sep 13 18:11:36 2014 (r368124)
@@ -3,7 +3,6 @@
PORTNAME= bacula
PKGNAMESUFFIX= -bat
-PORTREVISION= 5
COMMENT= Network backup solution (GUI)
Modified: head/sysutils/bacula-bat/pkg-plist
==============================================================================
--- head/sysutils/bacula-bat/pkg-plist Sat Sep 13 18:05:28 2014 (r368123)
+++ head/sysutils/bacula-bat/pkg-plist Sat Sep 13 18:11:36 2014 (r368124)
@@ -1,5 +1,4 @@
@sample %%ETCDIR%%/bat.conf.sample
man/man1/bat.1.gz
sbin/bat
- at dirrmtry %%ETCDIR%%
Modified: head/sysutils/bacula-server/Makefile
==============================================================================
--- head/sysutils/bacula-server/Makefile Sat Sep 13 18:05:28 2014 (r368123)
+++ head/sysutils/bacula-server/Makefile Sat Sep 13 18:11:36 2014 (r368124)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= bacula
-DISTVERSION= 7.0.4
-PORTREVISION?= 1
+DISTVERSION= 7.0.5
CATEGORIES?= sysutils
MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
PKGNAMEPREFIX?= #
@@ -78,11 +77,11 @@ CONFIGURE_ARGS+=--with-dir-user=${BACULA
.endif
# The user/group IDs below are registered, see
-# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#users-and-groups
#
BACULA_USER?= bacula
BACULA_GROUP?= ${BACULA_USER}
-BACULA_UID?= 910
+BACULA_UID?= bacula
BACULA_GID?= ${BACULA_UID}
BACULA_DIR?= /var/db/bacula
@@ -146,8 +145,14 @@ post-patch:
# This port does not install docs. See bacula-docs for that
${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
# 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
+ @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' \
+ ${WRKSRC}/src/filed/Makefile.in \
+ ${WRKSRC}/src/console/Makefile.in \
+ ${WRKSRC}/src/cats/Makefile.in \
+ ${WRKSRC}/src/dird/Makefile.in \
+ ${WRKSRC}/src/stored/Makefile.in \
+ ${WRKSRC}/src/tools/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
@@ -175,7 +180,6 @@ post-install:
.else
${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
.endif
for na in ${CONFFILES}; do \
${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \
Modified: head/sysutils/bacula-server/distinfo
==============================================================================
--- head/sysutils/bacula-server/distinfo Sat Sep 13 18:05:28 2014 (r368123)
+++ head/sysutils/bacula-server/distinfo Sat Sep 13 18:11:36 2014 (r368124)
@@ -1,2 +1,2 @@
-SHA256 (bacula-7.0.4.tar.gz) = ebf802b843a95f6526e82dd181dff7cd7dc7d1fdc55cec8636e0fe3af69acf7e
-SIZE (bacula-7.0.4.tar.gz) = 3596569
+SHA256 (bacula-7.0.5.tar.gz) = 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49
+SIZE (bacula-7.0.5.tar.gz) = 3216406
Modified: head/sysutils/bacula-server/pkg-plist
==============================================================================
--- head/sysutils/bacula-server/pkg-plist Sat Sep 13 18:05:28 2014 (r368123)
+++ head/sysutils/bacula-server/pkg-plist Sat Sep 13 18:11:36 2014 (r368124)
@@ -1,8 +1,6 @@
- at sample %%ETCDIR%%/bacula-barcodes.sample
- at group bacula
- at sample %%ETCDIR%%/bacula-dir.conf.sample
- at group wheel
- at sample %%ETCDIR%%/bacula-sd.conf.sample
+ at sample(,bacula,640) %%ETCDIR%%/bacula-barcodes.sample
+ at sample(,bacula,) %%ETCDIR%%/bacula-dir.conf.sample
+ at sample(,bacula,) %%ETCDIR%%/bacula-sd.conf.sample
lib/libbaccats-%%LIB_VERSION%%.so
lib/libbaccats.la
lib/libbaccats.so
@@ -21,9 +19,7 @@ sbin/bls
sbin/bpluginfo
sbin/bregex
sbin/bscan
- at mode 755
sbin/bsmtp
- at mode
sbin/btape
sbin/btraceback
sbin/bwild
@@ -75,4 +71,3 @@ man/man8/btape.8.gz
man/man8/btraceback.8.gz
man/man8/bwild.8.gz
man/man8/dbcheck.8.gz
- at dirrmtry %%ETCDIR%%
Modified: head/sysutils/bacula-server/pkg-plist.client
==============================================================================
--- head/sysutils/bacula-server/pkg-plist.client Sat Sep 13 18:05:28 2014 (r368123)
+++ head/sysutils/bacula-server/pkg-plist.client Sat Sep 13 18:11:36 2014 (r368124)
@@ -1,7 +1,5 @@
- at sample %%ETCDIR%%/bacula-fd.conf.sample
- at group bacula
- at sample %%ETCDIR%%/bconsole.conf.sample
- at group wheel
+ at sample(,bacula,640) %%ETCDIR%%/bacula-fd.conf.sample
+ at sample(,bacula,640) %%ETCDIR%%/bconsole.conf.sample
lib/libbac-%%LIB_VERSION%%.so
lib/libbac.la
lib/libbac.so
@@ -16,9 +14,7 @@ man/man8/bacula.8.gz
man/man8/bacula-fd.8.gz
man/man8/bconsole.8.gz
sbin/bacula-fd
- at group bacula
-sbin/bconsole
- at group wheel
+@(,bacula,750) sbin/bconsole
@exec mkdir -p %%BACULA_DIR%%
@dirrmtry %%BACULA_DIR%%
@dirrmtry share/bacula
More information about the svn-ports-all
mailing list