updated bareos to 17.2.4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: updated bareos to 17.2.4
From: Paul Lecuq <paul%paulbsd.com@localhost>
Date: Wed, 31 Jan 2018 16:52:57 +0000
Module Name:	pkgsrc-wip
Committed By:	Paul Lecuq <paul%paulbsd.com@localhost>
Pushed By:	paulbsd
Date:		Wed Jan 31 17:52:57 2018 +0100
Changeset:	ee2a5bc1583c06dc62e86c29c9b8e4aeb8f88946

Modified Files:
	bareos/Makefile
	bareos/Makefile.common
	bareos/PLIST
	bareos/distinfo
	bareos/patches/patch-src_console_Makefile.in
	bareos/patches/patch-src_dird_Makefile.in
	bareos/patches/patch-src_filed_Makefile.in
	bareos/patches/patch-src_stored_Makefile.in

Log Message:
updated bareos to 17.2.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ee2a5bc1583c06dc62e86c29c9b8e4aeb8f88946

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bareos/Makefile                              |  3 --
 bareos/Makefile.common                       |  2 +-
 bareos/PLIST                                 | 21 ++++----------
 bareos/distinfo                              | 16 +++++------
 bareos/patches/patch-src_console_Makefile.in | 30 ++++----------------
 bareos/patches/patch-src_dird_Makefile.in    | 41 ++++++++++++----------------
 bareos/patches/patch-src_filed_Makefile.in   | 32 ++++++----------------
 bareos/patches/patch-src_stored_Makefile.in  | 36 +++++++-----------------
 8 files changed, 57 insertions(+), 124 deletions(-)

diffs:
diff --git a/bareos/Makefile b/bareos/Makefile
index c845c0fc5a..d0217c5f77 100644
--- a/bareos/Makefile
+++ b/bareos/Makefile
@@ -23,10 +23,7 @@ PKG_USERS=		${BAREOS_DIR_USER}:${BAREOS_GROUP}
 PKG_USERS+=		${BAREOS_SD_USER}:${BAREOS_GROUP}
 PKG_GROUPS=		${BAREOS_GROUP}
 
