[pkg-bacula-commits] [bacula] 01/03: Imported Upstream version 7.4.6+dfsg
Carsten Leonhardt
leo at moszumanska.debian.org
Tue Mar 14 00:19:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch master
in repository bacula.
commit 9dbdab58a35b9b628361b250e5b9a285c9a8c16f
Author: Carsten Leonhardt <leo at debian.org>
Date: Tue Mar 14 01:15:28 2017 +0100
Imported Upstream version 7.4.6+dfsg
---
ChangeLog | 20 +++++++++++++++++++-
ReleaseNotes | 28 ++++++++++++++++++++++++++--
release/sign | 4 ++--
src/filed/xacl.c | 12 ++++++++++--
src/lib/address_conf.c | 2 +-
src/lib/bsock.c | 10 ++++++++++
src/stored/askdir.c | 3 +--
src/stored/wait.c | 6 +++---
src/version.h | 6 +++---
9 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 352e9ff..7a0fb7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,22 @@
- Changelog on version 7.4.5
+ Changelog on version 7.4.6
+
+Release Version 7.4.6
+
+10Mar17
+ - Fix bug #2271 where poll interval causes tape mount message to repeat
+ - Attempt to fix IPV6 not configured
+
+09Mar17
+ - Possible fix for acl seg fault on OpenBSD where no acl code defined
+ - Change release digest from SHA1 to SHA256
+
+14Feb17
+ - Fix getnameinfo() for FreeBSD fixes bug #2083
+
+Bugs fixed/closed since last release:
+2083 2271
+
+==========================================================================
Release version 7.4.5
diff --git a/ReleaseNotes b/ReleaseNotes
index 14452db..56a6e38 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,5 +1,30 @@
- Release Notes for Bacula 7.4.5
+ Release Notes for Bacula 7.4.6
+
+Release Version 7.4.6
+
+This is a bug fix release, which hopefully corrects a seg fault on OpenBSD
+due to the nex ACL/XATTR code, and it also fixes the large number of tape
+mount messages that are repeated at 5 minute intervals due to a bug in the
+poll code. Various small fixes for FreeBSD.
+
+Please note, the signature hash files (.sig) for the source code was
+previously SHA1. For this and future releases we have changed it to be
+SHA256.
+
+10Mar17
+ - Fix bug #2271 where poll interval causes tape mount message to repeat
+ - Attempt to fix IPV6 not configured
+ - Possible fix for acl seg fault on OpenBSD where no acl code defined
+ - Change release digest from SHA1 to SHA256
+ - Fix getnameinfo() for FreeBSD fixes bug #2083
+
+Bugs fixed/closed since last release:
+2083 2271
+
+=====================================================
+
+Release version 7.4.5
This is a minor bug fix plus a significant total rewrite of the
ACL and XATTR code by Radoslaw Korzeniewski.
@@ -22,7 +47,6 @@ ACL and XATTR code by Radoslaw Korzeniewski.
- Fix status alignment output reported by Wanderlei Huttel
-=====================================================
Release version 7.4.4
diff --git a/release/sign b/release/sign
index 2bdfc45..035a35c 100755
--- a/release/sign
+++ b/release/sign
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2017 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
gpgkey=${gpgkey:-bacula}
-gpg --detach-sign --armor --default-key $gpgkey -o $1.sig $1
+gpg --digest-algo=SHA256 --detach-sign --armor --default-key $gpgkey -o $1.sig $1
gpg --verify $1.sig
diff --git a/src/filed/xacl.c b/src/filed/xacl.c
index 5b60d7d..a66f95a 100644
--- a/src/filed/xacl.c
+++ b/src/filed/xacl.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2016 Kern Sibbald
+ Copyright (C) 2000-2017 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -1311,7 +1311,9 @@ bRC_XACL XACL::afs_restore_acl (JCR *jcr, int stream){
/*
* Creating the corrent instance of the XACL for a supported OS
*/
-void *new_xacl(){
+void *new_xacl()
+{
+ XACL *xacl;
#if defined(HAVE_DARWIN_OS)
return new XACL_OSX();
#elif defined(HAVE_LINUX_OS)
@@ -1328,5 +1330,11 @@ 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
};
diff --git a/src/lib/address_conf.c b/src/lib/address_conf.c
index 669f5ef..5262110 100644
--- a/src/lib/address_conf.c
+++ b/src/lib/address_conf.c
@@ -614,7 +614,7 @@ char *sockaddr_to_ascii(const struct sockaddr *sa, int socklen, char *buf, int b
char clientservice[NI_MAXSERV];
int status = 1;
if (sa->sa_family == AF_INET) {
- status = getnameinfo(sa, socklen, clienthost, sizeof(clienthost),
+ status = getnameinfo(sa, sizeof(sockaddr_in), clienthost, sizeof(clienthost),
clientservice, sizeof(clientservice),
NI_NUMERICHOST | NI_NUMERICSERV);
}
diff --git a/src/lib/bsock.c b/src/lib/bsock.c
index 1a694cc..e0bf32b 100644
--- a/src/lib/bsock.c
+++ b/src/lib/bsock.c
@@ -214,6 +214,16 @@ bool BSOCK::open(JCR *jcr, const char *name, char *host, char *service,
*/
break;
#endif
+#ifdef EPROTONOSUPPORT
+ /* See above comments */
+ case EPROTONOSUPPORT:
+ break;
+#endif
+#ifdef EPROTOTYPE
+ /* See above comments */
+ case EPROTOTYPE:
+ break;
+#endif
default:
*fatal = 1;
Qmsg3(jcr, M_ERROR, 0, _("Socket open error. proto=%d port=%d. ERR=%s\n"),
diff --git a/src/stored/askdir.c b/src/stored/askdir.c
index af0da08..84e4c47 100644
--- a/src/stored/askdir.c
+++ b/src/stored/askdir.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2016 Kern Sibbald
+ Copyright (C) 2000-2017 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -850,7 +850,6 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr, bool write_access)
}
get_out:
- dev->poll = false;
jcr->sendJobStatus(JS_Running);
Dmsg0(100, "leave dir_ask_sysop_to_mount_volume\n");
return true;
diff --git a/src/stored/wait.c b/src/stored/wait.c
index e664ee5..655e757 100644
--- a/src/stored/wait.c
+++ b/src/stored/wait.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2016 Kern Sibbald
+ Copyright (C) 2000-2017 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -146,7 +146,7 @@ int wait_for_sysop(DCR *dcr)
if (!unmounted && dev->vol_poll_interval &&
(total_waited >= dev->vol_poll_interval)) {
- Dmsg1(dbglvl, "poll return in wait blocked=%s\n", dev->print_blocked());
+ Dmsg1(dbglvl, "Set poll=true return in wait blocked=%s\n", dev->print_blocked());
dev->poll = true; /* returning a poll event */
stat = W_POLL;
break;
@@ -196,7 +196,7 @@ int wait_for_sysop(DCR *dcr)
dev->set_blocked(dev->dev_prev_blocked); /* restore entry state */
Dmsg1(dbglvl, "set %s\n", dev->print_blocked());
}
- Dmsg1(dbglvl, "Exit blocked=%s\n", dev->print_blocked());
+ Dmsg2(dbglvl, "Exit blocked=%s poll=%d\n", dev->print_blocked(), dev->poll);
dev->Unlock();
return stat;
}
diff --git a/src/version.h b/src/version.h
index 1fe7e44..78d91b0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -5,9 +5,9 @@
#define COMMUNITY 1 /* Define to create a Windows community binary */
/* Note: there can be only *one* VERSION in this file */
-#define VERSION "7.4.5"
-#define BDATE "07 February 2017"
-#define LSMDATE "07Feb17"
+#define VERSION "7.4.6"
+#define BDATE "10 March 2017"
+#define LSMDATE "10Mar17"
#define RELEASE 1 /* Use ONLY in rpms */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list