Upstream version 3.3.2
Conflicts:
common-src/glib-util.c
perl/Amanda/Header.pm
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
--- /dev/null
- VTAPES-access.diff
+dumpdates-path
+glib-2.32.patch
+kfreebsd-ftbfs.diff