Attachment 174252 Details for Bug 212282 – Patch rc-scripts properly

[patch] Patch rc-scripts properly

bareos-server.patch (text/plain), 3.20 KB, created by O. Hartmann on 2016-08-31 13:46:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: O. Hartmann

Created: 2016-08-31 13:46:01 UTC

Size: 3.20 KB

patch

obsolete

>diff -Nur sysutils/bareos-server.orig/Makefile sysutils/bareos-server/Makefile
>--- sysutils/bareos-server.orig/Makefile	2016-06-02 08:28:37.747742000 +0200
>+++ sysutils/bareos-server/Makefile	2016-08-31 15:43:29.871674000 +0200
>@@ -4,7 +4,7 @@
> PORTNAME=	bareos
> DISTVERSIONPREFIX=	Release/
> DISTVERSION=	15.2.2
>-PORTREVISION?=	3
>+PORTREVISION?=	4
> CATEGORIES?=	sysutils
> PKGNAMEPREFIX?=	#
> PKGNAMESUFFIX?=	-server
>diff -Nur sysutils/bareos-server.orig/files/bareos-dir.in sysutils/bareos-server/files/bareos-dir.in
>--- sysutils/bareos-server.orig/files/bareos-dir.in	2016-08-31 15:23:09.667272000 +0200
>+++ sysutils/bareos-server/files/bareos-dir.in	2016-08-31 15:40:14.791460000 +0200
>@@ -19,13 +19,22 @@
> name="bareos_dir"
> rcvar=${name}_enable
> command=%%PREFIX%%/sbin/bareos-dir
>+bareos_dir_user="bareos"
>+bareos_dir_group="bareos"
>+start_precmd=${name}_prestart
> 
> load_rc_config $name
> 
> : ${bareos_dir_enable="NO"}
>-: ${bareos_dir_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-dir.conf"}
>+: ${bareos_dir_flags=" -u ${bareos_dir_user} -g ${bareos_dir_group} -v -c %%PREFIX%%/etc/bareos/bareos-dir.conf"}
> : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
> 
> pidfile="${bareos_dir_pidfile}"
> 
>+bareos_dir_prestart()
>+{
>+        install -d -m 770 ${pidfile%/*} && chown ${bareos_dir_user}:${bareos_dir_group} ${pidfile%/*}
>+}
>+
>+
> run_rc_command "$1"
>diff -Nur sysutils/bareos-server.orig/files/bareos-fd.in sysutils/bareos-server/files/bareos-fd.in
>--- sysutils/bareos-server.orig/files/bareos-fd.in	2015-08-10 05:47:15.774999000 +0200
>+++ sysutils/bareos-server/files/bareos-fd.in	2016-08-31 15:37:14.558961000 +0200
>@@ -19,13 +19,21 @@
> name="bareos_fd"
> rcvar=${name}_enable
> command=%%PREFIX%%/sbin/bareos-fd
>+bareos_fd_user="root"
>+bareos_fd_group="wheel"
>+start_precmd=${name}_prestart
> 
> load_rc_config $name
> 
> : ${bareos_fd_enable="NO"}
>-: ${bareos_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bareos/bareos-fd.conf"}
>+: ${bareos_fd_flags=" -u ${bareos_fd_user} -g ${bareos_fd_group} -v -c %%PREFIX%%/etc/bareos/bareos-fd.conf"}
> : ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
> 
> pidfile="${bareos_fd_pidfile}"
> 
>+bareos_fd_prestart()
>+{
>+        install -d -m 750 ${pidfile%/*} && chown ${bareos_fd_user}:${bareos_fd_group} ${pidfile%/*}
>+}
>+
> run_rc_command "$1"
>diff -Nur sysutils/bareos-server.orig/files/bareos-sd.in sysutils/bareos-server/files/bareos-sd.in
>--- sysutils/bareos-server.orig/files/bareos-sd.in	2015-08-10 05:47:15.688250000 +0200
>+++ sysutils/bareos-server/files/bareos-sd.in	2016-08-31 15:36:22.049140000 +0200
>@@ -19,13 +19,21 @@
> name="bareos_sd"
> rcvar=${name}_enable
> command=%%PREFIX%%/sbin/bareos-sd
>+bareos_sd_user="bareos"
>+bareos_sd_group="bareos"
>+start_precmd=${name}_prestart
> 
> load_rc_config $name
> 
> : ${bareos_sd_enable="NO"}
>-: ${bareos_sd_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-sd.conf"}
>+: ${bareos_sd_flags=" -u ${bareos_sd_user} -g ${bareos_sd_group} -v -c %%PREFIX%%/etc/bareos/bareos-sd.conf"}
> : ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
> 
> pidfile="${bacula_sd_pidfile}"
> 
>+bareos_sd_prestart()
>+{
>+        install -d -m 750 ${pidfile%/*} && chown ${bareos_sd_user}:${bareos_sd_group} ${pidfile%/*}
>+}
>+
> run_rc_command "$1"

Flags:

ohartmann: maintainer-approval+

Actions: View | Diff

Attachments on bug 212282: 174252 | 174279 | 174296 | 177087