- updated bareos to 15.2.2 - configuration files location changes - avoiding git-info.sh , useless with pkgsrc - changes in rc.d scripts

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: - updated bareos to 15.2.2 - configuration files location changes - avoiding git-info.sh , useless with pkgsrc - changes in rc.d scripts
From: Paul Lecuq <paul%paulbsd.com@localhost>
Date: Tue, 05 Jan 2016 20:02:12 +0000
Module Name:	pkgsrc-wip
Committed By:	Paul Lecuq <paul%paulbsd.com@localhost>
Pushed By:	paulbsd
Date:		Tue Jan 5 21:02:12 2016 +0100
Changeset:	3361bbf35c5ac928a28580ed0392ec540c2c9bd3

Modified Files:
	bareos/Makefile
	bareos/Makefile.common
	bareos/PLIST
	bareos/distinfo
	bareos/files/bareos-dir.sh
	bareos/files/bareos-fd.sh
	bareos/files/bareos-sd.sh
Added Files:
	bareos/patches/patch-GNUmakefile.in
	bareos/patches/patch-Makefile.in
	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 15.2.2
- configuration files location changes
- avoiding git-info.sh, useless with pkgsrc
- changes in rc.d scripts

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

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

diffstat:
 bareos/Makefile                              |  8 ++++----
 bareos/Makefile.common                       |  8 ++++----
 bareos/PLIST                                 |  6 +-----
 bareos/distinfo                              | 12 +++++++++---
 bareos/files/bareos-dir.sh                   | 11 +++++++++++
 bareos/files/bareos-fd.sh                    | 10 ++++++++++
 bareos/files/bareos-sd.sh                    | 11 +++++++++++
 bareos/patches/patch-GNUmakefile.in          | 13 +++++++++++++
 bareos/patches/patch-Makefile.in             | 13 +++++++++++++
 bareos/patches/patch-src_console_Makefile.in | 27 +++++++++++++++++++++++++++
 bareos/patches/patch-src_dird_Makefile.in    | 25 +++++++++++++++++++++++++
 bareos/patches/patch-src_filed_Makefile.in   | 23 +++++++++++++++++++++++
 bareos/patches/patch-src_stored_Makefile.in  | 25 +++++++++++++++++++++++++
 13 files changed, 176 insertions(+), 16 deletions(-)

diffs:
diff --git a/bareos/Makefile b/bareos/Makefile
index 36953f6..a591ab2 100644
--- a/bareos/Makefile
+++ b/bareos/Makefile
@@ -21,10 +21,10 @@ 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
+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 07b75a5..85e0957 100644
--- a/bareos/Makefile.common
+++ b/bareos/Makefile.common
@@ -1,5 +1,5 @@
-DISTNAME=	bareos-Release-15.2.1
-PKGNAME=	bareos-15.2.1
+DISTNAME=	bareos-Release-15.2.2
+PKGNAME=	bareos-15.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	-https://github.com/bareos/bareos/archive/Release/${DISTNAME:S/bareos-Release-//}.tar.gz
 EXTRACT_SUFX=	.tar.gz
@@ -27,8 +27,8 @@ BAREOS_SD_USER?=        bareos-sd
 PKG_GROUPS_VARS+=       BAREOS_GROUP
 PKG_USERS_VARS=         BAREOS_DIR_USER BAREOS_SD_USER
 
-#PKG_SYSCONFSUBDIR?=     bareos
-BAREOS_PIDDIR?=         ${VARBASE}/run
+PKG_SYSCONFSUBDIR?=     bareos
+BAREOS_PIDDIR?=         ${VARBASE}/run/bareos
 BAREOS_WORKINGDIR?=     ${VARBASE}/spool/bareos
 
 BUILD_DEFS+=            VARBASE BAREOS_PIDDIR BAREOS_WORKINGDIR
diff --git a/bareos/PLIST b/bareos/PLIST
index 64a8000..b1dc4de 100644
--- a/bareos/PLIST
+++ b/bareos/PLIST
@@ -3,11 +3,6 @@ bin/bconsole
 bin/bregex
 bin/bsmtp
 bin/bwild
