fix directory creation permissions update maintainer unbreak CONF_FILE logic

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fix directory creation permissions update maintainer unbreak CONF_FILE logic
From: Frank Kardel <kardel%netbsd.org@localhost>
Date: Mon, 27 Jul 2020 13:41:37 +0000
Module Name:	pkgsrc-wip
Committed By:	Frank Kardel <kardel%netbsd.org@localhost>
Pushed By:	kardel
Date:		Mon Jul 27 15:41:37 2020 +0200
Changeset:	332c3f5744fe8d42c490b5e43ca92a59a9f14f3d

Modified Files:
	bareos-clientonly/Makefile
	bareos/Makefile
	bareos/Makefile.common
	bareos/distinfo
	bareos/patches/patch-core_cmake_BareosFindPrograms.cmake
	bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake
	bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in

Log Message:
fix directory creation permissions
update maintainer
unbreak CONF_FILE logic

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

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

diffstat:
 bareos-clientonly/Makefile                            |  5 +++--
 bareos/Makefile                                       | 19 +++++++++++++------
 bareos/Makefile.common                                |  7 ++++---
 bareos/distinfo                                       |  6 +++---
 .../patches/patch-core_cmake_BareosFindPrograms.cmake |  5 +++++
 .../patch-core_cmake_BareosInstallConfigFiles.cmake   |  3 +++
 .../patch-core_src_cats_make__catalog__backup.pl.in   |  8 +++++++-
 7 files changed, 38 insertions(+), 15 deletions(-)

diffs:
diff --git a/bareos-clientonly/Makefile b/bareos-clientonly/Makefile
index 1b3a242d52..76bff7b092 100644
--- a/bareos-clientonly/Makefile
+++ b/bareos-clientonly/Makefile
@@ -19,6 +19,9 @@ RCD_SCRIPTS=		bareos-fd
 
 .include "../../wip/bareos/Makefile.common"
 
+# needs to be here to get ${EGREP} defined
+.include "../../mk/bsd.pkg.mk"
+
 CONFIG_TEMPLATES!=	${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.client 2>/dev/null | sed -e 's/ /\\ /g'
 CONF_FILES?=
 
@@ -32,5 +35,3 @@ MAKE_DIRS?=
 MAKE_DIRS+=	${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
 MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}
 MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/bareos/Makefile b/bareos/Makefile
index b9fff27eff..c58625f2b1 100644
--- a/bareos/Makefile
+++ b/bareos/Makefile
@@ -10,15 +10,28 @@ RCD_SCRIPTS=		bareos bareos-dir bareos-sd bareos-fd
 
 # For make_catalog_backup.pl.in.
 USE_TOOLS+=		perl:run
+# strange: pkglint complains about VARBASE not defined in BUILD_DEFS, but it is defined in Makefile.common
+BUILD_DEFS+=		VARBASE
 
 .include "options.mk"
 .include "Makefile.common"
 
+# needs to be here to get ${EGREP} defined
+.include "../../mk/bsd.pkg.mk"
+
 REPLACE_PERL+=		core/src/cats/make_catalog_backup.pl.in
 
 # spool directory
 MAKE_DIRS_PERMS+=	${VARBASE}/${PKG_SYSCONFSUBDIR} \
 			${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working \
+			${BAREOS_DIR_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR} \
+			${BAREOS_DIR_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/bsr \
+			${BAREOS_DIR_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/storage \
+			${BAREOS_DIR_USER} ${BAREOS_GROUP} 0770
 
 post-install:
 	${LN} -fs ${PKG_SYSCONFSUBDIR}/backends/libbareossd-gentape.so ${DESTDIR:Q}/${BAREOS_LIBDIR:Q}/libbareossd-gentape.so
@@ -32,9 +45,3 @@ CONF_FILES+=	${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
 
 MAKE_DIRS?=
 MAKE_DIRS+=	${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
-MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}
-MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/bsr
-MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/storage
-MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/bareos/Makefile.common b/bareos/Makefile.common
index baa0476a49..e7bc70527f 100644
--- a/bareos/Makefile.common
+++ b/bareos/Makefile.common
@@ -11,7 +11,8 @@ WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG:C/\//-/}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bareos/}
 
-MAINTAINER=	paul%paulbsd.com@localhost
+# MAINTAINER=	paul%paulbsd.com@localhost
+MAINTAINER=	kardel%NetBSD.org@localhost
 HOMEPAGE=	http://www.bareos.org/
 LICENSE=	gnu-agpl-v3
 
@@ -30,8 +31,8 @@ CXXFLAGS+=	-march=i586
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing absolute paths.
-SUBST_FILES.paths=	core/src/cats/make_catalog_backup.pl.in
-SUBST_FILES.paths+=	core/CMakeLists.txt
+SUBST_FILES.paths=	core/CMakeLists.txt
+SUBST_FILES.paths+=	core/src/cats/make_catalog_backup.pl.in
 SUBST_SED.paths=	-e 's,"/usr/local,"${PREFIX},g'
 SUBST_SED.paths+=	-e 's,"/var/log,"${VARBASE}/log,g'
 SUBST_VARS.paths=	LOCALBASE PREFIX PKGVERSION
diff --git a/bareos/distinfo b/bareos/distinfo
index a07c1498db..493529a51f 100644
--- a/bareos/distinfo
+++ b/bareos/distinfo
@@ -7,15 +7,15 @@ Size (bareos-19.2.8.tar.gz) = 12604929 bytes
 SHA1 (patch-core_CMakeLists.txt) = 17524dd14c665f00a8911589b52f930ec55e1e0e
 SHA1 (patch-core_cmake_BareosCheckIncludes.cmake) = 8f2a88768acdbe9adf94939ae1dabd3edf40144b
 SHA1 (patch-core_cmake_BareosFindAllLibraries.cmake) = eb33f59f616a5d265a6371dcc028a3031b5dbab5
-SHA1 (patch-core_cmake_BareosFindPrograms.cmake) = fd8a188b2816397e53f2ec4da57c7bd979b655a7
-SHA1 (patch-core_cmake_BareosInstallConfigFiles.cmake) = fdaa273e8d460f45f8b08682f5a0a5a1a59b65a3
+SHA1 (patch-core_cmake_BareosFindPrograms.cmake) = a3ed507365fb123ea84911451655ced5f07c7f32
+SHA1 (patch-core_cmake_BareosInstallConfigFiles.cmake) = bad0e5c0c87e726aaac49da99857b3699f0d28e2
 SHA1 (patch-core_cmake_BareosSetVariableDefaults.cmake) = a0ff2802d0583fca2685250bd4a5e0c8259837b2
 SHA1 (patch-core_cmake_BareosTimeFunctions.cmake) = aafa1dd9652ae8cc57414a405f03247242100ba9
 SHA1 (patch-core_platforms_netbsd_CMakeLists.txt) = dd6a54bac7e4b51e3f564f83cc7f78a8826a0d8e
 SHA1 (patch-core_platforms_netbsd_chio-changer) = 4bc4d7382db8e41bd1a10852e429e8f4e16e9fe4
 SHA1 (patch-core_scripts_CMakeLists.txt) = b7869d18651e6e6da4ad5f23c8f4c80d0166aa7c
 SHA1 (patch-core_src_CMakeLists.txt) = 3db708e8ece43b1087773470a19ea3362aec3d79
-SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = 85f235ce37349ea14c7bf06db3c2fc2534374655
+SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = a31110c1219058a03a4f44411a848ff997aca3c1
 SHA1 (patch-core_src_cats_postgresql__queries.inc) = d255a93a039d671d9dad7b7b096dfff97095aa6e
 SHA1 (patch-core_src_dird_admin.cc) = 0e361de94ff0763c8ac17f32ccb0115c998a7ec2
 SHA1 (patch-core_src_dird_archive.cc) = fa383d6edb8aec942b6c44a35acf50d5ebe5c888
diff --git a/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake b/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake
index e760f961f7..d812a0c4ab 100644
--- a/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake
+++ b/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake
@@ -1,5 +1,10 @@
 $NetBSD$
 
+	the pkgsrc build system provides awk on the path.
+	The cmake build system uses this build path for
+	installed scripts - change the way the awk path
+	is found.
+
 --- core/cmake/BareosFindPrograms.cmake.orig	2020-07-09 17:39:20.000000000 +0000
 +++ core/cmake/BareosFindPrograms.cmake
 @@ -18,10 +18,14 @@
diff --git a/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake b/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake
index 660c361360..636a1ae294 100644
--- a/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake
+++ b/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake
@@ -1,5 +1,8 @@
 $NetBSD$
 
+	The original build source is lax on the permissions.
+	Adjust permission to match pkgsrc expectations.
+
 --- core/cmake/BareosInstallConfigFiles.cmake.orig	2020-07-09 17:39:20.000000000 +0000
 +++ core/cmake/BareosInstallConfigFiles.cmake
 @@ -69,6 +69,7 @@ macro(
diff --git a/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in b/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
index 292ccc54fd..36b6a1fb9e 100644
--- a/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
+++ b/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
@@ -2,8 +2,14 @@ $NetBSD$
 
 	XXX sort of works, but should ge generalized
 
---- core/src/cats/make_catalog_backup.pl.in.orig	2019-01-31 11:39:26.000000000 +0000
+--- core/src/cats/make_catalog_backup.pl.in.orig	2020-07-09 17:39:20.000000000 +0000
 +++ core/src/cats/make_catalog_backup.pl.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!@PREFIX@/bin/perl
+ use strict;
+ 
+ =head1 SCRIPT
 @@ -36,6 +36,7 @@ use strict;
  my $cat = shift or die "Usage: $0 catalogname";
  my $dir_conf='@sbindir@/bareos-dbcheck -B -c @confdir@';
Prev by Date: Update to the latest beta channel release
Next by Date: wip/gnome-desktop3: Requires recent gsettings-desktop-schemas
Previous by Thread: Update to the latest beta channel release
Next by Thread: wip/gnome-desktop3: Requires recent gsettings-desktop-schemas
Indexes:
Home | Main Index | Thread Index | Old Index