From bart.vanassche at gmail.com  Fri Apr 18 08:36:53 2008
From: bart.vanassche at gmail.com (Bart Van Assche)
Date: Fri Apr 18 08:36:57 2008
Subject: [ENBD] [PATCH 2.4.35] bug fixes for configure.in
In-Reply-To: <e2e108260804180544k2f9e2194ld6d58419a592957f@mail.gmail.com>
References: <e2e108260804180544k2f9e2194ld6d58419a592957f@mail.gmail.com>
Message-ID: <e2e108260804180736s51db86e2me0688a219a79ba8d@mail.gmail.com>

Hello,

There are some bugs in the configure script of enbd version 2.4.35.
Can the patch below please be reviewed and applied ?

Thanks,

Bart.

 --- orig/enbd-2.4.35/nbd/configure.in   2008-04-17 17:08:54.000000000 +0200
 +++ enbd-2.4.35/nbd/configure.in        2008-04-18 14:28:34.000000000 +0200
 @@ -46,7 +46,7 @@
   #include <sys/time.h>
   #include <unistd.h>
   ],
 -  [main() { static struct timeval a, b; timeradd(&a,&b,&a); }],
 +  [static struct timeval a, b; timeradd(&a,&b,&a)],
   [ac_cv_func_timeradd=yes; AC_DEFINE(HAVE_TIMERADD)],
   [ac_cv_func_timeradd=no;  cat >> confdefs.h <<\EOF
   #define timeradd(a, b, result) \
 @@ -152,7 +152,7 @@
   #include <unistd.h>
   #include <time.h>
   ],
 -  [main() {
 +  [
      static struct timespec a;
      switch(1) {
        case 1:
 @@ -167,7 +167,6 @@
      #endif
          return 0;
      }
 -   }
   ],
   [ac_cv_func_clock_monotonic=yes; AC_DEFINE(HAVE_CLOCK_MONOTONIC)],
   [ac_cv_func_clock_monotonic=no]
 @@ -185,6 +184,7 @@
  # if HAVE_STDLIB_H
  #  include <stdlib.h>
  # endif
 +#endif
  #if HAVE_SYS_SOCKET_H
  # include <sys/socket.h>
  #endif
From ptb at inv.it.uc3m.es  Sat Apr 19 00:02:07 2008
From: ptb at inv.it.uc3m.es (Peter T. Breuer)
Date: Sat Apr 19 00:23:09 2008
Subject: [ENBD] [PATCH 2.4.35] bug fixes for configure.in
In-Reply-To: <e2e108260804180736s51db86e2me0688a219a79ba8d@mail.gmail.com> 
	from"Bart Van Assche" at "Apr 18, 2008 04:36:53 pm"
Message-ID: <200804190602.m3J627r29161@inv.it.uc3m.es>

"Also sprach Bart Van Assche:"
> There are some bugs in the configure script of enbd version 2.4.35.
> Can the patch below please be reviewed and applied ?

Sure. Great. Thanks.


> 
> Thanks,
> 
> Bart.
> 
>  --- orig/enbd-2.4.35/nbd/configure.in   2008-04-17 17:08:54.000000000 +0200
>  +++ enbd-2.4.35/nbd/configure.in        2008-04-18 14:28:34.000000000 +0200
>  @@ -46,7 +46,7 @@
>    #include <sys/time.h>
>    #include <unistd.h>
>    ],
>  -  [main() { static struct timeval a, b; timeradd(&a,&b,&a); }],
>  +  [static struct timeval a, b; timeradd(&a,&b,&a)],

You are correct. I know this!


>    [ac_cv_func_timeradd=yes; AC_DEFINE(HAVE_TIMERADD)],
>    [ac_cv_func_timeradd=no;  cat >> confdefs.h <<\EOF
>    #define timeradd(a, b, result) \
>  @@ -152,7 +152,7 @@
>    #include <unistd.h>
>    #include <time.h>
>    ],
>  -  [main() {
>  +  [

Ditto. Thanks. I've done it correctly elsewhere, I'm sure!

>       static struct timespec a;
>       switch(1) {
>         case 1:
>  @@ -167,7 +167,6 @@
>       #endif
>           return 0;
>       }
>  -   }
>    ],
>    [ac_cv_func_clock_monotonic=yes; AC_DEFINE(HAVE_CLOCK_MONOTONIC)],
>    [ac_cv_func_clock_monotonic=no]
>  @@ -185,6 +184,7 @@
>   # if HAVE_STDLIB_H
>   #  include <stdlib.h>
>   # endif
>  +#endif

Argh. Even when I indent correctly, I don't get it right!

Thanks.


Sorry for minor vibrations in 2.4.35 at the moment even though
2.4.36pre is out. I am preparing a release of some software based on
enbd next month, and am using 2.4.35 as the "stable" platform for it,
which means that I have to fix such lacks as I find in 2.4.35 to satisfy
everyone. At the meoment the only functional change is that one has to
echo rioctl=1 to /proc/nbdinfo in order to turn on remote ioctls ... 
well the nontrivial ones. That makes cross-platform server/client
combinations safe by default.


>   #if HAVE_SYS_SOCKET_H
>   # include <sys/socket.h>
>   #endif
> _______________________________________________
> ENBD mailing list
> ENBD@lists.community.tummy.com
> http://lists.community.tummy.com/mailman/listinfo/enbd


Many thanks.

Peter
>