flock-build:

  set -m wasn't needed with ssh -tt and caused problems, remove
ChangeLog:
  [Bug 1172] 4.2.4p7-RC{3,4} fail to build on linux.
  remove unportable 'set -m' from flock-build script
configure.ac:
  reverse accidental backport from -dev of struct rtattr test in
  configure.ac without corresponding ntp_io.c code for HAVE_RTNETLINK

bk: 49fba68eFkfUWG2a50lgKLSnptYAtA

diff --git a/ChangeLog b/ChangeLog
index 91b1da15d7a5ec1d347bd565f5dde2923cb1679c..2232d189802c013bc94a9897129786c00f02fed7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+---
+
+* [Bug 1172] 4.2.4p7-RC{3,4} fail to build on linux.
+* flock-build script unportable 'set -m' use removed
+
 ---
 (4.2.4p7-RC4) 2009/04/29 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/configure.ac b/configure.ac
index 95b4a9f2073ba45ad5deb3a760e4568dc0493eec..a262e7ea466398a9842c3098c09a269fc9ff8bf3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -805,19 +805,8 @@ AC_CACHE_CHECK([for struct rt_msghdr], ac_cv_struct_rt_msghdr,
        ac_cv_struct_rt_msghdr=no)
 ])
 
-AC_CACHE_CHECK([for struct rtattr], ac_cv_struct_rtattr,
-[AC_TRY_COMPILE([
-#include <linux/rtnetlink.h>],
-[struct rtattr p;],
-       ac_cv_struct_rtattr=yes,
-       ac_cv_struct_rtattr=no)
-])
-
-if test $ac_cv_struct_rt_msghdr = yes -o $ac_cv_struct_rtattr = yes; then
+if test $ac_cv_struct_rt_msghdr = yes; then
     AC_DEFINE(HAS_ROUTING_SOCKET, 1, [Do we have a routing socket (struct rt_msghdr)?])
-    if test $ac_cv_struct_rtattr = yes; then
-        AC_DEFINE(HAVE_RTNETLINK, 1, [Do we have Linux routing socket?])
-    fi
 fi
 
 AC_CACHE_CHECK(

diff --git a/flock-build b/flock-build
index dafe25d855be48eb40fc9b939d644ad5315dd668..d80fc6d3d48cea3ea3d959342b620952fe88f1fe 100755 (executable)
--- a/flock-build
+++ b/flock-build
@@ -65,11 +65,9 @@ do
          1)
             cat > .flockbuild-$i-$SIG <<ENDQUOT
 #!/bin/sh
-# enable job control
-set -m
-# set -m alone is all that's needed on Solaris
-# FreeBSD job control was disabled without ssh -tt
-# option which forces a pseudo-tty to be used.
+
+# depends on job control and expects to be invoked under ssh -tt
+
 cd $c_d
 COUNT=0