cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 17.2.7

Browse Source 
- Add bareos-dir reload into rc script
- Fix default configuration path
- Some another modifications

PR:		231551 221593 230123
Submitted by:	rand __at__ iteris.com, hsn __at__ sendmail.cz
This commit is contained in:
Jose Alonso Cardenas Marquez 2018-11-20 21:49:17 +00:00
parent b634401915
commit 6fe9697b06
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=485488
9 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/bareos-client-static/Makefile
View File

@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= bareos
PORTREVISION= 1
PKGNAMESUFFIX= -client-static
COMMENT= Backup archiving recovery open sourced (static client)

1
sysutils/bareos-client/Makefile
View File

@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= bareos
PORTREVISION= 1
PKGNAMESUFFIX= -client
COMMENT= Backup archiving recovery open sourced (client)

6
sysutils/bareos-docs/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1526747394
SHA256 (bareos-manual-main-reference.pdf) = 417d19e150a1f5f0852b3c98c96b9678b63493bd9a5d75c0895a3f072f4b314f
SIZE (bareos-manual-main-reference.pdf) = 4138277
TIMESTAMP = 1542749547
SHA256 (bareos-manual-main-reference.pdf) = 5e23682cae0fa2d3f8d5c6f67d2bc340f5a60b22c48e12b027554ca2df73902a
SIZE (bareos-manual-main-reference.pdf) = 3937438

11
sysutils/bareos-server/Makefile
View File

@ -2,8 +2,8 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
DISTVERSION= 17.2.5
PORTREVISION?= 1
DISTVERSION= 17.2.7
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server
@ -14,15 +14,14 @@ COMMENT?= Backup archiving recovery open sourced (server)
LICENSE= AGPLv3 LGPL3
LICENSE_COMB= multi
USE_GITHUB= yes
USES+= libtool:keepla pkgconfig readline:port shebangfix
CONFLICTS?= bacula*-server-* bareos16-server-*
LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
libjansson.so:devel/jansson
USES+= libtool:keepla pkgconfig readline:port shebangfix
USE_GITHUB= yes
USERS= bareos
GROUPS= ${USERS}

6
sysutils/bareos-server/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1524284411
SHA256 (bareos-bareos-Release-17.2.5_GH0.tar.gz) = 720bcfbbb26d2e773088b3044b728b48fea2340b3fb0f622a0e07a88bec35bac
SIZE (bareos-bareos-Release-17.2.5_GH0.tar.gz) = 4181384
TIMESTAMP = 1535610174
SHA256 (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 99a5f907e3422532c783ee254dcf5c737d2b1b53522c00924d3e1009289d2fd2
SIZE (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 4184028

20
sysutils/bareos-server/files/bareos-dir.in
View File

@ -24,16 +24,34 @@ load_rc_config $name
: ${bareos_dir_enable="NO"}
: ${bareos_dir_flags="-u bareos -g bareos -v"}
: ${bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf"}
: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"}
: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
command=%%PREFIX%%/sbin/bareos-dir
command_args="-c ${bareos_dir_config}"
pidfile="${bareos_dir_pidfile}"
bconsole_command=/usr/local/bin/bconsole
start_precmd="bareos_start_precmd"
restart_precmd="bareos_dir_configtest"
reload_precmd="bareos_dir_configtest"
reload_cmd="bareos_dir_reload"
configtest_cmd="bareos_dir_configtest"
bareos_start_precmd() {
[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
bareos_dir_configtest
}
bareos_dir_configtest() {
echo "Performing sanity check on ${bareos_dir_config} configuration:"
eval ${command} -t
}
bareos_dir_reload() {
echo "Performing a graceful reload"
# bconsole always exits with 0, so we can't check the return status for success.
echo "reload" | ${bconsole_command}
}
extra_commands="reload configtest"
run_rc_command "$1"

2
sysutils/bareos-server/files/bareos-fd.in
View File

@ -24,7 +24,7 @@ load_rc_config $name
: ${bareos_fd_enable="NO"}
: ${bareos_fd_flags="-u root -g wheel -v"}
: ${bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"}
: ${bareos_fd_config="%%PREFIX%%/etc/bareos/"}
: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
command=%%PREFIX%%/sbin/bareos-fd

2
sysutils/bareos-server/files/bareos-sd.in
View File

@ -24,7 +24,7 @@ load_rc_config $name
: ${bareos_sd_enable="NO"}
: ${bareos_sd_flags="-u bareos -g bareos -v"}
: ${bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf"}
: ${bareos_sd_config="%%PREFIX%%/etc/bareos/"}
: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
command=%%PREFIX%%/sbin/bareos-sd

1
sysutils/bareos-traymonitor/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= bareos
PKGNAMESUFFIX= -traymonitor
PORTREVISION= 1
COMMENT= Backup archiving recovery open sourced (traymonitor)