Merge tag 'upstream/3.3.2'

Upstream version 3.3.2

Conflicts:
	common-src/glib-util.c
	perl/Amanda/Header.pm

diff --cc client-src/selfcheck.c
Simple merge

diff --cc common-src/glib-util.c
index 99f55f7aa8a91824fbb2d9202dc4fcc2fa1b9f3e,9fd8ced967bae8b91086e4c752a751523834c371..a20d7459d0992af0b5db590a8906b167c32f13c0
--- 1/common-src/glib-util.c
--- 2/common-src/glib-util.c
+++ b/common-src/glib-util.c
@@@ -38,8 -95,14 +95,13 @@@ glib_init(void) 
      if (did_glib_init) return;
      did_glib_init = TRUE;
  
 -    /* set up libcurl (this must happen before threading 
 -     * is initialized) */
 +    /* set up libcurl */
  #ifdef HAVE_LIBCURL
+ # ifdef G_THREADS_ENABLED
+ #  if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31))
+     g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
+ #  endif
+ # endif
      g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
  #endif
  

diff --cc debian/patches/series
index 9394693638ce5fd0481649662c1f41cab13491e1,0000000000000000000000000000000000000000..de4e07db022f340c8d55b7a7998a0ba178f61748
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,3 @@@
- VTAPES-access.diff
 +dumpdates-path
 +glib-2.32.patch
 +kfreebsd-ftbfs.diff

diff --cc man/amanda.conf.5
Simple merge

diff --cc man/disklist.5
Simple merge

diff --cc man/xml-source/amanda.conf.5.xml
Simple merge

diff --cc man/xml-source/disklist.5.xml
Simple merge

diff --cc server-src/diskfile.h
Simple merge