-etc/bareos/bareos-dir.conf
-etc/bareos/bareos-fd.conf
-etc/bareos/bareos-sd.conf
-etc/bareos/bconsole.conf
-etc/bareos/mtx-changer.conf
 lib/BareosDirPluginBaseclass.py
 lib/BareosDirWrapper.py
 lib/BareosFdPluginBaseclass.py
@@ -55,6 +50,7 @@ libexec/bareos/ddl/updates/${BAREOS_DB}.12_14.sql
 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/versions.map
 libexec/bareos/delete_catalog_backup
 libexec/bareos/disk-changer
diff --git a/bareos/distinfo b/bareos/distinfo
index f522edd..9427bc1 100644
--- a/bareos/distinfo
+++ b/bareos/distinfo
@@ -1,6 +1,12 @@
 $NetBSD$
 
-SHA1 (bareos-Release-15.2.1.tar.gz) = 79d7a5a404c99df32f90f1a883d5e7ad3a9f8610
-RMD160 (bareos-Release-15.2.1.tar.gz) = 3e5b26497b58c72c2ffc1a7666455f54a01c24c7
-Size (bareos-Release-15.2.1.tar.gz) = 3904573 bytes
+SHA1 (bareos-Release-15.2.2.tar.gz) = 2a3792389fe4c337d95dda54429dfc854cd7d225
+RMD160 (bareos-Release-15.2.2.tar.gz) = 2fbb0176e0aba7de5eae2765e006cab0800b0c60
+Size (bareos-Release-15.2.2.tar.gz) = 3928036 bytes
+SHA1 (patch-GNUmakefile.in) = 9afa4bf9e0818b2e969174b898c10eadcc6768b6
+SHA1 (patch-Makefile.in) = 020827dae3b780a3f8e9716ed15bae90ce40a44b
 SHA1 (patch-aa) = b60a5b11dc36e6a6ebc30a685be59d28ff765b16
+SHA1 (patch-src_console_Makefile.in) = 15754702725b7fe20283a01c328ba272c4adbbb3
+SHA1 (patch-src_dird_Makefile.in) = bbe4df434087683607c5de8219d3bf9228736fab
+SHA1 (patch-src_filed_Makefile.in) = 50a119b7dc66faf0ddf9a5f2a87c6a643ea306b4
+SHA1 (patch-src_stored_Makefile.in) = e126612e0785c668b5cbe4cd6ebbc6d4bdb3e977
diff --git a/bareos/files/bareos-dir.sh b/bareos/files/bareos-dir.sh
index 104439d..575c4c8 100644
--- a/bareos/files/bareos-dir.sh
+++ b/bareos/files/bareos-dir.sh
@@ -13,6 +13,17 @@ command="@PREFIX@/sbin/bareos-dir"
 required_files="@BAREOS_ETCDIR@/bareos-dir.conf"
 pidfile="@BAREOS_PIDDIR@/bareos-dir.9101.pid"
 command_args="-c ${required_files} -u @BAREOS_DIR_USER@ -g @BAREOS_GROUP@"
+start_precmd="bareosdir_precmd"
+
+bareosdir_precmd()
+{
+    if [ ! -d @BAREOS_PIDDIR@ ]; then
+        mkdir -p -m 775 @BAREOS_PIDDIR@
+    else
+        chmod 775 @BAREOS_PIDDIR@
+    fi
+    chown @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_PIDDIR@
+}
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
diff --git a/bareos/files/bareos-fd.sh b/bareos/files/bareos-fd.sh
index 368fea9..42e80ec 100644
--- a/bareos/files/bareos-fd.sh
+++ b/bareos/files/bareos-fd.sh
@@ -13,6 +13,16 @@ command="@PREFIX@/sbin/bareos-fd"
 required_files="@BAREOS_ETCDIR@/bareos-fd.conf"
 pidfile="@BAREOS_PIDDIR@/bareos-fd.9102.pid"
 command_args="-c ${required_files} -g @BAREOS_GROUP@"