-CONF_FILES+=		${EXAMPLESDIR}/bareos-fd.conf ${PKG_SYSCONFDIR}/bareos-fd.conf
 CONF_FILES+=		${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
-CONF_FILES+=		${EXAMPLESDIR}/bareos-dir.conf ${PKG_SYSCONFDIR}/bareos-dir.conf
-CONF_FILES+=		${EXAMPLESDIR}/bareos-sd.conf ${PKG_SYSCONFDIR}/bareos-sd.conf
 
 RCD_SCRIPTS=		bareos bareos-dir bareos-sd bareos-fd
 
diff --git a/bareos/Makefile.common b/bareos/Makefile.common
index eca5ed5ca4..61bdd6fb49 100644
--- a/bareos/Makefile.common
+++ b/bareos/Makefile.common
@@ -9,7 +9,7 @@ TAG=		Release
 GITHUB_TAG=	${TAG}/${PKGVERSION_NOREV}
 WRKSRC=		${WRKDIR}/${DISTNAME}-${TAG}-${PKGVERSION_NOREV}
 
-VERSION=	15.2.4
+VERSION=	17.2.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	paul%paulbsd.com@localhost
diff --git a/bareos/PLIST b/bareos/PLIST
index 3266bfe03f..b17384dbee 100644
--- a/bareos/PLIST
+++ b/bareos/PLIST
@@ -5,18 +5,13 @@ bin/bsmtp
 bin/bwild
 lib/BareosDirPluginBaseclass.py
 lib/BareosDirWrapper.py
-lib/BareosFdPluginBaseclass.py
-lib/BareosFdPluginLocalFileset.py
-lib/BareosFdWrapper.py
+lib/BareosSdPluginBaseclass.py
+lib/BareosSdWrapper.py
 lib/autoxflate-sd.so
 lib/bareos-dir-class-plugin.py
 lib/bareos-dir.py.template
-lib/bareos-fd-local-fileset.py
-lib/bareos-fd-mock-test.py
-lib/bareos-fd.py.template
 lib/bareos-sd.py.template
 lib/bareos_dir_consts.py
-lib/bareos_fd_consts.py
 lib/bareos_sd_consts.py
 lib/bpipe-fd.so
 lib/libbareos.la
@@ -37,7 +32,6 @@ libexec/bareos/bareos-ctl-funcs
 libexec/bareos/bareos-ctl-sd
 libexec/bareos/bareos-explorer
 libexec/bareos/bareos_config
-libexec/bareos/bconsole
 libexec/bareos/btraceback.dbx
 libexec/bareos/btraceback.gdb
 libexec/bareos/btraceback.mdb
@@ -54,6 +48,8 @@ libexec/bareos/ddl/updates/${BAREOS_DB}.14_2001.sql
 libexec/bareos/ddl/updates/${BAREOS_DB}.2001_2002.sql
 libexec/bareos/ddl/updates/${BAREOS_DB}.2002_2003.sql
 libexec/bareos/ddl/updates/${BAREOS_DB}.2003_2004.sql
+libexec/bareos/ddl/updates/${BAREOS_DB}.2004_2171.sql
+libexec/bareos/ddl/updates/${BAREOS_DB}.bee.1017_2004.sql
 libexec/bareos/ddl/versions.map
 libexec/bareos/delete_catalog_backup
 libexec/bareos/disk-changer
@@ -67,7 +63,6 @@ libexec/bareos/mtx-changer
 libexec/bareos/query.sql
 libexec/bareos/update_bareos_tables
 man/man1/bareos-tray-monitor.1
-man/man1/bat.1
 man/man1/bconsole.1
 man/man1/bregex.1
 man/man1/bsmtp.1
@@ -101,14 +96,10 @@ sbin/bsmtp
 sbin/btape
 sbin/btraceback
 sbin/bwild
-share/examples/bareos/bareos-dir.conf
-share/examples/bareos/bareos-fd.conf
-share/examples/bareos/bareos-sd.conf
-share/examples/bareos/bconsole.conf
+@pkgdir etc/bareos/bareos-sd.d
+@pkgdir etc/bareos/bareos-dir.d
 @pkgdir var/bareos/logs
 @pkgdir share/examples/bareos
 @pkgdir libexec/bareos/ddl/grants
 @pkgdir libexec/bareos/ddl/updates
 @pkgdir libexec/bareos/ddl/drops
-@pkgdir etc/bareos/bareos-sd.d
-@pkgdir etc/bareos/bareos-dir.d
diff --git a/bareos/distinfo b/bareos/distinfo
index a0d9364f72..c9e93eee3b 100644
--- a/bareos/distinfo
+++ b/bareos/distinfo
@@ -1,13 +1,13 @@
 $NetBSD$
 
-SHA1 (bareos/bareos.tar.gz) = 1e19d66606da78d4018eaeb6a8aaa98f43ad9845
-RMD160 (bareos/bareos.tar.gz) = 106ee92a9df4df94dc0c83b74a6a2ead35af6979
-SHA512 (bareos/bareos.tar.gz) = 35d06f48fc96b397598918af1346874f323a9f87abf85d8b3ccf39d7383667e8e7b454ff5e4311bfdec99ca2da13f06b348b03262ed6c671dfcb91fab2baa85e
-Size (bareos/bareos.tar.gz) = 4175538 bytes
+SHA1 (bareos/bareos.tar.gz) = 58c513e93b109753f0bce07b298ac6f2acbf1511
+RMD160 (bareos/bareos.tar.gz) = 5891765e20f1339cbec14cb2cfa69acf92c2008f
+SHA512 (bareos/bareos.tar.gz) = 165bee4dcfabac7e72839831de7067b4dafd1f82dd1615d7fa08ca331b1b3efa516555e33ca2d2ef42482c9b5104769c5ef3dd40a12e1954934874b6884ea26b
+Size (bareos/bareos.tar.gz) = 4173122 bytes
 SHA1 (patch-GNUmakefile.in) = 9afa4bf9e0818b2e969174b898c10eadcc6768b6
 SHA1 (patch-Makefile.in) = 020827dae3b780a3f8e9716ed15bae90ce40a44b
 SHA1 (patch-aa) = 2bdf72f63f6063da1fa3bd9533459ecb9aba9eb6
-SHA1 (patch-src_console_Makefile.in) = 4d4cf7c1a40972d2bb0695ab430f58d7cf73cc8a
-SHA1 (patch-src_dird_Makefile.in) = d6d724b506328af1d8852158ba58240db094bcfe
-SHA1 (patch-src_filed_Makefile.in) = d829be372bf3f8d54fe6c1b2c1ac99a167d3d57f
-SHA1 (patch-src_stored_Makefile.in) = d707d5029dceb1989be88e44bc3e25bf115e2c0e
+SHA1 (patch-src_console_Makefile.in) = 3b01d5615fffa19a02aecc893637d66f40848818
+SHA1 (patch-src_dird_Makefile.in) = c0ea330a289e9a620ca7c92bb2d94182de0904a4
+SHA1 (patch-src_filed_Makefile.in) = 8ab10fd6c56dc0097c53767f5ef0bf60ca915851
+SHA1 (patch-src_stored_Makefile.in) = 26575569dfdf0b056287fe419380f7a79f18e035
diff --git a/bareos/patches/patch-src_console_Makefile.in b/bareos/patches/patch-src_console_Makefile.in
index ed05eac3f6..2c314ca046 100644
--- a/bareos/patches/patch-src_console_Makefile.in
+++ b/bareos/patches/patch-src_console_Makefile.in
@@ -1,29 +1,11 @@
-$NetBSD$
-
---- src/console/Makefile.in.old	2016-01-04 21:54:23.000000000 +0100
-+++ src/console/Makefile.in	2016-01-04 21:55:33.000000000 +0100
-@@ -96,19 +96,19 @@
+--- src/console/Makefile.in.old	2017-12-30 10:09:21.000000000 +0100
++++ src/console/Makefile.in	2017-12-30 10:09:36.000000000 +0100
+@@ -95,7 +95,7 @@
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole;
  	@if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi
  	@srcconf=bconsole.conf; \
--	if  test -f ${DESTDIR}${confdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
+-	DESTCONFDIR=${DESTDIR}${configtemplatedir}; \
++	DESTCONFDIR=${DESTDIR}%%EXAMPLESDIR%%; \
+ 	if test -f $${DESTCONFDIR}/$$srcconf; then \
  	   destconf=$$srcconf.new; \
  	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
- 	else \
- 	   destconf=$$srcconf; \
--	   if  test -f ${DESTDIR}${confdir}/console.conf; then \
-+	   if  test -f ${DESTDIR}%%EXAMPLESDIR%%/console.conf; then \
- 	      echo "Existing console.conf moved to bconsole.conf"; \
--	      @$(MV) ${DESTDIR}${confdir}/console.conf ${DESTDIR}${confdir}/bconsole.conf; \
-+	      @$(MV) ${DESTDIR}%%EXAMPLESDIR%%/console.conf ${DESTDIR}%%EXAMPLESDIR%%/bconsole.conf; \
- 	      destconf=$$srcconf.new; \
- 	   fi; \
- 	fi; \
--	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${confdir}/$$destconf"; \
--	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${confdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
- 	if test -f static-bconsole; then \
- 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
- 	fi
diff --git a/bareos/patches/patch-src_dird_Makefile.in b/bareos/patches/patch-src_dird_Makefile.in
index 0f276da5f0..e9075bb236 100644
--- a/bareos/patches/patch-src_dird_Makefile.in
+++ b/bareos/patches/patch-src_dird_Makefile.in
@@ -1,27 +1,20 @@
-$NetBSD$
-
---- src/dird/Makefile.in	2016-01-04 21:35:13.000000000 +0100
-+++ src/dird/Makefile.in.old	2016-01-04 21:34:24.000000000 +0100
-@@ -142,17 +142,17 @@
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-dir $(DESTDIR)$(sbindir)/bareos-dir
+--- src/dird/Makefile.in.old	2017-12-30 10:03:42.000000000 +0100
++++ src/dird/Makefile.in	2017-12-30 10:04:38.000000000 +0100
+@@ -151,7 +151,7 @@
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-dbcheck $(DESTDIR)$(sbindir)/bareos-dbcheck
- 	@srcconf=bareos-dir.conf; \
--	   $(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/; \
--	   if  test -f ${DESTDIR}${confdir}/$$srcconf; then \
-+	   $(MKDIR) ${DESTDIR}%%EXAMPLESDIR%%/bareos-dir.d/; \
-+	   if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
- 	      destconf=$$srcconf.new; \
- 	      echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
- 	   else \
- 	      destconf=$$srcconf; \
- 	   fi; \
--	   echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${confdir}/$$destconf"; \
--	   ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${confdir}/$$destconf
-+	   echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	   ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
- 	   -@if test "x${dir_group}" != "x"; then \
--	      chgrp -f ${dir_group} ${DESTDIR}${confdir}/$$destconf ; \
-+	      chgrp -f ${dir_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \
- 	   fi
+ 	# copy configuration resource files to directory structure
+ 	@SRCCONFDIR=../defaultconfigs/bareos-dir.d/; \
+-	DESTCONFDIR=${DESTDIR}${configtemplatedir}/bareos-dir.d/; \
++	DESTCONFDIR=${DESTDIR}%%EXAMPLESDIR%%/bareos-dir.d/; \
+ 	echo "installing configuration resource files to $$DESTCONFDIR"; \
+ 	$(MKDIR) $$DESTCONFDIR; \
+ 	for RESTYPE in $(DIRD_RESTYPES); do \
+@@ -174,7 +174,7 @@
+ 	      fi; \
+ 	   done; \
+ 	done
+-	$(MKDIR) ${DESTDIR}${confdir}/bareos-dir-export/client/
++	$(MKDIR) ${DESTDIR}%%EXAMPLESDIR%%/bareos-dir-export/client/
  	@if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
  	   echo "  ==> Saving existing query.sql to query.sql.old"; \
+ 	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
diff --git a/bareos/patches/patch-src_filed_Makefile.in b/bareos/patches/patch-src_filed_Makefile.in
index 225be9f1c8..5c414c0b97 100644
--- a/bareos/patches/patch-src_filed_Makefile.in
+++ b/bareos/patches/patch-src_filed_Makefile.in
@@ -1,25 +1,11 @@
-$NetBSD$
-
---- src/filed/Makefile.in.old	2016-01-04 21:32:50.000000000 +0100
-+++ src/filed/Makefile.in	2016-01-04 21:30:51.000000000 +0100
-@@ -122,16 +122,16 @@
+--- src/filed/Makefile.in.old	2017-12-30 10:05:02.000000000 +0100
++++ src/filed/Makefile.in	2017-12-30 10:05:21.000000000 +0100
+@@ -124,7 +124,7 @@
  install: all
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-fd $(DESTDIR)$(sbindir)/bareos-fd
- 	@srcconf=bareos-fd.conf; \
--	if  test -f ${DESTDIR}${confdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
- 	   destconf=$$srcconf.new; \
- 	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
- 	else \
- 	   destconf=$$srcconf; \
- 	fi; \
--	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${confdir}/$$destconf"; \
--	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${confdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
- 	-@if test "x${fd_group}" != "x"; then \
--	   chgrp -f ${fd_group} ${DESTDIR}${confdir}/$$destconf ; \
-+	   chgrp -f ${fd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \
- 	fi
- 	@if test -f static-bareos-fd; then \
- 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bareos-fd $(DESTDIR)$(sbindir)/static-bareos-fd; \
+ 	@SRCCONFDIR=../defaultconfigs/bareos-fd.d/; \
+-	DESTCONFDIR=${DESTDIR}${configtemplatedir}/bareos-fd.d/; \
++	DESTCONFDIR=${DESTDIR}%%EXAMPLESDIR%%/bareos-fd.d/; \
+ 	echo "installing configuration resource files to $$DESTCONFDIR"; \
+ 	$(MKDIR) $$DESTCONFDIR; \
+ 	for RESTYPE in $(FILED_RESTYPES); do \
diff --git a/bareos/patches/patch-src_stored_Makefile.in b/bareos/patches/patch-src_stored_Makefile.in
index 44f5294e08..6f66778e38 100644
--- a/bareos/patches/patch-src_stored_Makefile.in
+++ b/bareos/patches/patch-src_stored_Makefile.in
@@ -1,27 +1,11 @@
-$NetBSD$
-
---- src/stored/Makefile.in	2016-01-04 21:36:52.000000000 +0100
-+++ src/stored/Makefile.in.old	2016-01-04 21:36:19.000000000 +0100
-@@ -243,17 +243,17 @@
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
+--- src/stored/Makefile.in.old	2017-12-30 10:09:58.000000000 +0100
++++ src/stored/Makefile.in	2017-12-30 10:10:23.000000000 +0100
+@@ -247,7 +247,7 @@
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
- 	@srcconf=bareos-sd.conf; \
--	$(MKDIR) ${DESTDIR}${confdir}/bareos-sd.d/; \
--	if  test -f ${DESTDIR}${confdir}/$$srcconf; then \
-+	$(MKDIR) ${DESTDIR}%%EXAMPLESDIR%%/bareos-sd.d/; \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
- 	   destconf=$$srcconf.new; \
- 	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
- 	else \
- 	   destconf=$$srcconf; \
- 	fi; \
--	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${confdir}/$$destconf"; \
--	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${confdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
- 	-@if test "x${sd_group}" != "x"; then \
--	   chgrp -f ${sd_group} ${DESTDIR}${confdir}/$$destconf; \
-+	   chgrp -f ${sd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf; \
- 	fi
- 	@if test -f static-bareos-sd; then \
- 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bareos-sd $(DESTDIR)$(sbindir)/static-bareos-sd; \
+ 	# copy configuration resource files to directory structure
+ 	@SRCCONFDIR=../defaultconfigs/bareos-sd.d/; \
+-	DESTCONFDIR=${DESTDIR}${configtemplatedir}/bareos-sd.d/; \
++	DESTCONFDIR=${DESTDIR}%%EXAMPLESDIR%%/bareos-sd.d/; \
+ 	echo "installing configuration resource files to $$DESTCONFDIR"; \
+ 	$(MKDIR) $$DESTCONFDIR; \
+ 	for RESTYPE in $(STORED_RESTYPES); do \
Prev by Date: torsocks: Fix a wordo in the comment in patches/patch-src_bin_torsocks.in
Next by Date: plasma-integration: depends on qqc2-desktop-style and Hack-ttf
Previous by Thread: torsocks: Fix a wordo in the comment in patches/patch-src_bin_torsocks.in
Next by Thread: plasma-integration: depends on qqc2-desktop-style and Hack-ttf
Indexes:
Home | Main Index | Thread Index | Old Index