Results 1 to 4 of 4

Thread: Amanda 2.6 and glib 2.24?

  1. #1

    Default Amanda 2.6 and glib 2.24?

    Hi! I noticed that there is a fix for the problem with glib 2.24 that has been added to the Amanda 3 branch. Is there an equivalent fix for the 2.6 branch, or will there be?

    Thanks,
    Ricky

  2. #2

    Default

    Hi! I went ahead and backported the fix from the 3_1 branch. Is there someplace I should post my patch other than here to have it committed?

    Thanks,
    Ricky

    Here is the patch:


    Code:
    --- common-src/glib-util.c.orig	2010-05-20 13:19:58.000000000 -0400
    +++ common-src/glib-util.c	2010-05-20 13:24:40.000000000 -0400
    @@ -38,26 +38,15 @@
         if (did_glib_init) return;
         did_glib_init = TRUE;
     
    -    /* Initialize glib's type system */
    -    g_type_init();
    -
         /* set up libcurl (this must happen before threading 
          * is initialized) */
     #ifdef HAVE_LIBCURL
     # ifdef G_THREADS_ENABLED
    -    g_assert(!g_thread_supported());
    +    g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
     # endif
         g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
     #endif
     
    -    /* And set up glib's threads */
    -#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
    -    if (g_thread_supported()) {
    -        return;
    -    }
    -    g_thread_init(NULL);
    -#endif
    -
         /* do a version check */
     #if GLIB_CHECK_VERSION(2,6,0)
         {
    @@ -71,6 +60,17 @@
     	}
         }
     #endif
    +
    +    /* Initialize glib's type system.  On glib >= 2.24, this will initialize
    +     * threads, so it must be done after curl is initialized. */
    +    g_type_init();
    +
    +    /* And set up glib's threads */
    +#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
    +    if (!g_thread_supported())
    +        g_thread_init(NULL);
    +#endif
    +
     }
     
     typedef enum {

  3. #3
    Join Date
    Mar 2007
    Location
    Chicago, IL
    Posts
    688

    Default

    You can fork the project on github:
    [url]http://github.com/zmanda/amanda[/url]

    At this point we're not planning another 2.6.1 release, so we haven't backported it.

  4. #4

    Default

    Would a patch be accepted and committed, so at least others who wanted to update from git could get the fix?

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •