packages: ntp/ntp-openssl_check.patch, ntp/ntp.spec, ntp/ntp-ntpdc-link_ord...

Mon May 24 21:24:44 CEST 2010

Author: jajcus                       Date: Mon May 24 19:24:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- PLD patches updated
- FC patches disabled (someone needs to review and update or remove them)

---- Files affected:
packages/ntp:
   ntp-openssl_check.patch (1.4 -> 1.5) , ntp.spec (1.132 -> 1.133) , ntp-ntpdc-link_order.patch (NONE -> 1.1)  (NEW), ntp-clock_settime.patch (1.1 -> NONE)  (REMOVED), ntp-manpage.patch (1.1 -> NONE)  (REMOVED), ntp-md5.patch (1.6 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ntp/ntp-openssl_check.patch
diff -u packages/ntp/ntp-openssl_check.patch:1.4 packages/ntp/ntp-openssl_check.patch:1.5

--- packages/ntp/ntp-openssl_check.patch:1.4	Mon May 24 19:55:05 2010
+++ packages/ntp/ntp-openssl_check.patch	Mon May 24 21:24:38 2010
@@ -1,5 +1,6 @@
---- ntp-4.2.6p1/configure.ac.orig	2010-05-24 19:32:21.000000000 +0200
-+++ ntp-4.2.6p1/configure.ac	2010-05-24 19:36:00.000000000 +0200
+diff -dur -x '*.orig' ntp-4.2.6p1.orig/configure.ac ntp-4.2.6p1/configure.ac
+--- ntp-4.2.6p1.orig/configure.ac	2010-05-24 20:26:21.000000000 +0200
++++ ntp-4.2.6p1/configure.ac	2010-05-24 20:32:57.000000000 +0200
 @@ -3247,7 +3247,6 @@
  AC_SUBST(OPENSSL_INC)
  AC_SUBST(OPENSSL_LIB)
@@ -8,10 +9,18 @@
  AC_ARG_WITH(openssl-libdir,
  	AC_HELP_STRING([--with-openssl-libdir], [+ =/something/reasonable]),
  [ans=$withval],
-@@ -3265,31 +3264,14 @@
- esac
+@@ -3257,39 +3256,14 @@
+ esac])
  case "$ans" in
   no) ;;
+- yes) # Look in:
+-    ans="/usr/lib /usr/lib/openssl /usr/sfw/lib /usr/local/lib /usr/local/ssl/lib /lib"
+-    ;;
+- *) # Look where they said
+-    ;;
+-esac
+-case "$ans" in
+- no) ;;
 - *) # Look for libcrypto.a and libssl.a:
 -    for i in $ans no
 -    do
@@ -47,7 +56,22 @@
  
  AC_MSG_CHECKING([for openssl include directory])
  AC_ARG_WITH(openssl-incdir,
-@@ -3335,7 +3317,7 @@
+@@ -3301,14 +3275,6 @@
+ esac])
+ case "$ans" in
+  no) ;;
+- yes) # look in:
+-    ans="/usr/include /usr/sfw/include /usr/local/include /usr/local/ssl/include"
+-    ;;
+- *) # Look where they said
+-    ;;
+-esac
+-case "$ans" in
+- no) ;;
+  *) # look for openssl/opensslconf.h:
+     for i in $ans no
+     do
+@@ -3335,7 +3301,7 @@
   no)
      ;;
   yes|openssl)
@@ -56,7 +80,7 @@
      then
  	ans=no
      else
-@@ -3349,11 +3331,9 @@
+@@ -3349,11 +3315,9 @@
   yes)
      # We have OpenSSL inc/lib - use them.
      CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
@@ -68,3 +92,4 @@
      AC_DEFINE(OPENSSL, , [Use OpenSSL?])
  esac
  
+Only in ntp-4.2.6p1: configure.ac~

================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.132 packages/ntp/ntp.spec:1.133
--- packages/ntp/ntp.spec:1.132	Mon May 24 19:55:05 2010
+++ packages/ntp/ntp.spec	Mon May 24 21:24:38 2010
@@ -1,4 +1,12 @@
 # $Revision$, $Date$
+#
+# TODO:
+#	- check which of the 'FC patches' are actually needed and update them
+#	as needed
+#	- ntpdseem.1 manual page 'disappeared'
+#	- warning: Installed (but unpackaged) file(s) found:
+#		/usr/share/man/man1/ntpsnmpd.1.gz
+#
 %include	/usr/lib/rpm/macros.perl
 Summary:	Network Time Protocol utilities
 Summary(pl.UTF-8):	Narzędzia do synchronizacji czasu (Network Time Protocol)
@@ -23,10 +31,8 @@
 Patch1:		%{name}-no_libelf.patch
 Patch2:		%{name}-ipv6.patch
 Patch3:		%{name}-openssl_check.patch
