From owner-svn-ports-all@freebsd.org Tue Nov 20 21:49:20 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20F67113F408; Tue, 20 Nov 2018 21:49:20 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B56E6858CD; Tue, 20 Nov 2018 21:49:19 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 743631716E; Tue, 20 Nov 2018 21:49:19 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAKLnJxI051287; Tue, 20 Nov 2018 21:49:19 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAKLnHtZ051278; Tue, 20 Nov 2018 21:49:17 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201811202149.wAKLnHtZ051278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Tue, 20 Nov 2018 21:49:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485488 - in head/sysutils: bareos-client bareos-client-static bareos-docs bareos-server bareos-server/files bareos-traymonitor X-SVN-Group: ports-head X-SVN-Commit-Author: acm X-SVN-Commit-Paths: in head/sysutils: bareos-client bareos-client-static bareos-docs bareos-server bareos-server/files bareos-traymonitor X-SVN-Commit-Revision: 485488 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B56E6858CD X-Spamd-Result: default: False [0.53 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.00)[0.001,0]; NEURAL_SPAM_SHORT(0.39)[0.391,0]; NEURAL_SPAM_MEDIUM(0.14)[0.143,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 21:49:20 -0000 Author: acm Date: Tue Nov 20 21:49:17 2018 New Revision: 485488 URL: https://svnweb.freebsd.org/changeset/ports/485488 Log: - Update to 17.2.7 - 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 Modified: head/sysutils/bareos-client-static/Makefile head/sysutils/bareos-client/Makefile head/sysutils/bareos-docs/distinfo head/sysutils/bareos-server/Makefile head/sysutils/bareos-server/distinfo head/sysutils/bareos-server/files/bareos-dir.in head/sysutils/bareos-server/files/bareos-fd.in head/sysutils/bareos-server/files/bareos-sd.in head/sysutils/bareos-traymonitor/Makefile Modified: head/sysutils/bareos-client-static/Makefile ============================================================================== --- head/sysutils/bareos-client-static/Makefile Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-client-static/Makefile Tue Nov 20 21:49:17 2018 (r485488) @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 1 PKGNAMESUFFIX= -client-static COMMENT= Backup archiving recovery open sourced (static client) Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-client/Makefile Tue Nov 20 21:49:17 2018 (r485488) @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) Modified: head/sysutils/bareos-docs/distinfo ============================================================================== --- head/sysutils/bareos-docs/distinfo Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-docs/distinfo Tue Nov 20 21:49:17 2018 (r485488) @@ -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 Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-server/Makefile Tue Nov 20 21:49:17 2018 (r485488) @@ -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,14 +14,13 @@ COMMENT?= Backup archiving recovery open sourced (serv 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} Modified: head/sysutils/bareos-server/distinfo ============================================================================== --- head/sysutils/bareos-server/distinfo Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-server/distinfo Tue Nov 20 21:49:17 2018 (r485488) @@ -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 Modified: head/sysutils/bareos-server/files/bareos-dir.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-dir.in Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-server/files/bareos-dir.in Tue Nov 20 21:49:17 2018 (r485488) @@ -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" Modified: head/sysutils/bareos-server/files/bareos-fd.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-fd.in Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-server/files/bareos-fd.in Tue Nov 20 21:49:17 2018 (r485488) @@ -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 Modified: head/sysutils/bareos-server/files/bareos-sd.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-sd.in Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-server/files/bareos-sd.in Tue Nov 20 21:49:17 2018 (r485488) @@ -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 Modified: head/sysutils/bareos-traymonitor/Makefile ============================================================================== --- head/sysutils/bareos-traymonitor/Makefile Tue Nov 20 21:07:51 2018 (r485487) +++ head/sysutils/bareos-traymonitor/Makefile Tue Nov 20 21:49:17 2018 (r485488) @@ -3,7 +3,6 @@ PORTNAME= bareos PKGNAMESUFFIX= -traymonitor -PORTREVISION= 1 COMMENT= Backup archiving recovery open sourced (traymonitor)