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

update to Bacula 7.4.7

Browse Source
This commit is contained in:
sthen 2017-03-16 11:04:35 +00:00
parent f004286ada
commit 5cfd04a510
5 changed files with 4 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/bacula/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.105 2017/03/13 09:42:57 sthen Exp $
# $OpenBSD: Makefile,v 1.106 2017/03/16 11:04:35 sthen Exp $
# XXX building this port while a version is already installed on the
# system will lead to unexpected hidden dependencies!!!
@ -10,7 +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.6
V= 7.4.7
DISTNAME= bacula-$V
PKGNAME-main= bacula-client-$V
PKGNAME-server= bacula-server-$V

4
sysutils/bacula/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bacula-7.4.6.tar.gz) = To6jIbZM1J4prsvdPLDcEGFTArGOLyb/p+fII2LBz+0=
SIZE (bacula-7.4.6.tar.gz) = 3312673
SHA256 (bacula-7.4.7.tar.gz) = b2B1wsqQpjze7KObC4Kj6gfOmZne3GiVHYi+1/vAvkA=
SIZE (bacula-7.4.7.tar.gz) = 3312991

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

@ -1,26 +0,0 @@
$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 */

26
sysutils/bacula/patches/patch-src_filed_xacl_c
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-src_filed_xacl_c,v 1.1 2017/03/13 09:42:57 sthen Exp $
--- src/filed/xacl.c.orig Sat Mar 11 09:15:14 2017
+++ src/filed/xacl.c Sun Mar 12 17:05:38 2017
@@ -1311,9 +1311,7 @@ bRC_XACL XACL::afs_restore_acl (JCR *jcr, int stream){
/*
* Creating the corrent instance of the XACL for a supported OS
*/
-void *new_xacl()
-{
- XACL *xacl;
+void *new_xacl(){
#if defined(HAVE_DARWIN_OS)
return new XACL_OSX();
#elif defined(HAVE_LINUX_OS)
@@ -1330,11 +1328,5 @@ void *new_xacl()
return new XACL_OSF1();
#elif defined(HAVE_SUN_OS)
return new XACL_Solaris();
-#else
- /* No driver defined */
- xacl = new XACL();
- xacl->disable_acl();
- xacl->disable_xattr();
- return xacl;
#endif
};

13
sysutils/bacula/patches/patch-src_lib_bnet_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_lib_bnet_c,v 1.3 2016/01/19 22:51:09 sthen Exp $
--- src/lib/bnet.c.orig Fri Jan 15 16:57:18 2016
+++ src/lib/bnet.c Mon Jan 18 13:07:24 2016
@@ -629,7 +629,9 @@ int set_socket_errno(int sockstat)
/* Handle errrors from prior connections as EAGAIN */
switch (errno) {
case ENETDOWN:
+#ifdef EPROTO
case EPROTO:
+#endif
case ENOPROTOOPT:
case EHOSTDOWN:
#ifdef ENONET