old

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

5 files changed, 7 insertions, 414 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 32532cd0e6a4..5eaa1ba0e511 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/keepalived
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.71 2011/01/29 19:00:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.72 2011/02/11 11:11:14 scarabeus Exp $
+
+  11 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/keepalived-1.1.13-do-not-need-kernel-sources.patch,
+  -keepalived-1.1.15.ebuild, -keepalived-1.1.17.ebuild,
+  -files/keepalived-1.1.17-do-not-need-kernel-sources.patch:
+  old
 
   29 Jan 2011; Raúl Porcel <armin76@gentoo.org> keepalived-1.1.20.ebuild:
   alpha/ia64/s390/sparc stable wrt #352015
diff --git a/sys-cluster/keepalived/files/keepalived-1.1.13-do-not-need-kernel-sources.patch b/sys-cluster/keepalived/files/keepalived-1.1.13-do-not-need-kernel-sources.patch
deleted file mode 100644
index 2ea18265ad60..000000000000
--- a/sys-cluster/keepalived/files/keepalived-1.1.13-do-not-need-kernel-sources.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Nuar keepalived-1.1.13.orig/configure.in keepalived-1.1.13/configure.in
---- keepalived-1.1.13.orig/configure.in	2006-10-10 02:19:38.000000000 -0700
-+++ keepalived-1.1.13/configure.in	2007-04-27 23:18:22.463502718 -0700
-@@ -48,103 +48,14 @@
- AC_CHECK_LIB(popt, poptGetContext,,AC_MSG_ERROR([Popt libraries is required]))
- 
- dnl ----[ Kernel version check ]----
--CPPFLAGS="$CPPFLAGS -I$kernelinc"
--AC_MSG_CHECKING([for kernel version])
--AC_TRY_RUN([
--    #include <stdlib.h>
--    #include <stdio.h>
--    #include <linux/version.h>
--    #if !defined(UTS_RELEASE)
--    #include <linux/utsrelease.h>
--    #endif
--    int main (void) {
--      FILE *fp = fopen ("linuxinfo", "w");
--      if (!fp) return 1;
--      fprintf (fp, "%s\n", UTS_RELEASE);
--      fclose (fp); 
--      return 0;
--    } 
--  ], [
--    LINUX_MAJOR=`cat linuxinfo | cut -d'.' -f1`
--    LINUX_MINOR=`cat linuxinfo | cut -d'.' -f2`
--    LINUX_PATCH=`cat linuxinfo | cut -d'.' -f3`
--  ], [
--    LINUX_MAJOR="0"
--    LINUX_MINOR="0"
--    LINUX_PATCH="0"
--  ], [
--    LINUX_MAJOR="0"
--    LINUX_MINOR="0"
--    LINUX_PATCH="0"
--  ])
--  rm -f linuxinfo
--  AC_MSG_RESULT([$LINUX_MAJOR.$LINUX_MINOR.$LINUX_PATCH])
--  if test "$LINUX_MINOR" = "6"; then
--    KERN="_KRNL_2_6_"
--  elif test "$LINUX_MINOR" = "4"; then
--    KERN="_KRNL_2_4_"
--  else
--    KERN="_KRNL_2_2_"
--  fi
--  if test "$LINUX_MAJOR" = "0" -a "$LINUX_MINOR" = "0" -a "$LINUX_PATCH" = "0"; then
--    AC_MSG_WARN([Cannot determine Linux Kernel version.])
--  fi
--
--AC_CHECK_FILE($kernelpath/net/core/link_watch.c, [
--                LINKWATCH_SUPPORT="_WITH_LINKWATCH_"
--              ], [
--                LINKWATCH_SUPPORT="_WITHOUT_LINKWATCH_"
--              ])
- 
-+KERN="_KRNL_2_6_"
-+LINKWATCH_SUPPORT="_WITH_LINKWATCH_"
- AC_SUBST(LINKWATCH_SUPPORT)
- AC_SUBST(KERN)
- 
- dnl ----[ Checks for LVS and VRRP support ]----
--IPVS_SUPPORT="_WITHOUT_LVS_"
--if test "$enable_lvs" != "no"; then
--  AC_CHECK_HEADER([net/ip_vs.h],
--    [IPVS_SUPPORT="_WITH_LVS_"],
--    [
--      IPVS_SUPPORT="_WITHOUT_LVS_"
--      IPVS_MAJOR="0"
--      IPVS_MINOR="0"
--      IPVS_PATCH="0"
--      AC_MSG_WARN([keepalived will be built without LVS support.])
--    ])
--fi  
--
--if test "$IPVS_SUPPORT" = "_WITH_LVS_"; then
--  AC_MSG_CHECKING([for IPVS version])
--  AC_TRY_RUN([ 
--    #include <stdlib.h>
--    #include <stdio.h>
--    #include <net/ip_vs.h>
--    int main (void) {
--      FILE *fp = fopen ("ipvsinfo", "w");
--      if (!fp) return 1;
--      fprintf (fp, "%d\n%d\n%d\n", NVERSION(IP_VS_VERSION_CODE));
--      fclose (fp); 
--      return 0;
--    } 
--  ], [
--    IPVS_MAJOR=`head -n 1 ipvsinfo | tail -n 1`
--    IPVS_MINOR=`head -n 2 ipvsinfo | tail -n 1`
--    IPVS_PATCH=`head -n 3 ipvsinfo | tail -n 1`
--  ], [
--    IPVS_MAJOR="0"
--    IPVS_MINOR="0"
--    IPVS_PATCH="0"
--  ], [
--    IPVS_MAJOR="0"
--    IPVS_MINOR="0"
--    IPVS_PATCH="0"
--  ])
--  rm -f ipvsinfo
--  AC_MSG_RESULT([$IPVS_MAJOR.$IPVS_MINOR.$IPVS_PATCH])
--  if test "$IPVS_MAJOR" = "0" -a "$IPVS_MINOR" = "0" -a "$IPVS_PATCH" = "0"; then
--    AC_MSG_WARN([Cannot determine IPVS version.])
--  fi
--fi
-+IPVS_SUPPORT="_WITH_LVS_"
- 
- if test "$IPVS_SUPPORT" = "_WITHOUT_LVS_" -a "$enable_vrrp" = "no"; then
-   AC_MSG_ERROR([keepalived MUST be compiled at least with LVS or VRRP framework])
-@@ -153,30 +64,7 @@
- dnl ----[ IPVS syncd support probe ]---
- dnl Sync daemon is supported since IPVS 0.9.2 for kernel 2.4
- 
--IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
--if test "$IPVS_SUPPORT" = "_WITH_LVS_"; then
--  AC_MSG_CHECKING([for IPVS syncd support])
--  if test "$KERN" = "_KRNL_2_6_"; then
--    IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
--  elif test "$IPVS_MAJOR" -ge 1 -a "$KERN" = "_KRNL_2_4_"; then
--    IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
--  elif test "$IPVS_MINOR" -ge 9 -a "$IPVS_PATCH" -ge 2 -a "$KERN" = "_KRNL_2_4_"; then
--    IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
--  else
--    IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
--  fi
--
--  if test "${IPVS_SUPPORT}" = "_WITHOUT_LVS_" -o "$enable_lvs_syncd" = "no"; then
--    IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
--  fi
--
--  if test "$IPVS_SYNCD" = "_HAVE_IPVS_SYNCD_"; then
--    AC_MSG_RESULT([yes])
--  else
--    AC_MSG_RESULT([no])
--  fi
--fi
--
-+IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
- AC_SUBST(IPVS_SYNCD)
- 
- dnl ----[ Checks for kernel netlink support ]----
diff --git a/sys-cluster/keepalived/files/keepalived-1.1.17-do-not-need-kernel-sources.patch b/sys-cluster/keepalived/files/keepalived-1.1.17-do-not-need-kernel-sources.patch
deleted file mode 100644
index 21441cc09a7c..000000000000
--- a/sys-cluster/keepalived/files/keepalived-1.1.17-do-not-need-kernel-sources.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -urN keepalived-1.1.17.orig/configure.in keepalived-1.1.17/configure.in
---- keepalived-1.1.17.orig/configure.in	2009-02-15 21:12:21.000000000 +0100
-+++ keepalived-1.1.17/configure.in	2009-03-05 12:24:05.550185436 +0100
-@@ -48,95 +48,20 @@
- AC_CHECK_LIB(popt, poptGetContext,,AC_MSG_ERROR([Popt libraries is required]))
- 
- dnl ----[ Kernel version check ]----
--CPPFLAGS="$CPPFLAGS -I$kernelinc"
--AC_MSG_CHECKING([for kernel version])
--AC_TRY_RUN([
--    #include <stdlib.h>
--    #include <stdio.h>
--    #include <linux/version.h>
--    #if !defined(UTS_RELEASE)
--    #include <linux/utsrelease.h>
--    #endif
--    int main (void) {
--      FILE *fp = fopen ("linuxinfo", "w");
--      if (!fp) return 1;
--      fprintf (fp, "%s\n", UTS_RELEASE);
--      fclose (fp); 
--      return 0;
--    } 
--  ], [
--    LINUX_MAJOR=`cat linuxinfo | cut -d'.' -f1`
--    LINUX_MINOR=`cat linuxinfo | cut -d'.' -f2`
--    LINUX_PATCH=`cat linuxinfo | cut -d'.' -f3`
--  ], [
--    LINUX_MAJOR="0"
--    LINUX_MINOR="0"
--    LINUX_PATCH="0"
--  ], [
--    LINUX_MAJOR="0"
--    LINUX_MINOR="0"
--    LINUX_PATCH="0"
--  ])
--  rm -f linuxinfo
--  AC_MSG_RESULT([$LINUX_MAJOR.$LINUX_MINOR.$LINUX_PATCH])
--  if test "$LINUX_MINOR" = "6"; then
--    KERN="_KRNL_2_6_"
--  elif test "$LINUX_MINOR" = "4"; then
--    KERN="_KRNL_2_4_"
--  else
--    KERN="_KRNL_2_2_"
--  fi
--  if test "$LINUX_MAJOR" = "0" -a "$LINUX_MINOR" = "0" -a "$LINUX_PATCH" = "0"; then
--    AC_MSG_WARN([Cannot determine Linux Kernel version.])
--  fi
--
--AC_CHECK_FILE($kernelpath/net/core/link_watch.c, [
--                LINKWATCH_SUPPORT="_WITH_LINKWATCH_"
--              ], [
--                LINKWATCH_SUPPORT="_WITHOUT_LINKWATCH_"
--              ])
--
-+KERN="_KRNL_2_6_"
-+LINKWATCH_SUPPORT="_WITH_LINKWATCH_"
- AC_SUBST(LINKWATCH_SUPPORT)
- AC_SUBST(KERN)
- 
- dnl ----[ Checks for LVS and VRRP support ]----
--IPVS_SUPPORT="_WITHOUT_LVS_"
--if test "$enable_lvs" != "no"; then
--  AC_CHECK_HEADER([net/ip_vs.h],
--    [IPVS_SUPPORT="_WITH_LVS_"],
--    [
--      IPVS_SUPPORT="_WITHOUT_LVS_"
--      AC_MSG_WARN([keepalived will be built without LVS support.])
--    ])
--fi  
-+IPVS_SUPPORT="_WITH_LVS_"
- 
- if test "$IPVS_SUPPORT" = "_WITHOUT_LVS_" -a "$enable_vrrp" = "no"; then
-   AC_MSG_ERROR([keepalived MUST be compiled at least with LVS or VRRP framework])
- fi
- 
- dnl ----[ IPVS syncd support probe ]---
--IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
--if test "$IPVS_SUPPORT" = "_WITH_LVS_"; then
--  AC_MSG_CHECKING([for IPVS syncd support])
--  if test "$KERN" = "_KRNL_2_6_"; then
--    IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
--  elif test "_KRNL_2_4_"; then
--    IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
--  else
--    IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
--  fi
--
--  if test "${IPVS_SUPPORT}" = "_WITHOUT_LVS_" -o "$enable_lvs_syncd" = "no"; then
--    IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
--  fi
--
--  if test "$IPVS_SYNCD" = "_HAVE_IPVS_SYNCD_"; then
--    AC_MSG_RESULT([yes])
--  else
--    AC_MSG_RESULT([no])
--  fi
--fi
--
-+IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
- AC_SUBST(IPVS_SYNCD)
- 
- dnl ----[ Checks for kernel netlink support ]----
diff --git a/sys-cluster/keepalived/keepalived-1.1.15.ebuild b/sys-cluster/keepalived/keepalived-1.1.15.ebuild
deleted file mode 100644
index b605bd370e5b..000000000000
--- a/sys-cluster/keepalived/keepalived-1.1.15.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild,v 1.12 2009/09/18 09:40:58 xmerlin Exp $
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="add a strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="debug profile"
-
-RDEPEND="dev-libs/popt
-	sys-apps/iproute2
-	dev-libs/openssl"
-DEPEND="${RDEPEND}
-	=sys-kernel/linux-headers-2.6*"
-
-src_unpack() {
-	unpack ${A}
-
-	# This patch allows us to avoid needing kernel sources for the configure phase
-	EPATCH_OPTS="-p1 -d${S}" epatch \
-		"${FILESDIR}"/${PN}-1.1.13-do-not-need-kernel-sources.patch
-	cd "${S}"
-	eautoreconf
-
-	# Prepare a suitable copy of the IPVS headers
-	# So that we don't need kernel sources at all!
-	mkdir -p "${S}"/include/net || die "Failed to prepare ipvs header directory"
-	cp -f "${FILESDIR}"/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
-		"${S}"/include/net/ip_vs.h || die "Failed to add ipvs header"
-
-	# Ensure that keepalived can find the header that we are injecting
-	append-flags -I"${S}"/include
-}
-
-src_compile() {
-	local myconf
-
-	myconf="--enable-vrrp"
-
-	# This is not an error
-	# The upstream makefile used to add man/, but doesn't anymore
-	myconf="${myconf} --mandir=/usr/share/man"
-
-	use debug && myconf="${myconf} --enable-debug"
-
-	# disable -fomit-frame-pointer for profiling
-	if use profile; then
-		filter-flags -fomit-frame-pointer
-		myconf="${myconf} --enable-profile"
-	fi
-
-	econf ${myconf} STRIP=/bin/true || die "configure failed"
-	emake || die "emake failed (myconf=${myconf})"
-}
-
-src_install() {
-	# Not parallel safe
-	emake -j1 install DESTDIR="${D}" || die "emake install failed"
-
-	newinitd "${FILESDIR}"/init-keepalived keepalived
-
-	dodoc doc/keepalived.conf.SYNOPSIS
-	dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -f "${D}"/etc/keepalived/samples/*.pem
-	# Clean up sysvinit files
-	rm -rf "${D}"/etc/sysconfig "${D}"/etc/rc.d/
-}
-
-pkg_postinst() {
-	elog "For internal debug support, compile with USE=debug via package.use"
-}
diff --git a/sys-cluster/keepalived/keepalived-1.1.17.ebuild b/sys-cluster/keepalived/keepalived-1.1.17.ebuild
deleted file mode 100644
index 6bfa79d622ce..000000000000
--- a/sys-cluster/keepalived/keepalived-1.1.17.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.17.ebuild,v 1.2 2009/09/18 09:40:58 xmerlin Exp $
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="add a strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="debug profile"
-
-RDEPEND="dev-libs/popt
-	sys-apps/iproute2
-	dev-libs/openssl"
-DEPEND="${RDEPEND}
-	=sys-kernel/linux-headers-2.6*"
-
-src_unpack() {
-	unpack ${A}
-
-	# This patch allows us to avoid needing kernel sources for the configure phase
-	EPATCH_OPTS="-p1 -d${S}" epatch \
-		"${FILESDIR}"/${P}-do-not-need-kernel-sources.patch
-	cd "${S}"
-	eautoreconf
-
-	# Prepare a suitable copy of the IPVS headers
-	# So that we don't need kernel sources at all!
-	mkdir -p "${S}"/include/net || die "Failed to prepare ipvs header directory"
-	cp -f "${FILESDIR}"/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
-		"${S}"/include/net/ip_vs.h || die "Failed to add ipvs header"
-
-	# Ensure that keepalived can find the header that we are injecting
-	append-flags -I"${S}"/include
-}
-
-src_compile() {
-	local myconf
-
-	myconf="--enable-vrrp"
-
-	# This is not an error
-	# The upstream makefile used to add man/, but doesn't anymore
-	myconf="${myconf} --mandir=/usr/share/man"
-
-	use debug && myconf="${myconf} --enable-debug"
-
-	# disable -fomit-frame-pointer for profiling
-	if use profile; then
-		filter-flags -fomit-frame-pointer
-		myconf="${myconf} --enable-profile"
-	fi
-
-	econf ${myconf} STRIP=/bin/true || die "configure failed"
-	emake || die "emake failed (myconf=${myconf})"
-}
-
-src_install() {
-	# Not parallel safe
-	emake -j1 install DESTDIR="${D}" || die "emake install failed"
-
-	newinitd "${FILESDIR}"/init-keepalived keepalived
-
-	dodoc doc/keepalived.conf.SYNOPSIS
-	dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -f "${D}"/etc/keepalived/samples/*.pem
-	# Clean up sysvinit files
-	rm -rf "${D}"/etc/sysconfig "${D}"/etc/rc.d/
-}
-
-pkg_postinst() {
-	elog "For internal debug support, compile with USE=debug via package.use"
-}