-Patch4:		%{name}-clock_settime.patch
-Patch5:		%{name}-md5.patch
-Patch6:		%{name}-nano.patch
-Patch7:		%{name}-manpage.patch
+Patch4:		%{name}-nano.patch
+Patch5:		%{name}-ntpdc-link_order.patch
 # FC patches
 Patch101:	%{name}-4.2.4p4-kernel.patch
 Patch102:	%{name}-4.2.4p0-droproot.patch
@@ -208,37 +214,35 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7	-p0
 
-# FC patches
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch114 -p1
-%patch115 -p1
-%patch117 -p1
-%patch118 -p1
-%patch119 -p1
-%patch120 -p1
-%patch122 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
-%patch127 -p1
-%patch129 -p1
-%patch130 -p1
-%patch133 -p1
+#%# FC patches
+#%%patch101 -p1
+#%%patch102 -p1
+#%%patch103 -p1
+#%%patch104 -p1
+#%%patch106 -p1
+#%%patch107 -p1
+#%%patch108 -p1
+#%%patch109 -p1
+#%%patch110 -p1
+#%%patch111 -p1
+#%%patch112 -p1
+#%%patch114 -p1
+#%%patch115 -p1
+#%%patch117 -p1
+#%%patch118 -p1
+#%%patch119 -p1
+#%%patch120 -p1
+#%%patch122 -p1
+#%%patch124 -p1
+#%%patch125 -p1
+#%%patch126 -p1
+#%%patch127 -p1
+#%%patch129 -p1
+#%%patch130 -p1
+#%%patch133 -p1
 
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
@@ -250,16 +254,18 @@
 %{__automake}
 cd sntp
 %{__libtoolize}
-%{__aclocal} -I libopts/m4
+%{__aclocal} -I ../m4 -I libopts/m4
 %{__autoconf}
 %{__automake}
 cd ..
 
+CPPFLAGS="%{rpmcppflags} -I/usr/include/readline"
 %configure \
 	--with-binsubdir=sbin \
 	--enable-linuxcaps \
 	--enable-getifaddrs \
 	--enable-ipv6 \
+	--with-lineeditlibs=readline \
 	--with-crypto=openssl
 
 %{__make}
@@ -373,7 +379,7 @@
 %attr(755,root,root) %{_sbindir}/tickadj
 %{_mandir}/man1/ntpd.1*
 %{_mandir}/man1/ntpdc.1*
-%{_mandir}/man1/ntpdsim.1*
+#%{_mandir}/man1/ntpdsim.1*
 %{_mandir}/man1/ntp-keygen.1*
 %{_mandir}/man1/ntpq.1*
 %{_mandir}/man1/ntptime.1*
@@ -411,6 +417,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2010/05/24 19:24:38  jajcus
+- PLD patches updated
+- FC patches disabled (someone needs to review and update or remove them)
+
 Revision 1.132  2010/05/24 17:55:05  jajcus
 - starting upgrade to 4.2.6p1
 

================================================================
Index: packages/ntp/ntp-ntpdc-link_order.patch
diff -u /dev/null packages/ntp/ntp-ntpdc-link_order.patch:1.1
--- /dev/null	Mon May 24 21:24:44 2010
+++ packages/ntp/ntp-ntpdc-link_order.patch	Mon May 24 21:24:38 2010
@@ -0,0 +1,26 @@
+--- ntp-4.2.6p1/ntpdc/Makefile.am.orig	2010-01-24 11:01:48.000000000 +0100
++++ ntp-4.2.6p1/ntpdc/Makefile.am	2010-05-24 20:59:08.000000000 +0200
+@@ -14,8 +14,8 @@
+ 	-I$(top_srcdir)/lib/isc/nothreads/include \
+ 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
+ # LDADD might need RESLIB and ADJLIB
+-ntpdc_LDADD=	version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+-		../libntp/libntp.a @LCRYPTO@
++ntpdc_LDADD=	version.o $(LIBOPTS_LDADD) \
++		../libntp/libntp.a @LCRYPTO@ @EDITLINE_LIBS@
+ # ntpdc-layout doesn't need any additional libraries at all
+ ntpdc_layout_LDADD=
+ DISTCLEANFILES=	.version version.c
+--- ntp-4.2.6p1/ntpq/Makefile.am~	2010-01-24 11:01:47.000000000 +0100
++++ ntp-4.2.6p1/ntpq/Makefile.am	2010-05-24 21:06:30.000000000 +0200
+@@ -12,8 +12,8 @@
+ 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
+ 
+ # LDADD might need RESLIB and ADJLIB
+-ntpq_LDADD=	version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+-		../libntp/libntp.a @LCRYPTO@
++ntpq_LDADD=	version.o $(LIBOPTS_LDADD) \
++		../libntp/libntp.a @EDITLINE_LIBS@ @LCRYPTO@
+ noinst_HEADERS=	ntpq.h
+ noinst_LIBRARIES=	libntpq.a
+ libntpq_a_CFLAGS=	-DNO_MAIN_ALLOWED -DBUILD_AS_LIB
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp-openssl_check.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.spec?r1=1.132&r2=1.133&f=u