+start_precmd="bareosfd_precmd"
+
+bareosfd_precmd()
+{
+    if [ ! -d @BAREOS_PIDDIR@ ]; then
+        mkdir -p -m 775 @BAREOS_PIDDIR@
+    else
+        chmod 775 @BAREOS_PIDDIR@
+    fi
+}
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
diff --git a/bareos/files/bareos-sd.sh b/bareos/files/bareos-sd.sh
index 0dabfef..b2f45c4 100644
--- a/bareos/files/bareos-sd.sh
+++ b/bareos/files/bareos-sd.sh
@@ -13,6 +13,17 @@ command="@PREFIX@/sbin/bareos-sd"
 required_files="@BAREOS_ETCDIR@/bareos-sd.conf"
 pidfile="@BAREOS_PIDDIR@/bareos-sd.9103.pid"
 command_args="-c ${required_files} -u @BAREOS_SD_USER@ -g @BAREOS_GROUP@"
+start_precmd="bareossd_precmd"
+
+bareossd_precmd()
+{
+    if [ ! -d @BAREOS_PIDDIR@ ]; then
+        mkdir -p -m 775 @BAREOS_PIDDIR@
+    else
+        chmod 775 @BAREOS_PIDDIR@
+    fi
+    chown @BAREOS_SD_USER@:@BAREOS_GROUP@ @BAREOS_PIDDIR@
+}
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
diff --git a/bareos/patches/patch-GNUmakefile.in b/bareos/patches/patch-GNUmakefile.in
new file mode 100644
index 0000000..a8b3cba
--- /dev/null
+++ b/bareos/patches/patch-GNUmakefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- GNUmakefile.in.old	2016-01-05 15:09:55.000000000 +0000
++++ GNUmakefile.in
+@@ -40,7 +40,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ 
+ #-------------------------------------------------------------------------
+ 
+-all: info Makefile subdirs
++all: Makefile subdirs
+ 	@echo "bareos was built successfully"
+ 
+ SUBDIRS = ${all_subdirs}
diff --git a/bareos/patches/patch-Makefile.in b/bareos/patches/patch-Makefile.in
new file mode 100644
index 0000000..6101022
--- /dev/null
+++ b/bareos/patches/patch-Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.in.old	2016-01-05 15:09:44.000000000 +0000
++++ Makefile.in
+@@ -40,7 +40,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ 
+ #-------------------------------------------------------------------------
+ 
+-all: info Makefile
++all: Makefile
+ 	@for I in ${all_subdirs}; \
+ 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+ 	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
diff --git a/bareos/patches/patch-src_console_Makefile.in b/bareos/patches/patch-src_console_Makefile.in
new file mode 100644
index 0000000..bb4ea09
--- /dev/null
+++ b/bareos/patches/patch-src_console_Makefile.in
@@ -0,0 +1,27 @@
+--- 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 @@
+ 	$(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 \
+ 	   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
new file mode 100644
index 0000000..820d0e5
--- /dev/null
+++ b/bareos/patches/patch-src_dird_Makefile.in
@@ -0,0 +1,25 @@
+--- 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
+ 	$(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
+ 	@if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
+ 	   echo "  ==> Saving existing query.sql to query.sql.old"; \
diff --git a/bareos/patches/patch-src_filed_Makefile.in b/bareos/patches/patch-src_filed_Makefile.in
new file mode 100644
index 0000000..0f16e05
--- /dev/null
+++ b/bareos/patches/patch-src_filed_Makefile.in
@@ -0,0 +1,23 @@
+--- 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 @@
+ 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; \
diff --git a/bareos/patches/patch-src_stored_Makefile.in b/bareos/patches/patch-src_stored_Makefile.in
new file mode 100644
index 0000000..1da742b
--- /dev/null
+++ b/bareos/patches/patch-src_stored_Makefile.in
@@ -0,0 +1,25 @@
+--- 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
+ 	$(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; \
Prev by Date: firefox-hg: bump version and update PLIST to match upstream.
Next by Date: tidy: add more information in the TODO
Previous by Thread: firefox-hg: bump version and update PLIST to match upstream.
Next by Thread: tidy: add more information in the TODO
Indexes:
Home | Main Index | Thread Index | Old Index