version bump

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 196 insertions, 2 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 037342ce08e0..0081b121bf3e 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/keepalived
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.59 2008/05/17 17:19:22 armin76 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.60 2009/02/16 14:32:42 wschlich Exp $
+
+*keepalived-1.1.16 (16 Feb 2009)
+
+  16 Feb 2009; Wolfram Schlich <wschlich@gentoo.org>
+  +files/keepalived-1.1.16-do-not-need-kernel-sources.patch,
+  +keepalived-1.1.16.ebuild:
+  version bump
 
   17 May 2008; Raúl Porcel <armin76@gentoo.org> keepalived-1.1.15.ebuild:
   ia64/sparc stable wrt #213995
diff --git a/sys-cluster/keepalived/files/keepalived-1.1.16-do-not-need-kernel-sources.patch b/sys-cluster/keepalived/files/keepalived-1.1.16-do-not-need-kernel-sources.patch
new file mode 100644
index 000000000000..d9fba417790a
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-1.1.16-do-not-need-kernel-sources.patch
@@ -0,0 +1,103 @@
+diff -urN keepalived-1.1.16.orig/configure.in keepalived-1.1.16/configure.in
+--- keepalived-1.1.16.orig/configure.in	2009-02-15 21:12:21.000000000 +0100
++++ keepalived-1.1.16/configure.in	2009-02-16 15:07:20.023468087 +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.16.ebuild b/sys-cluster/keepalived/keepalived-1.1.16.ebuild
new file mode 100644
index 000000000000..c8be83e170c3
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.1.16.ebuild
@@ -0,0 +1,84 @@
+# 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.16.ebuild,v 1.1 2009/02/16 14:32:42 wschlich 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"
+}