SOURCES: ntp-ipv6.patch, ntp-md5.patch, ntp-no_libelf.patch, ntp-o...

arekm arekm at pld-linux.org
Sun May 20 19:46:47 CEST 2007 

Author: arekm                        Date: Sun May 20 17:46:47 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 4.2.4p0

---- Files affected:
SOURCES:
   ntp-ipv6.patch (1.2 -> 1.3) , ntp-md5.patch (1.3 -> 1.4) , ntp-no_libelf.patch (1.1 -> 1.2) , ntp-openssl_check.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/ntp-ipv6.patch
diff -u SOURCES/ntp-ipv6.patch:1.2 SOURCES/ntp-ipv6.patch:1.3
--- SOURCES/ntp-ipv6.patch:1.2	Mon May 17 01:34:07 2004
+++ SOURCES/ntp-ipv6.patch	Sun May 20 19:46:41 2007
@@ -1,20 +1,21 @@
 diff -urN ntp-4.2.0.org/ntpdate/ntpdate.c ntp-4.2.0/ntpdate/ntpdate.c
 --- ntp-4.2.0.org/ntpdate/ntpdate.c	2004-05-17 00:41:52.720460048 +0200
 +++ ntp-4.2.0/ntpdate/ntpdate.c	2004-05-17 01:33:48.375808440 +0200
-@@ -1697,12 +1697,14 @@
-     	   }
+@@ -1756,12 +1756,14 @@
+ 	   }
  #ifdef IPV6_V6ONLY
-            /* Restricts AF_INET6 socket to IPv6 communications (see RFC 2553bis-03) */
--           if (res->ai_family == AF_INET6)
--                if (setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval)) < 0) {
-+           if (res->ai_family == AF_INET6) {
-+	        int i = setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval));
-+	        if (i < 0 && errno != ENOPROTOOPT) {
-    		           netsyslog(LOG_ERR, "setsockopt() IPV6_V6ONLY failed: %m");
-    		           exit(1);
- 		           /*NOTREACHED*/
-     	        }
+ 	   /* Restricts AF_INET6 socket to IPv6 communications (see RFC 2553bis-03) */
+-	   if (res->ai_family == AF_INET6)
+-		if (setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval)) < 0) {
++	   if (res->ai_family == AF_INET6) {
++		int i = setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval));
++		if (i < 0 && errno != ENOPROTOOPT) {
+ 			   netsyslog(LOG_ERR, "setsockopt() IPV6_V6ONLY failed: %m");
+ 			   exit(1);
+ 			   /*NOTREACHED*/
+ 		}
 +	   }
  #endif
  
-            /* Remember the socket family in fd_family structure */
+ 	   /* Remember the socket family in fd_family structure */
+

================================================================
Index: SOURCES/ntp-md5.patch
diff -u SOURCES/ntp-md5.patch:1.3 SOURCES/ntp-md5.patch:1.4
--- SOURCES/ntp-md5.patch:1.3	Thu Feb 22 14:19:15 2007
+++ SOURCES/ntp-md5.patch	Sun May 20 19:46:42 2007
@@ -1,10 +1,10 @@
---- ntp-4.2.0/configure.in	2006-09-13 10:51:32.253439861 +0300
-+++ ntp-4.2.0.ssl/configure.in	2006-10-02 23:07:07.809947790 +0300
-@@ -205,8 +205,10 @@
+--- ntp-4.2.0/configure.ac	2006-09-13 10:51:32.253439861 +0300
++++ ntp-4.2.0.ssl/configure.ac	2006-10-02 23:07:07.809947790 +0300
+@@ -330,8 +330,10 @@
  AC_CHECK_FUNC(openlog, , 
    AC_CHECK_LIB(gen, openlog, , 
-   AC_CHECK_LIB(syslog, openlog, , , -lsocket)))
-+AC_CHECK_LIB(crypto, MD5_Init, , 
+   AC_CHECK_LIB(syslog, openlog, , , $libxnet -lsocket)))
++AC_CHECK_LIB(crypto, MD5_Init, ,
  AC_CHECK_LIB(md5, MD5Init, , 
    AC_CHECK_LIB(md, MD5Init))
 +)

