cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to bacula-7.4.5, patched to avoid an FD segfault.

Browse Source
This commit is contained in:
sthen 2017-02-16 17:16:19 +00:00
parent 3e62fdd5fa
commit 106bb9a80f
5 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/bacula/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.103 2016/11/02 21:08:29 sthen Exp $
# $OpenBSD: Makefile,v 1.104 2017/02/16 17:16:19 sthen Exp $
# XXX building this port while a version is already installed on the
# system will lead to unexpected hidden dependencies!!!
@ -10,9 +10,7 @@ COMMENT-mysql= Bacula libbaccats support for MySQL
COMMENT-pgsql= Bacula libbaccats support for PostgreSQL
COMMENT-sqlite3= Bacula libbaccats support for SQLite3
V= 7.4.4pl0
DISTFILES= ${DISTNAME}{bacula-7.4.4}.tar.gz
WRKDIST= ${WRKDIR}/bacula-7.4.4
V= 7.4.5
DISTNAME= bacula-$V
PKGNAME-main= bacula-client-$V
PKGNAME-server= bacula-server-$V
@ -20,7 +18,6 @@ PKGNAME-bat= bacula-bat-$V
PKGNAME-mysql= bacula-mysql-$V
PKGNAME-pgsql= bacula-pgsql-$V
PKGNAME-sqlite3= bacula-sqlite3-$V
REVISION-sqlite3= 0
CATEGORIES= sysutils

4
sysutils/bacula/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bacula-7.4.4pl0.tar.gz) = 3TuzozubEH8SQsV2qUckudwthIbw6kYR5K02o1LJCxU=
SIZE (bacula-7.4.4pl0.tar.gz) = 3312236
SHA256 (bacula-7.4.5.tar.gz) = DglydoxqbUK1ve3q5xQjet2P/ZuXA8nrf2TYakfSfOw=
SIZE (bacula-7.4.5.tar.gz) = 3312284

8
sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.11 2016/01/19 22:51:09 sthen Exp $
--- src/dird/bacula-dir.conf.in.orig Fri Jan 15 16:57:18 2016
+++ src/dird/bacula-dir.conf.in Mon Jan 18 13:07:24 2016
@@ -183,8 +183,8 @@ Client {
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.12 2017/02/16 17:16:19 sthen Exp $
--- src/dird/bacula-dir.conf.in.orig Tue Feb 7 14:07:45 2017
+++ src/dird/bacula-dir.conf.in Wed Feb 8 12:15:33 2017
@@ -185,8 +185,8 @@ Client {
# You should change Name, Address, and Password before using
#
#Client {

8
sysutils/bacula/patches/patch-src_filed_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_filed_Makefile_in,v 1.4 2015/08/15 07:50:02 ajacoutot Exp $
--- src/filed/Makefile.in.orig Thu Aug 13 15:52:24 2015
+++ src/filed/Makefile.in Fri Aug 14 10:16:42 2015
@@ -108,9 +108,6 @@ install: all
$OpenBSD: patch-src_filed_Makefile_in,v 1.5 2017/02/16 17:16:19 sthen Exp $
--- src/filed/Makefile.in.orig Tue Feb 7 14:07:45 2017
+++ src/filed/Makefile.in Thu Feb 16 16:29:55 2017
@@ -109,9 +109,6 @@ install: all
fi; \
echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf

26
sysutils/bacula/patches/patch-src_filed_backup_c Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_filed_backup_c,v 1.1 2017/02/16 17:16:19 sthen Exp $
Avoid FD segfault at the end of backup on OS without ACL support.
--- src/filed/backup.c.orig Thu Feb 16 16:21:07 2017
+++ src/filed/backup.c Thu Feb 16 16:28:49 2017
@@ -163,12 +163,14 @@ bool blast_data_to_storage_daemon(JCR *jcr, char *addr
jcr->setJobStatus(JS_ErrorTerminated);
}
- if (jcr->xacl->get_acl_nr_errors() > 0) {
- Jmsg(jcr, M_WARNING, 0, _("Had %ld acl errors while doing backup\n"), jcr->xacl->get_acl_nr_errors());
- }
+ if (jcr->xacl) {
+ if (jcr->xacl->get_acl_nr_errors() > 0) {
+ Jmsg(jcr, M_WARNING, 0, _("Had %ld acl errors while doing backup\n"), jcr->xacl->get_acl_nr_errors());
+ }
- if (jcr->xacl->get_xattr_nr_errors() > 0) {
- Jmsg(jcr, M_WARNING, 0, _("Had %ld xattr errors while doing backup\n"), jcr->xacl->get_xattr_nr_errors());
+ if (jcr->xacl->get_xattr_nr_errors() > 0) {
+ Jmsg(jcr, M_WARNING, 0, _("Had %ld xattr errors while doing backup\n"), jcr->xacl->get_xattr_nr_errors());
+ }
}
/* Delete or keep snapshots */