packages: keepalived/keepalived-use-linux-libc-headers.patch, keepalived/ke...

mguevara mguevara at pld-linux.org
Mon Oct 19 22:43:10 CEST 2009 

Author: mguevara                     Date: Mon Oct 19 20:43:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.1.19-2 - use autoconf to generate configure, configure not patched 
  directly anymore

---- Files affected:
packages/keepalived:
   keepalived-use-linux-libc-headers.patch (1.1 -> 1.2) , keepalived.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/keepalived/keepalived-use-linux-libc-headers.patch
diff -u packages/keepalived/keepalived-use-linux-libc-headers.patch:1.1 packages/keepalived/keepalived-use-linux-libc-headers.patch:1.2
--- packages/keepalived/keepalived-use-linux-libc-headers.patch:1.1	Sun Oct 18 23:24:28 2009
+++ packages/keepalived/keepalived-use-linux-libc-headers.patch	Mon Oct 19 22:43:04 2009
@@ -1,113 +1,3 @@
-diff -NurpP --minimal keepalived-1.1.19.a/configure keepalived-1.1.19.b/configure
---- keepalived-1.1.19.a/configure	2009-09-28 12:56:54.000000000 +0200
-+++ keepalived-1.1.19.b/configure	2009-10-18 22:52:53.000000000 +0200
-@@ -4227,7 +4227,6 @@ $as_echo "$as_me: error: Popt libraries 
- fi
- 
- 
--CPPFLAGS="$CPPFLAGS -I$kernelinc"
- { $as_echo "$as_me:$LINENO: checking for kernel version" >&5
- $as_echo_n "checking for kernel version... " >&6; }
- if test "$cross_compiling" = yes; then
-@@ -4344,8 +4343,8 @@ $as_echo "$as_me: WARNING: Cannot determ
- IPVS_SUPPORT="_WITHOUT_LVS_"
- if test "$enable_lvs" != "no"; then
-   if test "${ac_cv_header_net_ip_vs_h+set}" = set; then
--  { $as_echo "$as_me:$LINENO: checking for net/ip_vs.h" >&5
--$as_echo_n "checking for net/ip_vs.h... " >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for linux/ip_vs.h" >&5
-+$as_echo_n "checking for linux/ip_vs.h... " >&6; }
- if test "${ac_cv_header_net_ip_vs_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
-@@ -4353,8 +4352,8 @@ fi
- $as_echo "$ac_cv_header_net_ip_vs_h" >&6; }
- else
-   # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking net/ip_vs.h usability" >&5
--$as_echo_n "checking net/ip_vs.h usability... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking linux/ip_vs.h usability" >&5
-+$as_echo_n "checking linux/ip_vs.h usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4362,7 +4361,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <net/ip_vs.h>
-+#include <linux/ip_vs.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -4395,15 +4394,15 @@ rm -f core conftest.err conftest.$ac_obj
- $as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking net/ip_vs.h presence" >&5
--$as_echo_n "checking net/ip_vs.h presence... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking linux/ip_vs.h presence" >&5
-+$as_echo_n "checking linux/ip_vs.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <net/ip_vs.h>
-+#include <linux/ip_vs.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
-@@ -4437,30 +4436,30 @@ $as_echo "$ac_header_preproc" >&6; }
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: net/ip_vs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: net/ip_vs.h: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: linux/ip_vs.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: linux/ip_vs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: linux/ip_vs.h: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: linux/ip_vs.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: net/ip_vs.h: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: net/ip_vs.h:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: net/ip_vs.h: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: net/ip_vs.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: net/ip_vs.h: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: net/ip_vs.h: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: linux/ip_vs.h: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: linux/ip_vs.h: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: linux/ip_vs.h:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: linux/ip_vs.h:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: linux/ip_vs.h: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: linux/ip_vs.h: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: linux/ip_vs.h:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: linux/ip_vs.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: linux/ip_vs.h: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: linux/ip_vs.h: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: linux/ip_vs.h: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: linux/ip_vs.h: in the future, the compiler will take precedence" >&2;}
- 
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for net/ip_vs.h" >&5
--$as_echo_n "checking for net/ip_vs.h... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for linux/ip_vs.h" >&5
-+$as_echo_n "checking for linux/ip_vs.h... " >&6; }
- if test "${ac_cv_header_net_ip_vs_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
 diff -NurpP --minimal keepalived-1.1.19.a/configure.in keepalived-1.1.19.b/configure.in
 --- keepalived-1.1.19.a/configure.in	2009-09-28 12:56:54.000000000 +0200
 +++ keepalived-1.1.19.b/configure.in	2009-10-18 23:00:33.000000000 +0200

================================================================
Index: packages/keepalived/keepalived.spec
diff -u packages/keepalived/keepalived.spec:1.18 packages/keepalived/keepalived.spec:1.19
--- packages/keepalived/keepalived.spec:1.18	Mon Oct 19 02:29:01 2009
+++ packages/keepalived/keepalived.spec	Mon Oct 19 22:43:04 2009
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Monitor HA zbudowany w oparciu o LVS, VRRP i narzędzie do sprawdzania usług
 Name:		keepalived
 Version:	1.1.19
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://www.keepalived.org/software/%{name}-%{version}.tar.gz
@@ -71,6 +71,8 @@
 %patch1 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
 %configure \
 	CFLAGS="%{rpmcflags} -include %{_includedir}/linux/errno.h -D_WITH_LINKWATCH_"
 %{__make}
@@ -124,6 +126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2009/10/19 20:43:04  mguevara
+- 1.1.19-2 - use autoconf to generate configure, configure not patched
+  directly anymore
+
 Revision 1.18  2009/10/19 00:29:01  mguevara
 - 1.1.19-1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/keepalived/keepalived-use-linux-libc-headers.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/keepalived/keepalived.spec?r1=1.18&r2=1.19&f=u

More information about the pld-cvs-commit mailing list