================================================================
Index: SOURCES/ntp-no_libelf.patch
diff -u SOURCES/ntp-no_libelf.patch:1.1 SOURCES/ntp-no_libelf.patch:1.2
--- SOURCES/ntp-no_libelf.patch:1.1	Thu Nov 21 12:07:04 2002
+++ SOURCES/ntp-no_libelf.patch	Sun May 20 19:46:42 2007
@@ -1,15 +1,16 @@
-diff -ur ntp-4.1.1a.orig/configure.in ntp-4.1.1a/configure.in
---- ntp-4.1.1a.orig/configure.in	Thu Mar 28 23:42:00 2002
-+++ ntp-4.1.1a/configure.in	Thu Nov 21 11:56:41 2002
-@@ -184,8 +184,8 @@
-     AC_CHECK_LIB(advapi32, main)
-     ;;
- esac
--AC_CHECK_LIB(elf, nlist)	dnl Only needed for tickadj...
--dnl AC_CHECK_LIB(kvm, main, , , -lelf)
-+#AC_CHECK_LIB(elf, nlist)	dnl Only needed for tickadj...
-+#dnl AC_CHECK_LIB(kvm, main, , , -lelf)
- AC_CHECK_LIB(kvm, main)		dnl We already know about -lelf here...
- AC_CHECK_LIB(ld, nlist)
- AC_CHECK_LIB(mld, nlist)
-Only in ntp-4.1.1a: configure.in~
+diff -ur ntp-4.1.1a.orig/configure.ac ntp-4.1.1a/configure.ac
+--- ntp-4.1.1a.orig/configure.ac	Thu Mar 28 23:42:00 2002
++++ ntp-4.1.1a/configure.ac	Thu Nov 21 11:56:41 2002
+@@ -512,9 +512,9 @@
+ case "$ac_cv_func___adjtimex" in
+  yes) ;;
+  *)
+-    AC_CHECK_LIB(elf, nlist)	dnl Only needed for tickadj...
++    #AC_CHECK_LIB(elf, nlist)	dnl Only needed for tickadj...
+     dnl AC_CHECK_LIB(kvm, main, , , -lelf)
+-    AC_CHECK_LIB(kvm, main)		dnl We already know about -lelf here...
++    #AC_CHECK_LIB(kvm, main)		dnl We already know about -lelf here...
+     AC_CHECK_LIB(ld, nlist)
+     AC_CHECK_LIB(mld, nlist)
+     AC_CHECK_HEADER(nlist.h,
+

================================================================
Index: SOURCES/ntp-openssl_check.patch
diff -u SOURCES/ntp-openssl_check.patch:1.1 SOURCES/ntp-openssl_check.patch:1.2
--- SOURCES/ntp-openssl_check.patch:1.1	Fri Nov 19 22:15:19 2004
+++ SOURCES/ntp-openssl_check.patch	Sun May 20 19:46:42 2007
@@ -1,18 +1,20 @@
-diff -dur ntp-4.2.0.orig/configure.in ntp-4.2.0/configure.in
---- ntp-4.2.0.orig/configure.in	2004-11-19 21:00:04.000000000 +0100
-+++ ntp-4.2.0/configure.in	2004-11-19 21:53:20.876855603 +0100
-@@ -2576,44 +2576,19 @@
- 
- AC_SUBST(MAKE_NTP_KEYGEN)
+diff -dur ntp-4.2.0.orig/configure.ac ntp-4.2.0/configure.ac
+--- ntp-4.2.0.orig/configure.ac	2004-11-19 21:00:04.000000000 +0100
++++ ntp-4.2.0/configure.ac	2004-11-19 21:53:20.876855603 +0100
+@@ -3012,7 +3012,6 @@
+ AC_SUBST(OPENSSL_INC)
+ AC_SUBST(OPENSSL_LIB)
  
 -AC_MSG_CHECKING(for openssl library directory)
  AC_ARG_WITH(openssl-libdir,
  	AC_HELP_STRING([--with-openssl-libdir], [+ =/something/reasonable]),
- [ans=$withval], [ans=yes])
+ [ans=$withval],
+@@ -3022,39 +3021,14 @@
+ esac])
  case "$ans" in
   no) ;;
 - yes) # Look in:
--    ans="/usr/lib /usr/lib/openssl /usr/local/lib /usr/local/ssl/lib"
+-    ans="/usr/lib /usr/lib/openssl /usr/sfw/lib /usr/local/lib /usr/local/ssl/lib"
 -    ;;
 - *) # Look where they said
 -    ;;
@@ -27,6 +29,7 @@
 -	    test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
 -	    ;;
 -	 *)
+-	    test -f $i/libcrypto.so -a -f $i/libssl.so && break
 -	    test -f $i/libcrypto.a -a -f $i/libssl.a && break
 -	    ;;
 -	esac
@@ -40,20 +43,19 @@
 -	OPENSSL_LIB=$ans
 -	;;
 -    esac
--    ;;
-+ *)
++  *)
 +   if test "$ans" != "yes" ; then
 +       LDFLAGS="$LDFLAGS -L$ans"
 +   fi
 +   AC_CHECK_LIB([crypto],[DES_crypt],[AC_SUBST(LCRYPTO,[-lcrypto])])
 +   AC_CHECK_LIB([ssl],[SSL_CTX_new],[AC_SUBST(LSSL,[-lssl])])
-+   ;;
+     ;;
  esac
 -AC_MSG_RESULT($ans)
  
  AC_MSG_CHECKING(for openssl include directory)
  AC_ARG_WITH(openssl-incdir,
-@@ -2653,15 +2628,13 @@
+@@ -3098,19 +3072,17 @@
  case "$ans" in
   no) ;;
   yes|openssl)
@@ -66,7 +68,12 @@
  	ans=openssl
  	CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
 -	LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
+ 	case "$need_dash_r" in
+ 	 1) LDFLAGS="$LDFLAGS -R$OPENSSL_LIB"
+ 	    ;;
+ 	esac
 -	AC_SUBST(LCRYPTO, [-lcrypto])
- 	MAKE_NTP_KEYGEN=ntp-keygen
  	AC_DEFINE(OPENSSL, , [Use OpenSSL?])
  	AC_CHECK_FUNCS(EVP_md2 EVP_mdc2)
+     fi
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ntp-ipv6.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/ntp-md5.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/ntp-no_libelf.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/ntp-openssl_check.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list